feature #389 Drop legacy PHP support (bocharsky-bw)

This PR was squashed before being merged into the master branch. Discussion ---------- Drop legacy PHP support Apply some Rector rules to upgrade syntax up to PHP 7.4 and drop legacy PHP support below 7.4 Commits ------- 6d99aa9 Drop legacy PHP support
knpuniversity · Feb 1, 2023 · 5e1abf1 · 5e1abf1
2 parents e343b87 + 6d99aa9
commit 5e1abf1
Show file tree

Hide file tree

Showing 68 changed files with 151 additions and 109 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -16,12 +16,12 @@ jobs:
       fail-fast: false
       matrix:
         # normal, highest, non-dev installs
-        php-version: ['7.3', '7.4', '8.0', '8.1', '8.2']
+        php-version: ['7.4', '8.0', '8.1', '8.2']
         composer-options: ['--prefer-stable']
         dependency-versions: ['highest']
         include:
           # testing lowest php with lowest dependencies
-          - php-version: '7.2'
+          - php-version: '7.4'
             dependency-versions: 'lowest'
             composer-options: '--prefer-lowest'
           # testing dev versions with highest PHP

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "php": ">=7.2.5",
+        "php": ">=7.4",
         "symfony/framework-bundle": "^4.4|^5.0|^6.0",
         "symfony/dependency-injection": "^4.4|^5.0|^6.0",
         "symfony/routing": "^4.4|^5.0|^6.0",

diff --git a/src/Client/ClientRegistry.php b/src/Client/ClientRegistry.php
@@ -14,11 +14,9 @@
 
 class ClientRegistry
 {
-    /** @var ContainerInterface */
-    private $container;
+    private ContainerInterface $container;
 
-    /** @var array */
-    private $serviceMap;
+    private array $serviceMap;
 
     /**
      * ClientRegistry constructor.

diff --git a/src/Client/OAuth2Client.php b/src/Client/OAuth2Client.php
@@ -23,14 +23,11 @@ class OAuth2Client implements OAuth2ClientInterface
 {
     public const OAUTH2_SESSION_STATE_KEY = 'knpu.oauth2_client_state';
 
-    /** @var AbstractProvider */
-    private $provider;
+    private AbstractProvider $provider;
 
-    /** @var RequestStack */
-    private $requestStack;
+    private RequestStack $requestStack;
 
-    /** @var bool */
-    private $isStateless = false;
+    private bool $isStateless = false;
 
     /**
      * OAuth2Client constructor.

diff --git a/src/Client/OAuth2PKCEClient.php b/src/Client/OAuth2PKCEClient.php
@@ -27,8 +27,7 @@ class OAuth2PKCEClient extends OAuth2Client
 {
     public const VERIFIER_KEY = 'pkce_code_verifier';
 
-    /** @var RequestStack */
-    private $requestStack;
+    private RequestStack $requestStack;
 
     public function __construct(AbstractProvider $provider,
                                 RequestStack $requestStack)

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -46,9 +46,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->end()
             ->end()
             ->validate()
-                ->ifTrue(function ($v) {
-                    return isset($v['http_client_options'], $v['http_client']) && !empty($v['http_client_options']);
-                })
+                ->ifTrue(fn ($v) => isset($v['http_client_options'], $v['http_client']) && !empty($v['http_client_options']))
                 ->thenInvalid('You cannot use both "http_client_options" and "http_client" at the same time under "knpu_oauth2_client".')
             ->end()
         ;

diff --git a/src/DependencyInjection/KnpUOAuth2ClientExtension.php b/src/DependencyInjection/KnpUOAuth2ClientExtension.php
@@ -86,14 +86,11 @@ class KnpUOAuth2ClientExtension extends Extension
     /** @var bool */
     private $checkExternalClassExistence;
 
-    /** @var array */
-    private $configurators = [];
+    private array $configurators = [];
 
-    /** @var array */
-    private $duplicateProviderTypes = [];
+    private array $duplicateProviderTypes = [];
 
-    /** @var array */
-    private static $supportedProviderTypes = [
+    private static array $supportedProviderTypes = [
         'amazon' => AmazonProviderConfigurator::class,
         'appid' => AppIdProviderConfigurator::class,
         'apple' => AppleProviderConfigurator::class,

diff --git a/src/DependencyInjection/ProviderFactory.php b/src/DependencyInjection/ProviderFactory.php
@@ -19,8 +19,7 @@
  */
 class ProviderFactory
 {
-    /** @var UrlGeneratorInterface */
-    private $generator;
+    private UrlGeneratorInterface $generator;
 
     /**
      * ProviderFactory constructor.

diff --git a/src/DependencyInjection/Providers/AmazonProviderConfigurator.php b/src/DependencyInjection/Providers/AmazonProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\AmazonClient;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 class AmazonProviderConfigurator implements ProviderConfiguratorInterface
@@ -49,6 +50,6 @@ public function getProviderDisplayName()
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\AmazonClient';
+        return AmazonClient::class;
     }
 }
diff --git a/src/DependencyInjection/Providers/AppIdProviderConfigurator.php b/src/DependencyInjection/Providers/AppIdProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\AppIdClient;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 /**
@@ -47,7 +48,7 @@ public function getProviderClass(array $configuration)
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\AppIdClient';
+        return AppIdClient::class;
     }
 
     public function getProviderOptions(array $configuration)

diff --git a/src/DependencyInjection/Providers/AppleProviderConfigurator.php b/src/DependencyInjection/Providers/AppleProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\AppleClient;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 class AppleProviderConfigurator implements ProviderConfiguratorInterface, ProviderWithoutClientSecretConfiguratorInterface
@@ -41,7 +42,7 @@ public function getProviderClass(array $configuration)
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\AppleClient';
+        return AppleClient::class;
     }
 
     public function getProviderOptions(array $configuration)

diff --git a/src/DependencyInjection/Providers/Auth0ProviderConfigurator.php b/src/DependencyInjection/Providers/Auth0ProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\Auth0Client;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 class Auth0ProviderConfigurator implements ProviderConfiguratorInterface
@@ -65,6 +66,6 @@ public function getProviderDisplayName()
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\Auth0Client';
+        return Auth0Client::class;
     }
 }
diff --git a/src/DependencyInjection/Providers/AzureProviderConfigurator.php b/src/DependencyInjection/Providers/AzureProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\AzureClient;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 class AzureProviderConfigurator implements ProviderConfiguratorInterface, ProviderWithoutClientSecretConfiguratorInterface
@@ -90,15 +91,11 @@ public function buildConfiguration(NodeBuilder $node)
         $node
             ->end()
               ->validate()
-                ->ifTrue(function ($v) {
-                    return empty($v['client_secret']) && empty($v['client_certificate_private_key']);
-                })
+                ->ifTrue(fn ($v) => empty($v['client_secret']) && empty($v['client_certificate_private_key']))
                 ->thenInvalid('You have to define either client_secret or client_certificate_private_key')
               ->end()
                 ->validate()
-                ->ifTrue(function ($v) {
-                    return !empty($v['client_certificate_private_key']) && empty($v['client_certificate_thumbprint']);
-                })
+                ->ifTrue(fn ($v) => !empty($v['client_certificate_private_key']) && empty($v['client_certificate_thumbprint']))
               ->thenInvalid('You have to define the client_certificate_thumbprint when using a certificate')
             ->end();
     }
@@ -145,6 +142,6 @@ public function getProviderDisplayName()
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\AzureClient';
+        return AzureClient::class;
     }
 }
diff --git a/src/DependencyInjection/Providers/BitbucketProviderConfigurator.php b/src/DependencyInjection/Providers/BitbucketProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\BitbucketClient;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 class BitbucketProviderConfigurator implements ProviderConfiguratorInterface
@@ -49,6 +50,6 @@ public function getProviderDisplayName()
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\BitbucketClient';
+        return BitbucketClient::class;
     }
 }
diff --git a/src/DependencyInjection/Providers/BoxProviderConfigurator.php b/src/DependencyInjection/Providers/BoxProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\BoxClient;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 class BoxProviderConfigurator implements ProviderConfiguratorInterface
@@ -49,6 +50,6 @@ public function getProviderDisplayName()
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\BoxClient';
+        return BoxClient::class;
     }
 }
diff --git a/src/DependencyInjection/Providers/BuddyProviderConfigurator.php b/src/DependencyInjection/Providers/BuddyProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\BuddyClient;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 class BuddyProviderConfigurator implements ProviderConfiguratorInterface
@@ -55,6 +56,6 @@ public function getProviderDisplayName()
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\BuddyClient';
+        return BuddyClient::class;
     }
 }
diff --git a/src/DependencyInjection/Providers/BufferProviderConfigurator.php b/src/DependencyInjection/Providers/BufferProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\BufferClient;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 class BufferProviderConfigurator implements ProviderConfiguratorInterface
@@ -49,6 +50,6 @@ public function getProviderDisplayName()
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\BufferClient';
+        return BufferClient::class;
     }
 }
diff --git a/src/DependencyInjection/Providers/CanvasLMSProviderConfigurator.php b/src/DependencyInjection/Providers/CanvasLMSProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\CanvasLMSClient;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 class CanvasLMSProviderConfigurator implements ProviderConfiguratorInterface
@@ -64,6 +65,6 @@ public function getProviderDisplayName()
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\CanvasLMSClient';
+        return CanvasLMSClient::class;
     }
 }
diff --git a/src/DependencyInjection/Providers/CleverProviderConfigurator.php b/src/DependencyInjection/Providers/CleverProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\CleverClient;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 class CleverProviderConfigurator implements ProviderConfiguratorInterface
@@ -49,6 +50,6 @@ public function getProviderDisplayName()
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\CleverClient';
+        return CleverClient::class;
     }
 }
diff --git a/src/DependencyInjection/Providers/DevianArtProviderConfigurator.php b/src/DependencyInjection/Providers/DevianArtProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\DevianArtClient;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 class DevianArtProviderConfigurator implements ProviderConfiguratorInterface
@@ -49,6 +50,6 @@ public function getProviderDisplayName()
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\DevianArtClient';
+        return DevianArtClient::class;
     }
 }
diff --git a/src/DependencyInjection/Providers/DigitalOceanProviderConfigurator.php b/src/DependencyInjection/Providers/DigitalOceanProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\DigitalOceanClient;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 class DigitalOceanProviderConfigurator implements ProviderConfiguratorInterface
@@ -49,6 +50,6 @@ public function getProviderDisplayName()
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\DigitalOceanClient';
+        return DigitalOceanClient::class;
     }
 }
diff --git a/src/DependencyInjection/Providers/DiscordProviderConfigurator.php b/src/DependencyInjection/Providers/DiscordProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\DiscordClient;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 class DiscordProviderConfigurator implements ProviderConfiguratorInterface
@@ -49,6 +50,6 @@ public function getProviderDisplayName()
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\DiscordClient';
+        return DiscordClient::class;
     }
 }
diff --git a/src/DependencyInjection/Providers/DribbbleProviderConfigurator.php b/src/DependencyInjection/Providers/DribbbleProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\DribbbleClient;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 class DribbbleProviderConfigurator implements ProviderConfiguratorInterface
@@ -49,6 +50,6 @@ public function getProviderDisplayName()
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\DribbbleClient';
+        return DribbbleClient::class;
     }
 }
diff --git a/src/DependencyInjection/Providers/DropboxProviderConfigurator.php b/src/DependencyInjection/Providers/DropboxProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\DropboxClient;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 class DropboxProviderConfigurator implements ProviderConfiguratorInterface
@@ -49,6 +50,6 @@ public function getProviderDisplayName()
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\DropboxClient';
+        return DropboxClient::class;
     }
 }
diff --git a/src/DependencyInjection/Providers/DrupalProviderConfigurator.php b/src/DependencyInjection/Providers/DrupalProviderConfigurator.php
@@ -10,6 +10,7 @@
 
 namespace KnpU\OAuth2ClientBundle\DependencyInjection\Providers;
 
+use KnpU\OAuth2ClientBundle\Client\Provider\DrupalClient;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 class DrupalProviderConfigurator implements ProviderConfiguratorInterface
@@ -56,6 +57,6 @@ public function getProviderDisplayName()
 
     public function getClientClass(array $config)
     {
-        return 'KnpU\OAuth2ClientBundle\Client\Provider\DrupalClient';
+        return DrupalClient::class;
     }
 }