Resolve conflicts between 1.0 and 2.0

Sylius · Dec 11, 2024 · 028199d · 028199d
2 parents e8c5a1d + 033dc4f
commit 028199d
Show file tree

Hide file tree

Showing 156 changed files with 992 additions and 1,268 deletions.
diff --git a/.github/workflows/build.yml → .github/workflows/build.yaml b/.github/workflows/build.yml → .github/workflows/build.yaml
@@ -12,60 +12,33 @@ on:
 
 jobs:
     tests:
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
 
         name: "Sylius ${{ matrix.sylius }}, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, ${{ matrix.database == 'mysql' && format('MySQL {0}', matrix.mysql) || matrix.database == 'postgres' && format('PostgreSQL {0}', matrix.postgres) }}, wkhtmltopdf: ${{ matrix.wkhtmltopdf }}, State Machine Adapter ${{ matrix.state_machine_adapter }}"
 
         strategy:
             fail-fast: false
             matrix:
-                php: ["8.3"]
-                symfony: ["^5.4.21", "^6.4"]
-                sylius: ["~1.13.0", "~1.14.0"]
-                mysql: ["8.4"]
+                php: ["8.2", "8.3"]
+                symfony: ["^6.4", "^7.1"]
+                sylius: ["~2.0.0"]
                 node: ["20.x"]
-                postgres: ["15.8"]
                 database: ["mysql", "postgres"]
-                wkhtmltopdf: ["0.12.6-1"]
+                mysql: ["8.4"]
+                postgres: ["15.8"]
+                wkhtmltopdf: ["0.12.6-1", false]
                 state_machine_adapter: ["symfony_workflow"]
 
                 include:
                     -
-                        php: "8.1"
-                        symfony: "^6.4"
-                        sylius: "~1.14.0"
-                        database: "mysql"
-                        mysql: "8.4"
+                        php: "8.3"
+                        symfony: "^7.1"
+                        sylius: "~2.0.0"
                         node: "20.x"
-                        wkhtmltopdf: "0.12.6-1"
-                        state_machine_adapter: "symfony_workflow"
-                    -
-                        php: "8.2"
-                        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.2"
-                        symfony: "^6.4"
-                        sylius: "~1.14.0"
-                        database: "mysql"
-                        mysql: "8.4"
-                        node: "20.x"
-                        wkhtmltopdf: false
-                        state_machine_adapter: "symfony_workflow"
-                    -
-                        php: "8.2"
-                        symfony: "^6.4"
-                        sylius: "~1.14.0"
-                        database: "postgres"
-                        postgres: "15.8"
-                        node: "20.x"
-                        wkhtmltopdf: false
-                        state_machine_adapter: "symfony_workflow"
 
         env:
             APP_ENV: test
@@ -135,7 +108,6 @@ jobs:
                 if: matrix.wkhtmltopdf == false
                 run: |
                     mv tests/Application/etc/sylius_invoicing_pdf_generation_disabled.yaml tests/Application/config/packages
-                    sed -i 's/pdf_generation_disabled/pdf_generation_enabled/g' behat.yml.dist
 
             -
                 name: Get Composer cache directory
@@ -164,6 +136,13 @@ jobs:
                 if: matrix.sylius != ''
                 run: composer require "sylius/sylius:${{ matrix.sylius }}" --no-update --no-scripts --no-interaction
 
+            -
+                name: Require Winzou State Machine
+                if: "${{ matrix.state_machine_adapter == 'winzou_state_machine' }}"
+                run: |
+                  composer require winzou/state-machine:^0.4 --no-update   
+                  composer require winzou/state-machine-bundle:^0.6 --no-update   
+
             -
                 name: Install PHP dependencies
                 run: composer install --no-interaction --no-scripts
@@ -206,21 +185,13 @@ jobs:
                 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 --no-check-publish
-
-            -
-                name: Run ECS
-                run: vendor/bin/ecs check src/ spec/
-
             -
                 name: Run security check
                 run: symfony security:check
 
             -
-                name: Run PHPStan
-                run: vendor/bin/phpstan analyse -c phpstan.neon -l max src/
+                name: Run analysis
+                run: composer analyse
 
             -
                 name: Run PHPSpec
@@ -232,7 +203,12 @@ jobs:
 
             -
                 name: Run Behat
-                run: vendor/bin/behat --colors --strict -vvv --no-interaction -f progress || vendor/bin/behat --colors --strict -vvv --no-interaction -f progress --rerun
+                run: |
+                    if [ "${{ matrix.wkhtmltopdf }}" != "false" ]; then
+                        vendor/bin/behat --colors --strict -vvv --no-interaction -f progress --tags="~@pdf_disabled" || vendor/bin/behat --colors --strict -vvv --no-interaction -f progress --rerun;
+                    else
+                        vendor/bin/behat --colors --strict -vvv --no-interaction -f progress --tags="~@pdf_enabled" || vendor/bin/behat --colors --strict -vvv --no-interaction -f progress --rerun;
+                    fi
 
             -
                 name: Upload Behat logs

diff --git a/CHANGELOG-2.0.md b/CHANGELOG-2.0.md
@@ -0,0 +1,11 @@
+# CHANGELOG
+
+### v2.0.0-RC.1 (2024-12-03)
+
+- [#323](https://github.com/Sylius/InvoicingPlugin/issues/323) Upgrade to 2.0 ([@TheMilek](https://github.com/TheMilek))
+- [#325](https://github.com/Sylius/InvoicingPlugin/issues/325) Reflect Sylius 2.0 Changes ([@Rafikooo](https://github.com/Rafikooo))
+- [#328](https://github.com/Sylius/InvoicingPlugin/issues/328) [Maintenance] Bump twig hooks ([@mpysiak](https://github.com/mpysiak))
+- [#332](https://github.com/Sylius/InvoicingPlugin/issues/332) Bump to stable Sylius 2.0 + minor clean up ([@GSadee](https://github.com/GSadee))
+- [#344](https://github.com/Sylius/InvoicingPlugin/issues/344) Fix translations' keys after upmerge ([@GSadee](https://github.com/GSadee))
+- [#347](https://github.com/Sylius/InvoicingPlugin/issues/347) [CI] Enable composer analyse ([@GSadee](https://github.com/GSadee))
+- [#348](https://github.com/Sylius/InvoicingPlugin/issues/348) Adjust the translations and routes after naming convention changes ([@TheMilek](https://github.com/TheMilek))