Skip to content

Commit

Permalink
Merge pull request #158 from lcobucci/require-php8
Browse files Browse the repository at this point in the history
Require PHP 8
  • Loading branch information
lcobucci authored Feb 22, 2021
2 parents 9c5b532 + 79dde9c commit 38d768b
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "7.4"
- "8.0"
operating-system:
- "ubuntu-latest"

Expand Down
67 changes: 67 additions & 0 deletions .github/workflows/composer-json-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: "Lint composer.json"

on:
pull_request:
push:

jobs:
coding-standards:
name: "Lint composer.json"

runs-on: ${{ matrix.operating-system }}

strategy:
matrix:
dependencies:
- "highest"
php-version:
- "8.0"
operating-system:
- "ubuntu-latest"

steps:
- name: "Checkout"
uses: "actions/checkout@v2"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
with:
coverage: "none"
php-version: "${{ matrix.php-version }}"
ini-values: memory_limit=-1
tools: composer:v2, composer-normalize, composer-require-checker, composer-unused

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: "Cache dependencies"
uses: "actions/cache@v2"
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"

- name: "Install lowest dependencies"
if: ${{ matrix.dependencies == 'lowest' }}
run: "composer update --prefer-lowest --no-interaction --no-progress"

- name: "Install highest dependencies"
if: ${{ matrix.dependencies == 'highest' }}
run: "composer update --no-interaction --no-progress"

- name: "Install locked dependencies"
if: ${{ matrix.dependencies == 'locked' }}
run: "composer install --no-interaction --no-progress"

- name: "Validate composer.json"
run: "composer validate --strict"

- name: "Normalize composer.json"
run: "composer-normalize --dry-run"

- name: "Check composer.json explicit dependencies"
run: "composer-require-checker check"

- name: "Check composer.json unused dependencies"
run: "composer-unused"
2 changes: 1 addition & 1 deletion .github/workflows/mutation-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "7.4"
- "8.0"
operating-system:
- "ubuntu-latest"

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
- "locked"
- "development"
php-version:
- "7.4"
- "8.0"
operating-system:
- "ubuntu-latest"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "7.4"
- "8.0"
operating-system:
- "ubuntu-latest"

Expand Down
20 changes: 13 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
{
"name": "lcobucci/error-handling-middleware",
"description": "A PSR-15 middleware compatible with RFC 7807",
"type": "library",
"description": "A PSR-15 middleware compatible with RFC 7807",
"keywords": [
"PSR-15",
"RFC-7807",
"error handling"
],
"license": "MIT",
"authors": [
{
"name": "Luís Cobucci",
"email": "[email protected]"
}
],
"keywords": ["PSR-15", "RFC-7807", "error handling"],
"require": {
"php": "^7.4 || ^8.0",
"php": "^8.0",
"ext-json": "*",
"fig/http-message-util": "^1.1",
"lcobucci/content-negotiation-middleware": "^3.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0",
"psr/http-server-handler": "^1.0",
"psr/http-server-middleware": "^1.0",
"psr/log": "^1.1"
},
Expand All @@ -30,6 +36,10 @@
"phpstan/phpstan-strict-rules": "^0.12",
"phpunit/phpunit": "^9.5"
},
"config": {
"preferred-install": "dist",
"sort-packages": true
},
"autoload": {
"psr-4": {
"Lcobucci\\ErrorHandling\\": "src"
Expand All @@ -39,9 +49,5 @@
"psr-4": {
"Lcobucci\\ErrorHandling\\Tests\\": "tests"
}
},
"config": {
"preferred-install": "dist",
"sort-packages": true
}
}
18 changes: 9 additions & 9 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 38d768b

Please sign in to comment.