fix: update supported PHP and Symfony versions + fix composer behavio…

…ur + remove coveralls integration (#40)
auxmoney · Apr 28, 2023 · 954eddc · 954eddc
1 parent a599674
commit 954eddc
Show file tree

Hide file tree

Showing 6 changed files with 747 additions and 667 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         token: ${{ secrets.GH_TOKEN }}
     - name: semantic release
-      uses: cycjimmy/semantic-release-action@v2
+      uses: cycjimmy/semantic-release-action@v3
       env:
         GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
       with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,22 +21,22 @@ jobs:
     strategy:
       matrix:
         include:
-          - symfony: '4.4.*'
-            php: '7.4'
           - symfony: '4.4.*'
             php: '8.0'
           - symfony: '4.4.*'
             php: '8.1'
-          - symfony: '5.4.*'
-            php: '7.4'
+          - symfony: '4.4.*'
+            php: '8.2'
           - symfony: '5.4.*'
             php: '8.0'
           - symfony: '5.4.*'
             php: '8.1'
-          - symfony: '6.0.*'
-            php: '8.0'
-          - symfony: '6.0.*'
+          - symfony: '5.4.*'
+            php: '8.2'
+          - symfony: '6.2.*'
             php: '8.1'
+          - symfony: '6.2.*'
+            php: '8.2'
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -50,10 +50,8 @@ jobs:
           composer config extra.symfony.require "${{ matrix.symfony }}"
           composer config extra.symfony.allow-contrib true
           composer config --no-plugins allow-plugins.symfony/flex true
-          # adds flex, suppress composer.lock
-          composer require symfony/flex --no-update
-          # create a lock file
-          composer install
+          # adds flex
+          composer require symfony/flex
           # updates to SYMFONY_VERSION, but runs recipes
           composer update symfony/*
           # reset tracked files
@@ -64,10 +62,6 @@ jobs:
         run: |
           composer config --no-plugins allow-plugins.symfony/flex true
           composer run-script quality
-      - name: upload coverage
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: php vendor/bin/php-coveralls --exclude-no-stmt --coverage_clover=build/logs/clover.xml -v
 
   test_functional:
     name: Functional Tests
@@ -77,22 +71,22 @@ jobs:
     strategy:
       matrix:
         include:
-          - symfony: '4.4.*'
-            php: '7.4'
           - symfony: '4.4.*'
             php: '8.0'
           - symfony: '4.4.*'
             php: '8.1'
-          - symfony: '5.4.*'
-            php: '7.4'
+          - symfony: '4.4.*'
+            php: '8.2'
           - symfony: '5.4.*'
             php: '8.0'
           - symfony: '5.4.*'
             php: '8.1'
-          - symfony: '6.0.*'
-            php: '8.0'
-          - symfony: '6.0.*'
+          - symfony: '5.4.*'
+            php: '8.2'
+          - symfony: '6.2.*'
             php: '8.1'
+          - symfony: '6.2.*'
+            php: '8.2'
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -106,10 +100,8 @@ jobs:
           composer config extra.symfony.require "${{ matrix.symfony }}"
           composer config extra.symfony.allow-contrib true
           composer config --no-plugins allow-plugins.symfony/flex true
-          # adds flex, suppress composer.lock
-          composer require symfony/flex --no-update
-          # create a lock file
-          composer install
+          # adds flex
+          composer require symfony/flex
           # updates to SYMFONY_VERSION, but runs recipes
           composer update symfony/*
           # reset tracked files

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .phpunit.result.cache
+/.idea/
 /.php-version
 /build/
 /vendor/
diff --git a/README.md b/README.md
@@ -2,7 +2,6 @@
 
 [![test](https://github.com/auxmoney/OpentracingBundle-Guzzle/workflows/test/badge.svg)](https://github.com/auxmoney/OpentracingBundle-Guzzle/actions?query=workflow%3Atest)
 [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/auxmoney/OpentracingBundle-Guzzle)](https://github.com/auxmoney/OpentracingBundle-Guzzle/releases/latest)
-![Coveralls github](https://img.shields.io/coveralls/github/auxmoney/OpentracingBundle-Guzzle)
 ![Codacy Badge](https://api.codacy.com/project/badge/Grade/aab701199e104bb6bdb247a4bdf7f5f2)
 ![Code Climate maintainability](https://img.shields.io/codeclimate/maintainability/auxmoney/OpentracingBundle-Guzzle)
 ![Scrutinizer code quality (GitHub/Bitbucket)](https://img.shields.io/scrutinizer/quality/g/auxmoney/OpentracingBundle-Guzzle)

diff --git a/composer.json b/composer.json
@@ -13,8 +13,8 @@
   "type": "symfony-bundle",
   "license": "MIT",
   "require": {
-    "php": "^7.4|^8.0",
-    "auxmoney/opentracing-bundle-core": "^1.0",
+    "php": "^8.0",
+    "auxmoney/opentracing-bundle-core": "^1.3",
     "opentracing/opentracing": "^1.0.1",
     "guzzlehttp/guzzle": "^6.0"
   },
@@ -25,7 +25,6 @@
     "phpstan/phpstan": "^1.5",
     "squizlabs/php_codesniffer": "^3.6",
     "phpmd/phpmd": "^2.12",
-    "php-coveralls/php-coveralls": "^2.5",
     "symfony/filesystem": "*",
     "symfony/process": "*",
     "symfony/yaml": "*",
@@ -50,7 +49,7 @@
     ],
     "phpmd": "vendor/bin/phpmd . text cleancode,codesize,controversial,design,naming,unusedcode --exclude vendor,Tests",
     "phpcs": "vendor/bin/phpcs",
-    "phpunit": "phpdbg -qrr vendor/bin/phpunit --colors=never --testsuite=unit",
+    "phpunit": "XDEBUG_MODE=coverage vendor/bin/phpunit --colors=never --testsuite=unit",
     "phpunit-functional": [
       "vendor/auxmoney/opentracing-bundle-core/Tests/Functional/Scripts/checkEnvironment.sh",
       "vendor/auxmoney/opentracing-bundle-core/Tests/Functional/Scripts/setup.sh",