Merge branch '6.1' into 6.2

nicolas-grekas · nicolas-grekas · commit 5bb0fce80dce · 2022-12-19T15:33:49.000+01:00
* 6.1:
  Fix using SYMFONY_IDE in tests
diff --git a/Tests/Functional/ConfigDebugCommandTest.php b/Tests/Functional/ConfigDebugCommandTest.php
@@ -69,7 +69,7 @@ public function testParametersValuesAreFullyResolved()
         $this->assertStringContainsString('locale: en', $tester->getDisplay());
         $this->assertStringContainsString('secret: test', $tester->getDisplay());
         $this->assertStringContainsString('cookie_httponly: true', $tester->getDisplay());
-        $this->assertStringContainsString('ide: null', $tester->getDisplay());
+        $this->assertStringContainsString('ide: '.($_ENV['SYMFONY_IDE'] ?? $_SERVER['SYMFONY_IDE'] ?? 'null'), $tester->getDisplay());
     }
 
     public function testDefaultParameterValueIsResolvedIfConfigIsExisting()
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -10,7 +10,6 @@
 >
     <php>
         <ini name="error_reporting" value="-1" />
-        <env name="SYMFONY_IDE" value="" force="true" />
         <env name="REDIS_HOST" value="localhost" />
         <env name="MEMCACHED_HOST" value="localhost" />
     </php>

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function testParametersValuesAreFullyResolved()`
`69`	`69`	`$this->assertStringContainsString('locale: en', $tester->getDisplay());`
`70`	`70`	`$this->assertStringContainsString('secret: test', $tester->getDisplay());`
`71`	`71`	`$this->assertStringContainsString('cookie_httponly: true', $tester->getDisplay());`
`72`		`- $this->assertStringContainsString('ide: null', $tester->getDisplay());`
	`72`	`+ $this->assertStringContainsString('ide: '.($_ENV['SYMFONY_IDE'] ?? $_SERVER['SYMFONY_IDE'] ?? 'null'), $tester->getDisplay());`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public function testDefaultParameterValueIsResolvedIfConfigIsExisting()`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`>`
`11`	`11`	`<php>`
`12`	`12`	`<ini name="error_reporting" value="-1" />`
`13`		`- <env name="SYMFONY_IDE" value="" force="true" />`
`14`	`13`	`<env name="REDIS_HOST" value="localhost" />`
`15`	`14`	`<env name="MEMCACHED_HOST" value="localhost" />`
`16`	`15`	`</php>`