Merge pull request #31 from MacPaw/fix/PLATECO-7191-reset-on-exception

Fix/plateco 7191 reset on exception

Author: alekseytupichenkov

.github/workflows/static-analysis.yaml

@@ -36,7 +36,7 @@ jobs:
         run: composer install --no-progress --no-interaction --prefer-dist
 
       - name: Run script
-        run: vendor/bin/phpstan analyse
+        run: vendor/bin/phpstan analyse --configuration=./phpstan.neon
 
   composer-validate:
     name: Composer validate

phpstan.neon

@@ -3,8 +3,3 @@ parameters:
     paths:
         - src
         - tests
-    ignoreErrors:
-        -
-            message: '~Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::children\(\).~'
-            count: 1
-            path: ./src/DependencyInjection

src/Messenger/Middleware/BaggageSchemaMiddleware.php

@@ -34,9 +34,11 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
                     ->setBaggage($stamp->baggage === null ? null : $this->baggageCodec->decode($stamp->baggage));
             }
 
-            $result = $stack->next()->handle($envelope, $stack);
-
-            $this->baggageSchemaResolver->reset();
+            try {
+                $result = $stack->next()->handle($envelope, $stack);
+            } finally {
+                $this->baggageSchemaResolver->reset();
+            }
 
             return $result;
         }