Merge branch '4.2'

GrahamCampbell · GrahamCampbell · commit b83be80cedb8 · 2021-05-23T16:53:44.000+01:00
diff --git a/tests/Dotenv/DotenvTest.php b/tests/Dotenv/DotenvTest.php
@@ -100,7 +100,7 @@ public function testDotenvLoadsEnvironmentVars()
         self::assertEmpty($_SERVER['NULL']);
     }
 
-    public function testDotenvLoadsEnvironmentVarsMultipleNotShortCircuitMode()
+    public function testDotenvLoadsEnvironmentVarsMultipleWithShortCircuitMode()
     {
         $dotenv = Dotenv::createMutable(self::$folder, ['.env', 'example.env']);
 
@@ -110,7 +110,7 @@ public function testDotenvLoadsEnvironmentVarsMultipleNotShortCircuitMode()
         );
     }
 
-    public function testDotenvLoadsEnvironmentVarsMultipleWithShortCircuitMode()
+    public function testDotenvLoadsEnvironmentVarsMultipleWithoutShortCircuitMode()
     {
         $dotenv = Dotenv::createMutable(self::$folder, ['.env', 'example.env'], false);
 
diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
@@ -1,9 +1,9 @@
 {
     "require": {
-        "phpstan/phpstan": "0.12.68",
+        "phpstan/phpstan": "0.12.88",
         "phpstan/extension-installer": "1.1.0",
         "phpstan/phpstan-deprecation-rules": "0.12.6",
-        "phpstan/phpstan-phpunit": "0.12.17",
+        "phpstan/phpstan-phpunit": "0.12.19",
         "phpstan/phpstan-strict-rules": "0.12.9",
         "thecodingmachine/phpstan-strict-rules": "0.12.1"
     },
diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "psalm/phar": "4.3.1"
+        "psalm/phar": "4.7.1"
     },
     "config": {
         "preferred-install": "dist"

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function testDotenvLoadsEnvironmentVars()`
`100`	`100`	`self::assertEmpty($_SERVER['NULL']);`
`101`	`101`	`}`
`102`	`102`
`103`		`- public function testDotenvLoadsEnvironmentVarsMultipleNotShortCircuitMode()`
	`103`	`+ public function testDotenvLoadsEnvironmentVarsMultipleWithShortCircuitMode()`
`104`	`104`	`{`
`105`	`105`	`$dotenv = Dotenv::createMutable(self::$folder, ['.env', 'example.env']);`
`106`	`106`
`@@ -110,7 +110,7 @@ public function testDotenvLoadsEnvironmentVarsMultipleNotShortCircuitMode()`
`110`	`110`	`);`
`111`	`111`	`}`
`112`	`112`
`113`		`- public function testDotenvLoadsEnvironmentVarsMultipleWithShortCircuitMode()`
	`113`	`+ public function testDotenvLoadsEnvironmentVarsMultipleWithoutShortCircuitMode()`
`114`	`114`	`{`
`115`	`115`	`$dotenv = Dotenv::createMutable(self::$folder, ['.env', 'example.env'], false);`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"require": {`
`3`		`- "psalm/phar": "4.3.1"`
	`3`	`+ "psalm/phar": "4.7.1"`
`4`	`4`	`},`
`5`	`5`	`"config": {`
`6`	`6`	`"preferred-install": "dist"`