diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php index 75cc2bcf9b384..22d2bcfe9cf50 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php +++ b/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())); } } diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php index 20f76cb4fdd73..2fb4ace86401c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php +++ b/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())); } } diff --git a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php index 733a00fe70dda..f63be17be331d 100644 --- a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php +++ b/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 diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php index ae07ad39a140d..f4b43a939e253 100644 --- a/src/Symfony/Component/Cache/Traits/RedisTrait.php +++ b/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))); } diff --git a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php index 77d533e17a17a..b3471e5d75a3d 100644 --- a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php +++ b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php @@ -135,7 +135,7 @@ 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) { @@ -143,7 +143,7 @@ public function write($content, array $metadata = null) } 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) { diff --git a/src/Symfony/Component/Console/Exception/CommandNotFoundException.php b/src/Symfony/Component/Console/Exception/CommandNotFoundException.php index 54f1a5b0ce848..cb7d1131fa776 100644 --- a/src/Symfony/Component/Console/Exception/CommandNotFoundException.php +++ b/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) { diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index b55a7de71bcca..188a0447e67a1 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/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; } diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php index 92fd0da71e648..709d00b2084ad 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php +++ b/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)) { diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php b/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php index 3b0192b7e458c..ef7e19cdea9c4 100644 --- a/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php +++ b/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; + } } diff --git a/src/Symfony/Component/Validator/Mapping/Loader/LoaderChain.php b/src/Symfony/Component/Validator/Mapping/Loader/LoaderChain.php index ead415e977c9e..f82c40000239c 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/LoaderChain.php +++ b/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; + } } diff --git a/src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php b/src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php index c371009a17a28..19b26e69c6a9a 100644 --- a/src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php +++ b/src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php @@ -20,27 +20,27 @@ class XmlReaderCaster { private static $nodeTypes = array( - \XmlReader::NONE => 'NONE', - \XmlReader::ELEMENT => 'ELEMENT', - \XmlReader::ATTRIBUTE => 'ATTRIBUTE', - \XmlReader::TEXT => 'TEXT', - \XmlReader::CDATA => 'CDATA', - \XmlReader::ENTITY_REF => 'ENTITY_REF', - \XmlReader::ENTITY => 'ENTITY', - \XmlReader::PI => 'PI (Processing Instruction)', - \XmlReader::COMMENT => 'COMMENT', - \XmlReader::DOC => 'DOC', - \XmlReader::DOC_TYPE => 'DOC_TYPE', - \XmlReader::DOC_FRAGMENT => 'DOC_FRAGMENT', - \XmlReader::NOTATION => 'NOTATION', - \XmlReader::WHITESPACE => 'WHITESPACE', - \XmlReader::SIGNIFICANT_WHITESPACE => 'SIGNIFICANT_WHITESPACE', - \XmlReader::END_ELEMENT => 'END_ELEMENT', - \XmlReader::END_ENTITY => 'END_ENTITY', - \XmlReader::XML_DECLARATION => 'XML_DECLARATION', + \XMLReader::NONE => 'NONE', + \XMLReader::ELEMENT => 'ELEMENT', + \XMLReader::ATTRIBUTE => 'ATTRIBUTE', + \XMLReader::TEXT => 'TEXT', + \XMLReader::CDATA => 'CDATA', + \XMLReader::ENTITY_REF => 'ENTITY_REF', + \XMLReader::ENTITY => 'ENTITY', + \XMLReader::PI => 'PI (Processing Instruction)', + \XMLReader::COMMENT => 'COMMENT', + \XMLReader::DOC => 'DOC', + \XMLReader::DOC_TYPE => 'DOC_TYPE', + \XMLReader::DOC_FRAGMENT => 'DOC_FRAGMENT', + \XMLReader::NOTATION => 'NOTATION', + \XMLReader::WHITESPACE => 'WHITESPACE', + \XMLReader::SIGNIFICANT_WHITESPACE => 'SIGNIFICANT_WHITESPACE', + \XMLReader::END_ELEMENT => 'END_ELEMENT', + \XMLReader::END_ENTITY => 'END_ENTITY', + \XMLReader::XML_DECLARATION => 'XML_DECLARATION', ); - public static function castXmlReader(\XmlReader $reader, array $a, Stub $stub, $isNested) + public static function castXmlReader(\XMLReader $reader, array $a, Stub $stub, $isNested) { $props = Caster::PREFIX_VIRTUAL.'parserProperties'; $info = array( @@ -49,17 +49,17 @@ public static function castXmlReader(\XmlReader $reader, array $a, Stub $stub, $ 'nodeType' => new ConstStub(self::$nodeTypes[$reader->nodeType], $reader->nodeType), 'depth' => $reader->depth, 'isDefault' => $reader->isDefault, - 'isEmptyElement' => \XmlReader::NONE === $reader->nodeType ? null : $reader->isEmptyElement, + 'isEmptyElement' => \XMLReader::NONE === $reader->nodeType ? null : $reader->isEmptyElement, 'xmlLang' => $reader->xmlLang, 'attributeCount' => $reader->attributeCount, 'value' => $reader->value, 'namespaceURI' => $reader->namespaceURI, 'baseURI' => $reader->baseURI ? new LinkStub($reader->baseURI) : $reader->baseURI, $props => array( - 'LOADDTD' => $reader->getParserProperty(\XmlReader::LOADDTD), - 'DEFAULTATTRS' => $reader->getParserProperty(\XmlReader::DEFAULTATTRS), - 'VALIDATE' => $reader->getParserProperty(\XmlReader::VALIDATE), - 'SUBST_ENTITIES' => $reader->getParserProperty(\XmlReader::SUBST_ENTITIES), + 'LOADDTD' => $reader->getParserProperty(\XMLReader::LOADDTD), + 'DEFAULTATTRS' => $reader->getParserProperty(\XMLReader::DEFAULTATTRS), + 'VALIDATE' => $reader->getParserProperty(\XMLReader::VALIDATE), + 'SUBST_ENTITIES' => $reader->getParserProperty(\XMLReader::SUBST_ENTITIES), ), );