Skip to content

Commit 954a6e3

Browse files
committed
Merge branch '4.1' into 4.2
* 4.1: fixed tests fixed CS fixed CS fixed CS fixed short array CS in comments fixed CS in ExpressionLanguage fixtures fixed CS in generated files fixed CS on generated container files fixed CS on Form PHP templates fixed CS on YAML fixtures fixed fixtures switched array() to []
2 parents fbcb106 + 71ac11d commit 954a6e3

File tree

2 files changed

+175
-175
lines changed

2 files changed

+175
-175
lines changed

Tests/Debug/OptionsResolverIntrospectorTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function testGetDefaultThrowsOnNotDefinedOption()
6464
public function testGetLazyClosures()
6565
{
6666
$resolver = new OptionsResolver();
67-
$closures = array();
67+
$closures = [];
6868
$resolver->setDefault($option = 'foo', $closures[] = function (Options $options) {});
6969

7070
$debug = new OptionsResolverIntrospector($resolver);
@@ -100,7 +100,7 @@ public function testGetAllowedTypes()
100100
{
101101
$resolver = new OptionsResolver();
102102
$resolver->setDefined($option = 'foo');
103-
$resolver->setAllowedTypes($option = 'foo', $allowedTypes = array('string', 'bool'));
103+
$resolver->setAllowedTypes($option = 'foo', $allowedTypes = ['string', 'bool']);
104104

105105
$debug = new OptionsResolverIntrospector($resolver);
106106
$this->assertSame($allowedTypes, $debug->getAllowedTypes($option));
@@ -135,7 +135,7 @@ public function testGetAllowedValues()
135135
{
136136
$resolver = new OptionsResolver();
137137
$resolver->setDefined($option = 'foo');
138-
$resolver->setAllowedValues($option = 'foo', $allowedValues = array('bar', 'baz'));
138+
$resolver->setAllowedValues($option = 'foo', $allowedValues = ['bar', 'baz']);
139139

140140
$debug = new OptionsResolverIntrospector($resolver);
141141
$this->assertSame($allowedValues, $debug->getAllowedValues($option));

0 commit comments

Comments
 (0)