Skip to content

Commit

Permalink
Merge pull request #530 from lcobucci/require-php-8.1
Browse files Browse the repository at this point in the history
Require PHP 8.1
  • Loading branch information
lcobucci authored Aug 9, 2022
2 parents 535c2e7 + b280e3c commit d23e931
Show file tree
Hide file tree
Showing 18 changed files with 255 additions and 384 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:
- "8.0"
- "8.1"
operating-system:
- "ubuntu-latest"

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/composer-json-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
dependencies:
- "highest"
php-version:
- "8.0"
- "8.1"
operating-system:
- "ubuntu-latest"

Expand Down Expand Up @@ -59,6 +59,6 @@ jobs:

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

- name: "Check composer.json unused dependencies"
run: "composer-unused"
#
# - 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:
- "8.0"
- "8.1"
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:
- "8.0"
- "8.1"
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:
- "8.0"
- "8.1"
operating-system:
- "ubuntu-latest"

Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ vendor/composer/installed.json: composer.json composer.lock

.PHONY: phpunit
phpunit:
@vendor/bin/phpunit
@php -d assert.exception=1 -d zend.assertions=1 vendor/bin/phpunit

.PHONY: infection
infection:
@vendor/bin/phpunit --coverage-xml=build/coverage-xml --log-junit=build/junit.xml $(PHPUNIT_FLAGS)
@vendor/bin/infection -s --threads=$(PARALLELISM) --coverage=build
@php -d assert.exception=1 -d zend.assertions=1 -d xdebug.mode=coverage vendor/bin/phpunit --coverage-xml=build/coverage-xml --log-junit=build/junit.xml $(PHPUNIT_FLAGS)
@php -d assert.exception=1 -d zend.assertions=1 vendor/bin/infection -s --threads=$(PARALLELISM) --coverage=build

.PHONY: phpcbf
phpcbf:
Expand Down
19 changes: 12 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
],
"require": {
"php": "^8.0",
"php": "^8.1",
"ext-json": "*",
"fig/http-message-util": "^1.1",
"psr/http-factory": "^1.0",
Expand All @@ -19,16 +19,16 @@
},
"require-dev": {
"infection/infection": "^0.26",
"jms/serializer": "^3.17",
"laminas/laminas-diactoros": "^2.11",
"jms/serializer": "^3.18",
"laminas/laminas-diactoros": "^2.14",
"lcobucci/coding-standard": "^8.0",
"league/plates": "^3.4",
"middlewares/negotiation": "^2.1",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-deprecation-rules": "^0.12",
"phpstan/phpstan-phpunit": "^0.12",
"phpstan/phpstan-strict-rules": "^0.12",
"phpstan/phpstan": "^1.8",
"phpstan/phpstan-deprecation-rules": "^1.0",
"phpstan/phpstan-phpunit": "^1.1",
"phpstan/phpstan-strict-rules": "^1.3",
"phpunit/phpunit": "^9.5",
"twig/twig": "^3.4"
},
Expand All @@ -50,6 +50,11 @@
}
},
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"infection/extension-installer": true,
"phpstan/extension-installer": true
},
"preferred-install": "dist",
"sort-packages": true
}
Expand Down
Loading

0 comments on commit d23e931

Please sign in to comment.