Skip to content

Commit 3a7c7ca

Browse files
author
Hugo Hamon
committed
Normalized @deprecated annotations.
1 parent 14ccd1b commit 3a7c7ca

27 files changed

+65
-63
lines changed

‎ButtonBuilder.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -592,12 +592,12 @@ public function getByReference()
592592
*
593593
* @return bool Always returns false.
594594
*
595-
* @deprecated since version 2.3, to be removed in 3.0. Use
596-
* {@link getInheritData()} instead.
595+
* @deprecated since version 2.3, to be removed in 3.0.
596+
* Use {@link getInheritData()} instead.
597597
*/
598598
public function getVirtual()
599599
{
600-
trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use FormConfigBuilder::getInheritData() instead.', E_USER_DEPRECATED);
600+
trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\FormConfigBuilder::getInheritData method instead.', E_USER_DEPRECATED);
601601

602602
return false;
603603
}

‎Exception/AlreadyBoundException.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
/**
1717
* Alias of {@link AlreadySubmittedException}.
1818
*
19-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
20-
* {@link AlreadySubmittedException} instead.
19+
* @deprecated since version 2.3, to be removed in 3.0.
20+
* Use {@link AlreadySubmittedException} instead.
2121
*/
2222
class AlreadyBoundException extends LogicException
2323
{

‎Extension/Core/ChoiceList/ChoiceList.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public function getValuesForChoices(array $choices)
199199
/**
200200
* {@inheritdoc}
201201
*
202-
* @deprecated Deprecated since version 2.4, to be removed in 3.0.
202+
* @deprecated since version 2.4, to be removed in 3.0.
203203
*/
204204
public function getIndicesForChoices(array $choices)
205205
{
@@ -227,7 +227,7 @@ public function getIndicesForChoices(array $choices)
227227
/**
228228
* {@inheritdoc}
229229
*
230-
* @deprecated Deprecated since version 2.4, to be removed in 3.0.
230+
* @deprecated since version 2.4, to be removed in 3.0.
231231
*/
232232
public function getIndicesForValues(array $values)
233233
{

‎Extension/Core/ChoiceList/ChoiceListInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public function getValuesForChoices(array $choices);
139139
*
140140
* @return array An array of indices with ascending, 0-based numeric keys
141141
*
142-
* @deprecated Deprecated since version 2.4, to be removed in 3.0.
142+
* @deprecated since version 2.4, to be removed in 3.0.
143143
*/
144144
public function getIndicesForChoices(array $choices);
145145

@@ -159,7 +159,7 @@ public function getIndicesForChoices(array $choices);
159159
*
160160
* @return array An array of indices with ascending, 0-based numeric keys
161161
*
162-
* @deprecated Deprecated since version 2.4, to be removed in 3.0.
162+
* @deprecated since version 2.4, to be removed in 3.0.
163163
*/
164164
public function getIndicesForValues(array $values);
165165
}

‎Extension/Core/ChoiceList/LazyChoiceList.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function getValuesForChoices(array $choices)
106106
/**
107107
* {@inheritdoc}
108108
*
109-
* @deprecated Deprecated since version 2.4, to be removed in 3.0.
109+
* @deprecated since version 2.4, to be removed in 3.0.
110110
*/
111111
public function getIndicesForChoices(array $choices)
112112
{
@@ -122,7 +122,7 @@ public function getIndicesForChoices(array $choices)
122122
/**
123123
* {@inheritdoc}
124124
*
125-
* @deprecated Deprecated since version 2.4, to be removed in 3.0.
125+
* @deprecated since version 2.4, to be removed in 3.0.
126126
*/
127127
public function getIndicesForValues(array $values)
128128
{

‎Extension/Core/ChoiceList/ObjectChoiceList.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public function getValuesForChoices(array $choices)
187187
/**
188188
* {@inheritdoc}
189189
*
190-
* @deprecated Deprecated since version 2.4, to be removed in 3.0.
190+
* @deprecated since version 2.4, to be removed in 3.0.
191191
*/
192192
public function getIndicesForChoices(array $choices)
193193
{

‎Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,21 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface
7676
/**
7777
* Alias for {@link self::ROUND_HALF_EVEN}.
7878
*
79-
* @deprecated Deprecated as of Symfony 2.4, to be removed in Symfony 3.0.
79+
* @deprecated since version 2.4, to be removed in 3.0.
8080
*/
8181
const ROUND_HALFEVEN = Deprecated::ROUND_HALFEVEN;
8282

8383
/**
8484
* Alias for {@link self::ROUND_HALF_UP}.
8585
*
86-
* @deprecated Deprecated as of Symfony 2.4, to be removed in Symfony 3.0.
86+
* @deprecated since version 2.4, to be removed in 3.0.
8787
*/
8888
const ROUND_HALFUP = Deprecated::ROUND_HALFUP;
8989

9090
/**
9191
* Alias for {@link self::ROUND_HALF_DOWN}.
9292
*
93-
* @deprecated Deprecated as of Symfony 2.4, to be removed in Symfony 3.0.
93+
* @deprecated since version 2.4, to be removed in 3.0.
9494
*/
9595
const ROUND_HALFDOWN = Deprecated::ROUND_HALFDOWN;
9696

‎Extension/Core/EventListener/FixCheckboxInputListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ public function preSubmit(FormEvent $event)
8181
/**
8282
* Alias of {@link preSubmit()}.
8383
*
84-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
85-
* {@link preSubmit()} instead.
84+
* @deprecated since version 2.3, to be removed in 3.0.
85+
* Use {@link preSubmit()} instead.
8686
*/
8787
public function preBind(FormEvent $event)
8888
{

‎Extension/Core/EventListener/FixRadioInputListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ public function preSubmit(FormEvent $event)
6363
/**
6464
* Alias of {@link preSubmit()}.
6565
*
66-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
67-
* {@link preSubmit()} instead.
66+
* @deprecated since version 2.3, to be removed in 3.0.
67+
* Use {@link preSubmit()} instead.
6868
*/
6969
public function preBind(FormEvent $event)
7070
{

‎Extension/Core/EventListener/FixUrlProtocolListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public function onSubmit(FormEvent $event)
4646
/**
4747
* Alias of {@link onSubmit()}.
4848
*
49-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
50-
* {@link onSubmit()} instead.
49+
* @deprecated since version 2.3, to be removed in 3.0.
50+
* Use {@link onSubmit()} instead.
5151
*/
5252
public function onBind(FormEvent $event)
5353
{

‎Extension/Core/EventListener/MergeCollectionListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ public function onSubmit(FormEvent $event)
129129
/**
130130
* Alias of {@link onSubmit()}.
131131
*
132-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
133-
* {@link onSubmit()} instead.
132+
* @deprecated since version 2.3, to be removed in 3.0.
133+
* Use {@link onSubmit()} instead.
134134
*/
135135
public function onBind(FormEvent $event)
136136
{

‎Extension/Core/EventListener/ResizeFormListener.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ public function onSubmit(FormEvent $event)
184184
/**
185185
* Alias of {@link preSubmit()}.
186186
*
187-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
188-
* {@link preSubmit()} instead.
187+
* @deprecated since version 2.3, to be removed in 3.0.
188+
* Use {@link preSubmit()} instead.
189189
*/
190190
public function preBind(FormEvent $event)
191191
{
@@ -197,8 +197,8 @@ public function preBind(FormEvent $event)
197197
/**
198198
* Alias of {@link onSubmit()}.
199199
*
200-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
201-
* {@link onSubmit()} instead.
200+
* @deprecated since version 2.3, to be removed in 3.0.
201+
* Use {@link onSubmit()} instead.
202202
*/
203203
public function onBind(FormEvent $event)
204204
{

‎Extension/Core/EventListener/TrimListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public function preSubmit(FormEvent $event)
4040
/**
4141
* Alias of {@link preSubmit()}.
4242
*
43-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
44-
* {@link preSubmit()} instead.
43+
* @deprecated since version 2.3, to be removed in 3.0.
44+
* Use {@link preSubmit()} instead.
4545
*/
4646
public function preBind(FormEvent $event)
4747
{

‎Extension/Csrf/CsrfProvider/CsrfProviderAdapter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* @since 2.4
2525
* @author Bernhard Schussek <[email protected]>
2626
*
27-
* @deprecated Deprecated since version 2.4, to be removed in Symfony 3.0.
27+
* @deprecated since version 2.4, to be removed in 3.0.
2828
*/
2929
class CsrfProviderAdapter implements CsrfTokenManagerInterface
3030
{

‎Extension/Csrf/CsrfProvider/CsrfProviderInterface.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@
2727
*
2828
* @author Bernhard Schussek <[email protected]>
2929
*
30-
* @deprecated since version 2.4, to be removed in Symfony 3.0. Use
31-
* {@link \Symfony\Component\Security\Csrf\CsrfTokenManagerInterface}
32-
* instead.
30+
* @deprecated since version 2.4, to be removed in 3.0.
31+
* Use {@link \Symfony\Component\Security\Csrf\CsrfTokenManagerInterface} instead.
3332
*/
3433
interface CsrfProviderInterface
3534
{

‎Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* @since 2.4
2323
* @author Bernhard Schussek <[email protected]>
2424
*
25-
* @deprecated Deprecated since version 2.4, to be removed in Symfony 3.0.
25+
* @deprecated since version 2.4, to be removed in 3.0.
2626
*/
2727
class CsrfTokenManagerAdapter implements CsrfProviderInterface
2828
{

‎Extension/Csrf/CsrfProvider/DefaultCsrfProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
*
2222
* @author Bernhard Schussek <[email protected]>
2323
*
24-
* @deprecated Deprecated since version 2.4, to be removed in Symfony 3.0. Use
25-
* {@link \Symfony\Component\Security\Csrf\CsrfTokenManager} in
24+
* @deprecated since version 2.4, to be removed in 3.0.
25+
* Use {@link \Symfony\Component\Security\Csrf\CsrfTokenManager} in
2626
* combination with {@link \Symfony\Component\Security\Csrf\TokenStorage\NativeSessionTokenStorage}
2727
* instead.
2828
*/

‎Extension/Csrf/CsrfProvider/SessionCsrfProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
*
2424
* @author Bernhard Schussek <[email protected]>
2525
*
26-
* @deprecated Deprecated since version 2.4, to be removed in Symfony 3.0. Use
27-
* {@link \Symfony\Component\Security\Csrf\CsrfTokenManager} in
26+
* @deprecated since version 2.4, to be removed in 3.0.
27+
* Use {@link \Symfony\Component\Security\Csrf\CsrfTokenManager} in
2828
* combination with {@link \Symfony\Component\Security\Csrf\TokenStorage\SessionTokenStorage}
2929
* instead.
3030
*/

‎Extension/Csrf/EventListener/CsrfValidationListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ public function preSubmit(FormEvent $event)
118118
/**
119119
* Alias of {@link preSubmit()}.
120120
*
121-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
122-
* {@link preSubmit()} instead.
121+
* @deprecated since version 2.3, to be removed in 3.0.
122+
* Use {@link preSubmit()} instead.
123123
*/
124124
public function preBind(FormEvent $event)
125125
{

‎Extension/HttpFoundation/EventListener/BindRequestListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
/**
2222
* @author Bernhard Schussek <[email protected]>
2323
*
24-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Pass the
25-
* Request instance to {@link Form::handleRequest()} instead.
24+
* @deprecated since version 2.3, to be removed in 3.0.
25+
* Pass the Request instance to {@link Form::handleRequest()} instead.
2626
*/
2727
class BindRequestListener implements EventSubscriberInterface
2828
{

‎Form.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -676,8 +676,8 @@ public function submit($submittedData, $clearMissing = true)
676676
/**
677677
* Alias of {@link submit()}.
678678
*
679-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
680-
* {@link submit()} instead.
679+
* @deprecated since version 2.3, to be removed in 3.0.
680+
* Use {@link submit()} instead.
681681
*/
682682
public function bind($submittedData)
683683
{
@@ -719,8 +719,8 @@ public function isSubmitted()
719719
/**
720720
* Alias of {@link isSubmitted()}.
721721
*
722-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
723-
* {@link isSubmitted()} instead.
722+
* @deprecated since version 2.3, to be removed in 3.0.
723+
* Use {@link isSubmitted()} instead.
724724
*/
725725
public function isBound()
726726
{
@@ -843,8 +843,8 @@ public function getErrors($deep = false, $flatten = true)
843843
*
844844
* @return string A string representation of all errors
845845
*
846-
* @deprecated Deprecated since version 2.5, to be removed in 3.0. Use
847-
* {@link getErrors()} instead and cast the result to a string.
846+
* @deprecated since version 2.5, to be removed in 3.0.
847+
* Use {@link getErrors()} instead and cast the result to a string.
848848
*/
849849
public function getErrorsAsString($level = 0)
850850
{

‎FormConfigBuilder.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,8 @@ public function getInheritData()
351351
*
352352
* @return FormConfigBuilder The configuration object.
353353
*
354-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
355-
* {@link getInheritData()} instead.
354+
* @deprecated since version 2.3, to be removed in 3.0.
355+
* Use {@link getInheritData()} instead.
356356
*/
357357
public function getVirtual()
358358
{
@@ -717,8 +717,8 @@ public function setInheritData($inheritData)
717717
*
718718
* @return FormConfigBuilder The configuration object.
719719
*
720-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
721-
* {@link setInheritData()} instead.
720+
* @deprecated since version 2.3, to be removed in 3.0.
721+
* Use {@link setInheritData()} instead.
722722
*/
723723
public function setVirtual($inheritData)
724724
{

‎FormEvents.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,24 +74,24 @@ final class FormEvents
7474
const POST_SET_DATA = 'form.post_set_data';
7575

7676
/**
77-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
78-
* {@link PRE_SUBMIT} instead.
77+
* @deprecated since version 2.3, to be removed in 3.0.
78+
* Use {@link PRE_SUBMIT} instead.
7979
*
8080
* @Event
8181
*/
8282
const PRE_BIND = Deprecated::PRE_BIND;
8383

8484
/**
85-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
86-
* {@link SUBMIT} instead.
85+
* @deprecated since version 2.3, to be removed in 3.0.
86+
* Use {@link SUBMIT} instead.
8787
*
8888
* @Event
8989
*/
9090
const BIND = Deprecated::BIND;
9191

9292
/**
93-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
94-
* {@link POST_SUBMIT} instead.
93+
* @deprecated since version 2.3, to be removed in 3.0.
94+
* Use {@link POST_SUBMIT} instead.
9595
*
9696
* @Event
9797
*/

‎Tests/Extension/Core/Type/TypeTestCase.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
use Symfony\Component\Form\Test\TypeTestCase as BaseTypeTestCase;
1515

1616
/**
17-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use Symfony\Component\Form\Test\TypeTestCase instead.
17+
* @deprecated since version 2.3, to be removed in 3.0.
18+
* Use {@link \Symfony\Component\Form\Test\TypeTestCase} instead.
1819
*/
1920
abstract class TypeTestCase extends BaseTypeTestCase
2021
{

‎Tests/FormIntegrationTestCase.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
use Symfony\Component\Form\Test\FormIntegrationTestCase as BaseFormIntegrationTestCase;
1515

1616
/**
17-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use Symfony\Component\Form\Test\FormIntegrationTestCase instead.
17+
* @deprecated since version 2.3, to be removed in 3.0.
18+
* Use {@link \Symfony\Component\Form\Test\FormIntegrationTestCase} instead.
1819
*/
1920
abstract class FormIntegrationTestCase extends BaseFormIntegrationTestCase
2021
{

‎Tests/FormPerformanceTestCase.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
use Symfony\Component\Form\Test\FormPerformanceTestCase as BaseFormPerformanceTestCase;
1515

1616
/**
17-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use Symfony\Component\Form\Test\FormPerformanceTestCase instead.
17+
* @deprecated since version 2.3, to be removed in 3.0.
18+
* Use {@link \Symfony\Component\Form\Test\FormPerformanceTestCase} instead.
1819
*/
1920
abstract class FormPerformanceTestCase extends BaseFormPerformanceTestCase
2021
{

‎Util/VirtualFormAwareIterator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
*
2323
* @author Bernhard Schussek <[email protected]>
2424
*
25-
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
26-
* {@link InheritDataAwareIterator} instead.
25+
* @deprecated since version 2.3, to be removed in 3.0.
26+
* Use {@link InheritDataAwareIterator} instead.
2727
*/
2828
class VirtualFormAwareIterator extends \IteratorIterator implements \RecursiveIterator
2929
{

0 commit comments

Comments
 (0)