Merge pull request #4 from Wojdylak/bump-to-1-14

Sylius · Nov 22, 2024 · 9e24237 · 9e24237
2 parents db632f7 + ec29f89
commit 9e24237
Show file tree

Hide file tree

Showing 3 changed files with 100 additions and 86 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -1,90 +1,95 @@
 name: Build
 
 on:
-  push: ~
-  pull_request: ~
-  release:
-    types: [created]
-  workflow_dispatch: ~
+    push: ~
+    pull_request: ~
+    release:
+        types: [created]
+    workflow_dispatch: ~
 
 jobs:
-  tests:
-    runs-on: ubuntu-latest
-
-    name: "Sylius ${{ matrix.sylius }}, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}"
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php: ["8.1", "8.2"]
-        symfony: ["^5.4.21", "^6.4"]
-        sylius: ["~1.12.0", "~1.13.0"]
-
-        include:
-          -   php: "8.3"
-              symfony: "^6.4"
-              sylius: "~1.13.0"
-
-    env:
-      APP_ENV: test
-
-    steps:
-      -
-        uses: actions/checkout@v4
-
-      -
-        name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: "${{ matrix.php }}"
-          extensions: intl
-          tools: symfony
-          coverage: none
-
-      -
-        name: Get Composer cache directory
-        id: composer-cache
-        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      -
-        name: Cache Composer
-        uses: actions/cache@v4
-        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:^2.4"
-          composer config --no-plugins allow-plugins.symfony/thanks true
-          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
-
-      -
-        name: Run ECS
-        run: vendor/bin/ecs check
-
-      -
-        name: Validate composer.json
-        run: composer validate --ansi --strict
-
-      -
-        name: Run PHPStan
-        run: vendor/bin/phpstan analyse
-
-      -
-        name: Run PHPUnit
-        run: vendor/bin/phpunit --colors=always
+    tests:
+        runs-on: ubuntu-latest
+
+        name: "Sylius ${{ matrix.sylius }}, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}"
+
+        strategy:
+            fail-fast: false
+            matrix:
+                php: [ "8.3" ]
+                symfony: [ "^5.4.21", "^6.4" ]
+                sylius: [ "~1.13.0", "~1.14.0" ]
+
+                include:
+                    -
+                        php: "8.1"
+                        symfony: "^5.4.21"
+                        sylius: "~1.13.0"
+                    -
+                        php: "8.2"
+                        symfony: "^6.4"
+                        sylius: "~1.14.0"
+
+        env:
+            APP_ENV: test
+
+        steps:
+            -
+                uses: actions/checkout@v4
+
+            -
+                name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: "${{ matrix.php }}"
+                    extensions: intl
+                    tools: symfony
+                    coverage: none
+
+            -
+                name: Get Composer cache directory
+                id: composer-cache
+                run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+            -
+                name: Cache Composer
+                uses: actions/cache@v4
+                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:^2.4"
+                    composer config --no-plugins allow-plugins.symfony/thanks true
+                    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
+
+            -
+                name: Run ECS
+                run: vendor/bin/ecs check
+
+            -
+                name: Validate composer.json
+                run: composer validate --ansi --strict
+
+            -
+                name: Run PHPStan
+                run: vendor/bin/phpstan analyse
+
+            -
+                name: Run PHPUnit
+                run: vendor/bin/phpunit --colors=always
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -0,0 +1,6 @@
+### UPGRADE FROM 0.1 TO 0.2
+
+1. Support for Sylius 1.14 has been added, it is now the recommended Sylius version to use with GmvPlugin.
+
+1. Support for Sylius 1.12 has been dropped, upgrade your application to [Sylius 1.13](https://github.com/Sylius/Sylius/blob/1.13/UPGRADE-1.13.md).
+   or [Sylius 1.14](https://github.com/Sylius/Sylius/blob/1.14/UPGRADE-1.14.md).
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "symfony/dependency-injection": "^5.4 || ^6.4",
         "symfony/framework-bundle": "^5.4 || ^6.4",
         "symfony/console": "^5.4 || ^6.4",
-        "sylius/core-bundle": "~1.12.0 || ~1.13.0"
+        "sylius/core-bundle": "~1.13.0 || ~1.14.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.5",
@@ -33,6 +33,9 @@
     "extra": {
         "symfony": {
             "require": "^5.4 || ^6.4"
+        },
+        "branch-alias": {
+            "dev-master": "0.2-dev"
         }
     },
     "config": {