Add support for PHP 8.2 (#4)

alexander-schranz · web-flow · commit a0e7ec9bc616 · 2023-05-22T15:05:51.000+02:00
* Add support for PHP 8.2

* Fix Deptrac dependency

* Update rector

* Fix php-cs
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -26,6 +26,12 @@ jobs:
                           SYMFONY_DEPRECATIONS_HELPER: weak
 
                     - php-version: '8.1'
+                      coverage: false
+                      dependency-versions: 'highest'
+                      env:
+                          SYMFONY_DEPRECATIONS_HELPER: weak
+
+                    - php-version: '8.2'
                       coverage: true
                       dependency-versions: 'highest'
                       env:
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "license": "proprietary",
     "type": "sulu-bundle",
     "require": {
-        "php": "8.0.* || 8.1.*",
+        "php": "8.0.* || 8.1.* || 8.2.*",
         "doctrine/dbal": "^3.3",
         "doctrine/doctrine-bundle": "^2.5",
         "doctrine/orm": "^2.11",
@@ -32,8 +32,8 @@
         "phpstan/phpstan-symfony": "^1.1",
         "phpstan/phpstan-webmozart-assert": "^1.0",
         "phpunit/phpunit": "^9.5",
-        "qossmic/deptrac-shim": "^0.23.0",
-        "rector/rector": "^0.13.10",
+        "qossmic/deptrac-shim": "^0.24.0 || ^1.0",
+        "rector/rector": "^0.15.0",
         "schranz/test-generator": "^0.4",
         "symfony/browser-kit": "^5.4 || ^6.0",
         "symfony/css-selector": "^5.4 || ^6.0",
diff --git a/rector.php b/rector.php
@@ -26,7 +26,7 @@
 
     // basic rules
     $rectorConfig->importNames();
-    $rectorConfig->importShortClasses();
+    $rectorConfig->importShortClasses(false);
 
     $rectorConfig->sets([
         SetList::CODE_QUALITY,
diff --git a/src/Infrastructure/Symfony/HttpKernel/SuluMessengerBundle.php b/src/Infrastructure/Symfony/HttpKernel/SuluMessengerBundle.php
@@ -4,7 +4,6 @@
 
 namespace Sulu\Messenger\Infrastructure\Symfony\HttpKernel;
 
-use RuntimeException;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\FileLocator;
@@ -53,7 +52,7 @@ public function getConfiguration(array $config, ContainerBuilder $container): Co
     public function prepend(ContainerBuilder $container): void
     {
         if (!$container->hasExtension('framework')) {
-            throw new RuntimeException(\sprintf('The "%s" bundle requires "framework" bundle.', self::ALIAS));
+            throw new \RuntimeException(\sprintf('The "%s" bundle requires "framework" bundle.', self::ALIAS));
         }
 
         $container->prependExtensionConfig(
diff --git a/tests/Traits/PrivatePropertyTrait.php b/tests/Traits/PrivatePropertyTrait.php
@@ -4,9 +4,7 @@
 
 namespace Sulu\Messenger\Tests\Traits;
 
-use ReflectionClass;
 use ReflectionException;
-use ReflectionProperty;
 
 trait PrivatePropertyTrait
 {
@@ -15,7 +13,7 @@ trait PrivatePropertyTrait
      */
     protected static function getPrivateProperty(object $object, string $propertyName)
     {
-        $reflection = new ReflectionClass($object);
+        $reflection = new \ReflectionClass($object);
         $propertyReflection = $reflection->getProperty($propertyName);
         $propertyReflection->setAccessible(true);
 
@@ -24,7 +22,7 @@ protected static function getPrivateProperty(object $object, string $propertyNam
 
     protected static function setPrivateProperty(object $object, string $propertyName, mixed $value): void
     {
-        $reflection = new ReflectionClass($object);
+        $reflection = new \ReflectionClass($object);
         try {
             $propertyReflection = $reflection->getProperty($propertyName);
             self::setValue($propertyReflection, $object, $value);
@@ -37,7 +35,7 @@ protected static function setPrivateProperty(object $object, string $propertyNam
         }
     }
 
-    private static function setValue(ReflectionProperty $propertyReflection, object $object, mixed $value): void
+    private static function setValue(\ReflectionProperty $propertyReflection, object $object, mixed $value): void
     {
         $propertyReflection->setAccessible(true);
 
diff --git a/tests/Unit/Infrastructure/Symfony/Messenger/FlushMiddleware/DoctrineFlushMiddlewareTest.php b/tests/Unit/Infrastructure/Symfony/Messenger/FlushMiddleware/DoctrineFlushMiddlewareTest.php
@@ -8,7 +8,6 @@
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
-use stdClass;
 use Sulu\Messenger\Infrastructure\Symfony\Messenger\FlushMiddleware\DoctrineFlushMiddleware;
 use Sulu\Messenger\Infrastructure\Symfony\Messenger\FlushMiddleware\EnableFlushStamp;
 use Symfony\Component\DependencyInjection\Container;
@@ -81,7 +80,7 @@ public function testGetSubscribedServices(): void
 
     private function createEnvelope(): Envelope
     {
-        return new Envelope(new stdClass());
+        return new Envelope(new \stdClass());
     }
 
     private function createStack(): StackMiddleware
diff --git a/tests/Unit/Infrastructure/Symfony/Messenger/LockMiddleware/LockMiddlewareTest.php b/tests/Unit/Infrastructure/Symfony/Messenger/LockMiddleware/LockMiddlewareTest.php
@@ -8,7 +8,6 @@
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
-use stdClass;
 use Sulu\Messenger\Infrastructure\Symfony\Messenger\LockMiddleware\LockMiddleware;
 use Sulu\Messenger\Infrastructure\Symfony\Messenger\LockMiddleware\LockStamp;
 use Symfony\Component\DependencyInjection\Container;
@@ -90,7 +89,7 @@ public function testGetSubscribedServices(): void
 
     private function createEnvelope(): Envelope
     {
-        return new Envelope(new stdClass());
+        return new Envelope(new \stdClass());
     }
 
     private function createStack(): StackMiddleware
diff --git a/tests/Unit/Infrastructure/Symfony/Messenger/UnpackExceptionMiddleware/UnpackExceptionMiddlewareTest.php b/tests/Unit/Infrastructure/Symfony/Messenger/UnpackExceptionMiddleware/UnpackExceptionMiddlewareTest.php
@@ -4,9 +4,7 @@
 
 namespace Sulu\Messenger\Tests\Unit\Common\Infrastructure\Symfony\Messenger\UnpackExceptionMiddleware;
 
-use LogicException;
 use PHPUnit\Framework\TestCase;
-use stdClass;
 use Sulu\Messenger\Infrastructure\Symfony\Messenger\UnpackExceptionMiddleware\UnpackExceptionMiddleware;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Exception\HandlerFailedException;
@@ -39,12 +37,12 @@ public function testHandleDefault(): void
 
     public function testHandleException(): void
     {
-        $this->expectException(LogicException::class);
+        $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('Specific unpacked exception.');
 
         $envelope = $this->createEnvelope();
         $stack = $this->createStack(function () use ($envelope): never {
-            throw new HandlerFailedException($envelope, [new LogicException('Specific unpacked exception.')]);
+            throw new HandlerFailedException($envelope, [new \LogicException('Specific unpacked exception.')]);
         });
 
         $this->assertSame(
@@ -55,7 +53,7 @@ public function testHandleException(): void
 
     private function createEnvelope(): Envelope
     {
-        return new Envelope(new stdClass());
+        return new Envelope(new \stdClass());
     }
 
     private function createStack(callable $handler = null): StackMiddleware

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`namespace Sulu\Messenger\Infrastructure\Symfony\HttpKernel;`
`6`	`6`
`7`		`-use RuntimeException;`
`8`	`7`	`use Symfony\Component\Config\Definition\Builder\TreeBuilder;`
`9`	`8`	`use Symfony\Component\Config\Definition\ConfigurationInterface;`
`10`	`9`	`use Symfony\Component\Config\FileLocator;`
`@@ -53,7 +52,7 @@ public function getConfiguration(array $config, ContainerBuilder $container): Co`
`53`	`52`	`public function prepend(ContainerBuilder $container): void`
`54`	`53`	`{`
`55`	`54`	`if (!$container->hasExtension('framework')) {`
`56`		`- throw new RuntimeException(\sprintf('The "%s" bundle requires "framework" bundle.', self::ALIAS));`
	`55`	`+ throw new \RuntimeException(\sprintf('The "%s" bundle requires "framework" bundle.', self::ALIAS));`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`$container->prependExtensionConfig(`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Sulu\Messenger\Tests\Traits;`
`6`	`6`
`7`		`-use ReflectionClass;`
`8`	`7`	`use ReflectionException;`
`9`		`-use ReflectionProperty;`
`10`	`8`
`11`	`9`	`trait PrivatePropertyTrait`
`12`	`10`	`{`
`@@ -15,7 +13,7 @@ trait PrivatePropertyTrait`
`15`	`13`	`*/`
`16`	`14`	`protected static function getPrivateProperty(object $object, string $propertyName)`
`17`	`15`	`{`
`18`		`- $reflection = new ReflectionClass($object);`
	`16`	`+ $reflection = new \ReflectionClass($object);`
`19`	`17`	`$propertyReflection = $reflection->getProperty($propertyName);`
`20`	`18`	`$propertyReflection->setAccessible(true);`
`21`	`19`
`@@ -24,7 +22,7 @@ protected static function getPrivateProperty(object $object, string $propertyNam`
`24`	`22`
`25`	`23`	`protected static function setPrivateProperty(object $object, string $propertyName, mixed $value): void`
`26`	`24`	`{`
`27`		`- $reflection = new ReflectionClass($object);`
	`25`	`+ $reflection = new \ReflectionClass($object);`
`28`	`26`	`try {`
`29`	`27`	`$propertyReflection = $reflection->getProperty($propertyName);`
`30`	`28`	`self::setValue($propertyReflection, $object, $value);`
`@@ -37,7 +35,7 @@ protected static function setPrivateProperty(object $object, string $propertyNam`
`37`	`35`	`}`
`38`	`36`	`}`
`39`	`37`
`40`		`- private static function setValue(ReflectionProperty $propertyReflection, object $object, mixed $value): void`
	`38`	`+ private static function setValue(\ReflectionProperty $propertyReflection, object $object, mixed $value): void`
`41`	`39`	`{`
`42`	`40`	`$propertyReflection->setAccessible(true);`
`43`	`41`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`use PHPUnit\Framework\TestCase;`
`9`	`9`	`use Prophecy\PhpUnit\ProphecyTrait;`
`10`	`10`	`use Prophecy\Prophecy\ObjectProphecy;`
`11`		`-use stdClass;`
`12`	`11`	`use Sulu\Messenger\Infrastructure\Symfony\Messenger\FlushMiddleware\DoctrineFlushMiddleware;`
`13`	`12`	`use Sulu\Messenger\Infrastructure\Symfony\Messenger\FlushMiddleware\EnableFlushStamp;`
`14`	`13`	`use Symfony\Component\DependencyInjection\Container;`
`@@ -81,7 +80,7 @@ public function testGetSubscribedServices(): void`
`81`	`80`
`82`	`81`	`private function createEnvelope(): Envelope`
`83`	`82`	`{`
`84`		`- return new Envelope(new stdClass());`
	`83`	`+ return new Envelope(new \stdClass());`
`85`	`84`	`}`
`86`	`85`
`87`	`86`	`private function createStack(): StackMiddleware`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`use Prophecy\Argument;`
`9`	`9`	`use Prophecy\PhpUnit\ProphecyTrait;`
`10`	`10`	`use Prophecy\Prophecy\ObjectProphecy;`
`11`		`-use stdClass;`
`12`	`11`	`use Sulu\Messenger\Infrastructure\Symfony\Messenger\LockMiddleware\LockMiddleware;`
`13`	`12`	`use Sulu\Messenger\Infrastructure\Symfony\Messenger\LockMiddleware\LockStamp;`
`14`	`13`	`use Symfony\Component\DependencyInjection\Container;`
`@@ -90,7 +89,7 @@ public function testGetSubscribedServices(): void`
`90`	`89`
`91`	`90`	`private function createEnvelope(): Envelope`
`92`	`91`	`{`
`93`		`- return new Envelope(new stdClass());`
	`92`	`+ return new Envelope(new \stdClass());`
`94`	`93`	`}`
`95`	`94`
`96`	`95`	`private function createStack(): StackMiddleware`