Merge 4.x into 5.x

sonata-project · May 9, 2023 · fa46578 · fa46578
2 parents da0107c + 5d465c6
commit fa46578
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -38,7 +38,6 @@ jobs:
               uses: ramsey/composer-install@v2
               with:
                   dependency-versions: highest
-                  composer-options: --prefer-dist --prefer-stable
 
             - name: Lint PHP files
               run: make lint-php

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -38,7 +38,6 @@ jobs:
               uses: ramsey/composer-install@v2
               with:
                   dependency-versions: highest
-                  composer-options: --prefer-dist --prefer-stable
 
             - name: PHPStan
               run: vendor/bin/phpstan --no-progress --memory-limit=1G analyse --error-format=github
@@ -64,7 +63,6 @@ jobs:
               uses: ramsey/composer-install@v2
               with:
                   dependency-versions: highest
-                  composer-options: --prefer-dist --prefer-stable
 
             - name: Psalm
               run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.2
@@ -90,7 +88,6 @@ jobs:
               uses: ramsey/composer-install@v2
               with:
                   dependency-versions: highest
-                  composer-options: --prefer-dist --prefer-stable
 
             - name: Rector
               run: vendor/bin/rector --no-progress-bar --dry-run
diff --git a/.github/workflows/symfony-lint.yaml b/.github/workflows/symfony-lint.yaml
@@ -37,7 +37,6 @@ jobs:
               uses: ramsey/composer-install@v2
               with:
                   dependency-versions: highest
-                  composer-options: --prefer-dist --prefer-stable
 
             - name: Lint container
               run: make lint-symfony-container
@@ -62,7 +61,6 @@ jobs:
               uses: ramsey/composer-install@v2
               with:
                   dependency-versions: highest
-                  composer-options: --prefer-dist --prefer-stable
 
             - name: Lint twig files
               run: make lint-symfony-twig
@@ -87,7 +85,6 @@ jobs:
               uses: ramsey/composer-install@v2
               with:
                   dependency-versions: highest
-                  composer-options: --prefer-dist --prefer-stable
 
             - name: Lint xliff files
               run: make lint-symfony-xliff
@@ -112,7 +109,6 @@ jobs:
               uses: ramsey/composer-install@v2
               with:
                   dependency-versions: highest
-                  composer-options: --prefer-dist --prefer-stable
 
             - name: Lint yaml files
               run: make lint-symfony-yaml
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -58,6 +58,11 @@ jobs:
                       allowed-to-fail: false
                       symfony-require: 6.2.*
                       variant: symfony/symfony:"6.2.*"
+                    - php-version: '8.2'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 6.3.*
+                      variant: symfony/symfony:"6.3.*"
 
         steps:
             - name: Checkout
@@ -88,7 +93,6 @@ jobs:
               uses: ramsey/composer-install@v2
               with:
                   dependency-versions: ${{ matrix.dependencies }}
-                  composer-options: --prefer-dist --prefer-stable
 
             - name: Run Tests with coverage
               run: make coverage

diff --git a/composer.json b/composer.json
@@ -116,6 +116,8 @@
         "symfony/messenger": "If you want to generate thumbnails asynchronously.",
         "twig/extra-bundle": "Auto configures the Twig Intl extension."
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "Sonata\\MediaBundle\\": "src/"