feat: support PHP 8 (#26)

auxmoney · Dec 15, 2021 · ebcd7a1 · ebcd7a1
1 parent 1e631cb
commit ebcd7a1
Show file tree

Hide file tree

Showing 6 changed files with 178 additions and 104 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,24 +20,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        include:
-          - php: '7.3'
-            symfony: '3.4.*'
-          - php: '7.4'
-            symfony: '3.4.*'
-          - php: '7.3'
-            symfony: '4.4.*'
-          - php: '7.4'
-            symfony: '4.4.*'
-          - php: '7.3'
-            symfony: '5.3.*'
-          - php: '7.4'
-            symfony: '5.3.*'
+        symfony:
+          - '3.4.*'
+          - '4.4.*'
+          - '5.3.*'
+        php:
+          - '7.4'
+          - '8.0'
+          - '8.1'
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: setup php
-        uses: nanasess/setup-php@v3.0.6
+      - name: Setup PHP Action
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
       - name: prepare test environment
@@ -73,13 +68,17 @@ jobs:
           - '3.4.*'
           - '4.4.*'
           - '5.3.*'
+        php:
+          - '7.4'
+          - '8.0'
+          - '8.1'
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: setup php
-        uses: nanasess/setup-php@v3.0.6
+      - name: Setup PHP Action
+        uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: ${{ matrix.php }}
       - name: prepare test environment
         run: |
           Tests/Functional/Scripts/downloadComposer.sh

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,3 +1,3 @@
 # Contributing
 
-Please have a look at [the core library](https://github.com/auxmoney/OpentracingBundle-core/blob/master/CONTRIBUTING.md).
+Please have a look at [the core library](https://github.com/auxmoney/OpentracingBundle-core/blob/master/CONTRIBUTING.md).
diff --git a/Tests/Functional/TestProjectFiles/const-false/.php-version b/Tests/Functional/TestProjectFiles/const-false/.php-version
diff --git a/Tests/Functional/TestProjectFiles/default/.php-version b/Tests/Functional/TestProjectFiles/default/.php-version
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     "auxmoney/opentracing-bundle-tracer-implementation": "*"
   },
   "require": {
-    "php": "^7.3.27",
+    "php": "^7.4|^8.0",
     "ext-json": "*",
     "auxmoney/opentracing-bundle-core": "^1.0",
     "opentracing/opentracing": "^1.0.1",