minor symfony#24855 Random fixes (nicolas-grekas)

This PR was merged into the 3.3 branch.

Discussion
----------

Random fixes

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

Commits
-------

49e5763 Random fixes

Author: nicolas-grekas

src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php

@@ -80,7 +80,7 @@ private function extractSupportedLoaders(array $loaders)
             if ($loader instanceof XmlFileLoader || $loader instanceof YamlFileLoader) {
                 $supportedLoaders[] = $loader;
             } elseif ($loader instanceof LoaderChain) {
-                $supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getDelegatedLoaders()));
+                $supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getLoaders()));
             }
         }
 

src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php

@@ -91,7 +91,7 @@ private function extractSupportedLoaders(array $loaders)
             if ($loader instanceof XmlFileLoader || $loader instanceof YamlFileLoader) {
                 $supportedLoaders[] = $loader;
             } elseif ($loader instanceof LoaderChain) {
-                $supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getDelegatedLoaders()));
+                $supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getLoaders()));
             }
         }
 

src/Symfony/Component/Cache/Adapter/PdoAdapter.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
+use Doctrine\DBAL\Connection;
 use Symfony\Component\Cache\Traits\PdoTrait;
 
 class PdoAdapter extends AbstractAdapter

src/Symfony/Component/Cache/Traits/RedisTrait.php

@@ -48,7 +48,7 @@ public function init($redisClient, $namespace = '', $defaultLifetime = 0)
             throw new InvalidArgumentException(sprintf('RedisAdapter namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0]));
         }
         if ($redisClient instanceof \RedisCluster) {
-            $this->enableversioning();
+            $this->enableVersioning();
         } elseif (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \Predis\Client) {
             throw new InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, is_object($redisClient) ? get_class($redisClient) : gettype($redisClient)));
         }

src/Symfony/Component/Config/ResourceCheckerConfigCache.php

@@ -135,15 +135,15 @@ public function write($content, array $metadata = null)
         $mode = 0666;
         $umask = umask();
         $filesystem = new Filesystem();
-        $filesystem->dumpFile($this->file, $content, null);
+        $filesystem->dumpFile($this->file, $content);
         try {
             $filesystem->chmod($this->file, $mode, $umask);
         } catch (IOException $e) {
             // discard chmod failure (some filesystem may not support it)
         }
 
         if (null !== $metadata) {
-            $filesystem->dumpFile($this->getMetaFile(), serialize($metadata), null);
+            $filesystem->dumpFile($this->getMetaFile(), serialize($metadata));
             try {
                 $filesystem->chmod($this->getMetaFile(), $mode, $umask);
             } catch (IOException $e) {

src/Symfony/Component/Console/Exception/CommandNotFoundException.php

@@ -21,10 +21,10 @@ class CommandNotFoundException extends \InvalidArgumentException implements Exce
     private $alternatives;
 
     /**
-     * @param string    $message      Exception message to throw
-     * @param array     $alternatives List of similar defined names
-     * @param int       $code         Exception code
-     * @param Exception $previous     previous exception used for the exception chaining
+     * @param string     $message      Exception message to throw
+     * @param array      $alternatives List of similar defined names
+     * @param int        $code         Exception code
+     * @param \Exception $previous     Previous exception used for the exception chaining
      */
     public function __construct($message, array $alternatives = array(), $code = 0, \Exception $previous = null)
     {

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

@@ -423,9 +423,9 @@ private function addServiceInstance($id, Definition $definition, $isSimpleInstan
      *
      * @return bool
      */
-    private function isSimpleInstance($id, Definition $definition)
+    private function isSimpleInstance($id, Definition $definition, array $inlinedDefinitions)
     {
-        foreach (array_merge(array($definition), $this->getInlinedDefinitions($definition)) as $sDefinition) {
+        foreach (array_merge(array($definition), $inlinedDefinitions) as $sDefinition) {
             if ($definition !== $sDefinition && !$this->hasReference($id, $sDefinition->getMethodCalls())) {
                 continue;
             }

src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php

@@ -149,6 +149,7 @@ private function getContainerCompilerLogs()
     private function sanitizeLogs($logs)
     {
         $sanitizedLogs = array();
+        $silencedLogs = array();
 
         foreach ($logs as $log) {
             if (!$this->isSilencedOrDeprecationErrorLog($log)) {

src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php

@@ -60,4 +60,12 @@ public function loadClassMetadata(ClassMetadataInterface $metadata)
 
         return $success;
     }
+
+    /**
+     * @return LoaderInterface[]
+     */
+    public function getLoaders()
+    {
+        return $this->loaders;
+    }
 }

src/Symfony/Component/Validator/Mapping/Loader/LoaderChain.php

@@ -56,4 +56,12 @@ public function loadClassMetadata(ClassMetadata $metadata)
 
         return $success;
     }
+
+    /**
+     * @return LoaderInterface[]
+     */
+    public function getLoaders()
+    {
+        return $this->loaders;
+    }
 }