fix: psalm on all, rename oauth and tidy up modern php

Author: lkm

Cache/NullCache.php

@@ -13,57 +13,17 @@
 use Psr\Log\LoggerInterface;
 use Psr\SimpleCache\CacheInterface;
 
-/**
- * Class BookboonOauthClient
- * @package Bookboon\OauthClient\Client
- */
-class OauthClient implements OauthInterface
+class AccessTokenClient
 {
+    protected string $_apiUri;
+    private ?AccessTokenInterface $accessToken;
+    protected ?string $act;
+    protected BookboonProvider $provider;
+    protected array $requestOptions = [];
+    protected string $apiId;
+    protected Headers $headers;
+    protected ?CacheInterface $cache;
 
-    const C_VERSION = '2.2';
-
-    /** @var string  */
-    protected $_apiUri;
-
-    /** @var AccessTokenInterface|null */
-    private $accessToken;
-
-    /** @var string|null */
-    protected $act;
-
-    /** @var BookboonProvider */
-    protected $provider;
-
-    /** @var array  */
-    protected $requestOptions = [];
-
-    /** @var string */
-    protected $apiId;
-
-    /** @var string */
-    protected $apiSecret;
-
-    /** @var Headers */
-    protected $headers;
-
-    /** @var CacheInterface|null */
-    protected $cache;
-
-    /**
-     * ClientCommon constructor.
-     * @param string $apiId
-     * @param string $apiSecret
-     * @param Headers $headers
-     * @param array $scopes
-     * @param CacheInterface|null $cache
-     * @param string|null $redirectUri
-     * @param string|null $appUserId
-     * @param string|null $authServiceUri
-     * @param string|null $apiUri
-     * @param LoggerInterface|null $logger
-     * @param array $clientOptions
-     * @throws UsageException
-     */
     public function __construct(
         string $apiId,
         string $apiSecret,
@@ -151,12 +111,6 @@ public function requestAccessToken(
         return $this->accessToken;
     }
 
-
-    /**
-     * @param AccessTokenInterface $accessToken
-     * @return AccessTokenInterface
-     * @throws IdentityProviderException
-     */
     public function refreshAccessToken(AccessTokenInterface $accessToken) : AccessTokenInterface
     {
         $this->accessToken = $this->provider->getAccessToken('refresh_token', [
@@ -166,20 +120,11 @@ public function refreshAccessToken(AccessTokenInterface $accessToken) : AccessTo
         return $accessToken;
     }
 
-    /**
-     * @return string
-     */
     public function generateState(): string
     {
         return $this->provider->generateRandomState();
     }
 
-    /**
-     * @param string $stateParameter
-     * @param string $stateSession
-     * @return boolean
-     * @throws ApiInvalidStateException
-     */
     public function isCorrectState(string $stateParameter, string $stateSession) : bool
     {
         if (empty($stateParameter) || ($stateParameter !== $stateSession)) {
@@ -189,10 +134,6 @@ public function isCorrectState(string $stateParameter, string $stateSession) : b
         return true;
     }
 
-    /**
-     * @param array $options
-     * @return string
-     */
     public function getAuthorizationUrl(array $options = []): string
     {
         $provider = $this->provider;
@@ -204,12 +145,6 @@ public function getAuthorizationUrl(array $options = []): string
         return $provider->getAuthorizationUrl($options);
     }
 
-
-    /**
-     * @param string|null $uri
-     * @return string
-     * @throws \Bookboon\ApiBundle\Exception\UsageException
-     */
     protected function parseUriOrDefault(?string $uri) : string
     {
         $protocol = ClientConstants::API_PROTOCOL;

Client/OauthClient.php Client/AccessTokenClient.phpClient/OauthClient.php renamed to Client/AccessTokenClient.php

@@ -14,8 +14,7 @@ class Headers implements ArrayAccess
     const HEADER_LANGUAGE = 'Accept-Language';
     const HEADER_XFF = 'X-Forwarded-For';
 
-    /** @var array */
-    private $headers = [];
+    private array $headers = [];
 
     public function __construct(array $headers = [])
     {
@@ -26,35 +25,16 @@ public function __construct(array $headers = [])
         $this->set(static::HEADER_XFF, $this->getRemoteAddress() ?? '');
     }
 
-    /**
-     * Set or override header.
-     *
-     * @param string $header
-     * @param string $value
-     * @return void
-     */
     public function set(string $header, string $value) : void
     {
         $this->headers[$header] = $value;
     }
 
-    /**
-     * Get specific header.
-     *
-     * @param string $header
-     *
-     * @return string|null false if header is not set or string value of header
-     */
     public function get(string $header) : ?string
     {
         return $this->headers[$header] ?? null;
     }
 
-    /**
-     * Get all headers in CURL format.
-     *
-     * @return array
-     */
     public function getAll() : array
     {
         $headers = [];
@@ -65,9 +45,6 @@ public function getAll() : array
         return $headers;
     }
 
-    /**
-     * @return array
-     */
     public function getHeadersArray() : array
     {
         return $this->headers;

Client/Headers.php

@@ -10,33 +10,17 @@
 use GuzzleHttp\RequestOptions;
 use League\OAuth2\Client\Token\AccessTokenInterface;
 use Psr\SimpleCache\CacheInterface;
-use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Serializer\SerializerInterface;
 
 class RawClient
 {
     const CACHE_KEY = "_raw_client_";
-    /**
-     * @var MappingCollection
-     */
-    private $_mappings;
-    /**
-     * @var ClientInterface
-     */
-    private $_client;
-    /**
-     * @var Serializer
-     */
-    private $_serializer;
-    /**
-     * @var CacheInterface
-     */
-    private $cache;
 
-    /**
-     * @var AccessTokenInterface|null
-     */
-    private $accessToken;
+    private MappingCollection $_mappings;
+    private ClientInterface $_client;
+    private SerializerInterface $_serializer;
+    private CacheInterface $cache;
+    private ?AccessTokenInterface $accessToken;
 
     public function __construct(
         MappingCollection   $mappings,

Client/OauthInterface.php

@@ -2,8 +2,6 @@
 
 namespace Bookboon\ApiBundle\DependencyInjection;
 
-use Bookboon\Api\Cache\Cache;
-use Bookboon\ApiBundle\Configuration\ApiConfiguration;
 use Bookboon\ApiBundle\Helper\ConfigurationHolder;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -12,7 +10,6 @@
 
 class BookboonApiExtension extends Extension
 {
-
     /**
      * Loads a specific configuration.
      *
@@ -23,7 +20,12 @@ class BookboonApiExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $config = $this->processConfiguration($this->getConfiguration($configs, $container), $configs);
+        $holder = $this->getConfiguration($configs, $container);
+        if (!$holder) {
+            throw new \InvalidArgumentException("nulled config");
+        }
+
+        $config = $this->processConfiguration($holder, $configs);
 
         $container->register(ConfigurationHolder::class, ConfigurationHolder::class)
             ->addArgument($config)

Client/RawClient.php

@@ -2,17 +2,11 @@
 
 namespace Bookboon\ApiBundle\DependencyInjection;
 
-use Bookboon\ApiBundle\Cache\NullCache;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * Generates the configuration tree builder.
-     *
-     * @return \Symfony\Component\Config\Definition\Builder\TreeBuilder The tree builder
-     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('bookboonapi');
@@ -27,13 +21,11 @@ public function getConfigTreeBuilder()
             ->scalarNode('currency')->end()
             ->scalarNode('impersonator_id')->defaultNull()->end()
             ->scalarNode('redirect')->defaultNull()->end()
-            ->scalarNode('cache_service')->defaultValue(NullCache::class)->end()
             ->arrayNode('languages')->isRequired()->prototype('scalar')->end()->end()
             ->arrayNode('scopes')->isRequired()->prototype('scalar')->end()->end()
             ->integerNode('premium_level')->end()
             ->scalarNode('override_api_uri')->defaultNull()->end()
             ->scalarNode('override_auth_uri')->defaultNull()->end()
-            ->scalarNode('client_service')->defaultNull()->end()
             ;
 
         return $treeBuilder;