Skip to content

Commit 215fdbe

Browse files
wouterjwouterj
committed
Removed alias attribute usages
1 parent aff5af6 commit 215fdbe

File tree

3 files changed

+40
-61
lines changed

3 files changed

+40
-61
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function process(ContainerBuilder $container)
3030

3131
$definition = $container->getDefinition('form.extension');
3232

33-
// Builds an array with service IDs as keys and tag aliases as values
33+
// Builds an array with fully-qualified type class names as keys and service IDs as values
3434
$types = array();
3535

3636
foreach ($container->findTaggedServiceIds('form.type') as $serviceId => $tag) {
@@ -46,12 +46,8 @@ public function process(ContainerBuilder $container)
4646
foreach ($container->findTaggedServiceIds('form.type_extension') as $serviceId => $tag) {
4747
if (isset($tag[0]['extended_type'])) {
4848
$extendedType = $tag[0]['extended_type'];
49-
} elseif (isset($tag[0]['alias'])) {
50-
@trigger_error('The alias option of the form.type_extension tag is deprecated since version 2.8 and will be removed in 3.0. Use the extended_type option instead.', E_USER_DEPRECATED);
51-
$extendedType = $tag[0]['alias'];
5249
} else {
53-
@trigger_error('The extended_type option of the form.type_extension tag is required since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
54-
$extendedType = $serviceId;
50+
throw new \InvalidArgumentException(sprintf('Tagged form type extension must have the extended type configured using the extended_type/extended-type attribute, none was configured for the "%s" service.', $serviceId));
5551
}
5652

5753
$typeExtensions[$extendedType][] = $serviceId;

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -50,97 +50,97 @@
5050

5151
<service id="form.type.form" class="Symfony\Component\Form\Extension\Core\Type\FormType">
5252
<argument type="service" id="form.property_accessor" />
53-
<tag name="form.type" alias="form" />
53+
<tag name="form.type" />
5454
</service>
5555
<service id="form.type.birthday" class="Symfony\Component\Form\Extension\Core\Type\BirthdayType">
56-
<tag name="form.type" alias="birthday" />
56+
<tag name="form.type" />
5757
</service>
5858
<service id="form.type.checkbox" class="Symfony\Component\Form\Extension\Core\Type\CheckboxType">
59-
<tag name="form.type" alias="checkbox" />
59+
<tag name="form.type" />
6060
</service>
6161
<service id="form.type.choice" class="Symfony\Component\Form\Extension\Core\Type\ChoiceType">
62-
<tag name="form.type" alias="choice" />
62+
<tag name="form.type" />
6363
</service>
6464
<service id="form.type.collection" class="Symfony\Component\Form\Extension\Core\Type\CollectionType">
65-
<tag name="form.type" alias="collection" />
65+
<tag name="form.type" />
6666
</service>
6767
<service id="form.type.country" class="Symfony\Component\Form\Extension\Core\Type\CountryType">
68-
<tag name="form.type" alias="country" />
68+
<tag name="form.type" />
6969
</service>
7070
<service id="form.type.date" class="Symfony\Component\Form\Extension\Core\Type\DateType">
71-
<tag name="form.type" alias="date" />
71+
<tag name="form.type" />
7272
</service>
7373
<service id="form.type.datetime" class="Symfony\Component\Form\Extension\Core\Type\DateTimeType">
74-
<tag name="form.type" alias="datetime" />
74+
<tag name="form.type" />
7575
</service>
7676
<service id="form.type.email" class="Symfony\Component\Form\Extension\Core\Type\EmailType">
77-
<tag name="form.type" alias="email" />
77+
<tag name="form.type" />
7878
</service>
7979
<service id="form.type.file" class="Symfony\Component\Form\Extension\Core\Type\FileType">
80-
<tag name="form.type" alias="file" />
80+
<tag name="form.type" />
8181
</service>
8282
<service id="form.type.hidden" class="Symfony\Component\Form\Extension\Core\Type\HiddenType">
83-
<tag name="form.type" alias="hidden" />
83+
<tag name="form.type" />
8484
</service>
8585
<service id="form.type.integer" class="Symfony\Component\Form\Extension\Core\Type\IntegerType">
86-
<tag name="form.type" alias="integer" />
86+
<tag name="form.type" />
8787
</service>
8888
<service id="form.type.language" class="Symfony\Component\Form\Extension\Core\Type\LanguageType">
89-
<tag name="form.type" alias="language" />
89+
<tag name="form.type" />
9090
</service>
9191
<service id="form.type.locale" class="Symfony\Component\Form\Extension\Core\Type\LocaleType">
92-
<tag name="form.type" alias="locale" />
92+
<tag name="form.type" />
9393
</service>
9494
<service id="form.type.money" class="Symfony\Component\Form\Extension\Core\Type\MoneyType">
95-
<tag name="form.type" alias="money" />
95+
<tag name="form.type" />
9696
</service>
9797
<service id="form.type.number" class="Symfony\Component\Form\Extension\Core\Type\NumberType">
98-
<tag name="form.type" alias="number" />
98+
<tag name="form.type" />
9999
</service>
100100
<service id="form.type.password" class="Symfony\Component\Form\Extension\Core\Type\PasswordType">
101-
<tag name="form.type" alias="password" />
101+
<tag name="form.type" />
102102
</service>
103103
<service id="form.type.percent" class="Symfony\Component\Form\Extension\Core\Type\PercentType">
104-
<tag name="form.type" alias="percent" />
104+
<tag name="form.type" />
105105
</service>
106106
<service id="form.type.radio" class="Symfony\Component\Form\Extension\Core\Type\RadioType">
107-
<tag name="form.type" alias="radio" />
107+
<tag name="form.type" />
108108
</service>
109109
<service id="form.type.range" class="Symfony\Component\Form\Extension\Core\Type\RangeType">
110-
<tag name="form.type" alias="range" />
110+
<tag name="form.type" />
111111
</service>
112112
<service id="form.type.repeated" class="Symfony\Component\Form\Extension\Core\Type\RepeatedType">
113-
<tag name="form.type" alias="repeated" />
113+
<tag name="form.type" />
114114
</service>
115115
<service id="form.type.search" class="Symfony\Component\Form\Extension\Core\Type\SearchType">
116-
<tag name="form.type" alias="search" />
116+
<tag name="form.type" />
117117
</service>
118118
<service id="form.type.textarea" class="Symfony\Component\Form\Extension\Core\Type\TextareaType">
119-
<tag name="form.type" alias="textarea" />
119+
<tag name="form.type" />
120120
</service>
121121
<service id="form.type.text" class="Symfony\Component\Form\Extension\Core\Type\TextType">
122-
<tag name="form.type" alias="text" />
122+
<tag name="form.type" />
123123
</service>
124124
<service id="form.type.time" class="Symfony\Component\Form\Extension\Core\Type\TimeType">
125-
<tag name="form.type" alias="time" />
125+
<tag name="form.type" />
126126
</service>
127127
<service id="form.type.timezone" class="Symfony\Component\Form\Extension\Core\Type\TimezoneType">
128-
<tag name="form.type" alias="timezone" />
128+
<tag name="form.type" />
129129
</service>
130130
<service id="form.type.url" class="Symfony\Component\Form\Extension\Core\Type\UrlType">
131-
<tag name="form.type" alias="url" />
131+
<tag name="form.type" />
132132
</service>
133133
<service id="form.type.button" class="Symfony\Component\Form\Extension\Core\Type\ButtonType">
134-
<tag name="form.type" alias="button" />
134+
<tag name="form.type" />
135135
</service>
136136
<service id="form.type.submit" class="Symfony\Component\Form\Extension\Core\Type\SubmitType">
137-
<tag name="form.type" alias="submit" />
137+
<tag name="form.type" />
138138
</service>
139139
<service id="form.type.reset" class="Symfony\Component\Form\Extension\Core\Type\ResetType">
140-
<tag name="form.type" alias="reset" />
140+
<tag name="form.type" />
141141
</service>
142142
<service id="form.type.currency" class="Symfony\Component\Form\Extension\Core\Type\CurrencyType">
143-
<tag name="form.type" alias="currency" />
143+
<tag name="form.type" />
144144
</service>
145145

146146
<!-- FormTypeHttpFoundationExtension -->

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php‎

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,9 @@ public function testAddTaggedTypes()
4545
array(),
4646
));
4747

48-
$definition1 = new Definition(__CLASS__.'_Type1');
49-
$definition1->addTag('form.type');
50-
$definition2 = new Definition(__CLASS__.'_Type2');
51-
$definition2->addTag('form.type');
52-
5348
$container->setDefinition('form.extension', $extDefinition);
54-
$container->setDefinition('my.type1', $definition1);
55-
$container->setDefinition('my.type2', $definition2);
49+
$container->register('my.type1', __CLASS__.'_Type1')->addTag('form.type');
50+
$container->register('my.type2', __CLASS__.'_Type2')->addTag('form.type');
5651

5752
$container->compile();
5853

@@ -100,9 +95,10 @@ public function testAddTaggedTypeExtensions()
10095
}
10196

10297
/**
103-
* @group legacy
98+
* @expectedException \InvalidArgumentException
99+
* @expectedExceptionMessage extended-type attribute, none was configured for the "my.type_extension" service
104100
*/
105-
public function testAliasOptionForTaggedTypeExtensions()
101+
public function testAddTaggedFormTypeExtensionWithoutExtendedTypeAttribute()
106102
{
107103
$container = new ContainerBuilder();
108104
$container->addCompilerPass(new FormPass());
@@ -115,23 +111,10 @@ public function testAliasOptionForTaggedTypeExtensions()
115111
));
116112

117113
$container->setDefinition('form.extension', $extDefinition);
118-
$container->register('my.type_extension1', 'stdClass')
119-
->addTag('form.type_extension', array('alias' => 'type1'));
120-
$container->register('my.type_extension2', 'stdClass')
121-
->addTag('form.type_extension', array('alias' => 'type2'));
114+
$container->register('my.type_extension', 'stdClass')
115+
->addTag('form.type_extension');
122116

123117
$container->compile();
124-
125-
$extDefinition = $container->getDefinition('form.extension');
126-
127-
$this->assertSame(array(
128-
'type1' => array(
129-
'my.type_extension1',
130-
),
131-
'type2' => array(
132-
'my.type_extension2',
133-
),
134-
), $extDefinition->getArgument(2));
135118
}
136119

137120
public function testAddTaggedGuessers()

0 commit comments

Comments
 (0)