8000 Merge branch '3.3' into 3.4 · symfony/symfony@c4ae739 · GitHub
[go: up one dir, main page]
Skip to content

Commit c4ae739

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.3' into 3.4
* 3.3: Random fixes Docblock fixes [HttpKernel] Enhance deprecation message [SecurityBundle] Fix the datacollector to properly support decision.object being null
2 parents 0aedd68 + 9a20a97 commit c4ae739

File tree

20 files changed

+64
-46
lines changed

20 files changed

+64
-46
lines changed

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
6969
* only do anything if the parameter is present. (But regardless of the
7070
* value of that parameter.
7171
*
72-
* @var string
72+
* @var string|false
7373
*/
7474
protected $enabledParameter;
7575

‎src/Symfony/Bridge/Twig/Extension/CodeExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public function formatFile($file, $line, $text = null)
196196
* @param string $file An absolute file path
197197
* @param int $line The line number
198198
*
199-
* @return string A link of false
199+
* @return string|false A link or false
200200
*/
201201
public function getFileLink($file, $line)
202202
{

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

+1Lines 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/Bundle/FrameworkBundle/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function getKernel()
6262
/**
6363
* Gets the profile associated with the current Response.
6464
*
65-
* @return HttpProfile A Profile instance
65+
* @return HttpProfile|false A Profile instance
6666
*/
6767
public function getProfile()
6868
{

‎src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322< 8000 /td>322
{{ profiler_dump(decision.attributes) }}
323323
{% endif %}
324324
</td>
325-
<td>{{ profiler_dump(decision.object) }}</td>
325+
<td>{{ profiler_dump(decision.seek('object')) }}</td>
326326
</tr>
327327
{% endfor %}
328328
</tbody>

‎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\PruneableInterface;
1516
use Symfony\Component\Cache\Traits\PdoTrait;
1617

‎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
@@ -121,15 +121,15 @@ public function write($content, array $metadata = null)
121121
$mode = 0666;
122122
$umask = umask();
123123
$filesystem = new Filesystem();
124-
$filesystem->dumpFile($this->file, $content, null);
124+
$filesystem->dumpFile($this->file, $content);
125125
try {
126126
$filesystem->chmod($this->file, $mode, $umask);
127127
} catch (IOException $e) {
128128
// discard chmod failure (some filesystem may not support it)
129129
}
130130

131131
if (null !== $metadata) {
132-
$filesystem->dumpFile($this->getMetaFile(), serialize($metadata), null);
132+
$filesystem->dumpFile($this->getMetaFile(), serialize($metadata));
133133
try {
134134
$filesystem->chmod($this->getMetaFile(), $mode, $umask);
135135
} catch (IOException $e) {

‎src/Symfony/Component/Config/Util/XmlUtils.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public static function loadFile($file, $schemaOrCallable = null)
135135
}
136136

137137
/**
138-
* Converts a \DomElement object to a PHP array.
138+
* Converts a \DOMElement object to a PHP array.
139139
*
140140
* The following rules applies during the conversion:
141141
*
@@ -149,7 +149,7 @@ public static function loadFile($file, $schemaOrCallable = null)
149149
*
150150
* * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>)
151151
*
152-
* @param \DomElement $element A \DomElement instance
152+
* @param \DOMElement $element A \DOMElement instance
153153
* @param bool $checkPrefix Check prefix in an element or an attribute name
154154
*
155155
* @return array A PHP array

0 commit comments

Comments
 (0)
0