feat: update vendors (#353)

* feat: update vendors * feat: revert grumphp * feat: update composer lock * feat: github workflow * feat: github workflow sf version * feat: donwgrade grumphp * feat: ignore file * feat: handle sf versions 1 * feat: handle sf versions 2
pixelfederation · Dec 5, 2024 · e0e9f48 · e0e9f48
1 parent a17df50
commit e0e9f48
Show file tree

Hide file tree

Showing 13 changed files with 3,282 additions and 1,612 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -17,32 +17,16 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: [ '8.2' ]
-        symfony-version: [ '5.4.*', '6.2', '6.3' ]
+        php-version: [ '8.2', '8.3' ]
+        symfony-version: [ '6.4.*', '7.1.*' ]
         symfony-deprecations-helper: [ 'max[direct]=0' ]
         grumphp-testsuite: [ 'no-analyse' ]
         grumphp-flag: [ '-no-analyse' ]
         include:
-          - php-version: '8.1'
-            symfony-version: '5.4.*'
-            symfony-deprecations-helper: 'disabled=1&max[indirect]=99999'
-            composer-flag: '--prefer-lowest'
-            grumphp-flag: '-no-analyse'
-            grumphp-testsuite: 'no-analyse'
-          - php-version: '8.1'
-            symfony-version: '5.4.*'
+          - php-version: '8.2'
+            symfony-version: '7.1.*'
             symfony-deprecations-helper: 'max[direct]=0&max[indirect]=99999'
             grumphp-testsuite: 'main'
-          - php-version: '8.1'
-            symfony-version: '6.2.*'
-            symfony-deprecations-helper: 'disabled=1&max[indirect]=99999'
-            grumphp-flag: '-no-analyse'
-            grumphp-testsuite: 'no-analyse'
-          - php-version: '8.1'
-            symfony-version: '6.3.*'
-            symfony-deprecations-helper: 'disabled=1&max[indirect]=99999'
-            grumphp-flag: '-no-analyse'
-            grumphp-testsuite: 'no-analyse'
 
     name: "PHP: ${{ matrix.php-version }}, Symfony: ${{ matrix.symfony-version }}, GrumPHP: ${{ matrix.grumphp-testsuite }}, Composer: ${{ matrix.composer-flag }}"
 
@@ -60,15 +44,17 @@ jobs:
       - name: Check PHP Version
         run: php -v
 
-      - name: Symfony version # run every time except for dependencies with SF 5.4 (locked in composer)
+      - name: Symfony version # run every time except for dependencies with SF 7.1 (locked in composer)
         if: ${{ matrix.grumphp-testsuite == 'no-analyse' }}
         run: composer config extra.symfony.require ${{ matrix.symfony-version }}
 
-      - name: Composer update # run for everything except php 7.4 or SF 5.4 locked in composer.lock
+      - name: Composer update # run for everything except php 8.2 or SF 7.1 locked in composer.lock
         if: ${{ matrix.grumphp-testsuite == 'no-analyse' }}
-        run: composer update ${{ matrix.composer-flag }} --prefer-dist --no-interaction
+        run: |
+          composer install # run because of symfony/flex
+          composer update --prefer-dist --no-interaction
 
-      - name: Composer install # only run for locked dependencies with php 7.4 or SF 5.4 (locked in composer)
+      - name: Composer install # only run for locked dependencies with php 8.2 or SF 7.1 (locked in composer)
         if: ${{ matrix.grumphp-testsuite == 'main' }}
         run: composer install --prefer-dist --no-interaction
 

diff --git a/composer.json b/composer.json
@@ -15,30 +15,31 @@
     }
   ],
   "require": {
-    "php": ">=8.1",
+    "php": ">=8.2",
     "ackintosh/ganesha": "^2.0 || ^3.0",
     "beberlei/assert": "^3.3",
     "doctrine/annotations": "^1.12|^2.0",
-    "symfony/cache": "^5.4.24|^6.2",
-    "symfony/framework-bundle": "^5.4.24|^6.2",
-    "symfony/proxy-manager-bridge": "^5.4.21|^6.2"
+    "symfony/cache": "^6.4 || ^7.1",
+    "symfony/framework-bundle": "^6.4 || ^7.1",
+    "symfony/proxy-manager-bridge": "^6.4 || ^7.1"
   },
   "require-dev": {
+    "amphp/amp": "3.0.2 as 2.6.4",
+    "amphp/byte-stream": "2.1.1 as 1.5",
     "friendsofphp/php-cs-fixer": "^3.2",
     "madewithlove/license-checker": "^0.10|^1.0",
-    "nikic/php-parser": "^4.2",
     "php-parallel-lint/php-parallel-lint": "^1.3",
     "phpcompatibility/php-compatibility": "^9.1",
     "phpmd/phpmd": "^2.6",
-    "phpro/grumphp": "^1.5",
+    "phpro/grumphp": "2.4.0",
     "phpstan/phpstan": "^1.1",
     "phpunit/phpunit": "^10.2",
     "pixelfederation/coding-standards": "^2.1",
     "roave/security-advisories": "dev-master",
     "squizlabs/php_codesniffer": "^3.4",
     "symfony/flex": "^2.3",
     "symfony/monolog-bundle": "^3.7",
-    "symfony/phpunit-bridge": "^5.4.25|^6.2",
+    "symfony/phpunit-bridge": "^6.4 || ^7.1",
     "vimeo/psalm": "^5.0"
   },
   "autoload": {
@@ -61,14 +62,14 @@
   },
   "extra": {
     "symfony": {
-      "require": "5.4.*",
+      "require": "7.1.*",
       "docker": false
     }
   },
   "scripts": {
-    "grumphp8.1": "grumphp run --testsuite=php8.1",
-    "grumphp8.1-no-analyse": "grumphp run --testsuite=php8.1-no-analyse",
+    "grumphp8.2": "grumphp run --testsuite=php8.2",
     "grumphp8.2-no-analyse": "grumphp run --testsuite=php8.2-no-analyse",
+    "grumphp8.3-no-analyse": "grumphp run --testsuite=php8.3-no-analyse",
     "lic-check": "license-checker check",
     "phpcs": "phpcs --standard=phpcs.ruleset.xml src",
     "phpcbf": "phpcbf --standard=phpcs.ruleset.xml --extensions=php --tab-width=4 -sp src tests",