Merge branch '4.2'

GrahamCampbell · GrahamCampbell · commit 4a4a82c234ae · 2021-10-02T20:22:21.000+01:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -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:
@@ -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:
diff --git a/composer.json b/composer.json
@@ -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": {
@@ -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": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -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"
diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
@@ -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",
diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.4",
-        "psalm/phar": "4.9.3"
+        "psalm/phar": "4.10.0"
     },
     "config": {
         "preferred-install": "dist"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"require": {`
`3`	`3`	`"php": "^7.4",`
`4`		`- "phpstan/phpstan": "0.12.98",`
	`4`	`+ "phpstan/phpstan": "0.12.99",`
`5`	`5`	`"phpstan/extension-installer": "1.1.0",`
`6`	`6`	`"phpstan/phpstan-deprecation-rules": "0.12.6",`
`7`	`7`	`"phpstan/phpstan-phpunit": "0.12.22",`