Merge pull request #1373 from JimTools/bugfix/static-drift

makasim · web-flow · commit 8cdbc1b57d72 · 2025-01-18T12:23:58.000+02:00
Bugfix/static drift
diff --git a/phpstan.neon b/phpstan.neon
@@ -14,10 +14,3 @@ parameters:
 		- pkg/enqueue-bundle/DependencyInjection/Configuration.php
 		- pkg/enqueue/Tests/Symfony/DependencyInjection/TransportFactoryTest.php
 		- pkg/simple-client/SimpleClient.php
-	ignoreErrors:
-		-
-			message: '#Class Symfony\\Component\\EventDispatcher\\LegacyEventDispatcherProxy not found#'
-			path: %currentWorkingDirectory%/*
-		-
-			message: '#.*Symfony\\Contracts\\EventDispatcher\\Event.*#'
-			path: %currentWorkingDirectory%/*
diff --git a/pkg/enqueue/Client/Config.php b/pkg/enqueue/Client/Config.php
@@ -163,7 +163,7 @@ public static function create(
         array $transportConfig = [],
         array $driverConfig = [],
     ): self {
-        return new static(
+        return new self(
             $prefix ?: '',
             $separator ?: '.',
             $app ?: '',
diff --git a/pkg/enqueue/Client/Driver/StompManagementClient.php b/pkg/enqueue/Client/Driver/StompManagementClient.php
@@ -24,7 +24,7 @@ public function __construct(Client $client, string $vhost = '/')
 
     public static function create(string $vhost = '/', string $host = 'localhost', int $port = 15672, string $login = 'guest', string $password = 'guest'): self
     {
-        return new static(new Client(null, 'http://'.$host.':'.$port, $login, $password), $vhost);
+        return new self(new Client(null, 'http://'.$host.':'.$port, $login, $password), $vhost);
     }
 
     public function declareQueue(string $name, array $options)
diff --git a/pkg/enqueue/Consumption/Exception/InvalidArgumentException.php b/pkg/enqueue/Consumption/Exception/InvalidArgumentException.php
@@ -12,7 +12,7 @@ class InvalidArgumentException extends \InvalidArgumentException implements Exce
     public static function assertInstanceOf($argument, $class)
     {
         if (false == $argument instanceof $class) {
-            throw new static(sprintf('The argument must be an instance of %s but got %s.', $class, is_object($argument) ? $argument::class : gettype($argument)));
+            throw new self(sprintf('The argument must be an instance of %s but got %s.', $class, is_object($argument) ? $argument::class : gettype($argument)));
         }
     }
 }
diff --git a/pkg/enqueue/Consumption/Result.php b/pkg/enqueue/Consumption/Result.php
@@ -89,7 +89,7 @@ public function setReply(?InteropMessage $reply = null)
      */
     public static function ack($reason = '')
     {
-        return new static(self::ACK, $reason);
+        return new self(self::ACK, $reason);
     }
 
     /**
@@ -99,7 +99,7 @@ public static function ack($reason = '')
      */
     public static function reject($reason)
     {
-        return new static(self::REJECT, $reason);
+        return new self(self::REJECT, $reason);
     }
 
     /**
@@ -109,7 +109,7 @@ public static function reject($reason)
      */
     public static function requeue($reason = '')
     {
-        return new static(self::REQUEUE, $reason);
+        return new self(self::REQUEUE, $reason);
     }
 
     /**
@@ -122,7 +122,7 @@ public static function reply(InteropMessage $replyMessage, $status = self::ACK,
     {
         $status = null === $status ? self::ACK : $status;
 
-        $result = new static($status, $reason);
+        $result = new self($status, $reason);
         $result->setReply($replyMessage);
 
         return $result;
diff --git a/pkg/enqueue/Rpc/TimeoutException.php b/pkg/enqueue/Rpc/TimeoutException.php
@@ -12,6 +12,6 @@ class TimeoutException extends \LogicException
      */
     public static function create($timeout, $correlationId)
     {
-        return new static(sprintf('Rpc call timeout is reached without receiving a reply message. Timeout: %s, CorrelationId: %s', $timeout, $correlationId));
+        return new self(sprintf('Rpc call timeout is reached without receiving a reply message. Timeout: %s, CorrelationId: %s', $timeout, $correlationId));
     }
 }
diff --git a/pkg/enqueue/Symfony/Client/SetupBrokerExtensionCommandTrait.php b/pkg/enqueue/Symfony/Client/SetupBrokerExtensionCommandTrait.php
@@ -18,7 +18,7 @@ protected function configureSetupBrokerExtension()
     }
 
     /**
-     * @return ExtensionInterface
+     * @return ExtensionInterface|null
      */
     protected function getSetupBrokerExtension(InputInterface $input, DriverInterface $driver)
     {
diff --git a/pkg/enqueue/Symfony/DiUtils.php b/pkg/enqueue/Symfony/DiUtils.php
@@ -27,7 +27,7 @@ public function __construct(string $moduleName, string $configName)
 
     public static function create(string $moduleName, string $configName): self
     {
-        return new static($moduleName, $configName);
+        return new self($moduleName, $configName);
     }
 
     public function getModuleName(): string
diff --git a/pkg/enqueue/Tests/Consumption/FallbackSubscriptionConsumerTest.php b/pkg/enqueue/Tests/Consumption/FallbackSubscriptionConsumerTest.php
@@ -147,34 +147,18 @@ public function testShouldConsumeMessagesFromTwoQueuesInExpectedOrder()
         $fourthMessage = $this->createMessageStub('fourth');
         $fifthMessage = $this->createMessageStub('fifth');
 
-        $fooMessages = [null, $firstMessage, null, $secondMessage, $thirdMessage];
-
         $fooConsumer = $this->createConsumerStub('foo_queue');
         $fooConsumer
             ->expects($this->any())
             ->method('receiveNoWait')
-            ->willReturnCallback(function () use (&$fooMessages) {
-                if (empty($fooMessages)) {
-                    return null;
-                }
-
-                return array_shift($fooMessages);
-            })
+            ->willReturnOnConsecutiveCalls(null, $firstMessage, null, $secondMessage, $thirdMessage)
         ;
 
-        $barMessages = [$fourthMessage, null, null, $fifthMessage];
-
         $barConsumer = $this->createConsumerStub('bar_queue');
         $barConsumer
             ->expects($this->any())
             ->method('receiveNoWait')
-            ->willReturnCallback(function () use (&$barMessages) {
-                if (empty($barMessages)) {
-                    return null;
-                }
-
-                return array_shift($barMessages);
-            })
+            ->willReturnOnConsecutiveCalls($fourthMessage, null, null, $fifthMessage)
         ;
 
         $actualOrder = [];
diff --git a/pkg/enqueue/Tests/Mocks/JsonSerializableObject.php b/pkg/enqueue/Tests/Mocks/JsonSerializableObject.php
@@ -4,7 +4,8 @@
 
 class JsonSerializableObject implements \JsonSerializable
 {
-    public function jsonSerialize()
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize(): array
     {
         return ['foo' => 'fooVal'];
     }
diff --git a/pkg/enqueue/Tests/Symfony/Client/DependencyInjection/BuildCommandSubscriberRoutesPassTest.php b/pkg/enqueue/Tests/Symfony/Client/DependencyInjection/BuildCommandSubscriberRoutesPassTest.php
@@ -443,6 +443,7 @@ private function createCommandSubscriberProcessor($commandSubscriberReturns = ['
 
             public function process(InteropMessage $message, Context $context)
             {
+                return self::ACK;
             }
 
             public static function getSubscribedCommand()
diff --git a/pkg/enqueue/Tests/Symfony/Client/DependencyInjection/BuildTopicSubscriberRoutesPassTest.php b/pkg/enqueue/Tests/Symfony/Client/DependencyInjection/BuildTopicSubscriberRoutesPassTest.php
@@ -407,6 +407,7 @@ private function createTopicSubscriberProcessor($topicSubscriberReturns = ['aTop
 
             public function process(InteropMessage $message, Context $context)
             {
+                return self::ACK;
             }
 
             public static function getSubscribedTopics()
diff --git a/pkg/enqueue/Tests/Symfony/Consumption/Mock/QueueSubscriberProcessor.php b/pkg/enqueue/Tests/Symfony/Consumption/Mock/QueueSubscriberProcessor.php
@@ -11,6 +11,7 @@ class QueueSubscriberProcessor implements Processor, QueueSubscriberInterface
 {
     public function process(InteropMessage $message, Context $context)
     {
+        return self::ACK;
     }
 
     public static function getSubscribedQueues()
diff --git a/pkg/enqueue/Tests/Util/Fixtures/JsonSerializableClass.php b/pkg/enqueue/Tests/Util/Fixtures/JsonSerializableClass.php
@@ -6,7 +6,8 @@ class JsonSerializableClass implements \JsonSerializable
 {
     public $keyPublic = 'public';
 
-    public function jsonSerialize()
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize(): array
     {
         return [
             'key' => 'value',
diff --git a/pkg/enqueue/Util/Stringify.php b/pkg/enqueue/Util/Stringify.php
@@ -25,6 +25,6 @@ public function __toString(): string
 
     public static function that($value): self
     {
-        return new static($value);
+        return new self($value);
     }
 }
diff --git a/pkg/job-queue/Test/DbalPersistedConnection.php b/pkg/job-queue/Test/DbalPersistedConnection.php
@@ -41,16 +41,22 @@ public function connect()
     public function beginTransaction()
     {
         $this->wrapTransactionNestingLevel('beginTransaction');
+
+        return true;
     }
 
     public function commit()
     {
         $this->wrapTransactionNestingLevel('commit');
+
+        return true;
     }
 
     public function rollBack()
     {
         $this->wrapTransactionNestingLevel('rollBack');
+
+        return true;
     }
 
     /**
diff --git a/pkg/monitoring/InfluxDbStorage.php b/pkg/monitoring/InfluxDbStorage.php
@@ -109,7 +109,7 @@ public static function createWithClient(Client $client, $config = 'influxdb:'):
         }
         $config['client'] = $client;
 
-        return new static($config);
+        return new self($config);
     }
 
     public function pushConsumerStats(ConsumerStats $stats): void
diff --git a/pkg/rdkafka/RdKafkaProducer.php b/pkg/rdkafka/RdKafkaProducer.php
@@ -121,5 +121,7 @@ public function flush(int $timeout): ?int
         if (method_exists($this->producer, 'flush')) {
             return $this->producer->flush($timeout);
         }
+
+        return null;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function __construct(Client $client, string $vhost = '/')`
`24`	`24`
`25`	`25`	`public static function create(string $vhost = '/', string $host = 'localhost', int $port = 15672, string $login = 'guest', string $password = 'guest'): self`
`26`	`26`	`{`
`27`		`- return new static(new Client(null, 'http://'.$host.':'.$port, $login, $password), $vhost);`
	`27`	`+ return new self(new Client(null, 'http://'.$host.':'.$port, $login, $password), $vhost);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public function declareQueue(string $name, array $options)`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class InvalidArgumentException extends \InvalidArgumentException implements Exce`
`12`	`12`	`public static function assertInstanceOf($argument, $class)`
`13`	`13`	`{`
`14`	`14`	`if (false == $argument instanceof $class) {`
`15`		`- throw new static(sprintf('The argument must be an instance of %s but got %s.', $class, is_object($argument) ? $argument::class : gettype($argument)));`
	`15`	`+ throw new self(sprintf('The argument must be an instance of %s but got %s.', $class, is_object($argument) ? $argument::class : gettype($argument)));`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function setReply(?InteropMessage $reply = null)`
`89`	`89`	`*/`
`90`	`90`	`public static function ack($reason = '')`
`91`	`91`	`{`
`92`		`- return new static(self::ACK, $reason);`
	`92`	`+ return new self(self::ACK, $reason);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`/**`
`@@ -99,7 +99,7 @@ public static function ack($reason = '')`
`99`	`99`	`*/`
`100`	`100`	`public static function reject($reason)`
`101`	`101`	`{`
`102`		`- return new static(self::REJECT, $reason);`
	`102`	`+ return new self(self::REJECT, $reason);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`/**`
`@@ -109,7 +109,7 @@ public static function reject($reason)`
`109`	`109`	`*/`
`110`	`110`	`public static function requeue($reason = '')`
`111`	`111`	`{`
`112`		`- return new static(self::REQUEUE, $reason);`
	`112`	`+ return new self(self::REQUEUE, $reason);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`/**`
`@@ -122,7 +122,7 @@ public static function reply(InteropMessage $replyMessage, $status = self::ACK,`
`122`	`122`	`{`
`123`	`123`	`$status = null === $status ? self::ACK : $status;`
`124`	`124`
`125`		`- $result = new static($status, $reason);`
	`125`	`+ $result = new self($status, $reason);`
`126`	`126`	`$result->setReply($replyMessage);`
`127`	`127`
`128`	`128`	`return $result;`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ class TimeoutException extends \LogicException`
`12`	`12`	`*/`
`13`	`13`	`public static function create($timeout, $correlationId)`
`14`	`14`	`{`
`15`		`- return new static(sprintf('Rpc call timeout is reached without receiving a reply message. Timeout: %s, CorrelationId: %s', $timeout, $correlationId));`
	`15`	`+ return new self(sprintf('Rpc call timeout is reached without receiving a reply message. Timeout: %s, CorrelationId: %s', $timeout, $correlationId));`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ protected function configureSetupBrokerExtension()`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`/**`
`21`		`- * @return ExtensionInterface`
	`21`	`+ * @return ExtensionInterface\|null`
`22`	`22`	`*/`
`23`	`23`	`protected function getSetupBrokerExtension(InputInterface $input, DriverInterface $driver)`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function __construct(string $moduleName, string $configName)`
`27`	`27`
`28`	`28`	`public static function create(string $moduleName, string $configName): self`
`29`	`29`	`{`
`30`		`- return new static($moduleName, $configName);`
	`30`	`+ return new self($moduleName, $configName);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public function getModuleName(): string`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@`
`4`	`4`
`5`	`5`	`class JsonSerializableObject implements \JsonSerializable`
`6`	`6`	`{`
`7`		`- public function jsonSerialize()`
	`7`	`+ #[\ReturnTypeWillChange]`
	`8`	`+ public function jsonSerialize(): array`
`8`	`9`	`{`
`9`	`10`	`return ['foo' => 'fooVal'];`
`10`	`11`	`}`