Merge pull request #121 from mapado/jd-feat-php81

mapado · Sep 26, 2023 · 34748fe · 34748fe
2 parents fb0e1a1 + 6a8afd0
commit 34748fe
Show file tree

Hide file tree

Showing 21 changed files with 2,203 additions and 13,341 deletions.
diff --git a/.atoum.php b/.atoum.php
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -2,7 +2,7 @@ name: PHP Composer
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request: ~
 
 permissions:
@@ -12,35 +12,31 @@ jobs:
   test:
 
     runs-on: ubuntu-latest
-    
+
     strategy:
       matrix:
         include:
-          - php: "7.4"
+          - php: "8.2"
+            scenario: "symfony6"
+          - php: "8.1"
+            scenario: "symfony6"
+          - php: "8.2"
+            scenario: "symfony5"
+          - php: "8.1"
             scenario: "symfony5"
-          - php: "7.4"
-            scenario: "symfony4-php74"
-          - php: "7.3"
+          - php: "8.2"
             scenario: "symfony4"
-            composer: "v1"
-          - php: "7.3"
-            scenario: "symfony3"
-            composer: "v1"
-          - php: "7.3"
-            scenario: "symfony2"
-            dependencies: "lowest"
-          - php: "7.2"
+          - php: "8.1"
             scenario: "symfony4"
-            dependencies: "lowest"
 
     steps:
     - uses: actions/checkout@v3
-    
+
     - name: Setup PHP with composer
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
-        tools: composer:${{ matrix.composer || 'v2' }}
+        tools: composer:v2
 
 #     - name: Validate composer.json and composer.lock
 #       run: composer validate --strict
@@ -56,9 +52,9 @@ jobs:
 
     - name: Install dependencies
       run: .scenarios.lock/install "${{ matrix.scenario }}" "${{ matrix.dependencies }}"
-    
+
     - name: PHPStan
       run: vendor/bin/phpstan analyse -c phpstan.neon src/
-    
+
     - name: atoum
       run: vendor/bin/atoum
diff --git a/.lintstagedrc b/.lintstagedrc
@@ -1,9 +1,9 @@
 # vim:ft=yaml
 "src/**/*.php":
   - "yarn run prettier --write"
-  - "vendor/bin/php-cs-fixer fix --config=.php_cs"
+  - "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php"
   - "git add"
 
 "Tests/**/*.php":
-  - "vendor/bin/php-cs-fixer fix --config=.php_cs"
+  - "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php"
   - "git add"
diff --git a/.php_cs → .php-cs-fixer.php b/.php_cs → .php-cs-fixer.php
diff --git a/.scenarios.lock/symfony2/composer.json b/.scenarios.lock/symfony2/composer.json