Merge branch '4.0' into 4.1

nicolas-grekas · nicolas-grekas · commit 28ef12888dea · 2018-06-29T18:29:42.000+02:00
* 4.0:
  [HttpFoundation] update phpdoc of FlashBagInterface::add()
  [ProxyManagerBridge] Fix support of private services (bis)
  bug #27701 [SecurityBundle] Dont throw if "security.http_utils" is not found (nicolas-grekas)
  [Form] relax fixtures for forward compat
  [Validator] Fix the namespace of RegexTest
  [Lock] fix locale dependent test case
diff --git a/Tests/Store/SemaphoreStoreTest.php b/Tests/Store/SemaphoreStoreTest.php
@@ -46,7 +46,7 @@ public function testResourceRemoval()
 
     private function getOpenedSemaphores()
     {
-        $lines = explode(PHP_EOL, trim(`ipcs -su`));
+        $lines = explode(PHP_EOL, trim(`LC_ALL=C ipcs -su`));
         if ('------ Semaphore Status --------' !== $lines[0]) {
             throw new \Exception('Failed to extract list of opend semaphores. Expect a Semaphore status, got '.implode(PHP_EOL, $lines));
         }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function testResourceRemoval()`
`46`	`46`
`47`	`47`	`private function getOpenedSemaphores()`
`48`	`48`	`{`
`49`		- $lines = explode(PHP_EOL, trim(`ipcs -su`));
	`49`	+ $lines = explode(PHP_EOL, trim(`LC_ALL=C ipcs -su`));
`50`	`50`	`if ('------ Semaphore Status --------' !== $lines[0]) {`
`51`	`51`	`throw new \Exception('Failed to extract list of opend semaphores. Expect a Semaphore status, got '.implode(PHP_EOL, $lines));`
`52`	`52`	`}`