Resolve conflicts between 1.7 and 2.0

Author: NoResponseMate

.github/workflows/build.yaml

@@ -3,15 +3,20 @@ name: Build
 on:
     push:
         branches-ignore:
+            - 'dependabot/**'
             - 'upmerge/**'
     pull_request: ~
     release:
-        types: [created]
+        types: [ created ]
     schedule:
         -
             cron: "0 1 * * 6" # Run at 1am every Saturday
     workflow_dispatch: ~
 
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+
 jobs:
     tests:
         runs-on: ubuntu-latest
@@ -21,42 +26,31 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: ["8.3"]
-                symfony: ["^5.4.21", "^6.4"]
-                sylius: ["~1.14.0"]
+                php: ["8.2", "8.3"]
+                symfony: ["^6.4", "~7.3.0"]
+                sylius: ["~2.0.1", "~2.1.0"]
                 database: ["mysql", "postgres"]
                 mysql: ["8.4"]
                 postgres: ["15.8"]
-                node: ["20.x"]
+                node: ["22.x"]
                 state_machine_adapter: ["symfony_workflow"]
 
                 include:
-                    -
-                        php: "8.3"
-                        symfony: "^6.4"
-                        sylius: "~1.14.0"
+                    -   php: "8.3"
+                        symfony: "~7.3.0"
+                        sylius: "~2.1.0"
+                        node: "24.x"
                         database: "mysql"
                         mysql: "8.4"
-                        node: "20.x"
-                        wkhtmltopdf: "0.12.6-1"
-                        state_machine_adapter: "symfony_workflow"
-                    -
-                        php: "8.3"
-                        symfony: "^6.4"
-                        sylius: "~1.14.0"
-                        database: "mysql"
-                        mysql: "8.4"
-                        node: "20.x"
-                        wkhtmltopdf: "0.12.6-1"
                         state_machine_adapter: "winzou_state_machine"
+
                     -
                         php: "8.3"
-                        symfony: "^6.4"
-                        sylius: "~1.14.0"
-                        database: "mysql"
-                        mysql: "8.4"
-                        node: "20.x"
-                        wkhtmltopdf: false
+                        symfony: "~7.3.0"
+                        sylius: "~2.1.0"
+                        node: "24.x"
+                        database: "postgres"
+                        postgres: "15.8"
                         state_machine_adapter: "symfony_workflow"
 
         env:
@@ -74,7 +68,7 @@ jobs:
                 with:
                     php-version: "${{ matrix.php }}"
                     extensions: intl
-                    tools: symfony
+                    tools: flex, symfony
                     coverage: none
 
             -
@@ -105,6 +99,10 @@ jobs:
                     postgresql version: "${{ matrix.postgres }}"
                     postgresql password: "postgres"
 
+            -
+                name: Output PHP version for Symfony CLI
+                run: php -v | head -n 1 | awk '{ print $2 }' > .php-version
+
             -
                 name: Get Composer cache directory
                 id: composer-cache
@@ -125,7 +123,6 @@ jobs:
                 run: |
                     composer global config --no-plugins allow-plugins.symfony/flex true
                     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 }}"
 
             -
@@ -134,55 +131,27 @@ jobs:
                 run: composer require "sylius/sylius:${{ matrix.sylius }}" --no-update --no-scripts --no-interaction
 
             -
-                name: Install PHP dependencies
-                run: composer install --no-interaction
-
-            -   name: Run security checks
+                name: Require Winzou State Machine
+                if: "${{ matrix.state_machine_adapter == 'winzou_state_machine' }}"
                 run: |
-                    set -e
-
-                    IGNORED=$(jq -r '.config.audit.ignore[]?' composer.json | sort || true)
-
-                    if [ -n "$IGNORED" ]; then
-                        echo "Ignored CVEs:"
-                        echo "$IGNORED"
-                        echo
-                    fi
-
-                    composer audit --no-interaction --abandoned=ignore --no-dev
-
-                    symfony security:check --format=json > symfony-audit.json || true
-
-                    FOUND=$(jq -r '.[]?.advisories[]?.cve? // empty' symfony-audit.json | sort | uniq)
-                    DIFF=$(comm -23 <(echo "$FOUND") <(echo "$IGNORED"))
-
-                    if [ -n "$DIFF" ]; then
-                      echo "❌ New vulnerabilities found by Symfony security:check:"
-                      echo "$DIFF"
-                      exit 1
-                    else
-                      echo "✅ No new vulnerabilities found by Symfony security:check."
-                    fi
-
-            -
-                name: Run ECS
-                run: vendor/bin/ecs check
+                    composer require winzou/state-machine:^0.4 --no-update   
+                    composer require winzou/state-machine-bundle:^0.6 --no-update 
 
             -
-                name: Validate composer.json
-                run: composer validate --ansi --strict
+                name: Install PHP dependencies
+                run: composer install --no-interaction
 
             -
-                name: Run analysis
-                run: composer analyse
+                name: Run PHPStan
+                run: vendor/bin/phpstan analyse -c phpstan.neon.dist
 
             -
-                name: Run PHPStan
-                run: vendor/bin/phpstan analyse -c phpstan.neon.dist src/
+                name: Run ECS
+                run: vendor/bin/ecs check src/
 
             -
-                name: Run PHPSpec
-                run: vendor/bin/phpspec run --ansi -f progress --no-interaction
+                name: Run unit tests
+                run: vendor/bin/phpunit --colors=always --testsuite=unit
 
             -
                 name: Get Yarn cache directory
@@ -200,54 +169,65 @@ jobs:
 
             -
                 name: Install JS dependencies
-                run: (cd tests/Application && yarn install)
+                run: (cd vendor/sylius/test-application && yarn install)
+
+            -   name: Check out database schema update
+                run: |
+                    vendor/bin/console doctrine:database:create
+                    vendor/bin/console doctrine:schema:update --force
+                    vendor/bin/console doctrine:schema:validate
+                    vendor/bin/console doctrine:database:drop --force
 
             -
                 name: Prepare test application database
                 run: |
-                    (cd tests/Application && bin/console doctrine:database:create -vvv)
-                    (cd tests/Application && bin/console doctrine:migrations:migrate -n -vvv -q)
+                    vendor/bin/console doctrine:database:create -vvv
+                    vendor/bin/console doctrine:migrations:migrate -n -vvv -q
 
             -
-                name: Test migrations generation directory
-                run: |
-                    cp etc/travis/Order.php src/Entity
-                    cp etc/travis/resources.yaml tests/Application/config/packages/
-                    (cd tests/Application && bin/console doctrine:migrations:diff -q)
-                    COUNT=$(ls tests/Application/src/Migrations/ | wc -l)
-                    if [ $COUNT == 0 ]; then exit 1; fi
-                    rm src/Entity/Order.php
-                    rm tests/Application/config/packages/resources.yaml
+                name: Setup messenger transports
+                run: vendor/bin/console messenger:setup-transports -vvv
+
+            -
+                name: Validate database schema
+                run: vendor/bin/console doctrine:schema:validate -vvv
 
             -
                 name: Prepare test application assets
                 run: |
-                    (cd tests/Application && bin/console assets:install public -vvv)
-                    (cd tests/Application && yarn build:prod)
+                    vendor/bin/console assets:install -vvv
+                    (cd vendor/sylius/test-application && yarn build)
 
             -
                 name: Prepare test application cache
-                run: (cd tests/Application && bin/console cache:warmup -vvv)
+                run: vendor/bin/console cache:warmup -vvv
 
             -
                 name: Validate container
-                run: (cd tests/Application && bin/console lint:container -vvv)
+                run: vendor/bin/console lint:container -vvv
+
+            -   name: Run security check
+                run: symfony security:check
+
+            -
+                name: Validate composer.json
+                run: composer validate --ansi --strict
 
             -
                 name: Load fixtures in test application
-                run: (cd tests/Application && bin/console sylius:fixtures:load -n)
+                run: vendor/bin/console sylius:fixtures:load -n
 
             -
-                name: Run PHPUnit
-                run: vendor/bin/phpunit --colors=always
+                name: Run Non-unit PHPUnit tests
+                run: vendor/bin/phpunit --colors=always --testsuite=non-unit
 
             -
                 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)
+                run: symfony server:start --port=8080 --daemon
 
             -
                 name: Run Behat
@@ -258,7 +238,8 @@ jobs:
                 uses: actions/upload-artifact@v4
                 if: failure()
                 with:
-                    name: Behat logs
+                    name: "Behat logs - ${{ matrix.sylius }}-${{ github.run_id }}-${{ github.run_number }}"
                     path: etc/build/
                     if-no-files-found: ignore
+                    compression-level: 6
                     overwrite: true

.github/workflows/upmerge_pr.yaml

@@ -20,6 +20,9 @@ jobs:
             fail-fast: false
             matrix:
                 include:
+                    -
+                        base_branch: "1.6"
+                        target_branch: "1.7"
                     -
                         base_branch: "1.7"
                         target_branch: "2.0"

.gitignore

@@ -5,9 +5,10 @@
 /etc/build/*
 !/etc/build/.gitignore
 
-/tests/Application/yarn.lock
-
 /.phpunit.result.cache
 /behat.yml
 /phpspec.yml
 /phpunit.xml
+
+/tests/TestApplication/.env.local
+/tests/TestApplication/.env.*.local

README.md

@@ -3,54 +3,41 @@
         <picture>
           <source media="(prefers-color-scheme: dark)" srcset="https://media.sylius.com/sylius-logo-800-dark.png">
           <source media="(prefers-color-scheme: light)" srcset="https://media.sylius.com/sylius-logo-800.png">
-          <img alt="Sylius Logo." src="https://media.sylius.com/sylius-logo-800.png">
+          <img alt="Sylius Logo" src="https://media.sylius.com/sylius-logo-800.png">
         </picture>
     </a>
 </p>
-<br/>
+
+<h1 align="center">PayPal Plugin</h1>
+
 <p align="center">
-    <a href="">
-        <img src="https://www.paypalobjects.com/webstatic/mktg/Logo/pp-logo-200px.png" width="200" />
-    </a>
+  <a href="https://sylius.com/plugins/" target="_blank">
+    <img src="https://sylius.com/assets/badge-official-sylius-plugin.png" width="200" alt="Official Sylius Plugin">
+  </a>
 </p>
-<br/>
+
 <p align="center">
-    <a href="https://sylius.com/plugins/" target="_blank">
-        <img src="https://sylius.com/assets/badge-official-sylius-plugin.png" width="150">
-    </a>
+  Official plugin for 
+  <a href="https://www.paypal.com/uk/business/platforms-and-marketplaces" target="_blank">PayPal Commerce Platform</a>
+  – the newest and most advanced of PayPal solutions.
 </p>
 
-# PayPal Plugin
+---
 
-Sylius Core Team’s plugin for [PayPal Commerce Platform](https://www.paypal.com/uk/business/platforms-and-marketplaces) - the newest and most advanced of PayPal solutions.
+## Documentation
 
-#### Why should I use PayPal in my online business?
+📖 Full documentation is available here:
+👉 [PayPal Plugin Documentation](https://docs.sylius.com/paypal-plugin)
 
-* one of the most popular payment methods in the world;
-* worldwide network of 280+ millions consumers and 24+ millions merchants;
-* bank payouts are available in U.S., U.K., the E.U., Australia, and Canada;
-* PCI DSS and 3DS 2.0 compliance
-* full risk management, incl. customisable fraud tools & insight and dispute resolution via dynamic APIs.
+## Security issues
 
-#### What does this plugin give me?
+If you think that you have found a security issue, please do not use the issue tracker and do not post it publicly.
+Instead, all security issues must be sent to `security@sylius.com`
 
-* official payment integration developed and maintained by the Sylius Core Team;
-* global support for over 100 currencies across 200+ markets;
-* two-side operations between Sylius & PayPal administration panels (payments, refunds, reports, etc.);
-* better conversion thanks to direct checkout from both product & cart page;
-* support for all credit & debit cards;
-* popular regional payment methods, i.e. iDeal, SEPA, Sofort, eps, Griopay or Przelewy24;
-* direct PayPal transactions with PayPal wallet
+## Community
 
-1. [Installation](docs/installation.md)
-1. [PayPal environment](docs/sandbox-vs-live.md)
-1. [Onboarding](docs/onboarding.md)
-1. [Reports](docs/reports.md)
-1. [Processing payments](docs/processing-payments.md)
-1. [Development](docs/development.md)
+For online communication, we invite you to chat with us and other users on [Sylius Slack](https://sylius.com/slack).
 
-#### Supported branches
+## License
 
-* `1.5` (v1.5.*) - security fixes
-* `1.6` (v1.6.*) - bug fixes, improvements
-* `1.7` (v1.7.*) - new features
+This plugin is released under the [MIT License](LICENSE).