Fixed tests

Author: tg666

composer.json

@@ -14,7 +14,7 @@
 		"php": "^7.4 || ^8.0",
 		"ext-json": "*",
 		"composer-plugin-api": "^1.1 || ^2.0",
-		"symfony/dotenv": "^5.4.5 || ^6.0 || ^7.0"
+		"symfony/dotenv": "^5.4.42 || ^6.2 || ^7.0"
 	},
 	"require-dev": {
 		"composer/composer": "^1.10 || ^2.0",
@@ -25,7 +25,7 @@
 		"phpstan/phpstan": "^1.9",
 		"phpstan/phpstan-nette": "^1.1",
 		"roave/security-advisories": "dev-latest",
-		"symfony/console": "^5.4 || ^6.0"
+		"symfony/console": "^5.4 || ^6.0 || ^7.0"
 	},
 	"autoload": {
 		"psr-4": {

tests/Bridge/Nette/DI/EnvironmentExtensionTest.phpt

@@ -15,7 +15,11 @@ use SixtyEightPublishers\Environment\Debug\EnvDetector;
 use SixtyEightPublishers\Environment\Bootstrap\EnvBootstrap;
 use function assert;
 use function uniqid;
+use function explode;
+use function implode;
+use function array_map;
 use function file_exists;
+use function version_compare;
 use function sys_get_temp_dir;
 
 require __DIR__ . '/../../../bootstrap.php';
@@ -51,7 +55,16 @@ final class EnvironmentExtensionTest extends TestCase
 
 		$tester->execute([]);
 
-		Assert::same(file_get_contents(__DIR__ . '/expectedDebugOutput.txt'), $tester->getDisplay());
+		$expectedOutput = file_get_contents(
+			version_compare($this->getDotenvVersion(), '6.0.0', '<')
+			? __DIR__ . '/expectedDebugOutput.v5.txt'
+			: __DIR__ . '/expectedDebugOutput.txt',
+		);
+
+		$expectedOutput = implode("\n", array_map('trim', explode("\n", $expectedOutput)));
+		$actualOutput = implode("\n", array_map('trim', explode("\n", $tester->getDisplay())));
+
+		Assert::same($expectedOutput, $actualOutput);
 	}
 
 	public function createCommandTester(string $name): CommandTester
@@ -84,6 +97,13 @@ final class EnvironmentExtensionTest extends TestCase
 
 		return $configurator->createContainer();
 	}
+
+	private function getDotenvVersion(): string
+	{
+		$packages = require __DIR__ . '/../../../../vendor/composer/installed.php';
+
+		return $packages['versions']['symfony/dotenv']['version'];
+	}
 }
 
 (new EnvironmentExtensionTest())->run();

tests/Bridge/Nette/DI/expectedDebugOutput.txt

@@ -14,15 +14,14 @@ Scanned Files (in descending priority)
 Variables
 ---------
 
- ----------- ------- ---------- ------ 
-  Variable    Value   .env.dev   .env  
- ----------- ------- ---------- ------ 
-  APP_DEBUG   1       n/a        1     
-  APP_ENV     dev     n/a        n/a   
-  TEST_A      a       n/a        a     
-  TEST_B      b       n/a        b     
-  TEST_C      c       c          n/a   
- ----------- ------- ---------- ------ 
+ ----------- ------- ---------- ------
+  Variable    Value   .env.dev   .env
+ ----------- ------- ---------- ------
+  APP_DEBUG   1       n/a        1
+  TEST_A      a       n/a        a
+  TEST_B      b       n/a        b
+  TEST_C      c       c          n/a
+ ----------- ------- ---------- ------
 
- // Note real values might be different between web and CLI.                    
+ // Note that values might be different between web and CLI.
 

tests/Bridge/Nette/DI/expectedDebugOutput.v5.txt

@@ -0,0 +1,27 @@
+
+Dotenv Variables & Files
+========================
+
+Scanned Files (in descending priority)
+--------------------------------------
+
+ * ⨯ .env.local.php
+ * ⨯ .env.dev.local
+ * ✓ .env.dev
+ * ⨯ .env.local
+ * ✓ .env
+
+Variables
+---------
+
+ ----------- ------- ---------- ------
+  Variable    Value   .env.dev   .env
+ ----------- ------- ---------- ------
+  APP_DEBUG   1       n/a        1
+  TEST_A      a       n/a        a
+  TEST_B      b       n/a        b
+  TEST_C      c       c          n/a
+ ----------- ------- ---------- ------
+
+ // Note that values might be different between web and CLI.
+

tests/Command/DumpEnvironmentCommandTest.phpt

@@ -113,7 +113,10 @@ final class DumpEnvironmentCommandTest extends TestCase
 
 		$vars = require $envLocalFile;
 
-		Assert::same($expected, $vars);
+		foreach ($expected as $envKey => $envVar) {
+			Assert::hasKey($envKey, $vars);
+			Assert::same($envVar, $vars[$envKey]);
+		}
 
 		unlink($envLocalFile);
 	}