Skip to content

Commit 2a9a6ec

Browse files
raymondschoutenraymondschouten
committed
ISSUE-142: Updated code to PHP 5.5
1 parent 6ee6ae4 commit 2a9a6ec

File tree

5 files changed

+52
-52
lines changed

5 files changed

+52
-52
lines changed

‎src/BirthdayType.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ class BirthdayType extends AbstractType
4040
*/
4141
public function configureOptions(OptionsResolver $resolver)
4242
{
43-
$resolver->setDefaults(array(
43+
$resolver->setDefaults([
4444
'years' => range(date('Y'), date('Y') - 120),
45-
));
45+
]);
4646
}
4747

4848
/**

‎src/BooleanType.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ public function configureOptions(OptionsResolver $resolver)
6363
};
6464

6565
$choicesNormalizer = function (Options $options) {
66-
return array(
66+
return [
6767
$options['label_true'] => $options['value_true'],
6868
$options['label_false'] => $options['value_false'],
69-
);
69+
];
7070
};
7171

7272
$expandedNormalizer = function (Options $options) {
@@ -77,26 +77,26 @@ public function configureOptions(OptionsResolver $resolver)
7777
return false;
7878
};
7979

80-
$resolver->setDefaults(array(
80+
$resolver->setDefaults([
8181
'label_true' => null,
8282
'label_false' => null,
8383
'value_true' => 'yes',
8484
'value_false' => 'no',
8585
'widget' => 'choice',
86-
));
86+
]);
8787

8888
$resolver->setNormalizer('label_true', $labelTrueNormalizer);
8989
$resolver->setNormalizer('label_false', $labelFalseNormalizer);
9090
$resolver->setNormalizer('choices', $choicesNormalizer);
9191
$resolver->setNormalizer('expanded', $expandedNormalizer);
9292
$resolver->setNormalizer('multiple', $multipleNormalizer);
9393

94-
$resolver->setAllowedTypes('value_true', array('string', 'integer', 'float'));
95-
$resolver->setAllowedTypes('value_false', array('string', 'integer', 'float'));
96-
$resolver->setAllowedTypes('label_true', array('string', 'null'));
97-
$resolver->setAllowedTypes('label_false', array('string', 'null'));
94+
$resolver->setAllowedTypes('value_true', ['string', 'integer', 'float']);
95+
$resolver->setAllowedTypes('value_false', ['string', 'integer', 'float']);
96+
$resolver->setAllowedTypes('label_true', ['string', 'null']);
97+
$resolver->setAllowedTypes('label_false', ['string', 'null']);
9898

99-
$resolver->setAllowedValues('widget', array('choice', 'radio'));
99+
$resolver->setAllowedValues('widget', ['choice', 'radio']);
100100
}
101101

102102
/**
@@ -118,6 +118,6 @@ public function getParent()
118118
*/
119119
public function humanize($text)
120120
{
121-
return ucfirst(trim(strtolower(preg_replace(array('/([A-Z])/', '/[_\s]+/'), array('_$1', ' '), $text))));
121+
return ucfirst(trim(strtolower(preg_replace(['/([A-Z])/', '/[_\s]+/'], ['_$1', ' '], $text))));
122122
}
123123
}

‎src/EntityType.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,21 +94,21 @@ public function configureOptions(OptionsResolver $resolver)
9494
return false;
9595
};
9696

97-
$resolver->setDefaults(array(
97+
$resolver->setDefaults([
9898
'entity_manager' => null,
99-
));
99+
]);
100100

101-
$resolver->setRequired(array(
101+
$resolver->setRequired([
102102
'class',
103-
));
103+
]);
104104

105105
$resolver->setNormalizer('entity_manager', $entityManagerNormalizer);
106106
$resolver->setNormalizer('compound', $compoundNormalizer);
107107

108-
$resolver->setAllowedTypes('entity_manager', array(
108+
$resolver->setAllowedTypes('entity_manager', [
109109
'null',
110110
'string',
111111
ObjectManager::class,
112-
));
112+
]);
113113
}
114114
}

‎tests/BooleanTypeTest.php‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ class BooleanTypeTest extends TypeTestCase
3333
*/
3434
public function test($valueTrue, $valueFalse)
3535
{
36-
$options = array(
36+
$options = [
3737
'value_true' => $valueTrue,
3838
'value_false' => $valueFalse,
39-
);
39+
];
4040

4141
$form = $this->factory->create(BooleanType::class, null, $options);
4242
$form->submit($valueTrue);
@@ -59,10 +59,10 @@ public function test($valueTrue, $valueFalse)
5959
*/
6060
public function testInvalidValue($valueTrue, $valueFalse)
6161
{
62-
$options = array(
62+
$options = [
6363
'value_true' => $valueTrue,
6464
'value_false' => $valueFalse,
65-
);
65+
];
6666

6767
$form = $this->factory->create(BooleanType::class, null, $options);
6868
$form->submit('foo');
@@ -79,9 +79,9 @@ public function testInvalidValue($valueTrue, $valueFalse)
7979
*/
8080
public function testWidget($widget, $expanded)
8181
{
82-
$options = array(
82+
$options = [
8383
'widget' => $widget,
84-
);
84+
];
8585

8686
$form = $this->factory->create(BooleanType::class, null, $options);
8787
$view = $form->createView();
@@ -92,10 +92,10 @@ public function testWidget($widget, $expanded)
9292

9393
public function testHumanize()
9494
{
95-
$options = array(
95+
$options = [
9696
'value_true' => 'an_underscored__label',
9797
'value_false' => 'aCamel Cased Label',
98-
);
98+
];
9999

100100
$form = $this->factory->create(BooleanType::class, null, $options);
101101
$view = $form->createView();
@@ -110,24 +110,24 @@ public function testHumanize()
110110
*/
111111
public function providerValueTrueFalse()
112112
{
113-
return array(
114-
'true/false' => array('true', 'false'),
115-
'yes/no' => array('yes', 'no'),
116-
'on/off' => array('on', 'off'),
117-
'1/0' => array('1', '0'),
118-
'1/2' => array(1, 2),
119-
'1.3/2.7' => array(1.3, 2.7),
120-
);
113+
return [
114+
'true/false' => ['true', 'false'],
115+
'yes/no' => ['yes', 'no'],
116+
'on/off' => ['on', 'off'],
117+
'1/0' => ['1', '0'],
118+
'1/2' => [1, 2],
119+
'1.3/2.7' => [1.3, 2.7],
120+
];
121121
}
122122

123123
/**
124124
* @return array[]
125125
*/
126126
public function providerWidget()
127127
{
128-
return array(
129-
'choice' => array('choice', false),
130-
'radio' => array('radio', true),
131-
);
128+
return [
129+
'choice' => ['choice', false],
130+
'radio' => ['radio', true],
131+
];
132132
}
133133
}

‎tests/EntityTypeTest.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected function setUp()
6565
$this->entityManager->method('getClassMetadata')->willReturn($this->metadata);
6666

6767
$this->metadata->method('getName')->willReturn($this->className);
68-
$this->metadata->method('getIdentifierValues')->willReturn(array('id' => $this->identifier));
68+
$this->metadata->method('getIdentifierValues')->willReturn(['id' => $this->identifier]);
6969

7070
$this->metadata->isIdentifierComposite = false;
7171

@@ -79,9 +79,9 @@ protected function getExtensions()
7979
{
8080
$type = new EntityType($this->registry);
8181

82-
return array(
83-
new PreloadedExtension(array($type), array()),
84-
);
82+
return [
83+
new PreloadedExtension([$type], []),
84+
];
8585
}
8686

8787
public function test()
@@ -90,9 +90,9 @@ public function test()
9090

9191
$this->repository->method('find')->willReturn($this->entity);
9292

93-
$options = array(
93+
$options = [
9494
'class' => $this->className,
95-
);
95+
];
9696

9797
$form = $this->factory->create(EntityType::class, null, $options);
9898
$form->submit($this->identifier);
@@ -107,9 +107,9 @@ public function testEntityNotFound()
107107

108108
$this->repository->method('find')->willReturn(null);
109109

110-
$options = array(
110+
$options = [
111111
'class' => $this->className,
112-
);
112+
];
113113

114114
$form = $this->factory->create(EntityType::class, null, $options);
115115
$form->submit($this->identifier);
@@ -122,10 +122,10 @@ public function testEntityManagerObject()
122122
{
123123
$this->repository->method('find')->willReturn($this->entity);
124124

125-
$options = array(
125+
$options = [
126126
'class' => $this->className,
127127
'entity_manager' => $this->entityManager,
128-
);
128+
];
129129

130130
$form = $this->factory->create(EntityType::class, null, $options);
131131
$form->submit($this->identifier);
@@ -140,10 +140,10 @@ public function testEntityManagerString()
140140

141141
$this->repository->method('find')->willReturn($this->entity);
142142

143-
$options = array(
143+
$options = [
144144
'class' => $this->className,
145145
'entity_manager' => 'Doctrine\ORM\EntityManager',
146-
);
146+
];
147147

148148
$form = $this->factory->create(EntityType::class, null, $options);
149149
$form->submit($this->identifier);
@@ -163,9 +163,9 @@ public function testNoEntityManager()
163163

164164
$this->repository->method('find')->willReturn($this->entity);
165165

166-
$options = array(
166+
$options = [
167167
'class' => $this->className,
168-
);
168+
];
169169

170170
$form = $this->factory->create(EntityType::class, null, $options);
171171
$form->submit($this->identifier);

0 commit comments

Comments
 (0)