minor symfony#13995 [2.3] Static Code Analysis for Components (kalessil)

This PR was squashed before being merged into the 2.3 branch (closes symfony#13995).

Discussion
----------

[2.3] Static Code Analysis for Components

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Static Code Analysis with Php Inspections (EA Extended), no functional changes:
- [Filesystem] : nested ifs, not optimal ifs
- in_array() miss-uses
- class re-implements an interface of super(s)
- array_keys/array_values as foreach array - fixed cases where changes has sense

Commits
-------

4abfabf [2.3] Static Code Analysis for Components

Author: fabpot

src/Symfony/Component/CssSelector/Exception/ExpressionErrorException.php

@@ -19,6 +19,6 @@
  *
  * @author Jean-François Simon <[email protected]>
  */
-class ExpressionErrorException extends ParseException implements ExceptionInterface
+class ExpressionErrorException extends ParseException
 {
 }

src/Symfony/Component/CssSelector/Exception/InternalErrorException.php

@@ -19,6 +19,6 @@
  *
  * @author Jean-François Simon <[email protected]>
  */
-class InternalErrorException extends ParseException implements ExceptionInterface
+class InternalErrorException extends ParseException
 {
 }

src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php

@@ -21,7 +21,7 @@
  *
  * @author Jean-François Simon <[email protected]>
  */
-class SyntaxErrorException extends ParseException implements ExceptionInterface
+class SyntaxErrorException extends ParseException
 {
     /**
      * @param string $expectedValue

src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php

@@ -173,7 +173,7 @@ private function findNodes()
         foreach ($container->getServiceIds() as $id) {
             $service = $container->get($id);
 
-            if (in_array($id, array_keys($container->getAliases()))) {
+            if (array_key_exists($id, $container->getAliases())) {
                 continue;
             }
 

src/Symfony/Component/Filesystem/Filesystem.php

@@ -41,10 +41,9 @@ public function copy($originFile, $targetFile, $override = false)
 
         $this->mkdir(dirname($targetFile));
 
-        if (!$override && is_file($targetFile) && null === parse_url($originFile, PHP_URL_HOST)) {
+        $doCopy = true;
+        if (!$override && null === parse_url($originFile, PHP_URL_HOST) && is_file($targetFile)) {
             $doCopy = filemtime($originFile) > filemtime($targetFile);
-        } else {
-            $doCopy = true;
         }
 
         if ($doCopy) {
@@ -274,7 +273,7 @@ public function rename($origin, $target, $overwrite = false)
      */
     public function symlink($originDir, $targetDir, $copyOnWindows = false)
     {
-        if (!function_exists('symlink') && $copyOnWindows) {
+        if ($copyOnWindows && !function_exists('symlink')) {
             $this->mirror($originDir, $targetDir);
 
             return;
@@ -291,16 +290,14 @@ public function symlink($originDir, $targetDir, $copyOnWindows = false)
             }
         }
 
-        if (!$ok) {
-            if (true !== @symlink($originDir, $targetDir)) {
-                $report = error_get_last();
-                if (is_array($report)) {
-                    if ('\\' === DIRECTORY_SEPARATOR && false !== strpos($report['message'], 'error code(1314)')) {
-                        throw new IOException('Unable to create symlink due to error code 1314: \'A required privilege is not held by the client\'. Do you have the required Administrator-rights?');
-                    }
+        if (!$ok && true !== @symlink($originDir, $targetDir)) {
+            $report = error_get_last();
+            if (is_array($report)) {
+                if ('\\' === DIRECTORY_SEPARATOR && false !== strpos($report['message'], 'error code(1314)')) {
+                    throw new IOException('Unable to create symlink due to error code 1314: \'A required privilege is not held by the client\'. Do you have the required Administrator-rights?');
                 }
-                throw new IOException(sprintf('Failed to create symbolic link from %s to %s', $originDir, $targetDir));
             }
+            throw new IOException(sprintf('Failed to create symbolic link from %s to %s', $originDir, $targetDir));
         }
     }
 
@@ -339,9 +336,9 @@ public function makePathRelative($endPath, $startPath)
         $endPathRemainder = implode('/', array_slice($endPathArr, $index));
 
         // Construct $endPath from traversing to the common path, then to the remaining $endPath
-        $relativePath = $traverser.(strlen($endPathRemainder) > 0 ? $endPathRemainder.'/' : '');
+        $relativePath = $traverser.('' !== $endPathRemainder ? $endPathRemainder.'/' : '');
 
-        return (strlen($relativePath) === 0) ? './' : $relativePath;
+        return '' === $relativePath ? './' : $relativePath;
     }
 
     /**

src/Symfony/Component/Form/NativeRequestHandler.php

@@ -184,10 +184,10 @@ private static function fixPhpFilesArray($data)
             unset($files[$k]);
         }
 
-        foreach (array_keys($data['name']) as $key) {
+        foreach ($data['name'] as $key => $name) {
             $files[$key] = self::fixPhpFilesArray(array(
                 'error' => $data['error'][$key],
-                'name' => $data['name'][$key],
+                'name' => $name,
                 'type' => $data['type'][$key],
                 'tmp_name' => $data['tmp_name'][$key],
                 'size' => $data['size'][$key],

src/Symfony/Component/HttpFoundation/FileBag.php

@@ -140,10 +140,10 @@ protected function fixPhpFilesArray($data)
             unset($files[$k]);
         }
 
-        foreach (array_keys($data['name']) as $key) {
+        foreach ($data['name'] as $key => $name) {
             $files[$key] = $this->fixPhpFilesArray(array(
                 'error' => $data['error'][$key],
-                'name' => $data['name'][$key],
+                'name' => $name,
                 'type' => $data['type'][$key],
                 'tmp_name' => $data['tmp_name'][$key],
                 'size' => $data['size'][$key],

src/Symfony/Component/HttpFoundation/Request.php

@@ -1549,7 +1549,7 @@ public function getLanguages()
         foreach (array_keys($languages) as $lang) {
             if (strstr($lang, '-')) {
                 $codes = explode('-', $lang);
-                if ($codes[0] == 'i') {
+                if ('i' === $codes[0]) {
                     // Language not listed in ISO 639 that are not variants
                     // of any listed language, which can be registered with the
                     // i-prefix, such as i-cherokee
@@ -1558,7 +1558,7 @@ public function getLanguages()
                     }
                 } else {
                     for ($i = 0, $max = count($codes); $i < $max; $i++) {
-                        if ($i == 0) {
+                        if ($i === 0) {
                             $lang = strtolower($codes[0]);
                         } else {
                             $lang .= '_'.strtoupper($codes[$i]);

src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php

@@ -75,7 +75,7 @@ public function testGuessWithNonReadablePath()
             $this->markTestSkipped('Can not verify chmod operations on Windows');
         }
 
-        if (in_array(get_current_user(), array('root'))) {
+        if ('root' === get_current_user()) {
             $this->markTestSkipped('This test will fail if run under superuser');
         }
 

src/Symfony/Component/Translation/Loader/CsvFileLoader.php

@@ -22,7 +22,7 @@
  *
  * @api
  */
-class CsvFileLoader extends ArrayLoader implements LoaderInterface
+class CsvFileLoader extends ArrayLoader
 {
     private $delimiter = ';';
     private $enclosure = '"';