Merge pull request #1833 from stloyd/bugfix/sf-54

stloyd · web-flow · commit 26a34330bf50 · 2021-12-07T09:23:27.000+01:00
Bugfix | Symfony 5.4 problems
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -78,7 +78,6 @@ jobs:
             stability: 'stable'
           - php: '8.0'
             symfony-require: '5.4.*'
-            stability: 'dev'
             dependencies: 'highest'
       fail-fast: false
     steps:
diff --git a/DependencyInjection/HWIOAuthExtension.php b/DependencyInjection/HWIOAuthExtension.php
@@ -142,10 +142,7 @@ public function createResourceOwnerService(ContainerBuilder $container, $name, a
         $container->setDefinition('hwi_oauth.resource_owner.'.$name, $definition);
     }
 
-    /**
-     * @return string
-     */
-    public function getAlias()
+    public function getAlias(): string
     {
         return 'hwi_oauth';
     }
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Installation
 
 All the installation instructions are located in the documentation, check it for a specific version:
 
-* [__2.0__](https://github.com/hwi/HWIOAuthBundle/blob/master/Resources/doc/1-setting_up_the_bundle.md) (upcoming) - with support for Symfony: `^4.4` & `^5.3` (PHP: `^7.3` & `^8.0`),
+* [__2.0__](https://github.com/hwi/HWIOAuthBundle/blob/master/Resources/doc/1-setting_up_the_bundle.md) (upcoming) - with support for Symfony: `^4.4`, `^5.4` & `^6.0` (PHP: `^7.4`, `^8.0`),
 
 * [__1.4__](https://github.com/hwi/HWIOAuthBundle/blob/1.4/Resources/doc/1-setting_up_the_bundle.md) (current) - with support for Symfony: `^4.4` & `^5.1` (PHP: `^7.3` & `^8.0`),
 
diff --git a/Security/Core/Authentication/Token/AbstractOAuthToken.php b/Security/Core/Authentication/Token/AbstractOAuthToken.php
@@ -70,10 +70,9 @@ public function __construct($accessToken, array $roles = [])
 
         // Workaround for: Method "AbstractToken::setAuthenticated()" is deprecated
         if (Kernel::VERSION_ID > 50399) {
-            // @phpstan-ignore-next-line
-            parent::setAuthenticated(\count($roles) > 0, false);
+            $this->setAuthenticated(\count($roles) > 0, false);
         } else {
-            parent::setAuthenticated(\count($roles) > 0);
+            $this->setAuthenticated(\count($roles) > 0);
         }
     }
 
diff --git a/Security/Core/Exception/AccountNotLinkedException.php b/Security/Core/Exception/AccountNotLinkedException.php
@@ -50,7 +50,7 @@ public function __unserialize(array $data): void
     /**
      * {@inheritdoc}
      */
-    public function getMessageKey()
+    public function getMessageKey(): string
     {
         return 'Account could not be linked correctly.';
     }
diff --git a/composer.json b/composer.json
@@ -130,6 +130,18 @@
     },
 
     "conflict": {
+        "symfony/cache":                "^6.0",
+        "symfony/config":               "^6.0",
+        "symfony/dependency-injection": "^6.0",
+        "symfony/doctrine-bridge":      "^6.0",
+        "symfony/error-handler":        "^6.0",
+        "symfony/http-foundation":      "^6.0",
+        "symfony/password-hasher":      "^6.0",
+        "symfony/property-info":        "^6.0",
+        "symfony/security-core":        "^6.0",
+        "symfony/security-http":        "^6.0",
+        "symfony/security-csrf":        "^6.0",
+        "symfony/twig-bridge":          "^6.0",
         "twig/twig":                    "<1.34"
     },
 

Original file line number	Diff line number	Diff line change
`@@ -142,10 +142,7 @@ public function createResourceOwnerService(ContainerBuilder $container, $name, a`
`142`	`142`	`$container->setDefinition('hwi_oauth.resource_owner.'.$name, $definition);`
`143`	`143`	`}`
`144`	`144`
`145`		`- /**`
`146`		`- * @return string`
`147`		`- */`
`148`		`- public function getAlias()`
	`145`	`+ public function getAlias(): string`
`149`	`146`	`{`
`150`	`147`	`return 'hwi_oauth';`
`151`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,9 @@ public function __construct($accessToken, array $roles = [])`
`70`	`70`
`71`	`71`	`// Workaround for: Method "AbstractToken::setAuthenticated()" is deprecated`
`72`	`72`	`if (Kernel::VERSION_ID > 50399) {`
`73`		`- // @phpstan-ignore-next-line`
`74`		`- parent::setAuthenticated(\count($roles) > 0, false);`
	`73`	`+ $this->setAuthenticated(\count($roles) > 0, false);`
`75`	`74`	`} else {`
`76`		`- parent::setAuthenticated(\count($roles) > 0);`
	`75`	`+ $this->setAuthenticated(\count($roles) > 0);`
`77`	`76`	`}`
`78`	`77`	`}`
`79`	`78`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function __unserialize(array $data): void`
`50`	`50`	`/**`
`51`	`51`	`* {@inheritdoc}`
`52`	`52`	`*/`
`53`		`- public function getMessageKey()`
	`53`	`+ public function getMessageKey(): string`
`54`	`54`	`{`
`55`	`55`	`return 'Account could not be linked correctly.';`
`56`	`56`	`}`