diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index faa073c6..53fe8f2a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,7 +85,7 @@ jobs: if: matrix.symfony != '' run: | composer global config --no-plugins allow-plugins.symfony/flex true - composer global require --no-progress --no-scripts --no-plugins "symfony/flex:1.18.5" + composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^2.4" composer config --no-plugins allow-plugins.symfony/thanks true composer config extra.symfony.require "${{ matrix.symfony }}" diff --git a/CONFLICTS.md b/CONFLICTS.md new file mode 100644 index 00000000..06d5f13a --- /dev/null +++ b/CONFLICTS.md @@ -0,0 +1,10 @@ +# CONFLICTS + +This document explains why certain conflicts were added to `composer.json` and +references related issues. + +- `behat/mink-selenium2-driver:>=1.7.0`: + + This version adds strict type to the `Behat\Mink\Driver\Selenium2Driver::visit($url)` method + which causes a fatal error because the method signature is no longer compatible with the parent class: + `PHP Fatal error: Declaration of Behat\Mink\Driver\Selenium2Driver::visit(string $url) must be compatible with Behat\Mink\Driver\CoreDriver::visit($url) in /home/runner/work/Sylius-Standard/Sylius-Standard/vendor/behat/mink-selenium2-driver/src/Selenium2Driver.php on line 401` diff --git a/README.md b/README.md index fe5385fd..af85d5eb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@

- + + + + Sylius Logo. +


diff --git a/composer.json b/composer.json index 23237a66..2bd8f17f 100644 --- a/composer.json +++ b/composer.json @@ -39,8 +39,7 @@ "symfony/dotenv": "^5.4 || ^6.0", "symfony/intl": "^5.4 || ^6.0", "symfony/web-profiler-bundle": "^5.4 || ^6.0", - "symfony/webpack-encore-bundle": "^1.15", - "vimeo/psalm": "4.27.0" + "symfony/webpack-encore-bundle": "^1.15" }, "autoload": { "psr-4": { @@ -51,6 +50,9 @@ "autoload-dev": { "classmap": ["tests/Application/Kernel.php"] }, + "conflict": { + "behat/mink-selenium2-driver": ">=1.7.0" + }, "config": { "sort-packages": true, "allow-plugins": { @@ -68,8 +70,7 @@ "scripts": { "analyse": [ "@composer validate --strict", - "vendor/bin/phpstan.phar analyse", - "vendor/bin/psalm" + "vendor/bin/phpstan.phar analyse" ], "fix": [ "vendor/bin/ecs check src/ spec/ --fix" diff --git a/psalm.xml b/psalm.xml deleted file mode 100644 index 5b990dc2..00000000 --- a/psalm.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Controller/CancelLastPayPalPaymentAction.php b/src/Controller/CancelLastPayPalPaymentAction.php index 9d587293..351b4061 100644 --- a/src/Controller/CancelLastPayPalPaymentAction.php +++ b/src/Controller/CancelLastPayPalPaymentAction.php @@ -51,6 +51,14 @@ public function __invoke(Request $request): Response $paymentStateMachine = $this->stateMachineFactory->get($payment, PaymentTransitions::GRAPH); $paymentStateMachine->apply(PaymentTransitions::TRANSITION_CANCEL); + /** @var PaymentInterface $lastPayment */ + $lastPayment = $order->getLastPayment(); + if ($lastPayment->getState() === PaymentInterface::STATE_NEW) { + $this->objectManager->flush(); + + return new Response('', Response::HTTP_NO_CONTENT); + } + $this->orderPaymentProcessor->process($order); $this->objectManager->flush(); diff --git a/src/Controller/CancelPayPalCheckoutPaymentAction.php b/src/Controller/CancelPayPalCheckoutPaymentAction.php index 0020c599..2e864da6 100644 --- a/src/Controller/CancelPayPalCheckoutPaymentAction.php +++ b/src/Controller/CancelPayPalCheckoutPaymentAction.php @@ -28,7 +28,6 @@ public function __invoke(Request $request): Response { /** * @var string $content - * @psalm-suppress UnnecessaryVarAnnotation */ $content = $request->getContent(); diff --git a/src/Controller/CancelPayPalOrderAction.php b/src/Controller/CancelPayPalOrderAction.php index ea5d15bc..d5e5dacb 100644 --- a/src/Controller/CancelPayPalOrderAction.php +++ b/src/Controller/CancelPayPalOrderAction.php @@ -39,7 +39,6 @@ public function __invoke(Request $request): Response { /** * @var string $content - * @psalm-suppress UnnecessaryVarAnnotation */ $content = $request->getContent(); diff --git a/src/Controller/CancelPayPalPaymentAction.php b/src/Controller/CancelPayPalPaymentAction.php index 33c407e8..95a7752f 100644 --- a/src/Controller/CancelPayPalPaymentAction.php +++ b/src/Controller/CancelPayPalPaymentAction.php @@ -50,7 +50,6 @@ public function __invoke(Request $request): Response { /** * @var string $content - * @psalm-suppress UnnecessaryVarAnnotation */ $content = $request->getContent(); diff --git a/src/Controller/PayPalPaymentOnErrorAction.php b/src/Controller/PayPalPaymentOnErrorAction.php index 9c218499..879b13c8 100644 --- a/src/Controller/PayPalPaymentOnErrorAction.php +++ b/src/Controller/PayPalPaymentOnErrorAction.php @@ -31,7 +31,6 @@ public function __invoke(Request $request): Response { /** * @var string $content - * @psalm-suppress UnnecessaryVarAnnotation */ $content = $request->getContent(); diff --git a/src/Controller/Webhook/RefundOrderAction.php b/src/Controller/Webhook/RefundOrderAction.php index 0c9bc9aa..aa214995 100644 --- a/src/Controller/Webhook/RefundOrderAction.php +++ b/src/Controller/Webhook/RefundOrderAction.php @@ -64,7 +64,6 @@ private function getPayPalPaymentUrl(Request $request): string { /** * @var string $content - * @psalm-suppress UnnecessaryVarAnnotation */ $content = $request->getContent();