Skip to content

Commit 5302e68

Browse files
wouterjwouterj
committed
Removed alias attribute usages
1 parent 746ec84 commit 5302e68

File tree

2 files changed

+32
-41
lines changed

2 files changed

+32
-41
lines changed

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,10 @@ 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) {
37-
// The following if-else block is deprecated and will be removed
38-
// in Symfony 3.0
39-
// Deprecation errors are triggered in the form registry
40-
if (isset($tag[0]['alias'])) {
41-
$types[$tag[0]['alias']] = $serviceId;
42-
} else {
43-
$types[$serviceId] = $serviceId;
44-
}
45-
4637
// Support type access by FQCN
4738
$serviceDefinition = $container->getDefinition($serviceId);
4839
$types[$serviceDefinition->getClass()] = $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 -->

0 commit comments

Comments
 (0)