Merge pull request #66 from FLUX-SE/fix-php7.4

Fix php7.4

.github/workflows/build.yml

@@ -28,8 +28,12 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [ "8.1" ]
+                php: [ "7.4", "8.1" ]
                 symfony: [ "^5.4", "^6.4" ]
+                exclude:
+                    -
+                        php: "7.4"
+                        symfony: "^6.4"
 
         steps:
             -

ecs.php

@@ -11,9 +11,10 @@
     $config->paths([
         'src',
         'tests/Behat',
+        'spec',
+        'ecs.php',
     ]);
 
     // PHP 7 compatibility
     $config->ruleWithConfiguration(TrailingCommaInMultilineFixer::class, ['elements' => ['arrays']]);
-
 };

spec/Extension/CancelExistingPaymentIntentExtensionSpec.php

@@ -104,9 +104,9 @@ public function it_doesnt_found_the_related_session_and_do_nothing(
             ->willReturn($allSessionRequest);
 
         $allSessionRequest->setParameters([
-            'payment_intent' => $piId
+            'payment_intent' => $piId,
         ])->shouldBeCalled();
-        $allSessionRequest->getApiResources()->willReturn(Collection::constructFrom(['data'=>[]]));
+        $allSessionRequest->getApiResources()->willReturn(Collection::constructFrom(['data' => []]));
 
         $gateway->execute($allSessionRequest)->shouldBeCalled();
 
@@ -139,15 +139,15 @@ public function it_founds_a_related_expired_session_and_does_nothing(
             ->willReturn($allSessionRequest);
 
         $allSessionRequest->setParameters([
-            'payment_intent' => $piId
+            'payment_intent' => $piId,
         ])->shouldBeCalled();
         $allSessionRequest->getApiResources()->willReturn(Collection::constructFrom([
-            'data'=>[
+            'data' => [
                 [
                     'id' => $csId,
                     'status' => Session::STATUS_EXPIRED,
-                ]
-            ]
+                ],
+            ],
         ]));
 
         $gateway->execute($allSessionRequest)->shouldBeCalled();
@@ -183,15 +183,15 @@ public function it_founds_a_related_session_and_expires_it(
             ->willReturn($allSessionRequest);
 
         $allSessionRequest->setParameters([
-            'payment_intent' => $piId
+            'payment_intent' => $piId,
         ])->shouldBeCalled();
         $allSessionRequest->getApiResources()->willReturn(Collection::constructFrom([
-            'data'=>[
+            'data' => [
                 [
                     'id' => $csId,
                     'status' => Session::STATUS_OPEN,
-                ]
-            ]
+                ],
+            ],
         ]));
 
         $gateway->execute($allSessionRequest)->shouldBeCalled();

spec/StateMachine/CancelOrderProcessorSpec.php

@@ -6,20 +6,20 @@
 
 use FluxSE\SyliusPayumStripePlugin\Command\CancelPayment;
 use PhpSpec\ObjectBehavior;
-use SM\Event\TransitionEvent;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 final class CancelOrderProcessorSpec extends ObjectBehavior
 {
-    public function let(MessageBusInterface $commandBus): void {
+    public function let(MessageBusInterface $commandBus): void
+    {
         $this->beConstructedWith($commandBus);
     }
 
     public function it_is_invokable_when_it_is_new(
         PaymentInterface $payment,
-        MessageBusInterface $commandBus,
+        MessageBusInterface $commandBus
     ): void {
         $payment->getId()->willReturn(1);
 
@@ -48,7 +48,7 @@ public function it_do_nothing_when_it_is_completed(
     }
 
     public function it_do_nothing_when_it_is_refunded(
-        PaymentInterface $payment,
+        PaymentInterface $payment
     ): void {
         $this->__invoke($payment, PaymentInterface::STATE_REFUNDED);
     }

spec/StateMachine/CaptureAuthorizedOrderProcessorSpec.php

@@ -6,14 +6,14 @@
 
 use FluxSE\SyliusPayumStripePlugin\Command\CaptureAuthorizedPayment;
 use PhpSpec\ObjectBehavior;
-use SM\Event\TransitionEvent;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 final class CaptureAuthorizedOrderProcessorSpec extends ObjectBehavior
 {
-    public function let(MessageBusInterface $commandBus): void {
+    public function let(MessageBusInterface $commandBus): void
+    {
         $this->beConstructedWith($commandBus);
     }
 

spec/StateMachine/RefundOrderProcessorSpec.php

@@ -6,14 +6,14 @@
 
 use FluxSE\SyliusPayumStripePlugin\Command\RefundPayment;
 use PhpSpec\ObjectBehavior;
-use SM\Event\TransitionEvent;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 final class RefundOrderProcessorSpec extends ObjectBehavior
 {
-    public function let(MessageBusInterface $commandBus): void {
+    public function let(MessageBusInterface $commandBus): void
+    {
         $this->beConstructedWith($commandBus, false);
     }
 
@@ -33,7 +33,6 @@ public function it_do_nothing_when_it_is_disabled(
         PaymentInterface $payment,
         MessageBusInterface $commandBus
     ): void {
-
         $this->beConstructedWith($commandBus, true);
 
         $command = new RefundPayment(1);

src/Extension/UpdatePaymentStateExtension.php

@@ -24,11 +24,20 @@ final class UpdatePaymentStateExtension implements ExtensionInterface
     /** @var PaymentInterface[] */
     private array $scheduledPaymentsToProcess = [];
 
+    private StateMachineInterface $stateMachine;
+
+    private StorageInterface $storage;
+
+    private GetStatusFactoryInterface $getStatusRequestFactory;
+
     public function __construct(
-        private StateMachineInterface $stateMachine,
-        private StorageInterface $storage,
-        private GetStatusFactoryInterface $getStatusRequestFactory
+        StateMachineInterface $stateMachine,
+        StorageInterface $storage,
+        GetStatusFactoryInterface $getStatusRequestFactory
     ) {
+        $this->getStatusRequestFactory = $getStatusRequestFactory;
+        $this->storage = $storage;
+        $this->stateMachine = $stateMachine;
     }
 
     public function onPreExecute(Context $context): void

tests/Application/config/jwt/private-test.pem

@@ -1,51 +1,30 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQdNUc9WvJTZeO305P
+pNHWHAICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIdnEaZjJBOPAEggTI
+8JV9320qiURwcfFTdMRMyVEVN4adJnQ9JJDOs/RSl4WGlNKx08/sbYv6msKa+PmE
+D1i6b18QlMAG3gRhQXWcRHudyh3sYVFebrcC/bQF834cdn7qNuUPRj84xFZzoZA+
+Q1hsPLRDMu/3LoKVlO8C/DBSOLPnP5/p0kyUE/9pjLL2uhuJAP0oJhh287Oyoo8b
+oKb81RCyUbCokfDdUeDKupHEzhi1Kg6MrP1XdkJEVfTYAOw2NzDegG0z7B/UVk0W
+jnpMaBL5+k4zY5R5n7Nrj2M/QfOmMOS1mRKUJuiQYtfJjfddUcW7c717PmbpswxD
+3IYCPq/PwpqaV19H+3T0uma1+AtIa2VymO2NtiqdBFB7TGR7fkuDKYbfldGWmTfC
+kb1CcOqjbkX9KhuMXPOGf4g3djj3zur4YuH4xlIE0s7TzGeG1VHDNSwpIl3q0sn5
+aJX1g1fjrWH99HQUa/Wl3UgfcPmSaA7rCnTAjYS1zV5EHJomObQQNPvtbBgf3ifV
+ENS3zJxyscXB4NU1LyFOMgTBjPkD360uXbPtJt5nlMjfqs3wJYhbnRF4g0/94XnW
+/qsogeQ6O6IkR+SjXXyYxB2QqmAPbMbqBbf1WZxFRKsHBGXjbeLUyOMT/R5tvSNA
+xZzV+XvSPRb7+Qsss0XUtwU6NNJvJdEb2hO6YgdIebl40+GLxBZC5j/STqLe8oMU
+ckgcaAulbTpTgTlddHCHTezDOsn7PjKXZ6I7NsfvfrW6nJwkFUXCqqnNwTycvvsF
+b8IHfNBQR5+8cX6SnGpvp7ZEX7RgSNWRIo2h4wNRFCNwib48hyNTOT4kdvgHUJdJ
+8wp53lYCUQLYcF6Ogu9gIA2aGaENWr86pPL+4RnDIl2ZnaOWURAmH3syv9TFXOQI
+pWG62Y5wkH3ghfcpoOSAaUwKpB7l9UhHltc2WaS2HhLCDwhOVF41olewlrImTfOY
+s7p52lTJM5ApalmMEqJcv7cncrVQncTgtIoOjF1DPrvYy1JPypAR2wycnsH1RJMi
+cQjcn6VP0QZ1vTRGMly+6Rcm1vD0Qa9Mfuo9oNmqvCGwWFwieCxypHGZe89kMcMT
+K3dk4NjeZ54XNNmPFuY1W2WHv54ZG0uTGJZOan83u3DJyKUL3qN/6liTnLjePYXi
+rSFHkB0IzuwDXsVwtw3d+LrMWfL1mrFCJ0XOCswNO/7usyXnlUqPKuy+DXpttDoI
+xFu7pGpnIl7vXUzcvj1PWYA73PZsgEAThM3P2xiWOA8Mpa6GV2CoXVf/YeVtRoON
+Z+zNd+ftvw3ERZz6WrTuBa0flyqhqmC54Jfetz9fQNg9lty9iOUgnJOwzIX6AqCU
+G+BaiyhCRacCFvoTL1GgdiQxDFYeDOKMgdwNsnRn+fw7/BsuIY8Fdhtu928Bi/Zr
+98XzvKPt++hYc2SBwv4H+90GgFyI/5lDHkeU+O/isg8wXrF8Ql53GLJK57CAE9R7
+NsKGJiKL1iH7qBVTHkRDsdX0m7rgXTgip1MUbbwOFtdmYDZ25OY1sVI2O4AWoXyE
+tI1IQIEZid727HWef6zPkOVEE57NWtbH+Mu89NjOMDu2O+aLGt/AMrD/dKgUWTCs
++y78NWkWI+RJDx3KGzLRQfqVEt5WIf+D
+-----END ENCRYPTED PRIVATE KEY-----

tests/Application/config/jwt/public-test.pem

@@ -1,14 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxuS1SudSNkjTQcP4H5Sj
-zrdO29upko9KYZgUH6z5n+weDtIo5tysdm7xY3nNAU9ixo7wrBvttuf7T1fDCVJj
-hzqX5iewaCZks7q9kYygCbvmrAocbx5D9EPZPH0sQQoa9gMuNou2nqWpVdTYCMAj
-xzVpqa2krioUzkBJzaWGDYiijv9qKbjWvRUUoYFNOFIFXHFFDrK5ISBC155XiETK
-yBYhB1wZVWX1tHe1nDW609BHAAsr1Ve3uiodzYzQ7S9Rw9Q6RCRSRgZRzFV1GTJE
-uyMpCCD51DA4otYeEPQf+8hvV3aKbSNydzrQICY95kfB0p9HxorBPh8QHq0qKZOI
-le1Aglp0UV3OWgXLWncNc0m8e8hT2I55lYkLio99/4PGfalAdJBPhKtTzbJllaER
-HOnlMkEvwk7eggkbbXEN/Ay6usi0R8mRaxhMkS9i8MxubgQBDsOomtegRqA1EzSG
-U/FJMS5g/I/gO9bjFu2l2LJwd6B4t/FZt/9mAIGYbIj5/Ykd0E1WIKYAIRUoyW1g
-TrGe70yxdHEPEILnZZMRVJzDbkVYfgKAFUpAUqbHTtS+YI6p9tjFuxBrc6GZR/kp
-pL/MkEARDX0ZX3n4sPLQf/vdR7+Ks8Yqws1IqsZ3h8iP8WpykbEwnd1w49A1ZBBi
-nIXU3idf41EtQgawbpK5Oy0CAwEAAQ==
------END PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn3qaayYIb004HknI2wAx
+rX5mbhb5KerstzhpD60untZJg1rM+JFndeDI1pfxpyH6PT2J6ZroxjmRRfAe/dy9
+igLqk74t4euqGdl3uXPH+n/B88T5B/2RBmB6DHrZ0AVXh7MQeJRGgOrSB66VrLeT
+O/mrTQxc85BYft+u5Hv7LE6kygGyv1I+e2/mtXHKsrinAmHu3H5mI4t1PuJCEwPw
+e/z/Cd7Sge0hNwjw33Xm8hrsk2J6JX16lv8SWKIlUGrDNMDNRk+KZHhQaSyRjkxw
+5OYzvPpMPxNFNKF2X2+RCIkoMXUfqesBqTbv9kDBoEQJgkBkPbi3Os2ozpMuXsI7
+GQIDAQAB
+-----END PUBLIC KEY-----

tests/Behat/Bug/PantherCookieSetter.php

@@ -10,10 +10,16 @@
 
 final class PantherCookieSetter implements CookieSetterInterface
 {
+    private Session $minkSession;
+
+    private CookieSetterInterface $decoratedCookieSetter;
+
     public function __construct(
-        private Session $minkSession,
-        private CookieSetterInterface $decoratedCookieSetter
+        Session $minkSession,
+        CookieSetterInterface $decoratedCookieSetter
     ) {
+        $this->decoratedCookieSetter = $decoratedCookieSetter;
+        $this->minkSession = $minkSession;
     }
 
     public function setCookie($name, $value): void