Merge branch '10.2' into 10.3

GrahamCampbell · GrahamCampbell · commit d6febd4cf10c · 2020-11-27T17:42:25.000Z
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.1.1@16bfbd9224698bd738c665f33039fade2a1a3977">
+<files psalm-version="4.2.1@ea9cb72143b77e7520c52fa37290bd8d8bc88fd9">
   <file src="src/Api/AbstractApi.php">
     <InvalidArgument occurrences="1"/>
   </file>
diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.2.5 || ^8.0",
-        "phpstan/phpstan": "~0.12.54",
+        "phpstan/phpstan": "~0.12.57",
         "phpstan/phpstan-deprecation-rules": "~0.12.5",
         "phpstan/phpstan-strict-rules": "~0.12.5",
         "thecodingmachine/phpstan-strict-rules": "~0.12.1",
diff --git a/vendor-bin/phpunit/composer.json b/vendor-bin/phpunit/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.1 || ^8.0",
-        "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.4.2"
+        "phpunit/phpunit": "^7.5.20 || ^8.5.11 || ^9.4.3"
     },
     "config": {
         "preferred-install": "dist"
diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.1 || ^8.0",
-        "psalm/phar": "~4.1.1"
+        "psalm/phar": "~4.2.1"
     },
     "config": {
         "preferred-install": "dist"
diff --git a/vendor-bin/rector/composer.json b/vendor-bin/rector/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.2.5",
-        "rector/rector-prefixed": "0.8.48"
+        "rector/rector-prefixed": "0.8.52"
     },
     "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.2.5 \|\| ^8.0",`
`4`		`- "phpstan/phpstan": "~0.12.54",`
	`4`	`+ "phpstan/phpstan": "~0.12.57",`
`5`	`5`	`"phpstan/phpstan-deprecation-rules": "~0.12.5",`
`6`	`6`	`"phpstan/phpstan-strict-rules": "~0.12.5",`
`7`	`7`	`"thecodingmachine/phpstan-strict-rules": "~0.12.1",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"require": {`
`3`	`3`	`"php": "^7.1 \|\| ^8.0",`
`4`		`- "phpunit/phpunit": "^7.5.20 \|\| ^8.5.8 \|\| ^9.4.2"`
	`4`	`+ "phpunit/phpunit": "^7.5.20 \|\| ^8.5.11 \|\| ^9.4.3"`
`5`	`5`	`},`
`6`	`6`	`"config": {`
`7`	`7`	`"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.2.5",`
`4`		`- "rector/rector-prefixed": "0.8.48"`
	`4`	`+ "rector/rector-prefixed": "0.8.52"`
`5`	`5`	`},`
`6`	`6`	`"config": {`
`7`	`7`	`"preferred-install": "dist"`