Merge branch '2.7' into 2.8

* 2.7:
  fixed CS
  SCA with Php Inspections (EA Extended): 2.7
  Remove deprecated each function
  Fixed PHPdoc return references in FormBuilderInterface
  [FrameworkBundle] Fix perf issue in CacheClearCommand::warmup()

Author: fabpot

src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php

@@ -147,7 +147,7 @@ protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = tr
         $safeTempKernel = str_replace('\\', '\\\\', get_class($tempKernel));
         $realKernelFQN = get_class($realKernel);
 
-        foreach (Finder::create()->files()->name('*.meta')->in($warmupDir) as $file) {
+        foreach (Finder::create()->files()->depth('<3')->name('*.meta')->in($warmupDir) as $file) {
             file_put_contents($file, preg_replace(
                 '/(C\:\d+\:)"'.$safeTempKernel.'"/',
                 sprintf('$1"%s"', $realKernelFQN),
@@ -159,14 +159,16 @@ protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = tr
         $search = array($warmupDir, str_replace('\\', '\\\\', $warmupDir));
         $replace = str_replace('\\', '/', $realCacheDir);
         foreach (Finder::create()->files()->in($warmupDir) as $file) {
-            $content = str_replace($search, $replace, file_get_contents($file));
-            file_put_contents($file, $content);
+            $content = str_replace($search, $replace, file_get_contents($file), $count);
+            if ($count) {
+                file_put_contents($file, $content);
+            }
         }
 
         // fix references to container's class
         $tempContainerClass = get_class($tempKernel->getContainer());
         $realContainerClass = get_class($realKernel->getContainer());
-        foreach (Finder::create()->files()->name($tempContainerClass.'*')->in($warmupDir) as $file) {
+        foreach (Finder::create()->files()->depth('<2')->name($tempContainerClass.'*')->in($warmupDir) as $file) {
             $content = str_replace($tempContainerClass, $realContainerClass, file_get_contents($file));
             file_put_contents($file, $content);
             rename($file, str_replace(DIRECTORY_SEPARATOR.$tempContainerClass, DIRECTORY_SEPARATOR.$realContainerClass, $file));

src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php

@@ -78,7 +78,7 @@ public function getVersion($path = null, $packageName = null)
 
         // packageName is null and path not, so path is a path or a packageName
         try {
-            $package = $this->packages->getPackage($path);
+            $this->packages->getPackage($path);
         } catch (\InvalidArgumentException $e) {
             // path is not a package, so it should be a path
             return $this->packages->getVersion($path);

src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php

@@ -75,7 +75,6 @@ protected function findTemplate($template, $throw = true)
         }
 
         $file = null;
-        $previous = null;
         try {
             $file = parent::findTemplate($logicalName);
         } catch (LoaderError $e) {

src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php

@@ -170,9 +170,10 @@ public function testGlobalsWithDifferentTypesAndValues()
 
         $calls = $container->getDefinition('twig')->getMethodCalls();
         foreach (array_slice($calls, 1) as $call) {
-            list($name, $value) = each($globals);
-            $this->assertEquals($name, $call[1][0]);
-            $this->assertSame($value, $call[1][1]);
+            $this->assertEquals(key($globals), $call[1][0]);
+            $this->assertSame(current($globals), $call[1][1]);
+
+            next($globals);
         }
     }
 

src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php

@@ -120,7 +120,7 @@ public function testGet()
             $this->assertEquals('Circular reference detected for service "baz", path: "baz".', $e->getMessage(), '->get() throws a LogicException if the service has a circular reference to itself');
         }
 
-        $this->assertTrue($builder->get('bar') === $builder->get('bar'), '->get() always returns the same instance if the service is shared');
+        $this->assertSame($builder->get('bar'), $builder->get('bar'), '->get() always returns the same instance if the service is shared');
     }
 
     public function testNonSharedServicesReturnsDifferentInstances()

src/Symfony/Component/Filesystem/Tests/LockHandlerTest.php

@@ -49,7 +49,7 @@ public function testErrorHandlingInLockIfLockPathBecomesUnwritable()
             $this->markTestSkipped('This test cannot run on Windows.');
         }
 
-        $lockPath = sys_get_temp_dir().'/'.uniqid();
+        $lockPath = sys_get_temp_dir().'/'.uniqid('', true);
         $e = null;
         $wrongMessage = null;
 

src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php

@@ -89,7 +89,7 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
 
         if (!is_callable($preferredChoices) && !empty($preferredChoices)) {
             $preferredChoices = function ($choice) use ($preferredChoices) {
-                return false !== array_search($choice, $preferredChoices, true);
+                return in_array($choice, $preferredChoices, true);
             };
         }
 

src/Symfony/Component/Form/FormBuilderInterface.php

@@ -27,7 +27,7 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild
      * @param string|FormTypeInterface        $type
      * @param array                           $options
      *
-     * @return $this
+     * @return self
      */
     public function add($child, $type = null, array $options = array());
 
@@ -58,7 +58,7 @@ public function get($name);
      *
      * @param string $name
      *
-     * @return $this
+     * @return self
      */
     public function remove($name);
 

src/Symfony/Component/Form/FormRenderer.php

@@ -316,6 +316,6 @@ public function searchAndRenderBlock(FormView $view, $blockNameSuffix, array $va
      */
     public function humanize($text)
     {
-        return ucfirst(trim(strtolower(preg_replace(array('/([A-Z])/', '/[_\s]+/'), array('_$1', ' '), $text))));
+        return ucfirst(strtolower(trim(preg_replace(array('/([A-Z])/', '/[_\s]+/'), array('_$1', ' '), $text))));
     }
 }

src/Symfony/Component/VarDumper/Dumper/CliDumper.php

@@ -123,9 +123,9 @@ public function dumpScalar(Cursor $cursor, $type, $value)
                 $style = 'num';
 
                 switch (true) {
-                    case INF === $value:  $value = 'INF';  break;
+                    case INF === $value:  $value = 'INF'; break;
                     case -INF === $value: $value = '-INF'; break;
-                    case is_nan($value):  $value = 'NAN';  break;
+                    case is_nan($value):  $value = 'NAN'; break;
                     default:
                         $value = (string) $value;
                         if (false === strpos($value, $this->decimalPoint)) {