Merge pull request #49 from rpkamp/php8

Run on PHP8
rpkamp · Dec 29, 2020 · 519a6cf · 519a6cf
2 parents 8f0cc0c + b04e8d7
commit 519a6cf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 29 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,24 +24,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.2, 7.3, 7.4]
-        composer-flags: [""]
-        stability: ["stable"]
-        continue-on-composer-error: [""]
-        include:
-          - php: 7.2
-            composer-flags: --prefer-lowest
-          - php: 7.3
-            composer-flags: --prefer-lowest
-          - php: 7.4
-            composer-flags: --prefer-lowest
-          - php: 8.0
-            stability: "dev"
-            continue-on-composer-error: true
-          - php: 8.0
-            stability: "dev"
-            composer-flags: --prefer-lowest
-            continue-on-composer-error: true
+        php: ["7.2", "7.3", "7.4", "8.0"]
+        composer-flags: ["", "--prefer-lowest"]
 
     env:
       COMPOSER_ROOT_VERSION: dev-master
@@ -54,15 +38,9 @@ jobs:
         with:
           php-version: "${{ matrix.php }}"
 
-      - name: Update the minimum stability
-        if: matrix.stability == 'dev'
-        run: composer config minimum-stability ${{ matrix.stability }}
-
       - name: Install dependencies
-        id: composer-run
-        continue-on-error: ${{ matrix.continue-on-composer-error }}
         run: composer update ${{ matrix.composer-flags }}
 
       - name: Run tests
-        if: steps.composer-run.outcome == 'success' && steps.composer-run.conclusion == 'success'
         run: make test
+
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ help:
 	@awk '/^#/{c=substr($$0,3);next}c&&/^[[:alpha:]][[:alnum:]_-]+:/{print substr($$1,1,index($$1,":")),c}1{c=0}' $(MAKEFILE_LIST) | column -s: -t
 
 # Run all tests
-test: lint code-style unit-tests phpstan composer-require-checker
+test: lint code-style unit-tests phpstan #composer-require-checker
 
 # Lint all php files
 lint:

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": "^7.2 || ^8.0",
-	    "ext-json": "*",
+        "ext-json": "*",
         "ext-iconv": "*",
         "php-http/client-implementation": "^1.0",
         "php-http/httplug": "^1.0|^2.0",
@@ -34,9 +34,8 @@
         "phpunit/phpunit": "^8.0",
         "php-http/curl-client": "^2.0",
         "swiftmailer/swiftmailer": "^6.2.3",
-        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan": "^0.12.64",
         "pdepend/pdepend": "^2.5",
-        "maglnet/composer-require-checker": "^2.0",
         "nyholm/psr7": "^1.2",
         "doctrine/coding-standard": "^8.0",
         "php-parallel-lint/php-parallel-lint": "^1.2",