SYL-3329 Add support for Sylius 1.13

.github/workflows/build.yml

@@ -14,23 +14,38 @@ jobs:
     tests:
         runs-on: ubuntu-latest
 
-        name: "PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, Sylius ${{ matrix.sylius }}, MySQL ${{ matrix.mysql }}"
+        name: "Sylius ${{ matrix.sylius }}, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}, State Machine Adapter ${{ matrix.state_machine_adapter }}"
 
         strategy:
             fail-fast: false
             matrix:
-                php: ["8.0", "8.1"]
-                node: ["16.x"]
-                mysql: ["5.7", "8.0"]
-                symfony: ["^5.4", "^6.0"]
-                sylius: ["~1.12.0"]
+                php: ["8.1", "8.2"]
+                node: ["20.x"]
+                mysql: ["8.0"]
+                symfony: ["^5.4.21", "^6.4"]
+                sylius: ["~1.12.0", "~1.13.x-dev"]
+                state_machine_adapter: ["winzou_state_machine", "symfony_workflow"]
+
+                include:
+                    -   php: "8.3"
+                        node: "20.x"
+                        mysql: "8.0"
+                        symfony: "^6.4"
+                        sylius: "~1.13.x-dev"
+                        state_machine_adapter: "symfony_workflow"
+
+                exclude:
+                    - sylius: "~1.12.0"
+                      state_machine_adapter: "symfony_workflow"
+
         env:
             APP_ENV: test
             DATABASE_URL: "mysql://root:[email protected]/sylius?serverVersion=${{ matrix.mysql }}"
+            TEST_SYLIUS_STATE_MACHINE_ADAPTER: "${{ matrix.state_machine_adapter }}"
 
         steps:
             -
-                uses: actions/checkout@v2
+                uses: actions/checkout@v4
 
             -
                 name: Setup PHP
@@ -43,7 +58,7 @@ jobs:
 
             -
                 name: Setup Node
-                uses: actions/setup-node@v1
+                uses: actions/setup-node@v4
                 with:
                     node-version: "${{ matrix.node }}"
 
@@ -69,11 +84,11 @@ jobs:
             -
                 name: Get Composer cache directory
                 id: composer-cache
-                run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+                run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
             -
                 name: Cache Composer
-                uses: actions/cache@v2
+                uses: actions/cache@v4
                 with:
                     path: ${{ steps.composer-cache.outputs.dir }}
                     key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json **/composer.lock') }}
@@ -85,7 +100,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 }}"
 
@@ -101,11 +116,11 @@ jobs:
             -
                 name: Get Yarn cache directory
                 id: yarn-cache
-                run: echo "::set-output name=dir::$(yarn cache dir)"
+                run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
             -
                 name: Cache Yarn
-                uses: actions/cache@v2
+                uses: actions/cache@v4
                 with:
                     path: ${{ steps.yarn-cache.outputs.dir }}
                     key: ${{ runner.os }}-node-${{ matrix.node }}-yarn-${{ hashFiles('**/package.json **/yarn.lock') }}
@@ -147,12 +162,21 @@ jobs:
                 name: Load fixtures in test application
                 run: (cd tests/Application && bin/console sylius:fixtures:load -n)
 
+            -
+                name: Run security check
+                run: symfony security:check
+
+            -
+                name: Run ECS
+                run: vendor/bin/ecs check
+
             -
                 name: Validate composer.json
                 run: composer validate --ansi --strict
 
             -
                 name: Run analysis
+                if: ${{ matrix.sylius != '1.13.x-dev' }}
                 run: composer analyse
 
             -

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`

UPGRADE.md

@@ -1,3 +1,8 @@
+### UPGRADE FROM 1.5.1 to 1.6
+
+1. Support for Sylius 1.13 has been added, it is now the recommended Sylius version to use.
+2. Support for PHP 8.0 has been dropped.
+
 ### UPGRADE FROM 1.3.0 to 1.3.1
 
 1. `sylius_paypal_plugin_pay_with_paypal_form` route now operates on both payment ID and order token. URl then changed from

composer.json

@@ -5,13 +5,16 @@
     "description": "PayPal plugin for Sylius.",
     "license": "MIT",
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "doctrine/doctrine-migrations-bundle": "^3.0",
+        "php-http/discovery": "^1.17",
         "phpseclib/phpseclib": "^2.0",
-        "polishsymfonycommunity/symfony-mocker-container": "^1.0",
+        "psr/http-client": "^1.0",
+        "psr/http-client-implementation": "~1.0",
+        "psr/http-factory-implementation": "~1.0",
         "sylius-labs/doctrine-migrations-extra-bundle": "^0.1.4 || ^0.2",
-        "sylius/sylius": "~1.12.0",
-        "symfony/mailer": "^5.4 || ^6.0"
+        "sylius/sylius": "~1.12.0 || ~1.13.x-dev",
+        "symfony/mailer": "^5.4.21 || ^6.4"
     },
     "require-dev": {
         "behat/behat": "^3.6.1",
@@ -27,20 +30,22 @@
         "friends-of-behat/symfony-extension": "^2.1",
         "friends-of-behat/variadic-extension": "^1.3",
         "lchrusciel/api-test-case": "^5.1",
+        "nyholm/psr7": "^1.8",
         "phpspec/phpspec": "^7.0",
         "phpstan/phpstan": "^1.6",
         "phpstan/phpstan-doctrine": "1.3.37",
         "phpstan/phpstan-webmozart-assert": "^1.1",
         "phpunit/phpunit": "^8.5",
+        "polishsymfonycommunity/symfony-mocker-container": "^1.0",
         "sylius-labs/coding-standard": "^4.0",
         "sylius/sylius-rector": "^1.0",
-        "symfony/browser-kit": "^5.4 || ^6.0",
-        "symfony/debug-bundle": "^5.4 || ^6.0",
-        "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/browser-kit": "^5.4.21 || ^6.4",
+        "symfony/debug-bundle": "^5.4.21 || ^6.4",
+        "symfony/dotenv": "^5.4.21 || ^6.4",
+        "symfony/http-client": "^5.4.21 || ^6.4",
+        "symfony/intl": "^5.4.21 || ^6.4",
+        "symfony/web-profiler-bundle": "^5.4.21 || ^6.4",
+        "symfony/webpack-encore-bundle": "^1.15"
     },
     "autoload": {
         "psr-4": {
@@ -51,13 +56,17 @@
     "autoload-dev": {
         "classmap": ["tests/Application/Kernel.php"]
     },
+    "conflict": {
+        "behat/mink-selenium2-driver": ">=1.7.0"
+    },
     "config": {
         "sort-packages": true,
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": false,
             "ocramius/package-versions": false,
             "symfony/flex": true,
-            "symfony/thanks": false
+            "symfony/thanks": false,
+            "php-http/discovery": true
         }
     },
     "extra": {
@@ -68,13 +77,15 @@
     "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"
         ]
     },
     "prefer-stable": true,
-    "minimum-stability": "dev"
+    "minimum-stability": "dev",
+    "suggest": {
+        "php-http/guzzle6-adapter ":"Required to use this package on 32bit PHP"
+    }
 }

ecs.php

@@ -1,12 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
 use SlevomatCodingStandard\Sniffs\Commenting\InlineDocCommentDeclarationSniff;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
-use Symplify\EasyCodingStandard\ValueObject\Option;
 
 return static function (ECSConfig $config): void {
+    $config->paths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests/Behat',
+        __DIR__ . '/ecs.php',
+    ]);
+
     $config->import('vendor/sylius-labs/coding-standard/ecs.php');
 
     $config->skip([

phpstan.neon.dist

@@ -17,6 +17,7 @@ parameters:
         - 'src/DependencyInjection/Configuration.php'
         - 'src/DependencyInjection/SyliusPayPalExtension.php'
         - 'src/Command/CompletePaidPaymentsCommand.php'
+        - 'src/Migrations/**.php'
 
         # Test dependencies
         - 'tests/Application/app/**.php'

spec/Api/GenericApiSpec.php

@@ -13,17 +13,19 @@
 
 namespace spec\Sylius\PayPalPlugin\Api;
 
-use GuzzleHttp\ClientInterface;
 use PhpSpec\ObjectBehavior;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
+use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 use Sylius\PayPalPlugin\Api\GenericApiInterface;
 
 final class GenericApiSpec extends ObjectBehavior
 {
-    function let(ClientInterface $client): void
+    function let(ClientInterface $client, RequestFactoryInterface $requestFactory): void
     {
-        $this->beConstructedWith($client);
+        $this->beConstructedWith($client, $requestFactory);
     }
 
     function it_implements_generic_api_interface(): void
@@ -33,17 +35,19 @@ function it_implements_generic_api_interface(): void
 
     function it_calls_api_by_url(
         ClientInterface $client,
+        RequestFactoryInterface $requestFactory,
+        RequestInterface $request,
         ResponseInterface $response,
         StreamInterface $body
     ): void {
-        $client->request('GET', 'http://url.com/', [
-            'headers' => [
-                'Authorization' => 'Bearer TOKEN',
-                'Content-Type' => 'application/json',
-                'Accept' => 'application/json',
-            ],
-        ])->willReturn($response);
 
+        $requestFactory->createRequest('GET', 'http://url.com/')->willReturn($request);
+
+        $request->withHeader('Authorization', 'Bearer TOKEN')->willReturn($request);
+        $request->withHeader('Content-Type', 'application/json')->willReturn($request);
+        $request->withHeader('Accept', 'application/json')->willReturn($request);
+
+        $client->sendRequest($request)->willReturn($response);
         $response->getBody()->willReturn($body);
         $body->getContents()->willReturn('{ "parameter": "VALUE" }');