Skip to content

Commit 160e064

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 dfdaffd + 637a957 commit 160e064

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

AbstractRendererEngine.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ public function setTheme(FormView $view, $themes)
6767
// Unset instead of resetting to an empty array, in order to allow
6868
// implementations (like TwigRendererEngine) to check whether $cacheKey
6969
// is set at all.
70-
unset($this->resources[$cacheKey]);
71-
unset($this->resourceHierarchyLevels[$cacheKey]);
70+
unset($this->resources[$cacheKey], $this->resourceHierarchyLevels[$cacheKey]);
7271
}
7372

7473
/**

FormBuilder.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ public function remove($name)
138138
throw new BadMethodCallException('FormBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
139139
}
140140

141-
unset($this->unresolvedChildren[$name]);
142-
unset($this->children[$name]);
141+
unset($this->unresolvedChildren[$name], $this->children[$name]);
143142

144143
return $this;
145144
}

FormEvents.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
/**
1414
* To learn more about how form events work check the documentation
15-
* entry at {@link http://symfony.com/doc/any/components/form/form_events.html}
15+
* entry at {@link http://symfony.com/doc/any/components/form/form_events.html}.
1616
*
1717
* To learn how to dynamically modify forms using events check the cookbook
18-
* entry at {@link http://symfony.com/doc/any/cookbook/form/dynamic_form_modification.html}
18+
* entry at {@link http://symfony.com/doc/any/cookbook/form/dynamic_form_modification.html}.
1919
*
2020
* @author Bernhard Schussek <[email protected]>
2121
*/

FormRenderer.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,7 @@ public function searchAndRenderBlock(FormView $view, $blockNameSuffix, array $va
296296
// Clear the caches if they were filled for the first time within
297297
// this function call
298298
if ($hierarchyInit) {
299-
unset($this->blockNameHierarchyMap[$viewAndSuffixCacheKey]);
300-
unset($this->hierarchyLevelMap[$viewAndSuffixCacheKey]);
299+
unset($this->blockNameHierarchyMap[$viewAndSuffixCacheKey], $this->hierarchyLevelMap[$viewAndSuffixCacheKey]);
301300
}
302301

303302
if ($varInit) {

Test/FormPerformanceTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected function runTest()
5454
*/
5555
public function setMaxRunningTime($maxRunningTime)
5656
{
57-
if (is_integer($maxRunningTime) && $maxRunningTime >= 0) {
57+
if (is_int($maxRunningTime) && $maxRunningTime >= 0) {
5858
$this->maxRunningTime = $maxRunningTime;
5959
} else {
6060
throw new \InvalidArgumentException();

0 commit comments

Comments
 (0)