8000 Random fixes · symfony/symfony@49e5763 · GitHub
[go: up one dir, main page]
Skip to content

Commit 49e5763

Browse files
nicolas-grekasnicolas-grekas
committed
Random fixes
1 parent 39a5801 commit 49e5763

File tree

11 files changed

+53
-35
lines changed

11 files changed

+53
-35
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private function extractSupportedLoaders(array $loaders)
8080
if ($loader instanceof XmlFileLoader || $loader instanceof YamlFileLoader) {
8181
$supportedLoaders[] = $loader;
8282
} elseif ($loader instanceof LoaderChain) {
83-
$supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getDelegatedLoaders()));
83+
$supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getLoaders()));
8484
}
8585
}
8686

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private function extractSupportedLoaders(array $loaders)
9191
if ($loader instanceof XmlFileLoader || $loader instanceof YamlFileLoader) {
9292
$supportedLoaders[] = $loader;
9393
} elseif ($loader instanceof LoaderChain) {
94-
$supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getDelegatedLoaders()));
94+
$supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getLoaders()));
9595
}
9696
}
9797

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Cache\Adapter;
1313

14+
use Doctrine\DBAL\Connection;
1415
use Symfony\Component\Cache\Traits\PdoTrait;
1516

1617
class PdoAdapter extends AbstractAdapter

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function init($redisClient, $namespace = '', $defaultLifetime = 0)
4848
throw new InvalidArgumentException(sprintf('RedisAdapter namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0]));
4949
}
5050
if ($redisClient instanceof \RedisCluster) {
51-
$this->enableversioning();
51+
$this->enableVersioning();
5252
} elseif (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \Predis\Client) {
5353
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)));
5454
}

‎src/Symfony/Component/Config/ResourceCheckerConfigCache.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,15 @@ public function write($content, array $metadata = null)
135135
$mode = 0666;
136136
$umask = umask();
137137
$filesystem = new Filesystem();
138-
$filesystem->dumpFile($this->file, $content, null);
138+
$filesystem->dumpFile($this->file, $content);
139139
try {
140140
$filesystem->chmod($this->file, $mode, $umask);
141141
} catch (IOException $e) {
142142
// discard chmod failure (some filesystem may not support it)
143143
}
144144

145145
if (null !== $metadata) {
146-
$filesystem->dumpFile($this->getMetaFile(), serialize($metadata), null);
146+
$filesystem->dumpFile($this->getMetaFile(), serialize($metadata));
147147
try {
148148
$filesystem->chmod($this->getMetaFile(), $mode, $umask);
149149
} catch (IOException $e) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ class CommandNotFoundException extends \InvalidArgumentException implements Exce
2121
private $alternatives;
2222

2323
/**
24-
* @param string $message Exception message to throw
25-
* @param array $alternatives List of similar defined names
26-
* @param int $code Exception code
27-
* @param Exception $previous previous exception used for the exception chaining
24+
* @param string $message Exception message to throw
25+
* @param array $alternatives List of similar defined names
26+
* @param int $code Exception code
27+
* @param \Exception $previous Previous exception used for the exception chaining
2828
*/
2929
public function __construct($message, array $alternatives = array(), $code = 0, \Exception $previous = null)
3030
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,9 +423,9 @@ private function addServiceInstance($id, Definition $definition, $isSimpleInstan
423423
*
424424
* @return bool
425425
*/
426-
private function isSimpleInstance($id, Definition $definition)
426+
private function isSimpleInstance($id, Definition $definition, array $inlinedDefinitions)
427427
{
428-
foreach (array_merge(array($definition), $this->getInlinedDefinitions($definition)) as $sDefinition) {
428+
foreach (array_merge(array($definition), $inlinedDefinitions) as $sDefinition) {
429429
if ($definition !== $sDefinition && !$this->hasReference($id, $sDefinition->getMethodCalls())) {
430430
continue;
431431
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ private function getContainerCompilerLogs()
149149
private function sanitizeLogs($logs)
150150
{
151151
$sanitizedLogs = array();
152+
$silencedLogs = array();
152153

153154
foreach ($logs as $log) {
154155
if (!$this->isSilencedOrDeprecationErrorLog($log)) {

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,12 @@ public function loadClassMetadata(ClassMetadataInterface $metadata)
6060

6161
return $success;
6262
}
63+
64+
/**
65+
* @return LoaderInterface[]
66+
*/
67+
public function getLoaders()
68+
{
69+
return $this->loaders;
70+
}
6371
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,12 @@ public function loadClassMetadata(ClassMetadata $metadata)
5656

5757
return $success;
5858
}
59+
60+
/**
61+
* @return LoaderInterface[]
62+
*/
63+
public function getLoaders()
64+
{
65+
return $this->loaders;
66+
}
5967
}

‎src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@
2020
class XmlReaderCaster
2121
{
2222
private static $nodeTypes = array(
23-
\XmlReader::NONE => 'NONE',
24-
\XmlReader::ELEMENT => 'ELEMENT',
25-
\XmlReader::ATTRIBUTE => 'ATTRIBUTE',
26-
\XmlReader::TEXT => 'TEXT',
27-
\XmlReader::CDATA => 'CDATA',
28-
\XmlReader::ENTITY_REF => 'ENTITY_REF',
29-
\XmlReader::ENTITY => 'ENTITY',
30-
\XmlReader::PI => 'PI (Processing Instruction)',
31-
\XmlReader::COMMENT => 'COMMENT',
32-
\XmlReader::DOC => 'DOC',
33-
\XmlReader::DOC_TYPE => 'DOC_TYPE',
34-
\XmlReader::DOC_FRAGMENT => 'DOC_FRAGMENT',
35-
\XmlReader::NOTATION => 'NOTATION',
36-
\XmlReader::WHITESPACE => 'WHITESPACE',
37-
\XmlReader::SIGNIFICANT_WHITESPACE => 'SIGNIFICANT_WHITESPACE',
38-
\XmlReader::END_ELEMENT => 'END_ELEMENT',
39-
\XmlReader::END_ENTITY => 'END_ENTITY',
40-
\XmlReader::XML_DECLARATION => 'XML_DECLARATION',
23+
\XMLReader::NONE => 'NONE',
24+
\XMLReader::ELEMENT => 'ELEMENT',
25+
\XMLReader::ATTRIBUTE => 'ATTRIBUTE',
26+
\XMLReader::TEXT => 'TEXT',
27+
\XMLReader::CDATA => 'CDATA',
28+
\XMLReader::ENTITY_REF => 'ENTITY_REF',
29+
\XMLReader::ENTITY => 'ENTITY',
30+
\XMLReader::PI => 'PI (Processing Instruction)',
31+
\XMLReader::COMMENT => 'COMMENT',
32+
\XMLReader::DOC => 'DOC',
33+
\XMLReader::DOC_TYPE => 'DOC_TYPE',
34+
\XMLReader::DOC_FRAGMENT => 'DOC_FRAGMENT',
35+
\XMLReader::NOTATION => 'NOTATION',
36+
\XMLReader::WHITESPACE => 'WHITESPACE',
37+
\XMLReader::SIGNIFICANT_WHITESPACE => 'SIGNIFICANT_WHITESPACE',
38+
\XMLReader::END_ELEMENT => 'END_ELEMENT',
39+
\XMLReader::END_ENTITY => 'END_ENTITY',
40+
\XMLReader::XML_DECLARATION => 'XML_DECLARATION',
4141
);
4242

43-
public static function castXmlReader(\XmlReader $reader, array $a, Stub $stub, $isNested)
43+
public static function castXmlReader(\XMLReader $reader, array $a, Stub $stub, $isNested)
4444
{
4545
$props = Caster::PREFIX_VIRTUAL.'parserProperties';
4646
$info = array(
@@ -49,17 +49,17 @@ public static function castXmlReader(\XmlReader $reader, array $a, Stub $stub, $
4949
'nodeType' => new ConstStub(self::$nodeTypes[$reader->nodeType], $reader->nodeType),
5050
'depth' => $reader->depth,
5151
'isDefault' => $reader->isDefault,
52-
'isEmptyElement' => \XmlReader::NONE === $reader->nodeType ? null : $reader->isEmptyElement,
52+
'isEmptyElement' => \XMLReader::NONE === $reader->nodeType ? null : $reader->isEmptyElement,
5353
'xmlLang' => $reader->xmlLang,
5454
'attributeCount' => $reader->attributeCount,
5555
'value' => $reader->value,
5656
'namespaceURI' => $reader->namespaceURI,
5757
'baseURI' => $reader->baseURI ? new LinkStub($reader->baseURI) : $reader->baseURI,
5858
$props => array(
59-
'LOADDTD' => $reader->getParserProperty(\XmlReader::LOADDTD),
60-
'DEFAULTATTRS' => $reader->getParserProperty(\XmlReader::DEFAULTATTRS),
61-
'VALIDATE' => $reader->getParserProperty(\XmlReader::VALIDATE),
62-
'SUBST_ENTITIES' => $reader->getParserProperty(\XmlReader::SUBST_ENTITIES),
59+
'LOADDTD' => $reader->getParserProperty(\XMLReader::LOADDTD),
60+
'DEFAULTATTRS' => $reader->getParserProperty(\XMLReader::DEFAULTATTRS),
61+
'VALIDATE' => $reader->getParserProperty(\XMLReader::VALIDATE),
62+
'SUBST_ENTITIES' => $reader->getParserProperty(\XMLReader::SUBST_ENTITIES),
6363
),
6464
);
6565

0 commit comments

Comments
 (0)
0