Skip to content

Commit 73827d4

Browse files
committed
Merge branch '2.3' into 2.6
* 2.3: replaced the last remaining is_integer() call [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup [Validator] Added missing galician (gl) translations [travis] Tests Security sub-components [travis] Tests Security sub-components CS fixes [travis] test with php nightly Conflicts: src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
2 parents dae135e + 3e3979c commit 73827d4

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Definition/Builder/ArrayNodeDefinition.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ protected function validatePrototypeNode(PrototypedArrayNode $node)
472472
);
473473
}
474474

475-
if (null !== $this->key && (null === $this->addDefaultChildren || is_integer($this->addDefaultChildren) && $this->addDefaultChildren > 0)) {
475+
if (null !== $this->key && (null === $this->addDefaultChildren || is_int($this->addDefaultChildren) && $this->addDefaultChildren > 0)) {
476476
throw new InvalidDefinitionException(
477477
sprintf('->addDefaultChildrenIfNoneSet() should set default children names as ->useAttributeAsKey() is used at path "%s"', $path)
478478
);

Definition/PrototypedArrayNode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function setAddChildrenIfNoneSet($children = array('defaults'))
117117
if (null === $children) {
118118
$this->defaultChildren = array('defaults');
119119
} else {
120-
$this->defaultChildren = is_integer($children) && $children > 0 ? range(1, $children) : (array) $children;
120+
$this->defaultChildren = is_int($children) && $children > 0 ? range(1, $children) : (array) $children;
121121
}
122122
}
123123

Util/XmlUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ protected static function getXmlErrors($internalErrors)
222222
LIBXML_ERR_WARNING == $error->level ? 'WARNING' : 'ERROR',
223223
$error->code,
224224
trim($error->message),
225-
$error->file ? $error->file : 'n/a',
225+
$error->file ?: 'n/a',
226226
$error->line,
227227
$error->column
228228
);

0 commit comments

Comments
 (0)