prepare release

spiral · Jan 22, 2025 · 594a395 · 594a395
1 parent 80c9577
commit 594a395
Show file tree

Hide file tree

Showing 26 changed files with 117 additions and 112 deletions.
diff --git a/composer.json b/composer.json
@@ -35,12 +35,12 @@
     "require": {
         "php": ">=8.1",
         "ext-json": "*",
-        "spiral/core": "^3.15",
-        "spiral/hmvc": "^3.15",
-        "spiral/serializer": "^3.15",
-        "spiral/snapshots": "^3.15",
-        "spiral/telemetry": "^3.15",
-        "spiral/tokenizer": "^3.15",
+        "spiral/core": "^3.14.10",
+        "spiral/hmvc": "^3.14.10",
+        "spiral/serializer": "^3.14.10",
+        "spiral/snapshots": "^3.14.10",
+        "spiral/telemetry": "^3.14.10",
+        "spiral/tokenizer": "^3.14.10",
         "spiral/attributes": "^2.8|^3.0",
         "doctrine/inflector": "^1.4|^2.0",
         "ramsey/uuid": "^4.2.3",
@@ -59,7 +59,7 @@
     "require-dev": {
         "phpunit/phpunit": "^10.1",
         "mockery/mockery": "^1.5",
-        "spiral/boot": "^3.15",
+        "spiral/boot": "^3.14.10",
         "vimeo/psalm": "^5.9"
     },
     "extra": {

diff --git a/src/Attribute/RetryPolicy.php b/src/Attribute/RetryPolicy.php
@@ -25,7 +25,7 @@
 class RetryPolicy
 {
     /**
-     * @param int<0, max> $maxAttempts
+     * @param 0|positive-int $maxAttempts
      * @param positive-int $delay in seconds.
      */
     public function __construct(

diff --git a/src/ContainerRegistry.php b/src/ContainerRegistry.php
@@ -38,7 +38,7 @@ public function getHandler(string $jobType): HandlerInterface
     private function className(string $jobType): string
     {
         $names = \explode('.', $jobType);
-        $names = \array_map(fn (string $value): string => $this->inflector->classify($value), $names);
+        $names = \array_map(fn (string $value) => $this->inflector->classify($value), $names);
 
         return \implode('\\', $names);
     }

diff --git a/src/RetryPolicy.php b/src/RetryPolicy.php
@@ -11,12 +11,12 @@
 final class RetryPolicy implements RetryPolicyInterface
 {
     /**
-     * @var int<0, max>
+     * @var positive-int|0
      */
     private readonly int $maxAttempts;
 
     /**
-     * @var int<0, max>
+     * @var positive-int|0
      */
     private readonly int $delay;
 
@@ -50,7 +50,7 @@ public function __construct(int $maxAttempts, int $delay, float $multiplier = 1)
     }
 
     /**
-     * @param int<0, max> $attempts
+     * @param positive-int|0 $attempts
      *
      * @return positive-int
      */
@@ -60,7 +60,7 @@ public function getDelay(int $attempts = 0): int
     }
 
     /**
-     * @param int<0, max> $attempts
+     * @param positive-int|0 $attempts
      */
     public function isRetryable(\Throwable $exception, int $attempts = 0): bool
     {

diff --git a/src/RetryPolicyInterface.php b/src/RetryPolicyInterface.php
@@ -7,12 +7,12 @@
 interface RetryPolicyInterface
 {
     /**
-     * @param int<0, max> $attempts
+     * @param positive-int|0 $attempts
      */
     public function isRetryable(\Throwable $exception, int $attempts = 0): bool;
 
     /**
-     * @param int<0, max> $attempts
+     * @param positive-int|0 $attempts
      *
      * @return positive-int
      */

diff --git a/tests/Attribute/JobHandlerTest.php b/tests/Attribute/JobHandlerTest.php
@@ -20,7 +20,7 @@ public function testJobHandler(string $class, ?JobHandler $expected): void
     {
         $reader = (new Factory())->create();
 
-        self::assertEquals($expected, $reader->firstClassMetadata(new \ReflectionClass($class), JobHandler::class));
+        $this->assertEquals($expected, $reader->firstClassMetadata(new \ReflectionClass($class), JobHandler::class));
     }
 
     public static function classesProvider(): \Traversable

diff --git a/tests/Attribute/RetryPolicyTest.php b/tests/Attribute/RetryPolicyTest.php
@@ -21,7 +21,7 @@ public function testRetryPolicy(string $class, ?RetryPolicy $expected): void
     {
         $reader = (new Factory())->create();
 
-        self::assertEquals($expected, $reader->firstClassMetadata(new \ReflectionClass($class), RetryPolicy::class));
+        $this->assertEquals($expected, $reader->firstClassMetadata(new \ReflectionClass($class), RetryPolicy::class));
     }
 
     public static function classesProvider(): \Traversable

diff --git a/tests/Attribute/SerializerTest.php b/tests/Attribute/SerializerTest.php
@@ -20,7 +20,7 @@ public function testSerializer(string $class, ?Serializer $expected): void
     {
         $reader = (new Factory())->create();
 
-        self::assertEquals($expected, $reader->firstClassMetadata(new \ReflectionClass($class), Serializer::class));
+        $this->assertEquals($expected, $reader->firstClassMetadata(new \ReflectionClass($class), Serializer::class));
     }
 
     public static function classesProvider(): \Traversable

diff --git a/tests/Config/QueueConfigTest.php b/tests/Config/QueueConfigTest.php
@@ -19,7 +19,7 @@ public function testGetsAliases(): void
             'aliases' => ['foo', 'bar'],
         ]);
 
-        self::assertSame(['foo', 'bar'], $config->getAliases());
+        $this->assertSame(['foo', 'bar'], $config->getAliases());
     }
 
     public function testConsumeInterceptors(): void
@@ -30,7 +30,7 @@ public function testConsumeInterceptors(): void
             ],
         ]);
 
-        self::assertSame(['foo', 'bar'], $config->getConsumeInterceptors());
+        $this->assertSame(['foo', 'bar'], $config->getConsumeInterceptors());
     }
 
     public function testPushInterceptors(): void
@@ -41,22 +41,22 @@ public function testPushInterceptors(): void
             ],
         ]);
 
-        self::assertSame(['foo', 'bar'], $config->getPushInterceptors());
+        $this->assertSame(['foo', 'bar'], $config->getPushInterceptors());
     }
 
     public function testGetNotExistsAliases(): void
     {
         $config = new QueueConfig();
 
-        self::assertSame([], $config->getAliases());
+        $this->assertSame([], $config->getAliases());
     }
 
     public function testGetsDefaultDriver(): void
     {
         $config = new QueueConfig([
             'default' => 'foo',
         ]);
-        self::assertSame('foo', $config->getDefaultDriver());
+        $this->assertSame('foo', $config->getDefaultDriver());
     }
 
     public function testGetsNonStringDefaultDriverShouldThrowAnException(): void
@@ -75,14 +75,14 @@ public function testGetsDriverAliases(): void
             'driverAliases' => ['foo', 'bar'],
         ]);
 
-        self::assertSame(['foo', 'bar'], $config->getDriverAliases());
+        $this->assertSame(['foo', 'bar'], $config->getDriverAliases());
     }
 
     public function testGetNotExistsDriverAliases(): void
     {
         $config = new QueueConfig();
 
-        self::assertSame([], $config->getDriverAliases());
+        $this->assertSame([], $config->getDriverAliases());
     }
 
     public function testGetsConnectionsWithoutDriver(): void
@@ -91,14 +91,14 @@ public function testGetsConnectionsWithoutDriver(): void
             'connections' => ['foo', 'bar'],
         ]);
 
-        self::assertSame(['foo', 'bar'], $config->getConnections());
+        $this->assertSame(['foo', 'bar'], $config->getConnections());
     }
 
     public function testGetsNotExistsConnections(): void
     {
         $config = new QueueConfig();
 
-        self::assertSame([], $config->getConnections());
+        $this->assertSame([], $config->getConnections());
     }
 
     public function testGetsConnectionsWithSpecificDriverAlias(): void
@@ -118,7 +118,7 @@ public function testGetsConnectionsWithSpecificDriverAlias(): void
             ],
         ]);
 
-        self::assertSame([
+        $this->assertSame([
             'foo' => [
                 'driver' => 'baz',
             ],
@@ -142,7 +142,7 @@ public function testGetsConnectionsWithSpecificDriver(): void
             ],
         ]);
 
-        self::assertSame([
+        $this->assertSame([
             'foo' => [
                 'driver' => 'alias',
             ],
@@ -169,7 +169,7 @@ public function testGetsConnection(): void
             ],
         ]);
 
-        self::assertSame([
+        $this->assertSame([
             'driver' => 'baz',
         ], $config->getConnection('foo'));
     }
@@ -240,14 +240,14 @@ public function testGetsRegistryHandlers(): void
             ]
         ]);
 
-        self::assertSame(['foo', 'bar'], $config->getRegistryHandlers());
+        $this->assertSame(['foo', 'bar'], $config->getRegistryHandlers());
     }
 
     public function testGetsNotExistsRegistryHandlers(): void
     {
         $config = new QueueConfig();
 
-        self::assertSame([], $config->getRegistryHandlers());
+        $this->assertSame([], $config->getRegistryHandlers());
     }
 
     public function testGetRegistrySerializers(): void
@@ -258,22 +258,22 @@ public function testGetRegistrySerializers(): void
             ]
         ]);
 
-        self::assertSame(['foo' => 'some', 'bar' => 'other'], $config->getRegistrySerializers());
+        $this->assertSame(['foo' => 'some', 'bar' => 'other'], $config->getRegistrySerializers());
     }
 
     public function testGetNotExistsRegistrySerializers(): void
     {
         $config = new QueueConfig();
 
-        self::assertSame([], $config->getRegistrySerializers());
+        $this->assertSame([], $config->getRegistrySerializers());
     }
 
     #[DataProvider('defaultSerializerDataProvider')]
     public function testGetDefaultSerializer(array $config, mixed $expected): void
     {
         $config = new QueueConfig($config);
 
-        self::assertEquals($expected, $config->getDefaultSerializer());
+        $this->assertEquals($expected, $config->getDefaultSerializer());
     }
 
     public static function defaultSerializerDataProvider(): \Generator

diff --git a/tests/ContainerRegistryT.php b/tests/ContainerRegistryT.php
@@ -32,7 +32,7 @@ public function testGetsHandlerByJobType(): void
 
         $this->registry->getHandler('mail.job');
 
-        self::assertSame($handler, $this->registry->getHandler('mail.job'));
+        $this->assertSame($handler, $this->registry->getHandler('mail.job'));
     }
 
     public function testGetsHandlerWithWrongInterface(): void

diff --git a/tests/Core/QueueInjectorTest.php b/tests/Core/QueueInjectorTest.php
@@ -38,7 +38,7 @@ public function testGetByContext(): void
         $result = $injector->createInjection($reflection, 'test');
         $result->push('foo');
 
-        self::assertInstanceOf(Queue::class, $result);
+        $this->assertInstanceOf(Queue::class, $result);
     }
 
     public function testGetByIncorrectContext(): void

diff --git a/tests/Driver/NullDriverTest.php b/tests/Driver/NullDriverTest.php
@@ -23,7 +23,7 @@ protected function setUp(): void
     public function testJobShouldBePushed(mixed $payload): void
     {
         $id = $this->queue->push('foo', $payload);
-        self::assertNotNull($id);
+        $this->assertNotNull($id);
     }
 
     public static function payloadDataProvider(): \Traversable

diff --git a/tests/Driver/SyncDriverTest.php b/tests/Driver/SyncDriverTest.php
@@ -62,7 +62,7 @@ public function testJobShouldBePushed(mixed $payload): void
 
         $id = $this->queue->push('foo', $payload);
 
-        self::assertSame($uuid->toString(), $id);
+        $this->assertSame($uuid->toString(), $id);
     }
 
     public function testJobWithHeadersShouldBePushed(): void
@@ -84,7 +84,7 @@ public function testJobWithHeadersShouldBePushed(): void
 
         $id = $this->queue->push('foo', ['baz' => 'baf'], $options);
 
-        self::assertSame($uuid->toString(), $id);
+        $this->assertSame($uuid->toString(), $id);
     }
 
     public static function payloadDataProvider(): \Traversable

diff --git a/tests/Interceptor/Consume/RetryPolicyInterceptorTest.php b/tests/Interceptor/Consume/RetryPolicyInterceptorTest.php
@@ -51,7 +51,7 @@ public function testWithoutException(): void
             ->with('foo', 'bar', [])
             ->willReturn('result');
 
-        self::assertSame('result', $this->interceptor->process('foo', 'bar', [], $this->core));
+        $this->assertSame('result', $this->interceptor->process('foo', 'bar', [], $this->core));
     }
 
     #[DataProvider('jobNameDataProvider')]
@@ -100,8 +100,8 @@ public function testWithDefaultRetryPolicy(string $name): void
         try {
             $this->interceptor->process($name, 'bar', [], $this->core);
         } catch (RetryException $e) {
-            self::assertSame(1, $e->getOptions()->getDelay());
-            self::assertSame(['attempts' => ['1']], $e->getOptions()->getHeaders());
+            $this->assertSame(1, $e->getOptions()->getDelay());
+            $this->assertSame(['attempts' => ['1']], $e->getOptions()->getHeaders());
         }
     }
 
@@ -121,8 +121,8 @@ public function testWithoutRetryPolicyAttribute(string $name): void
         try {
             $this->interceptor->process($name, 'bar', [], $this->core);
         } catch (RetryException $e) {
-            self::assertSame(4, $e->getOptions()->getDelay());
-            self::assertSame(['attempts' => ['1']], $e->getOptions()->getHeaders());
+            $this->assertSame(4, $e->getOptions()->getDelay());
+            $this->assertSame(['attempts' => ['1']], $e->getOptions()->getHeaders());
         }
     }
 
@@ -147,8 +147,8 @@ public function testWithRetryPolicyInAttribute(string $name): void
                 $this->core
             );
         } catch (RetryException $e) {
-            self::assertSame(8, $e->getOptions()->getDelay());
-            self::assertSame(['attempts' => ['2']], $e->getOptions()->getHeaders());
+            $this->assertSame(8, $e->getOptions()->getDelay());
+            $this->assertSame(['attempts' => ['2']], $e->getOptions()->getHeaders());
         }
     }
 
@@ -175,8 +175,8 @@ public function testWithRetryPolicyInException(string $name): void
                 $this->core
             );
         } catch (RetryException $e) {
-            self::assertSame(8, $e->getOptions()->getDelay());
-            self::assertSame(['attempts' => ['2']], $e->getOptions()->getHeaders());
+            $this->assertSame(8, $e->getOptions()->getDelay());
+            $this->assertSame(['attempts' => ['2']], $e->getOptions()->getHeaders());
         }
     }
 
@@ -213,8 +213,8 @@ public function getDelay(int $attempts = 0): int
                 $this->core
             );
         } catch (RetryException $e) {
-            self::assertSame(5, $e->getOptions()->getDelay());
-            self::assertSame(['attempts' => ['2']], $e->getOptions()->getHeaders());
+            $this->assertSame(5, $e->getOptions()->getDelay());
+            $this->assertSame(['attempts' => ['2']], $e->getOptions()->getHeaders());
         }
     }
 
@@ -243,8 +243,8 @@ public function testWithRetryPolicyInExceptionInsideJobException(string $name):
                 $this->core
             );
         } catch (RetryException $e) {
-            self::assertSame(8, $e->getOptions()->getDelay());
-            self::assertSame(['attempts' => ['2']], $e->getOptions()->getHeaders());
+            $this->assertSame(8, $e->getOptions()->getDelay());
+            $this->assertSame(['attempts' => ['2']], $e->getOptions()->getHeaders());
         }
     }