Merge pull request #89 from webgriffe/sylius-2

Update to sylius 2.0

Author: LucaGallinari

.docker/nginx/nginx.conf

@@ -21,19 +21,20 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: ["8.1", "8.2", "8.3"]
-                symfony: ["5.4.*", "^6.0"]
-                sylius: ["1.12.16", "1.13.1"]
-                node: ["18.x"]
-                mysql: ["8.0"]
+                php: ["8.4"]
+                symfony: ["^7.3"]
+                sylius: ["~2.2.0"]
+                node: ["22.x"]
+                mysql: ["8.4"]
 
         env:
             APP_ENV: test
+            BEHAT_BASE_URL: "https://127.0.0.1:8080/"
             DATABASE_URL: "mysql://root:[email protected]/sylius?serverVersion=${{ matrix.mysql }}"
 
         steps:
             -
-                uses: actions/checkout@v2
+                uses: actions/checkout@v4
 
             -
                 name: Setup PHP
@@ -65,26 +66,14 @@ jobs:
                 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: Validate composer.json
                 run: composer validate --ansi --strict
 
             -
                 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
@@ -95,16 +84,12 @@ jobs:
                     restore-keys: |
                         ${{ runner.os }}-php-${{ matrix.php }}-composer-
 
-            -
-                name: Configure global composer
-                run: |
-                    composer global config --no-plugins allow-plugins.symfony/flex true
-                    composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^2.2.2"
-
             -
                 name: Restrict Symfony version
                 if: matrix.symfony != ''
                 run: |
+                    composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^2.4"
+                    composer global config --no-plugins allow-plugins.symfony/flex true
                     composer config extra.symfony.require "${{ matrix.symfony }}"
 
             -
@@ -114,14 +99,36 @@ jobs:
 
             -
                 name: Install PHP dependencies
-                run: composer install --no-interaction --no-plugins
-                env:
-                    SYMFONY_REQUIRE: ${{ matrix.symfony }}
+                run: composer install --no-interaction
+
+            -
+                name: Validate container
+                run: vendor/bin/console lint:container
+
+            -
+                name: Run ECS
+                run: vendor/bin/ecs check
+
+            -
+                name: Run PHPStan
+                run: vendor/bin/phpstan analyse -c phpstan.neon -l max src/
+
+            -
+                name: Run Psalm
+                run: vendor/bin/psalm
+
+            -
+                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
                 id: yarn-cache
-                run: echo "::set-output name=dir::$(yarn cache dir)"
+                run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
             -
                 name: Cache Yarn
@@ -134,73 +141,71 @@ jobs:
 
             -
                 name: Install JS dependencies
-                run: (cd tests/Application && yarn install)
+                run: (cd vendor/sylius/test-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)
+                    (vendor/bin/console doctrine:database:create -vvv)
+                    (vendor/bin/console doctrine:schema:create -vvv)
+
+            -
+                name: Validate database schema
+                run: vendor/bin/console doctrine:schema:validate
 
             -
                 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: Load fixtures in test application
-                run: (cd tests/Application && bin/console sylius:fixtures:load -n)
-
-            -
-                name: Validate database schema
-                run: (cd tests/Application && bin/console doctrine:schema:validate)
-
-            -
-                name: Run ECS
-                run: vendor/bin/ecs check
-
-            -
-                name: Run PHPStan
-                run: vendor/bin/phpstan analyse
-
-            -
-                name: Run Psalm
-                run: vendor/bin/psalm
-
-            -
-                name: Run PHPSpec
-                run: vendor/bin/phpspec run --ansi -f progress --no-interaction
-
-            -
-                name: Run PHPUnit
-                run: vendor/bin/phpunit --colors=always
-
-            #-
-            #    name: Run Behat
-            #    run: vendor/bin/behat --colors --strict -vvv --no-interaction || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun
-
-            -
-                name: Upload Behat logs
-                uses: actions/upload-artifact@v4
-                if: failure()
-                with:
-                    name: Behat logs
-                    path: etc/build/
-                    if-no-files-found: ignore
+                run: vendor/bin/console sylius:fixtures:load -n
+
+            -
+                name: Run Non-unit PHPUnit tests
+                run: vendor/bin/phpunit --colors=always --testsuite=non-unit
+#
+#            -
+#                name: Install certificates
+#                run: symfony server:ca:install || true
+#
+#            -
+#                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: symfony server:start --port=8080 --daemon
+#
+#            -
+#                name: Run Behat
+#                run: vendor/bin/behat --colors --strict -vvv --no-interaction || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun
+#
+#            -
+#                name: Upload Behat logs
+#                uses: actions/upload-artifact@v4
+#                if: failure()
+#                with:
+#                    name: "Behat logs - ${{ matrix.sylius }}-${{ github.run_id }}-${{ github.run_number }}"
+#                    path: etc/build/
+#                    if-no-files-found: ignore
+#                    compression-level: 6
+#                    overwrite: true
 
     roave_bc_check:
         name: Roave BC Check
         runs-on: ubuntu-latest
         env:
-            PHP_VERSION: 8.2
+            PHP_VERSION: 8.4
         steps:
             -   name: Checkout code
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
                 with:
                     fetch-depth: 0
 

.docker/php/php.ini

@@ -1,18 +1,23 @@
 /vendor/
+/var/
 /node_modules/
+/drivers/
 /composer.lock
 
 /etc/build/*
 !/etc/build/.gitignore
 
-/tests/Application/yarn.lock
-
 /.phpunit.result.cache
 /behat.yml
 /phpspec.yml
 /phpunit.xml
+/compose.override.yml
+/docker-compose.override.yml
+.phpunit.result.cache
 
 # Symfony CLI https://symfony.com/doc/current/setup/symfony_server.html#different-php-settings-per-project
 /.php-version
 /php.ini
-/docker-compose.override.yml
+
+/tests/TestApplication/.env.local
+/tests/TestApplication/.env.*.local

.github/CODEOWNERS

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Webgriffe®
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.