Skip to content

Commit 8859259

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: Php Inspections (EA Extended): squash all PR-13813 commits replaced the last remaining is_integer() call [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup [FrameworkBundle] simplify dep declaration [VarDumper] Fix "next element is already occupied" [Validator] Added missing galician (gl) translations [PropertyAccess] stop overwriting once a reference is reached (3rd) [OptionsResolver] Remove Unused Variable from Foreach Cycles [travis] Tests Security sub-components [Twig] bootstrap_3_layout.html.twig is usable as a trait [travis] Tests Security sub-components CS fixes [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty [travis] test with php nightly Conflicts: .travis.yml src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
2 parents 8ef7a00 + 2ed0314 commit 8859259

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
388388
);
389389

390390
foreach ($urls as $i => $url) {
391-
if (is_integer($i)) {
391+
if (is_int($i)) {
392392
if (0 === strpos($url, 'https://') || 0 === strpos($url, '//')) {
393393
$urls['http'][] = $urls['ssl'][] = $url;
394394
} else {

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
303303
'memcached' => 'Symfony\Component\HttpKernel\Profiler\MemcachedProfilerStorage',
304304
'redis' => 'Symfony\Component\HttpKernel\Profiler\RedisProfilerStorage',
305305
);
306-
list($class, ) = explode(':', $config['dsn'], 2);
306+
list($class) = explode(':', $config['dsn'], 2);
307307
if (!isset($supported[$class])) {
308308
throw new \LogicException(sprintf('Driver "%s" is not supported for the profiler.', $class));
309309
}

0 commit comments

Comments
 (0)