Add support for Symfony 6

digital-blueprint · Mar 7, 2024 · 1672da5 · 1672da5
1 parent 8211c34
commit 1672da5
Show file tree

Hide file tree

Showing 4 changed files with 1,078 additions and 1,423 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,29 +10,34 @@ env:
 
 jobs:
   unit-tests:
-    name: Tests for php${{ matrix.php-versions }}
+    name: Tests for php${{ matrix.php-versions }} ${{ matrix.name }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         php-versions: ['8.1', '8.2', '8.3']
+        composer-command: ['install']
+        include:
+          - php-versions: '8.1'
+            composer-command: 'update --prefer-lowest --prefer-dist --prefer-stable --no-interaction'
+            name: prefer-lowest
     steps:
-    - name: Set up php${{ matrix.php-versions }}
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php-versions }}
-        extensions: ctype,curl,dom,gd,iconv,intl,json,mbstring,openssl,posix,sqlite,xml,zip,gmp
-        coverage: xdebug
-    - name: Checkout code
-      uses: actions/checkout@v4
-    - name: Cache composer cache directory
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.COMPOSER_CACHE_DIR }}
-        key: composer-cache
-    - name: Unit tests
-      run: |
-        composer install
-        composer test
+      - name: Set up php${{ matrix.php-versions }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: ctype,curl,dom,gd,iconv,intl,json,mbstring,openssl,posix,sqlite,xml,zip,gmp
+          coverage: xdebug
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Cache composer cache directory
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.COMPOSER_CACHE_DIR }}
+          key: composer-cache
+      - name: Unit tests
+        run: |
+          composer ${{ matrix.composer-command }}
+          composer test
   linting:
     name: Linting
     runs-on: ubuntu-latest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v0.3.11
+
+* Add support for Symfony 6
+
 # v0.3.10
 
 * dev: replace abandoned composer-git-hooks with captainhook.

diff --git a/composer.json b/composer.json
@@ -7,25 +7,25 @@
         "ext-json": "*",
         "ext-soap": "*",
         "api-platform/core": "^2.7.11",
-        "dbp/relay-core-bundle": "^0.1.145",
+        "dbp/relay-core-bundle": "^0.1.148",
         "guzzlehttp/guzzle": "^7.5",
         "guzzlehttp/promises": "^2.0",
         "guzzlehttp/psr7": "^2.6",
         "league/uri": "^6.5 || ^7.0",
         "myclabs/php-enum": "^1.8.4",
-        "symfony/filesystem": "^5.4",
-        "symfony/framework-bundle": "^5.4",
-        "symfony/stopwatch": "^5.4",
-        "symfony/uid": "^5.4",
-        "zbateson/mail-mime-parser": "^2.0",
+        "symfony/filesystem": "^5.4 || ^6.4",
+        "symfony/framework-bundle": "^5.4 || ^6.4",
+        "symfony/stopwatch": "^5.4 || ^6.4",
+        "symfony/uid": "^5.4 || ^6.4",
+        "zbateson/mail-mime-parser": "^2.2",
         "psr/log": "^1.1.4 || ^2.0.0 || ^3.0.0",
-        "symfony/config": "^5.4",
-        "symfony/console": "^5.4",
-        "symfony/dependency-injection": "^5.4",
-        "symfony/http-foundation": "^5.4",
-        "symfony/http-kernel": "^5.4",
-        "symfony/routing": "^5.4",
-        "symfony/security-core": "^5.4"
+        "symfony/config": "^5.4 || ^6.4",
+        "symfony/console": "^5.4 || ^6.4",
+        "symfony/dependency-injection": "^5.4 || ^6.4",
+        "symfony/http-foundation": "^5.4 || ^6.4",
+        "symfony/http-kernel": "^5.4 || ^6.4",
+        "symfony/routing": "^5.4 || ^6.4",
+        "symfony/security-core": "^5.4 || ^6.4"
     },
     "require-dev": {
         "ext-simplexml": "*",
@@ -34,14 +34,18 @@
         "phpstan/phpstan": "^1.10.59",
         "phpstan/phpstan-phpunit": "^1.3.16",
         "phpunit/phpunit": "^9.6.17",
-        "symfony/browser-kit": "^5.4.35",
-        "symfony/error-handler": "^5.4.36",
-        "symfony/http-client": "^5.4.35",
-        "symfony/monolog-bridge": "^5.4.35",
+        "symfony/browser-kit": "^5.4 || ^6.4",
+        "symfony/error-handler": "^5.4 || ^6.4",
+        "symfony/http-client": "^5.4 || ^6.4",
+        "symfony/monolog-bridge": "^5.4 || ^6.4",
         "symfony/monolog-bundle": "^3.10",
-        "symfony/phpunit-bridge": "^5.4.35",
+        "symfony/phpunit-bridge": "^5.4 || ^6.4",
         "vimeo/psalm": "^5.22.2"
     },
+    "conflict": {
+        "willdurand/negotiation": "<3",
+        "pimple/pimple": "<3.1"
+    },
     "autoload": {
         "psr-4": {
             "Dbp\\Relay\\EsignBundle\\": "src/"