Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 008d32e2b895 · 2020-05-08T12:54:34.000+02:00
* 3.4:
  [3.4] CS fixes
diff --git a/Tests/Store/SemaphoreStoreTest.php b/Tests/Store/SemaphoreStoreTest.php
@@ -48,15 +48,15 @@ public function testResourceRemoval()
     private function getOpenedSemaphores()
     {
         if ('Darwin' === PHP_OS) {
-            $lines = explode(PHP_EOL, trim(`ipcs -s`));
+            $lines = explode(PHP_EOL, trim(shell_exec('ipcs -s')));
             if (-1 === $start = array_search('Semaphores:', $lines)) {
                 throw new \Exception('Failed to extract list of opened semaphores. Expected a Semaphore list, got '.implode(PHP_EOL, $lines));
             }
 
             return \count(\array_slice($lines, ++$start));
         }
 
-        $lines = explode(PHP_EOL, trim(`LC_ALL=C ipcs -su`));
+        $lines = explode(PHP_EOL, trim(shell_exec('LC_ALL=C ipcs -su')));
         if ('------ Semaphore Status --------' !== $lines[0]) {
             throw new \Exception('Failed to extract list of opened semaphores. Expected a Semaphore status, got '.implode(PHP_EOL, $lines));
         }

Original file line number	Diff line number	Diff line change
`@@ -48,15 +48,15 @@ public function testResourceRemoval()`
`48`	`48`	`private function getOpenedSemaphores()`
`49`	`49`	`{`
`50`	`50`	`if ('Darwin' === PHP_OS) {`
`51`		- $lines = explode(PHP_EOL, trim(`ipcs -s`));
	`51`	`+ $lines = explode(PHP_EOL, trim(shell_exec('ipcs -s')));`
`52`	`52`	`if (-1 === $start = array_search('Semaphores:', $lines)) {`
`53`	`53`	`throw new \Exception('Failed to extract list of opened semaphores. Expected a Semaphore list, got '.implode(PHP_EOL, $lines));`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`return \count(\array_slice($lines, ++$start));`
`57`	`57`	`}`
`58`	`58`
`59`		- $lines = explode(PHP_EOL, trim(`LC_ALL=C ipcs -su`));
	`59`	`+ $lines = explode(PHP_EOL, trim(shell_exec('LC_ALL=C ipcs -su')));`
`60`	`60`	`if ('------ Semaphore Status --------' !== $lines[0]) {`
`61`	`61`	`throw new \Exception('Failed to extract list of opened semaphores. Expected a Semaphore status, got '.implode(PHP_EOL, $lines));`
`62`	`62`	`}`