Saga refactoring

Author: mmasiukevich

.github/workflows/continuous-integration.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           coverage: none
           tools: composer:v2
 
@@ -33,7 +33,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           coverage: none
           tools: composer:v2
 
@@ -53,15 +53,15 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           coverage: none
           tools: composer:v2
 
       - name: Install dependencies with composer
         run: composer update --no-ansi --no-interaction --no-progress
 
       - name: Run phpstan/phpstan
-        run: ./vendor/bin/phpstan analyse src --level 7
+        run: ./vendor/bin/phpstan analyse src --level 9
 
   phpunit:
     name: PHPUnit
@@ -91,7 +91,7 @@ jobs:
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           extensions: ${{ env.PHP_EXTENSIONS }}
           ini-values: ${{ env.PHP_INI_VALUES }}
           tools: composer:v2

.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -3,13 +3,13 @@
 [![Packagist](https://img.shields.io/packagist/v/php-service-bus/sagas.svg)](https://packagist.org/packages/php-service-bus/sagas)
 [![Packagist](https://img.shields.io/packagist/dt/php-service-bus/sagas.svg)](https://packagist.org/packages/php-service-bus/sagas)
 ![Continuous Integration](https://github.com/php-service-bus/sagas/workflows/Continuous%20Integration/badge.svg)
-[![codecov](https://codecov.io/gh/php-service-bus/sagas/branch/v5.0/graph/badge.svg?token=0bKwdiuo0S)](https://codecov.io/gh/php-service-bus/sagas)
+[![codecov](https://codecov.io/gh/php-service-bus/sagas/branch/v5.1/graph/badge.svg?token=0bKwdiuo0S)](https://codecov.io/gh/php-service-bus/sagas)
 [![Shepherd](https://shepherd.dev/github/php-service-bus/sagas/coverage.svg)](https://shepherd.dev/github/php-service-bus/sagas)
 
 This component is part of the [PHP Service Bus](https://github.com/php-service-bus/service-bus): saga pattern implementation
 
 ## Documentation
-[Sagas](https://github.com/php-service-bus/service-bus/blob/v5.0/.documentation/sagas.md)
+[Sagas](https://github.com/php-service-bus/service-bus/blob/v5.1/.documentation/sagas.md)
 
 ## Contributing
 Contributions are welcome! Please read [CONTRIBUTING](.github/CONTRIBUTING.md) for details.

README.md

@@ -23,6 +23,7 @@
     },
     "files": [
       "src/functions.php",
+      "src/Configuration/functions.php",
       "src/Store/Sql/functions.php"
     ]
   },
@@ -37,6 +38,7 @@
     },
     "files": [
       "src/functions.php",
+      "src/Configuration/functions.php",
       "src/Store/Sql/functions.php"
     ]
   },
@@ -46,14 +48,15 @@
     "php-service-bus/mutex": "v5.1.*",
     "php-service-bus/annotations-reader":"v5.1.*",
     "php-service-bus/messages-router": "v5.1.*",
+    "php-service-bus/argument-resolver": "v5.1.*",
     "psr/log": "v1.1.*"
   },
   "require-dev": {
     "php-service-bus/code-style-config": "v5.1.*",
     "doctrine/dbal": "v3.2.*",
     "phpunit/phpunit": "v9.5.*",
-    "vimeo/psalm": "v4.13.*",
-    "phpstan/phpstan": "v1.2.*",
+    "vimeo/psalm": "v4.19.*",
+    "phpstan/phpstan": "v1.4.*",
     "boesing/psalm-plugin-stringf": "v1.1.*"
   },
   "prefer-stable": true,
@@ -68,6 +71,9 @@
     "pre-commit": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --allow-risky=yes && ./vendor/bin/psalm --config=psalm.xml && ./vendor/bin/phpstan analyse src --level 9 && ./vendor/bin/phpunit --configuration phpunit.xml --verbose"
   },
   "config": {
-    "optimize-autoloader": true
+    "optimize-autoloader": true,
+    "allow-plugins": {
+      "composer/package-versions-deprecated": true
+    }
   }
 }

composer.json

@@ -1,3 +1,5 @@
 parameters:
 	checkMissingIterableValueType: false
-	checkGenericClassInNonGenericObjectType: false
+	checkGenericClassInNonGenericObjectType: false
+	ignoreErrors:
+		- '#Method ServiceBus\\Sagas\\Saga::.* is unused#'

phpstan.neon

@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false"
-         backupStaticAttributes="false" beStrictAboutTestsThatDoNotTestAnything="false" colors="true" verbose="true"
-         convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true"
-         failOnRisky="true" failOnWarning="true" stopOnFailure="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         cacheResult="false"
+         convertDeprecationsToExceptions="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="true"
+         stopOnError="false"
+         stopOnFailure="false"
+         beStrictAboutChangesToGlobalState="true"
+         beStrictAboutOutputDuringTests="true"
+         verbose="true"
+>
     <coverage>
         <include>
             <directory>./src</directory>
@@ -19,27 +29,27 @@
     </php>
     <testsuites>
 
-        <testsuite name="Component: common">
+        <testsuite name="PHP Service Bus: Common component">
             <directory>./vendor/php-service-bus/common/tests/</directory>
         </testsuite>
 
-        <testsuite name="Component: annotations (attributes) reader">
+        <testsuite name="PHP Service Bus: Annotations (attributes) reader component">
             <directory>./vendor/php-service-bus/annotations-reader/tests/</directory>
         </testsuite>
 
-        <testsuite name="Component: messages router">
+        <testsuite name="PHP Service Bus: Messages router component">
             <directory>./vendor/php-service-bus/messages-router/tests/</directory>
         </testsuite>
 
-        <testsuite name="Component: mutex">
+        <testsuite name="PHP Service Bus: Mutex component">
             <directory>./vendor/php-service-bus/mutex/tests/</directory>
         </testsuite>
 
-        <testsuite name="Component: storage">
+        <testsuite name="PHP Service Bus: Storage component">
             <directory>./vendor/php-service-bus/storage/tests/</directory>
         </testsuite>
 
-        <testsuite name="Saga component">
+        <testsuite name="PHP Service Bus: Sagas component">
             <directory>./tests/</directory>
         </testsuite>
 

phpunit.xml

@@ -3,7 +3,6 @@
         totallyTyped="true"
         useDocblockTypes="true"
         useDocblockPropertyTypes="true"
-        allowPhpStormGenerics="true"
         strictBinaryOperands="true"
         findUnusedPsalmSuppress="true"
         ignoreInternalFunctionFalseReturn="false"
@@ -21,5 +20,9 @@
 
     <issueHandlers>
         <PropertyNotSetInConstructor errorLevel="suppress"/>
+        <UnnecessaryVarAnnotation errorLevel="suppress"/>
     </issueHandlers>
+    <plugins>
+        <pluginClass class="Boesing\PsalmPluginStringf\Plugin"/>
+    </plugins>
 </psalm>

psalm.xml

@@ -8,14 +8,14 @@
  * @license https://opensource.org/licenses/MIT
  */
 
-declare(strict_types = 0);
+declare(strict_types=0);
 
 namespace ServiceBus\Sagas\Configuration\Attributes\Exceptions;
 
 /**
  *
  */
-final class InvalidSagaEventListenerMethod extends \LogicException
+final class InvalidSagaHandlerMethod extends \LogicException
 {
     public static function tooManyArguments(\ReflectionMethod $reflectionMethod): self
     {
@@ -42,7 +42,7 @@ public static function wrongEventArgument(\ReflectionMethod $reflectionMethod):
     public static function unexpectedName(string $expected, string $actual): self
     {
         return new self(\sprintf(
-            'Invalid method name of the event listener: "%s". Expected: %s',
+            'Invalid method name of the method: "%s". Expected: %s',
             $actual,
             $expected
         ));