Merge pull request #16 from eimkua1/php-8-support

PHP 8.0 support
laminas-api-tools · Jun 21, 2021 · fdbffb9 · fdbffb9
2 parents 9c635ac + 5134aa7
commit fdbffb9
Show file tree

Hide file tree

Showing 17 changed files with 894 additions and 377 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -30,4 +30,6 @@ jobs:
       - name: ${{ matrix.name }}
         uses: laminas/laminas-continuous-integration-action@v1
         with:
-          job: ${{ matrix.job }}
+          job: ${{ matrix.job }}
+        env:
+          COMPOSER_AUTH: "{\"github-oauth\":{\"github.com\":\"${{ secrets.GITHUB_TOKEN }}\"}}"
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@
 /coveralls-upload.json
 /phpunit.xml
 /vendor/
+/.phpunit.result.cache
+/.phpcs-cache
diff --git a/composer.json b/composer.json
@@ -26,13 +26,31 @@
             "module": "Laminas\\ApiTools\\Rest"
         }
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/eimkua1/api-tools-api-problem.git"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/eimkua1/api-tools-content-negotiation.git"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/eimkua1/api-tools-mvc-auth.git"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/eimkua1/api-tools-oauth2.git"
+        }
+    ],
     "require": {
-        "php": "^7.3",
-        "laminas-api-tools/api-tools-api-problem": "^1.2.2",
-        "laminas-api-tools/api-tools-content-negotiation": "^1.2.1",
+        "php": "^7.3 || ~8.0.0",
+        "laminas-api-tools/api-tools-api-problem": "^1.4.0",
+        "laminas-api-tools/api-tools-content-negotiation": "^1.5.0",
         "laminas-api-tools/api-tools-hal": "^1.4",
-        "laminas-api-tools/api-tools-mvc-auth": "^1.4",
-        "laminas/laminas-eventmanager": "^3.3",
+        "laminas-api-tools/api-tools-mvc-auth": "^1.6",
+        "laminas/laminas-eventmanager": "^3.2",
         "laminas/laminas-mvc": "^2.7.14 || ^3.0.2",
         "laminas/laminas-paginator": "^2.7",
         "laminas/laminas-stdlib": "^2.7.8 || ^3.3",
@@ -47,7 +65,8 @@
         "laminas/laminas-uri": "^2.5.2",
         "laminas/laminas-validator": "^2.8.1",
         "laminas/laminas-view": "^2.11.3",
-        "phpunit/phpunit": "^7.5.15"
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^9.3"
     },
     "autoload": {
         "psr-4": {