Merge pull request #1364 from zavitkov/zavitkov/feature/fix-sf7-deprecations

makasim · web-flow · commit bbbc4c0b581a · 2024-11-18T18:16:41.000+02:00
SF7 deprecations fix
diff --git a/composer.json b/composer.json
@@ -51,7 +51,7 @@
   "require-dev": {
     "ext-pcntl": "*",
     "phpunit/phpunit": "^9.5",
-    "phpstan/phpstan": "^0.12",
+    "phpstan/phpstan": "^1.0",
     "queue-interop/queue-spec": "^0.6.2",
     "symfony/browser-kit": "^6.2|^7.0",
     "symfony/config": "^6.2|^7.0",
@@ -60,9 +60,9 @@
     "symfony/dependency-injection": "^6.2|^7.0",
     "symfony/event-dispatcher": "^6.2|^7.0",
     "symfony/expression-language": "^6.2|^7.0",
-    "symfony/http-kernel": "^^6.2|^7.0",
+    "symfony/http-kernel": "^6.2|^7.0",
     "symfony/filesystem": "^6.2|^7.0",
-    "symfony/framework-bundle": "^^6.2|^7.0",
+    "symfony/framework-bundle": "^6.2|^7.0",
     "symfony/validator": "^6.2|^7.0",
     "symfony/yaml": "^6.2|^7.0",
     "empi89/php-amqp-stubs": "*@dev",
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,5 +1,5 @@
 parameters:
-	excludes_analyse:
+	excludePaths:
 		- docs
 		- bin
 		- docker
diff --git a/pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php b/pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php
@@ -22,10 +22,10 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 final class EnqueueExtension extends Extension implements PrependExtensionInterface
 {
diff --git a/pkg/enqueue-bundle/Profiler/AbstractMessageQueueCollector.php b/pkg/enqueue-bundle/Profiler/AbstractMessageQueueCollector.php
@@ -59,27 +59,19 @@ public function prettyPrintPriority($priority)
     }
 
     /**
-     * @param mixed $body
-     *
      * @return string
      */
     public function ensureString($body)
     {
         return is_string($body) ? $body : JSON::encode($body);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getName(): string
     {
         return 'enqueue.message_queue';
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function reset()
+    public function reset(): void
     {
         $this->data = [];
     }
diff --git a/pkg/enqueue-bundle/Profiler/MessageQueueCollector.php b/pkg/enqueue-bundle/Profiler/MessageQueueCollector.php
@@ -4,11 +4,10 @@
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Throwable;
 
 class MessageQueueCollector extends AbstractMessageQueueCollector
 {
-    public function collect(Request $request, Response $response, Throwable $exception = null)
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         $this->collectInternal($request, $response);
     }
diff --git a/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/EnqueueExtensionTest.php b/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/EnqueueExtensionTest.php
@@ -13,21 +13,21 @@
 use Enqueue\Test\ClassExtensionTrait;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class EnqueueExtensionTest extends TestCase
 {
     use ClassExtensionTrait;
 
     public function testShouldImplementConfigurationInterface()
     {
-        self::assertClassExtends(Extension::class, EnqueueExtension::class);
+        $this->assertClassExtends(Extension::class, EnqueueExtension::class);
     }
 
     public function testShouldBeFinal()
     {
-        self::assertClassFinal(EnqueueExtension::class);
+        $this->assertClassFinal(EnqueueExtension::class);
     }
 
     public function testCouldBeConstructedWithoutAnyArguments()

Original file line number	Diff line number	Diff line change
`@@ -59,27 +59,19 @@ public function prettyPrintPriority($priority)`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/**`
`62`		`- * @param mixed $body`
`63`		`- *`
`64`	`62`	`* @return string`
`65`	`63`	`*/`
`66`	`64`	`public function ensureString($body)`
`67`	`65`	`{`
`68`	`66`	`return is_string($body) ? $body : JSON::encode($body);`
`69`	`67`	`}`
`70`	`68`
`71`		`- /**`
`72`		`- * {@inheritdoc}`
`73`		`- */`
`74`	`69`	`public function getName(): string`
`75`	`70`	`{`
`76`	`71`	`return 'enqueue.message_queue';`
`77`	`72`	`}`
`78`	`73`
`79`		`- /**`
`80`		`- * {@inheritdoc}`
`81`		`- */`
`82`		`- public function reset()`
	`74`	`+ public function reset(): void`
`83`	`75`	`{`
`84`	`76`	`$this->data = [];`
`85`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,10 @@`
`4`	`4`
`5`	`5`	`use Symfony\Component\HttpFoundation\Request;`
`6`	`6`	`use Symfony\Component\HttpFoundation\Response;`
`7`		`-use Throwable;`
`8`	`7`
`9`	`8`	`class MessageQueueCollector extends AbstractMessageQueueCollector`
`10`	`9`	`{`
`11`		`- public function collect(Request $request, Response $response, Throwable $exception = null)`
	`10`	`+ public function collect(Request $request, Response $response, ?\Throwable $exception = null): void`
`12`	`11`	`{`
`13`	`12`	`$this->collectInternal($request, $response);`
`14`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,21 +13,21 @@`
`13`	`13`	`use Enqueue\Test\ClassExtensionTrait;`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`	`15`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
	`16`	`+use Symfony\Component\DependencyInjection\Extension\Extension;`
`16`	`17`	`use Symfony\Component\DependencyInjection\Reference;`
`17`		`-use Symfony\Component\HttpKernel\DependencyInjection\Extension;`
`18`	`18`
`19`	`19`	`class EnqueueExtensionTest extends TestCase`
`20`	`20`	`{`
`21`	`21`	`use ClassExtensionTrait;`
`22`	`22`
`23`	`23`	`public function testShouldImplementConfigurationInterface()`
`24`	`24`	`{`
`25`		`- self::assertClassExtends(Extension::class, EnqueueExtension::class);`
	`25`	`+ $this->assertClassExtends(Extension::class, EnqueueExtension::class);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public function testShouldBeFinal()`
`29`	`29`	`{`
`30`		`- self::assertClassFinal(EnqueueExtension::class);`
	`30`	`+ $this->assertClassFinal(EnqueueExtension::class);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public function testCouldBeConstructedWithoutAnyArguments()`