Skip to content

Commit

Permalink
Merge branch '4.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
GrahamCampbell committed Oct 2, 2021
2 parents 3349d8c + d38f4d1 commit 4a4a82c
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 15 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ jobs:
- name: Setup Problem Matchers
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

- name: Mimic PHP 8.0
run: composer config platform.php 8.0.999
if: matrix.php > 8

- name: Install Latest Dependencies
uses: nick-invision/retry@v1
with:
Expand Down Expand Up @@ -63,10 +59,6 @@ jobs:
- name: Setup Problem Matchers
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

- name: Mimic PHP 8.0
run: composer config platform.php 8.0.999
if: matrix.php > 8

- name: Install Lowest Dependencies
uses: nick-invision/retry@v1
with:
Expand Down
6 changes: 2 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@
{
"name": "Graham Campbell",
"email": "hello@gjcampbell.co.uk",
"homepage": "https://gjcampbell.co.uk/"
},
{
"name": "Vance Lucas",
"email": "vance@vancelucas.com",
"homepage": "https://vancelucas.com/"
"email": "vance@vancelucas.com"
}
],
"require": {
Expand All @@ -27,7 +25,7 @@
"require-dev": {
"ext-filter": "*",
"bamarni/composer-bin-plugin": "^1.4.1",
"phpunit/phpunit": "^7.5.20 || ^8.5.20 || ^9.5.8"
"phpunit/phpunit": "^7.5.20 || ^8.5.21 || ^9.5.10"
},
"autoload": {
"psr-4": {
Expand Down
3 changes: 2 additions & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
beStrictAboutOutputDuringTests="true"
bootstrap="vendor/autoload.php"
colors="true"
convertDeprecationsToExceptions="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
failOnRisky="true"
failOnWarning="true"
failOnWarning="false"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
Expand Down
2 changes: 1 addition & 1 deletion vendor-bin/phpstan/composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"require": {
"php": "^7.4",
"phpstan/phpstan": "0.12.98",
"phpstan/phpstan": "0.12.99",
"phpstan/extension-installer": "1.1.0",
"phpstan/phpstan-deprecation-rules": "0.12.6",
"phpstan/phpstan-phpunit": "0.12.22",
Expand Down
2 changes: 1 addition & 1 deletion vendor-bin/psalm/composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"require": {
"php": "^7.4",
"psalm/phar": "4.9.3"
"psalm/phar": "4.10.0"
},
"config": {
"preferred-install": "dist"
Expand Down

0 comments on commit 4a4a82c

Please sign in to comment.