Merge pull request #68 from tomkalon/feature/OP-367

Feature/op 367 - Sylius 1.13 support

.github/workflows/build.yml

@@ -1,164 +1,161 @@
 name: Build
 
 on:
- push:
-  branches-ignore:
-   - 'dependabot/**'
- pull_request: ~
- release:
-  types: [ created ]
- schedule:
-  - cron: "0 1 * * 6" # Run at 1am every Saturday
- workflow_dispatch: ~
+  push:
+    branches-ignore:
+      - 'dependabot/**'
+  pull_request: ~
+  release:
+    types: [ created ]
+  schedule:
+    - cron: "0 1 * * 6" # Run at 1am every Saturday
+  workflow_dispatch: ~
 
 jobs:
- tests:
-  runs-on: ubuntu-22.04
-
-  name: "Sylius ${{ matrix.sylius }}, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}"
-
-  strategy:
-    fail-fast: false
-    matrix:
-      php: [ "8.0" ]
-      symfony: [ "^5.4", "^6.0" ]
-      sylius: [ "~1.11.0", "~1.12.0" ]
-      node: [ "^14.17.x" ]
-      mysql: [ "5.7", "8.0" ]
-
-      exclude:
-        - sylius: ~1.11.0
-          symfony: "^6.0"
-  env:
-   APP_ENV: test
-   DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?serverVersion=${{ matrix.mysql }}"
-
-  steps:
-   - uses: actions/checkout@v2
-
-   - name: Setup PHP
-     uses: shivammathur/setup-php@v2
-     with:
-      php-version: "${{ matrix.php }}"
-      extensions: intl
-      tools: symfony
-      coverage: none
-
-   - name: Setup Node
-     uses: actions/setup-node@v1
-     with:
-      node-version: "${{ matrix.node }}"
-
-   - name: Shutdown default MySQL
-     run: sudo service mysql stop
-
-   - name: Setup MySQL
-     uses: mirromutth/mysql-action@v1.1
-     with:
-      mysql version: "${{ matrix.mysql }}"
-      mysql root password: "root"
-
-   - name: Configure sysctl limits
-     run: |
-      sudo swapoff -a
-      sudo sysctl -w vm.swappiness=1
-      sudo sysctl -w fs.file-max=262144
-      sudo sysctl -w vm.max_map_count=262144
-
-   - name: Runs Elasticsearch
-     uses: elastic/elastic-github-actions/elasticsearch@master
-     with:
-      stack-version: 7.16.3
-
-   - name: Output PHP version for Symfony CLI
-     run: php -v | head -n 1 | awk '{ print $2 }' > .php-version
-
-   - name: Install certificates
-     run: symfony server:ca:install
-
-   - name: Run Chrome Headless
-     run: google-chrome-stable --enable-automation --disable-background-networking --no-default-browser-check --no-first-run --disable-popup-blocking --disable-default-apps --allow-insecure-localhost --disable-translate --disable-extensions --no-sandbox --enable-features=Metal --headless --remote-debugging-port=9222 --window-size=2880,1800 --proxy-server='direct://' --proxy-bypass-list='*' http://127.0.0.1 > /dev/null 2>&1 &
-
-   - name: Run webserver
-     run: (cd tests/Application && symfony server:start --port=8080 --dir=public --daemon)
-
-   - name: Get Composer cache directory
-     id: composer-cache
-     run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-   - name: Cache Composer
-     uses: actions/cache@v2
-     with:
-      path: ${{ steps.composer-cache.outputs.dir }}
-      key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json **/composer.lock') }}
-      restore-keys: |
-       ${{ runner.os }}-php-${{ matrix.php }}-composer-
-
-   - name: Restrict Symfony version
-     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.10"
-      composer config extra.symfony.require "${{ matrix.symfony }}"
-
-   - name: Restrict Sylius version
-     if: matrix.sylius != ''
-     run: composer require "sylius/sylius:${{ matrix.sylius }}" --no-update --no-scripts --no-interaction
-
-   - name: Install PHP dependencies
-     run: composer install --no-interaction --no-scripts
-
-   - name: Get Yarn cache directory
-     id: yarn-cache
-     run: echo "::set-output name=dir::$(yarn cache dir)"
-
-   - name: Cache Yarn
-     uses: actions/cache@v2
-     with:
-      path: ${{ steps.yarn-cache.outputs.dir }}
-      key: ${{ runner.os }}-node-${{ matrix.node }}-yarn-${{ hashFiles('**/package.json **/yarn.lock') }}
-      restore-keys: |
-       ${{ runner.os }}-node-${{ matrix.node }}-yarn-
-
-   - name: Install JS dependencies
-     run: (cd tests/Application && yarn install)
-
-   - name: Prepare test application database
-     run: |
-      (cd tests/Application && bin/console doctrine:database:create -vvv)
-      (cd tests/Application && bin/console doctrine:schema:create -vvv)
-
-   - name: Prepare test application assets
-     run: |
-      (cd tests/Application && bin/console assets:install public -vvv)
-      (cd tests/Application && yarn encore dev)
-
-   - name: Prepare test application cache
-     run: (cd tests/Application && bin/console cache:warmup -vvv)
-
-   - name: Load fixtures in test application
-     run: (cd tests/Application && bin/console sylius:fixtures:load -n)
-
-   - name: Validate composer.json
-     run: composer validate --ansi --strict
-
-   - name: Validate database schema
-     run: (cd tests/Application && bin/console doctrine:schema:validate)
-
-   - name: Run PHPSpec
-     run: vendor/bin/phpspec run --ansi -f progress --no-interaction
-
-   - name: Run Behat
-     run: vendor/bin/behat --colors --strict -vvv --no-interaction || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun
-
-   - name: Failed build Slack notification
-     uses: rtCamp/action-slack-notify@v2
-     if: ${{ failure() && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') }}
-     env:
-         SLACK_CHANNEL: ${{ secrets.FAILED_BUILD_SLACK_CHANNEL }}
-         SLACK_COLOR: ${{ job.status }}
-         SLACK_ICON: https://github.com/rtCamp.png?size=48
-         SLACK_MESSAGE: ':x:'
-         SLACK_TITLE: Failed build on ${{ github.event.repository.name }} repository
-         SLACK_USERNAME: ${{ secrets.FAILED_BUILD_SLACK_USERNAME }}
-         SLACK_WEBHOOK: ${{ secrets.FAILED_BUILD_SLACK_WEBHOOK }}
+  tests:
+    runs-on: ubuntu-22.04
+
+    name: "Sylius ${{ matrix.sylius }}, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}"
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ "8.0", "8.1", "8.2", "8.3" ]
+        symfony: [ "^5.4", "^6.0" ]
+        sylius: [ "~1.12.0", "~1.13.0" ]
+        node: [ "^14.17.x" ]
+        mysql: [ "5.7", "8.0" ]
+
+    env:
+      APP_ENV: test
+      DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?serverVersion=${{ matrix.mysql }}"
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "${{ matrix.php }}"
+          extensions: intl
+          tools: symfony
+          coverage: none
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: "${{ matrix.node }}"
+
+      - name: Shutdown default MySQL
+        run: sudo service mysql stop
+
+      - name: Setup MySQL
+        uses: mirromutth/mysql-action@v1.1
+        with:
+          mysql version: "${{ matrix.mysql }}"
+          mysql root password: "root"
+
+      - name: Configure sysctl limits
+        run: |
+          sudo swapoff -a
+          sudo sysctl -w vm.swappiness=1
+          sudo sysctl -w fs.file-max=262144
+          sudo sysctl -w vm.max_map_count=262144
+      
+      - name: Runs Elasticsearch
+        uses: elastic/elastic-github-actions/elasticsearch@master
+        with:
+          stack-version: 7.16.3
+
+      - name: Output PHP version for Symfony CLI
+        run: php -v | head -n 1 | awk '{ print $2 }' > .php-version
+
+      - name: Install certificates
+        run: symfony server:ca:install
+
+      - name: Run Chrome Headless
+        run: google-chrome-stable --enable-automation --disable-background-networking --no-default-browser-check --no-first-run --disable-popup-blocking --disable-default-apps --allow-insecure-localhost --disable-translate --disable-extensions --no-sandbox --enable-features=Metal --headless --remote-debugging-port=9222 --window-size=2880,1800 --proxy-server='direct://' --proxy-bypass-list='*' http://127.0.0.1 > /dev/null 2>&1 &
+
+      - name: Run webserver
+        run: (cd tests/Application && symfony server:start --port=8080 --dir=public --daemon)
+
+      - name: Get Composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache Composer
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json **/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-${{ matrix.php }}-composer-
+      
+      - name: Restrict Symfony version
+        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.10"
+          composer config extra.symfony.require "${{ matrix.symfony }}"
+      
+      - name: Restrict Sylius version
+        if: matrix.sylius != ''
+        run: composer require "sylius/sylius:${{ matrix.sylius }}" --no-update --no-scripts --no-interaction
+
+      - name: Install PHP dependencies
+        run: composer install --no-interaction --no-scripts
+
+      - name: Get Yarn cache directory
+        id: yarn-cache
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - name: Cache Yarn
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarn-cache.outputs.dir }}
+          key: ${{ runner.os }}-node-${{ matrix.node }}-yarn-${{ hashFiles('**/package.json **/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node-${{ matrix.node }}-yarn-
+      
+      - name: Install JS dependencies
+        run: (cd tests/Application && yarn install)
+
+      - name: Prepare test application database
+        run: |
+          (cd tests/Application && bin/console doctrine:database:create -vvv)
+          (cd tests/Application && bin/console doctrine:schema:create -vvv)
+      
+      - name: Prepare test application assets
+        run: |
+          (cd tests/Application && bin/console assets:install public -vvv)
+          (cd tests/Application && yarn encore dev)
+      
+      - name: Prepare test application cache
+        run: (cd tests/Application && bin/console cache:warmup -vvv)
+
+      - name: Load fixtures in test application
+        run: (cd tests/Application && bin/console sylius:fixtures:load -n)
+
+      - name: Validate composer.json
+        run: composer validate --ansi --strict
+
+      - name: Validate database schema
+        run: (cd tests/Application && bin/console doctrine:schema:validate)
+
+      - name: Run PHPSpec
+        run: vendor/bin/phpspec run --ansi -f progress --no-interaction
+
+      - name: Run Behat
+        run: vendor/bin/behat --colors --strict -vvv --no-interaction || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun
+
+      - name: Failed build Slack notification
+        uses: rtCamp/action-slack-notify@v2
+        if: ${{ failure() && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') }}
+        env:
+          SLACK_CHANNEL: ${{ secrets.FAILED_BUILD_SLACK_CHANNEL }}
+          SLACK_COLOR: ${{ job.status }}
+          SLACK_ICON: https://github.com/rtCamp.png?size=48
+          SLACK_MESSAGE: ':x:'
+          SLACK_TITLE: Failed build on ${{ github.event.repository.name }} repository
+          SLACK_USERNAME: ${{ secrets.FAILED_BUILD_SLACK_USERNAME }}
+          SLACK_WEBHOOK: ${{ secrets.FAILED_BUILD_SLACK_WEBHOOK }}

.gitignore

@@ -1,4 +1,6 @@
 /vendor
+/node_modules/
+/composer.lock
 
 !tests/Application/web/app_test.php
 tests/Application/web/*

composer.json

@@ -15,14 +15,14 @@
     ],
     "require": {
         "php": "^8.0",
-        "sylius/sylius": "~1.11.0 || ~1.12.0",
+        "sylius/sylius": "~1.12.0 || ~1.13.0",
         "openpayu/openpayu": "^2.2",
         "php-http/message-factory": "^1.1"
     },
     "require-dev": {
         "symfony/webpack-encore-bundle": "^1.15",
         "behat/behat": "^3.7",
-        "behat/mink-selenium2-driver": "^1.4",
+        "behat/mink-selenium2-driver": "~1.6.0",
         "dmore/behat-chrome-extension": "^1.3",
         "dmore/chrome-mink-driver": "^2.7",
         "friends-of-behat/mink": "^1.8",
@@ -42,16 +42,11 @@
         "symfony/intl": "^5.4 || ^6.0",
         "symfony/web-profiler-bundle": "^6.0 || ^5.4",
         "vimeo/psalm": "4.16.1",
-        "symfony/dependency-injection": "<4.4.19 || ^5.2",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
         "bitbag/coding-standard": "^3.0"
     },
     "conflict": {
-        "symfony/symfony": "4.1.8",
-        "symfony/browser-kit": "4.1.8",
-        "symfony/dom-crawler": "4.1.8",
-        "symfony/routing": "4.1.8",
-        "symfony/doctrine-bridge": "4.4.16"
+        "doctrine/persistence": "<3.0"
     },
     "prefer-stable": true,
     "autoload": {

src/Exception/PayUResponseException.php

@@ -11,8 +11,6 @@
 namespace BitBag\SyliusPayUPlugin\Exception;
 
 use Exception;
-use Payum\Core\Exception\Http\HttpException;
-use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 
 final class PayUResponseException extends Exception
 {