fix: resolve conflict github workflows

Author: DominicDetta

.github/workflows/php.yml

@@ -1,4 +1,3 @@
-
 name: PHP QA
 
 on:
@@ -18,29 +17,33 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        php-version: ['8.1', '8.2', '8.3', '8.4']
+        # Sorted alphabetically to ease finding the desired run in the GitHub Workflow UI.
         project: [
           'Aws',
           'Context/Swoole',
+          'Instrumentation/CakePHP',
+          'Instrumentation/CodeIgniter',
+          'Instrumentation/Curl',
           'Instrumentation/ExtAmqp',
           'Instrumentation/ExtRdKafka',
           'Instrumentation/Guzzle',
           'Instrumentation/HttpAsyncClient',
-          'Instrumentation/Slim',
-          'Instrumentation/CakePHP',
+          'Instrumentation/IO',
+          'Instrumentation/Laravel',
+          'Instrumentation/MongoDB',
+          'Instrumentation/MySqli',
+          'Instrumentation/OpenAIPHP',
+          'Instrumentation/PDO',
+          # Sort PSRs numerically.
           'Instrumentation/Psr3',
           'Instrumentation/Psr6',
           'Instrumentation/Psr14',
           'Instrumentation/Psr15',
           'Instrumentation/Psr16',
           'Instrumentation/Psr18',
-          'Instrumentation/IO',
-          'Instrumentation/PDO',
+          'Instrumentation/Slim',
           'Instrumentation/Symfony',
-          'Instrumentation/OpenAIPHP',
-          'Instrumentation/Laravel',
-          'Instrumentation/MongoDB',
-          'Instrumentation/CodeIgniter',
           'Instrumentation/Yii',
           'Instrumentation/Doctrine',
           'Logs/Monolog',
@@ -50,79 +53,23 @@ jobs:
           'ResourceDetectors/Container',
           'Sampler/RuleBased',
           'Shims/OpenTracing',
-          'Symfony'
+          'Symfony',
         ]
         exclude:
-          - project: 'Instrumentation/Guzzle'
-            php-version: 7.4
-          - project: 'Instrumentation/HttpAsyncClient'
-            php-version: 7.4
-          - project: 'Instrumentation/Slim'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr3'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr6'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr14'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr15'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr16'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr18'
-            php-version: 7.4
-          - project: 'Instrumentation/IO'
-            php-version: 7.4
-          - project: 'Instrumentation/Symfony'
-            php-version: 7.4
-          - project: 'Instrumentation/Laravel'
-            php-version: 7.4
-          - project: 'Instrumentation/CodeIgniter'
-            php-version: 7.4
-          - project: 'Instrumentation/Yii'
-            php-version: 7.4
-          - project: 'Instrumentation/IO'
-            php-version: 8.0
           - project: 'Instrumentation/IO'
             php-version: 8.1
-          - project: 'Instrumentation/PDO'
-            php-version: 7.4
-          - project: 'Instrumentation/PDO'
-            php-version: 8.0
+          - project: 'Instrumentation/Curl'
+            php-version: 8.1
+          - project: 'Instrumentation/MySqli'
+            php-version: 8.1
           - project: 'Instrumentation/PDO'
             php-version: 8.1
-          - project: 'Instrumentation/ExtAmqp'
-            php-version: 7.4
-          - project: 'Instrumentation/ExtAmqp'
-            php-version: 8.0
           - project: 'Instrumentation/ExtAmqp'
             php-version: 8.1
-          - project: 'Instrumentation/ExtRdKafka'
-            php-version: 7.4
-          - project: 'Instrumentation/ExtRdKafka'
-            php-version: 8.0
           - project: 'Instrumentation/ExtRdKafka'
             php-version: 8.1
-          - project: 'Instrumentation/OpenAIPHP'
-            php-version: 7.4
-          - project: 'Instrumentation/OpenAIPHP'
-            php-version: 8.0
-          - project: 'Instrumentation/CakePHP'
-            php-version: 7.4
-          - project: 'Instrumentation/Doctrine'
-            php-version: 7.4            
-          - project: 'Instrumentation/Doctrine'
-            php-version: 8.0
           - project: 'Instrumentation/Doctrine'
             php-version: 8.1
-          - project: 'Propagation/ServerTiming'
-            php-version: 7.4
-          - project: 'ResourceDetectors/Container'
-            php-version: 7.4
-          - project: 'Sampler/RuleBased'
-            php-version: 7.4
-          - project: 'Sampler/RuleBased'
-            php-version: 8.0
     steps:
     - uses: actions/checkout@v4
 
@@ -131,7 +78,7 @@ jobs:
       with:
         php-version: ${{ matrix.php-version }}
         coverage: xdebug
-        extensions: ast, amqp, grpc, opentelemetry, rdkafka
+        extensions: ast, amqp, grpc, opentelemetry, rdkafka, mysqli
 
     - name: Validate composer.json and composer.lock
       run: composer validate
@@ -158,7 +105,7 @@ jobs:
 
     - name: Check Style
       working-directory: src/${{ matrix.project }}
-      run: vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php -v --dry-run --stop-on-violation --using-cache=no -vvv
+      run: PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php -v --dry-run --stop-on-violation --using-cache=no -vvv
 
     - name: Run Phan
       working-directory: src/${{ matrix.project }}
@@ -191,6 +138,11 @@ jobs:
       run: |
         KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://localhost:29092,PLAINTEXT_HOST://localhost:9092 docker compose up  kafka -d --wait
 
+    - name: Start Mysql
+      if: ${{ matrix.project == 'Instrumentation/MySqli' }}
+      run: |
+        docker compose up  mysql -d --wait
+
     - name: Run PHPUnit
       working-directory: src/${{ matrix.project }}
       run: vendor/bin/phpunit
@@ -202,10 +154,10 @@ jobs:
     - name: Code Coverage
       uses: codecov/codecov-action@v4
       # only generate coverage against the latest PHP version
-      if: ${{ matrix.php-version == '8.3' }}
+      if: ${{ matrix.php-version == '8.4' }}
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         directory: src/${{ matrix.project }}
         files: ./coverage.clover
         flags: ${{ matrix.project }}
-        verbose: false
+        verbose: false