Skip to content

Commit e9b1997

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: renamed some confusing tests [2.3] Fix @link annotations [2.6] Fix @link annotations Fix javascript [2.3][Translation] test refresh cache when resources File change. [Translator] Cache does not take fallback locales into consideration Conflicts: src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php src/Symfony/Component/Validator/ValidatorInterface.php
2 parents 5e87c58 + 1f1d8da commit e9b1997

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

Extension/Core/ChoiceList/ChoiceListInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function getRemainingViews();
8888
* Returns the indices corresponding to the given choices.
8989
*
9090
* The indices must be positive integers or strings accepted by
91-
* {@link FormConfigBuilder::validateName()}.
91+
* {@link \Symfony\Component\Form\FormConfigBuilder::validateName()}.
9292
*
9393
* The index "placeholder" is internally reserved.
9494
*
@@ -108,7 +108,7 @@ public function getIndicesForChoices(array $choices);
108108
* Returns the indices corresponding to the given values.
109109
*
110110
* The indices must be positive integers or strings accepted by
111-
* {@link FormConfigBuilder::validateName()}.
111+
* {@link \Symfony\Component\Form\FormConfigBuilder::validateName()}.
112112
*
113113
* The index "placeholder" is internally reserved.
114114
*

Extension/Core/Type/BaseType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* Encapsulates common logic of {@link FormType} and {@link ButtonType}.
2222
*
2323
* This type does not appear in the form's type inheritance chain and as such
24-
* cannot be extended (via {@link FormTypeExtension}s) nor themed.
24+
* cannot be extended (via {@link \Symfony\Component\Form\FormExtensionInterface}) nor themed.
2525
*
2626
* @author Bernhard Schussek <[email protected]>
2727
*/

Extension/DataCollector/FormDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Symfony\Component\HttpKernel\DataCollector\DataCollector;
1919

2020
/**
21-
* Data collector for {@link \Symfony\Component\Form\FormInterface} instances.
21+
* Data collector for {@link FormInterface} instances.
2222
*
2323
* @since 2.4
2424
* @author Robert Schönthal <[email protected]>

Extension/HttpFoundation/EventListener/BindRequestListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* @author Bernhard Schussek <[email protected]>
2121
*
2222
* @deprecated since version 2.3, to be removed in 3.0.
23-
* Pass the Request instance to {@link Form::handleRequest()} instead.
23+
* Pass the Request instance to {@link \Symfony\Component\Form\Form::handleRequest()} instead.
2424
*/
2525
class BindRequestListener implements EventSubscriberInterface
2626
{

Extension/Validator/ViolationMapper/ViolationPath.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class ViolationPath implements \IteratorAggregate, PropertyPathInterface
4848
/**
4949
* Creates a new violation path from a string.
5050
*
51-
* @param string $violationPath The property path of a {@link ConstraintViolation}
51+
* @param string $violationPath The property path of a {@link \Symfony\Component\Validator\ConstraintViolation}
5252
* object.
5353
*/
5454
public function __construct($violationPath)

NativeRequestHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ private static function getRequestMethod()
159159
* It's safe to pass an already converted array, in which case this method
160160
* just returns the original array unmodified.
161161
*
162-
* This method is identical to {@link Symfony\Component\HttpFoundation\FileBag::fixPhpFilesArray}
162+
* This method is identical to {@link \Symfony\Component\HttpFoundation\FileBag::fixPhpFilesArray}
163163
* and should be kept as such in order to port fixes quickly and easily.
164164
*
165165
* @param array $data

0 commit comments

Comments
 (0)