Skip to content

Commit fd4a5f2

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: Show more accurate message in profiler when missing stopwatch CS Fixes: Not double split with one array argument Remove redundant animation prefixes Remove redundant `box-sizing` prefixes Rework firewall access denied rule fixed CS Fix missing $extraDirs when open_basedir returns
2 parents 3896e5a + ed3b397 commit fd4a5f2

File tree

1 file changed

+16
-22
lines changed

1 file changed

+16
-22
lines changed

Tests/OptionsResolverTest.php

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -851,13 +851,11 @@ public function testResolveFailsWithCorrectLevelsButWrongScalar()
851851
$this->resolver->setDefined('foo');
852852
$this->resolver->setAllowedTypes('foo', 'int[][]');
853853

854-
$this->resolver->resolve(
855-
[
856-
'foo' => [
857-
[1.2],
858-
],
859-
]
860-
);
854+
$this->resolver->resolve([
855+
'foo' => [
856+
[1.2],
857+
],
858+
]);
861859
}
862860

863861
/**
@@ -1918,13 +1916,11 @@ public function testNestedArrays()
19181916
1, 2,
19191917
],
19201918
],
1921-
], $this->resolver->resolve(
1922-
[
1923-
'foo' => [
1924-
[1, 2],
1925-
],
1926-
]
1927-
));
1919+
], $this->resolver->resolve([
1920+
'foo' => [
1921+
[1, 2],
1922+
],
1923+
]));
19281924
}
19291925

19301926
public function testNested2Arrays()
@@ -1964,17 +1960,15 @@ public function testNestedArraysException()
19641960
$this->resolver->setDefined('foo');
19651961
$this->resolver->setAllowedTypes('foo', 'float[][][][]');
19661962

1967-
$this->resolver->resolve(
1968-
[
1969-
'foo' => [
1963+
$this->resolver->resolve([
1964+
'foo' => [
1965+
[
19701966
[
1971-
[
1972-
[1, 2],
1973-
],
1967+
[1, 2],
19741968
],
19751969
],
1976-
]
1977-
);
1970+
],
1971+
]);
19781972
}
19791973

19801974
/**

0 commit comments

Comments
 (0)