From 3cc2f1054118727e94c1d9916d25a0bcc86b661a Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Fri, 1 Jul 2016 20:46:12 +0200 Subject: [PATCH 1/8] =?UTF-8?q?[Validator]=C2=A0make=20UuidValidator=20cla?= =?UTF-8?q?ss=20formatting=20consistent.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Validator/Constraints/UuidValidator.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/Symfony/Component/Validator/Constraints/UuidValidator.php b/src/Symfony/Component/Validator/Constraints/UuidValidator.php index 08f9e27b73..d4f71a187a 100644 --- a/src/Symfony/Component/Validator/Constraints/UuidValidator.php +++ b/src/Symfony/Component/Validator/Constraints/UuidValidator.php @@ -232,20 +232,14 @@ class UuidValidator extends ConstraintValidator if ($i !== $h) { if ($this->context instanceof ExecutionContextInterface) { $this->context->buildViolation($constraint->message) - ->setParameter( - '{{ value }}', - $this->formatValue($value) - ) - ->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR) - ->addViolation(); + ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR) + ->addViolation(); } else { $this->buildViolation($constraint->message) - ->setParameter( - '{{ value }}', - $this->formatValue($value) - ) - ->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR) - ->addViolation(); + ->setParameter('{{ value }}', $this->formatValue($value)) + ->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR) + ->addViolation(); } return; From ff8bb4b5f27c5af85dba6ac2d26223490e8191c7 Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Fri, 1 Jul 2016 21:10:03 +0200 Subject: [PATCH 2/8] [Validator] UuidValidator must accept a Uuid constraint. --- .../Component/Validator/Constraints/UuidValidator.php | 4 ++++ .../Validator/Tests/Constraints/UuidValidatorTest.php | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/Symfony/Component/Validator/Constraints/UuidValidator.php b/src/Symfony/Component/Validator/Constraints/UuidValidator.php index 08f9e27b73..6ef9178f7e 100644 --- a/src/Symfony/Component/Validator/Constraints/UuidValidator.php +++ b/src/Symfony/Component/Validator/Constraints/UuidValidator.php @@ -81,6 +81,10 @@ class UuidValidator extends ConstraintValidator return; } + if (!$constraint instanceof Uuid) { + throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Uuid'); + } + if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) { throw new UnexpectedTypeException($value, 'string'); } diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php index 0abda39f02..05a60684c2 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php @@ -44,6 +44,16 @@ class UuidValidatorTest extends AbstractConstraintValidatorTest $this->assertNoViolation(); } + /** + * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException + */ + public function testExpectsUuidConstraintCompatibleType() + { + $constraint = $this->getMockForAbstractClass('Symfony\\Component\\Validator\\Constraint'); + + $this->validator->validate('216fff40-98d9-11e3-a5e2-0800200c9a66', $constraint); + } + /** * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException */ From 43dff0e8e605b8ae4326dea25a0ca543446fee09 Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Fri, 1 Jul 2016 21:33:41 +0200 Subject: [PATCH 3/8] [Validator] add missing interface use statement for phpdoc block return type. --- .../Validator/Mapping/Factory/MetadataFactoryInterface.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Validator/Mapping/Factory/MetadataFactoryInterface.php b/src/Symfony/Component/Validator/Mapping/Factory/MetadataFactoryInterface.php index c3fbb69a0e..0e1ce25220 100644 --- a/src/Symfony/Component/Validator/Mapping/Factory/MetadataFactoryInterface.php +++ b/src/Symfony/Component/Validator/Mapping/Factory/MetadataFactoryInterface.php @@ -11,7 +11,8 @@ namespace Symfony\Component\Validator\Mapping\Factory; -use Symfony\Component\Validator\Exception; +use Symfony\Component\Validator\Exception\NoSuchMetadataException; +use Symfony\Component\Validator\Mapping\MetadataInterface; /** * Returns {@link \Symfony\Component\Validator\Mapping\MetadataInterface} instances for values. @@ -29,7 +30,7 @@ interface MetadataFactoryInterface * * @return MetadataInterface The metadata for the value * - * @throws Exception\NoSuchMetadataException If no metadata exists for the given value + * @throws NoSuchMetadataException If no metadata exists for the given value */ public function getMetadataFor($value); From 2cec4a61efe2e17073522ea8fdbec978577510a2 Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Fri, 1 Jul 2016 21:54:14 +0200 Subject: [PATCH 4/8] Remove and change unrelevant comments in Validator and Security components. --- .../Security/Csrf/TokenStorage/SessionTokenStorage.php | 2 +- .../Validator/Violation/ConstraintViolationBuilder.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php b/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php index a6a6ea3894..a3ee0a13c9 100644 --- a/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php +++ b/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php @@ -15,7 +15,7 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface; use Symfony\Component\Security\Csrf\Exception\TokenNotFoundException; /** - * Token storage that uses a Symfony2 Session object. + * Token storage that uses a Symfony Session object. * * @since 2.4 * diff --git a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php index d7d3877aed..cceb6dea98 100644 --- a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php +++ b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php @@ -199,7 +199,7 @@ class ConstraintViolationBuilder implements ConstraintViolationBuilderInterface $this->message, $this->plural, $this->parameters, - $this->translationDomain# + $this->translationDomain ); } catch (\InvalidArgumentException $e) { $translatedMessage = $this->translator->trans( From c1a2a0a8ef3bb544f1addf64f5a84bbfbc327c44 Mon Sep 17 00:00:00 2001 From: Jules Pietri Date: Sat, 2 Jul 2016 16:09:17 +0200 Subject: [PATCH 5/8] [Security] fixed DebugAccessDecisionManager::setVoters() --- .../Security/Core/Authorization/DebugAccessDecisionManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Core/Authorization/DebugAccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/DebugAccessDecisionManager.php index 1a04bc1f60..aa15443dd0 100644 --- a/src/Symfony/Component/Security/Core/Authorization/DebugAccessDecisionManager.php +++ b/src/Symfony/Component/Security/Core/Authorization/DebugAccessDecisionManager.php @@ -62,7 +62,7 @@ class DebugAccessDecisionManager implements AccessDecisionManagerInterface */ public function setVoters(array $voters) { - if (!$this->manager instanceof AccessDecisionManager) { + if (!method_exists($this->manager, 'setVoters')) { return; } From 5d6f6aa7c7b0d4a1da9e3836c1c134bf241da4ef Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 4 Jul 2016 07:27:33 +0200 Subject: [PATCH 6/8] removed @since --- .../CompilerPass/RegisterMappingsPass.php | 2 -- .../Doctrine/Form/ChoiceList/IdReader.php | 2 -- ...gacyUniqueEntityValidatorLegacyApiTest.php | 2 -- .../Csrf/CsrfProvider/CsrfProviderAdapter.php | 2 -- .../CsrfProvider/CsrfTokenManagerAdapter.php | 2 -- .../DataCollector/DataCollectorExtension.php | 2 -- .../EventListener/DataCollectorListener.php | 2 -- .../DataCollector/FormDataCollector.php | 2 -- .../FormDataCollectorInterface.php | 2 -- .../DataCollector/FormDataExtractor.php | 2 -- .../FormDataExtractorInterface.php | 2 -- .../Proxy/ResolvedTypeDataCollectorProxy.php | 2 -- .../ResolvedTypeFactoryDataCollectorProxy.php | 2 -- .../Type/DataCollectorTypeExtension.php | 2 -- .../Component/Form/FormErrorIterator.php | 2 -- src/Symfony/Component/Form/FormInterface.php | 3 --- .../Form/Test/FormPerformanceTestCase.php | 2 -- .../LegacyFormValidatorLegacyApiTest.php | 2 -- .../Component/Form/Util/OrderedHashMap.php | 16 ------------- .../Form/Util/OrderedHashMapIterator.php | 24 ++++--------------- .../LegacyUserPasswordValidatorTest.php | 2 -- .../Csrf/CsrfTokenManagerInterface.php | 2 -- .../TokenGeneratorInterface.php | 2 -- .../TokenGenerator/UriSafeTokenGenerator.php | 2 -- .../NativeSessionTokenStorage.php | 2 -- .../Csrf/TokenStorage/SessionTokenStorage.php | 2 -- .../TokenStorage/TokenStorageInterface.php | 2 -- .../Component/Validator/Constraint.php | 4 ---- .../Validator/Constraints/Callback.php | 2 -- .../Validator/Constraints/Composite.php | 2 -- .../Validator/Constraints/Traverse.php | 2 -- .../Validator/Context/ExecutionContext.php | 2 -- .../Context/ExecutionContextFactory.php | 2 -- .../ExecutionContextFactoryInterface.php | 2 -- .../Context/ExecutionContextInterface.php | 2 -- .../Context/LegacyExecutionContext.php | 2 -- .../Context/LegacyExecutionContextFactory.php | 2 -- .../UnsupportedMetadataException.php | 2 -- .../Validator/Mapping/CascadingStrategy.php | 2 -- .../Mapping/ClassMetadataInterface.php | 2 -- .../Factory/MetadataFactoryInterface.php | 2 -- .../Validator/Mapping/GenericMetadata.php | 2 -- .../Validator/Mapping/MetadataInterface.php | 2 -- .../Mapping/PropertyMetadataInterface.php | 2 -- .../Validator/Mapping/TraversalStrategy.php | 2 -- .../AbstractConstraintValidatorTest.php | 2 -- .../Tests/Constraints/CompositeTest.php | 2 -- .../Fixtures/StubGlobalExecutionContext.php | 2 -- .../Tests/Validator/Abstract2Dot5ApiTest.php | 2 -- .../Tests/Validator/AbstractLegacyApiTest.php | 2 -- .../Tests/Validator/AbstractValidatorTest.php | 2 -- .../Component/Validator/Util/PropertyPath.php | 2 -- .../ContextualValidatorInterface.php | 2 -- .../Validator/Validator/LegacyValidator.php | 2 -- .../RecursiveContextualValidator.php | 2 -- .../Validator/RecursiveValidator.php | 2 -- .../Validator/ValidatorInterface.php | 2 -- .../Violation/ConstraintViolationBuilder.php | 2 -- .../ConstraintViolationBuilderInterface.php | 2 -- 59 files changed, 4 insertions(+), 153 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php index 5620740a52..9a4756ff9e 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php @@ -118,8 +118,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface * @param string $registerAliasMethodName Name of Configuration class method to * register alias. * @param string[] $aliasMap Map of alias to namespace - * - * @since Support for bundle alias was added in Symfony 2.6 */ public function __construct($driver, array $namespaces, array $managerParameters, $driverPattern, $enabledParameter = false, $configurationPattern = '', $registerAliasMethodName = '', array $aliasMap = array()) { diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php index 1f2d1e9e1e..cd966ea986 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php @@ -18,8 +18,6 @@ use Symfony\Component\Form\Exception\RuntimeException; /** * A utility for reading object IDs. * - * @since 1.0 - * * @author Bernhard Schussek * * @internal This class is meant for internal use only. diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidatorLegacyApiTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidatorLegacyApiTest.php index cde865cc1d..91c57118d9 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidatorLegacyApiTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidatorLegacyApiTest.php @@ -14,8 +14,6 @@ namespace Symfony\Bridge\Doctrine\Tests\Validator\Constraints; use Symfony\Component\Validator\Validation; /** - * @since 2.5.4 - * * @author Bernhard Schussek * @group legacy */ diff --git a/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfProviderAdapter.php b/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfProviderAdapter.php index 2a55069692..011d34a680 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfProviderAdapter.php +++ b/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfProviderAdapter.php @@ -21,8 +21,6 @@ use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface; * Adapter for using old CSRF providers where the new {@link CsrfTokenManagerInterface} * is expected. * - * @since 2.4 - * * @author Bernhard Schussek * * @deprecated since version 2.4, to be removed in 3.0. diff --git a/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php b/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php index b246a616b0..93ed314714 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php +++ b/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php @@ -17,8 +17,6 @@ use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface; /** * Adapter for using the new token generator with the old interface. * - * @since 2.4 - * * @author Bernhard Schussek * * @deprecated since version 2.4, to be removed in 3.0. diff --git a/src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php b/src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php index 70b347fa9a..2f2e51c090 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php @@ -17,8 +17,6 @@ use Symfony\Component\Form\AbstractExtension; /** * Extension for collecting data of the forms on a page. * - * @since 2.4 - * * @author Robert Schönthal * @author Bernhard Schussek */ diff --git a/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php b/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php index 8fd70f09b1..0bd33d36a5 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php @@ -20,8 +20,6 @@ use Symfony\Component\Form\FormEvents; * Listener that invokes a data collector for the {@link FormEvents::POST_SET_DATA} * and {@link FormEvents::POST_SUBMIT} events. * - * @since 2.4 - * * @author Bernhard Schussek */ class DataCollectorListener implements EventSubscriberInterface diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php index d1375df889..a408dde230 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php @@ -20,8 +20,6 @@ use Symfony\Component\HttpKernel\DataCollector\DataCollector; /** * Data collector for {@link FormInterface} instances. * - * @since 2.4 - * * @author Robert Schönthal * @author Bernhard Schussek */ diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php index a57693a995..ee004a09f3 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php @@ -18,8 +18,6 @@ use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface; /** * Collects and structures information about forms. * - * @since 2.4 - * * @author Bernhard Schussek */ interface FormDataCollectorInterface extends DataCollectorInterface diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php index 1c678ac665..71f07b5fe0 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php @@ -19,8 +19,6 @@ use Symfony\Component\Validator\ConstraintViolationInterface; /** * Default implementation of {@link FormDataExtractorInterface}. * - * @since 2.4 - * * @author Bernhard Schussek */ class FormDataExtractor implements FormDataExtractorInterface diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractorInterface.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractorInterface.php index a5bb7d0ef3..e0bc6dc0ca 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractorInterface.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractorInterface.php @@ -17,8 +17,6 @@ use Symfony\Component\Form\FormView; /** * Extracts arrays of information out of forms. * - * @since 2.4 - * * @author Bernhard Schussek */ interface FormDataExtractorInterface diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php index 61caf60a3f..4c1d6f0bea 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php @@ -21,8 +21,6 @@ use Symfony\Component\Form\ResolvedFormTypeInterface; /** * Proxy that invokes a data collector when creating a form and its view. * - * @since 2.4 - * * @author Bernhard Schussek */ class ResolvedTypeDataCollectorProxy implements ResolvedFormTypeInterface diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php index f5f4ed2e20..5051d0bb63 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php @@ -20,8 +20,6 @@ use Symfony\Component\Form\ResolvedFormTypeInterface; * Proxy that wraps resolved types into {@link ResolvedTypeDataCollectorProxy} * instances. * - * @since 2.4 - * * @author Bernhard Schussek */ class ResolvedTypeFactoryDataCollectorProxy implements ResolvedFormTypeFactoryInterface diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php b/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php index 55918d7c1e..6aa33b589e 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php @@ -19,8 +19,6 @@ use Symfony\Component\Form\FormBuilderInterface; /** * Type extension for collecting data of a form with this type. * - * @since 2.4 - * * @author Robert Schönthal * @author Bernhard Schussek */ diff --git a/src/Symfony/Component/Form/FormErrorIterator.php b/src/Symfony/Component/Form/FormErrorIterator.php index 113de435d5..41a1297d30 100644 --- a/src/Symfony/Component/Form/FormErrorIterator.php +++ b/src/Symfony/Component/Form/FormErrorIterator.php @@ -27,8 +27,6 @@ use Symfony\Component\Form\Exception\BadMethodCallException; * flatten the recursive structure into a flat list of errors. * * @author Bernhard Schussek - * - * @since 2.5 */ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \ArrayAccess, \Countable { diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php index 13b03f5118..9de802847e 100644 --- a/src/Symfony/Component/Form/FormInterface.php +++ b/src/Symfony/Component/Form/FormInterface.php @@ -102,9 +102,6 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable * * @return FormErrorIterator An iterator over the {@link FormError} * instances that where added to this form - * - * @since 2.5 Since version 2.5 this method returns a - * {@link FormErrorIterator} instance instead of an array */ public function getErrors($deep = false, $flatten = true); diff --git a/src/Symfony/Component/Form/Test/FormPerformanceTestCase.php b/src/Symfony/Component/Form/Test/FormPerformanceTestCase.php index 090eb8bc4f..75ddba6212 100644 --- a/src/Symfony/Component/Form/Test/FormPerformanceTestCase.php +++ b/src/Symfony/Component/Form/Test/FormPerformanceTestCase.php @@ -62,8 +62,6 @@ abstract class FormPerformanceTestCase extends FormIntegrationTestCase } /** - * @since Method available since Release 2.3.0 - * * @return int */ public function getMaxRunningTime() diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidatorLegacyApiTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidatorLegacyApiTest.php index 7ea58b7cef..b756a92b49 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidatorLegacyApiTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidatorLegacyApiTest.php @@ -14,8 +14,6 @@ namespace Symfony\Component\Form\Tests\Extension\Validator\Constraints; use Symfony\Component\Validator\Validation; /** - * @since 2.5.3 - * * @author Bernhard Schussek * @group legacy */ diff --git a/src/Symfony/Component/Form/Util/OrderedHashMap.php b/src/Symfony/Component/Form/Util/OrderedHashMap.php index 3aaa7d0451..a25df3214f 100644 --- a/src/Symfony/Component/Form/Util/OrderedHashMap.php +++ b/src/Symfony/Component/Form/Util/OrderedHashMap.php @@ -63,8 +63,6 @@ namespace Symfony\Component\Form\Util; * } * * @author Bernhard Schussek - * - * @since 2.2.6 */ class OrderedHashMap implements \ArrayAccess, \IteratorAggregate, \Countable { @@ -93,8 +91,6 @@ class OrderedHashMap implements \ArrayAccess, \IteratorAggregate, \Countable * Creates a new map. * * @param array $elements The elements to insert initially - * - * @since 2.2.6 */ public function __construct(array $elements = array()) { @@ -104,8 +100,6 @@ class OrderedHashMap implements \ArrayAccess, \IteratorAggregate, \Countable /** * {@inheritdoc} - * - * @since 2.2.6 */ public function offsetExists($key) { @@ -114,8 +108,6 @@ class OrderedHashMap implements \ArrayAccess, \IteratorAggregate, \Countable /** * {@inheritdoc} - * - * @since 2.2.6 */ public function offsetGet($key) { @@ -128,8 +120,6 @@ class OrderedHashMap implements \ArrayAccess, \IteratorAggregate, \Countable /** * {@inheritdoc} - * - * @since 2.2.6 */ public function offsetSet($key, $value) { @@ -151,8 +141,6 @@ class OrderedHashMap implements \ArrayAccess, \IteratorAggregate, \Countable /** * {@inheritdoc} - * - * @since 2.2.6 */ public function offsetUnset($key) { @@ -170,8 +158,6 @@ class OrderedHashMap implements \ArrayAccess, \IteratorAggregate, \Countable /** * {@inheritdoc} - * - * @since 2.2.6 */ public function getIterator() { @@ -180,8 +166,6 @@ class OrderedHashMap implements \ArrayAccess, \IteratorAggregate, \Countable /** * {@inheritdoc} - * - * @since 2.2.6 */ public function count() { diff --git a/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php b/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php index f606626814..32f591c860 100644 --- a/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php +++ b/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php @@ -17,8 +17,6 @@ namespace Symfony\Component\Form\Util; * This class is internal and should not be used. * * @author Bernhard Schussek - * - * @since 2.2.6 */ class OrderedHashMapIterator implements \Iterator { @@ -69,8 +67,6 @@ class OrderedHashMapIterator implements \Iterator * This array is managed by the corresponding * {@link OrderedHashMap} instance to support * recognizing the deletion of elements. - * - * @since 2.2.6 */ public function __construct(array &$elements, array &$orderedKeys, array &$managedCursors) { @@ -85,8 +81,6 @@ class OrderedHashMapIterator implements \Iterator /** * Removes the iterator's cursors from the managed cursors of the * corresponding {@link OrderedHashMap} instance. - * - * @since 2.2.6 */ public function __destruct() { @@ -96,9 +90,7 @@ class OrderedHashMapIterator implements \Iterator } /** - *{@inheritdoc} - * - * @since 2.2.6 + * {@inheritdoc} */ public function current() { @@ -107,8 +99,6 @@ class OrderedHashMapIterator implements \Iterator /** * {@inheritdoc} - * - * @since 2.2.6 */ public function next() { @@ -124,9 +114,7 @@ class OrderedHashMapIterator implements \Iterator } /** - *{@inheritdoc} - * - * @since 2.2.6 + * {@inheritdoc} */ public function key() { @@ -134,9 +122,7 @@ class OrderedHashMapIterator implements \Iterator } /** - *{@inheritdoc} - * - * @since 2.2.6 + * {@inheritdoc} */ public function valid() { @@ -144,9 +130,7 @@ class OrderedHashMapIterator implements \Iterator } /** - *{@inheritdoc} - * - * @since 2.2.6 + * {@inheritdoc} */ public function rewind() { diff --git a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php index 8053732bee..f7da8c0bf6 100644 --- a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php +++ b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php @@ -14,8 +14,6 @@ namespace Symfony\Component\Security\Core\Tests\Validator\Constraints; use Symfony\Component\Validator\Validation; /** - * @since 2.5.4 - * * @author Bernhard Schussek * @group legacy */ diff --git a/src/Symfony/Component/Security/Csrf/CsrfTokenManagerInterface.php b/src/Symfony/Component/Security/Csrf/CsrfTokenManagerInterface.php index bccabe6c9c..5936b6440e 100644 --- a/src/Symfony/Component/Security/Csrf/CsrfTokenManagerInterface.php +++ b/src/Symfony/Component/Security/Csrf/CsrfTokenManagerInterface.php @@ -14,8 +14,6 @@ namespace Symfony\Component\Security\Csrf; /** * Manages CSRF tokens. * - * @since 2.4 - * * @author Bernhard Schussek */ interface CsrfTokenManagerInterface diff --git a/src/Symfony/Component/Security/Csrf/TokenGenerator/TokenGeneratorInterface.php b/src/Symfony/Component/Security/Csrf/TokenGenerator/TokenGeneratorInterface.php index 1405b84f03..0ec2881774 100644 --- a/src/Symfony/Component/Security/Csrf/TokenGenerator/TokenGeneratorInterface.php +++ b/src/Symfony/Component/Security/Csrf/TokenGenerator/TokenGeneratorInterface.php @@ -14,8 +14,6 @@ namespace Symfony\Component\Security\Csrf\TokenGenerator; /** * Generates CSRF tokens. * - * @since 2.4 - * * @author Bernhard Schussek */ interface TokenGeneratorInterface diff --git a/src/Symfony/Component/Security/Csrf/TokenGenerator/UriSafeTokenGenerator.php b/src/Symfony/Component/Security/Csrf/TokenGenerator/UriSafeTokenGenerator.php index edeb435138..31e82ee5ec 100644 --- a/src/Symfony/Component/Security/Csrf/TokenGenerator/UriSafeTokenGenerator.php +++ b/src/Symfony/Component/Security/Csrf/TokenGenerator/UriSafeTokenGenerator.php @@ -17,8 +17,6 @@ use Symfony\Component\Security\Core\Util\SecureRandom; /** * Generates CSRF tokens. * - * @since 2.4 - * * @author Bernhard Schussek */ class UriSafeTokenGenerator implements TokenGeneratorInterface diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php b/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php index 2620156f36..71151fa831 100644 --- a/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php +++ b/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php @@ -16,8 +16,6 @@ use Symfony\Component\Security\Csrf\Exception\TokenNotFoundException; /** * Token storage that uses PHP's native session handling. * - * @since 2.4 - * * @author Bernhard Schussek */ class NativeSessionTokenStorage implements TokenStorageInterface diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php b/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php index a3ee0a13c9..37b33e6f21 100644 --- a/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php +++ b/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php @@ -17,8 +17,6 @@ use Symfony\Component\Security\Csrf\Exception\TokenNotFoundException; /** * Token storage that uses a Symfony Session object. * - * @since 2.4 - * * @author Bernhard Schussek */ class SessionTokenStorage implements TokenStorageInterface diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/TokenStorageInterface.php b/src/Symfony/Component/Security/Csrf/TokenStorage/TokenStorageInterface.php index 5efe72f694..92386fbbda 100644 --- a/src/Symfony/Component/Security/Csrf/TokenStorage/TokenStorageInterface.php +++ b/src/Symfony/Component/Security/Csrf/TokenStorage/TokenStorageInterface.php @@ -14,8 +14,6 @@ namespace Symfony\Component\Security\Csrf\TokenStorage; /** * Stores CSRF tokens. * - * @since 2.4 - * * @author Bernhard Schussek */ interface TokenStorageInterface diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php index 75b1e4ded0..a6d06472c2 100644 --- a/src/Symfony/Component/Validator/Constraint.php +++ b/src/Symfony/Component/Validator/Constraint.php @@ -207,8 +207,6 @@ abstract class Constraint * @throws InvalidOptionsException If an invalid option name is given * * @internal This method should not be used or overwritten in userland code. - * - * @since 2.6 */ public function __get($option) { @@ -296,8 +294,6 @@ abstract class Constraint * @internal This method may be replaced by an implementation of * {@link \Serializable} in the future. Please don't use or * overwrite it. - * - * @since 2.6 */ public function __sleep() { diff --git a/src/Symfony/Component/Validator/Constraints/Callback.php b/src/Symfony/Component/Validator/Constraints/Callback.php index 7e4ccd47b5..36e6087e1e 100644 --- a/src/Symfony/Component/Validator/Constraints/Callback.php +++ b/src/Symfony/Component/Validator/Constraints/Callback.php @@ -23,8 +23,6 @@ class Callback extends Constraint { /** * @var string|callable - * - * @since 2.4 */ public $callback; diff --git a/src/Symfony/Component/Validator/Constraints/Composite.php b/src/Symfony/Component/Validator/Constraints/Composite.php index 90c98620f0..ab8466bcfc 100644 --- a/src/Symfony/Component/Validator/Constraints/Composite.php +++ b/src/Symfony/Component/Validator/Constraints/Composite.php @@ -24,8 +24,6 @@ use Symfony\Component\Validator\Exception\ConstraintDefinitionException; * let {@link getCompositeOption()} return the name of the property which * contains the nested constraints. * - * @since 2.6 - * * @author Bernhard Schussek */ abstract class Composite extends Constraint diff --git a/src/Symfony/Component/Validator/Constraints/Traverse.php b/src/Symfony/Component/Validator/Constraints/Traverse.php index 5811ad770a..9d8bc126d1 100644 --- a/src/Symfony/Component/Validator/Constraints/Traverse.php +++ b/src/Symfony/Component/Validator/Constraints/Traverse.php @@ -17,8 +17,6 @@ use Symfony\Component\Validator\Exception\ConstraintDefinitionException; /** * @Annotation * - * @since 2.5 - * * @author Bernhard Schussek */ class Traverse extends Constraint diff --git a/src/Symfony/Component/Validator/Context/ExecutionContext.php b/src/Symfony/Component/Validator/Context/ExecutionContext.php index 722bcc947d..dce975c203 100644 --- a/src/Symfony/Component/Validator/Context/ExecutionContext.php +++ b/src/Symfony/Component/Validator/Context/ExecutionContext.php @@ -27,8 +27,6 @@ use Symfony\Component\Validator\Violation\ConstraintViolationBuilder; /** * The context used and created by {@link ExecutionContextFactory}. * - * @since 2.5 - * * @author Bernhard Schussek * * @see ExecutionContextInterface diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php b/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php index f4f01d926e..8182c41f8c 100644 --- a/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php +++ b/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php @@ -17,8 +17,6 @@ use Symfony\Component\Validator\Validator\ValidatorInterface; /** * Creates new {@link ExecutionContext} instances. * - * @since 2.5 - * * @author Bernhard Schussek * * @internal You should not instantiate or use this class. Code against diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextFactoryInterface.php b/src/Symfony/Component/Validator/Context/ExecutionContextFactoryInterface.php index e4af667d2d..f3ab3dd68a 100644 --- a/src/Symfony/Component/Validator/Context/ExecutionContextFactoryInterface.php +++ b/src/Symfony/Component/Validator/Context/ExecutionContextFactoryInterface.php @@ -19,8 +19,6 @@ use Symfony\Component\Validator\Validator\ValidatorInterface; * You can use a custom factory if you want to customize the execution context * that is passed through the validation run. * - * @since 2.5 - * * @author Bernhard Schussek */ interface ExecutionContextFactoryInterface diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php index 9c28bde9ea..d38d33747a 100644 --- a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php +++ b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php @@ -56,8 +56,6 @@ use Symfony\Component\Validator\Violation\ConstraintViolationBuilderInterface; * cannot store a context and expect that the methods still return the same * results later on. * - * @since 2.5 - * * @author Bernhard Schussek */ interface ExecutionContextInterface extends LegacyExecutionContextInterface diff --git a/src/Symfony/Component/Validator/Context/LegacyExecutionContext.php b/src/Symfony/Component/Validator/Context/LegacyExecutionContext.php index f52b359fb3..37ca2a1d10 100644 --- a/src/Symfony/Component/Validator/Context/LegacyExecutionContext.php +++ b/src/Symfony/Component/Validator/Context/LegacyExecutionContext.php @@ -20,8 +20,6 @@ use Symfony\Component\Validator\Validator\ValidatorInterface; /** * An execution context that is compatible with the legacy API (< 2.5). * - * @since 2.5 - * * @author Bernhard Schussek * * @deprecated since version 2.5, to be removed in 3.0. diff --git a/src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php b/src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php index c110644e99..757eb72a5b 100644 --- a/src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php +++ b/src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php @@ -22,8 +22,6 @@ use Symfony\Component\Validator\Validator\ValidatorInterface; * * Implemented for backward compatibility with Symfony < 2.5. * - * @since 2.5 - * * @author Bernhard Schussek * * @deprecated since version 2.5, to be removed in 3.0. diff --git a/src/Symfony/Component/Validator/Exception/UnsupportedMetadataException.php b/src/Symfony/Component/Validator/Exception/UnsupportedMetadataException.php index 97cc5ffe5d..aff569b957 100644 --- a/src/Symfony/Component/Validator/Exception/UnsupportedMetadataException.php +++ b/src/Symfony/Component/Validator/Exception/UnsupportedMetadataException.php @@ -12,8 +12,6 @@ namespace Symfony\Component\Validator\Exception; /** - * @since 2.5 - * * @author Bernhard Schussek */ class UnsupportedMetadataException extends InvalidArgumentException diff --git a/src/Symfony/Component/Validator/Mapping/CascadingStrategy.php b/src/Symfony/Component/Validator/Mapping/CascadingStrategy.php index 2b97bdd4ca..c78fb42ad4 100644 --- a/src/Symfony/Component/Validator/Mapping/CascadingStrategy.php +++ b/src/Symfony/Component/Validator/Mapping/CascadingStrategy.php @@ -27,8 +27,6 @@ namespace Symfony\Component\Validator\Mapping; * Although the constants currently represent a boolean switch, they are * implemented as bit mask in order to allow future extensions. * - * @since 2.5 - * * @author Bernhard Schussek * * @see TraversalStrategy diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadataInterface.php b/src/Symfony/Component/Validator/Mapping/ClassMetadataInterface.php index 577440d61d..d8c3d843bd 100644 --- a/src/Symfony/Component/Validator/Mapping/ClassMetadataInterface.php +++ b/src/Symfony/Component/Validator/Mapping/ClassMetadataInterface.php @@ -24,8 +24,6 @@ use Symfony\Component\Validator\PropertyMetadataContainerInterface as LegacyProp * by a group sequence for that class and whether instances of that class * should be traversed or not. * - * @since 2.5 - * * @author Bernhard Schussek * * @see MetadataInterface diff --git a/src/Symfony/Component/Validator/Mapping/Factory/MetadataFactoryInterface.php b/src/Symfony/Component/Validator/Mapping/Factory/MetadataFactoryInterface.php index 6e55e771dd..438ef9871c 100644 --- a/src/Symfony/Component/Validator/Mapping/Factory/MetadataFactoryInterface.php +++ b/src/Symfony/Component/Validator/Mapping/Factory/MetadataFactoryInterface.php @@ -16,8 +16,6 @@ use Symfony\Component\Validator\MetadataFactoryInterface as LegacyMetadataFactor /** * Returns {@link \Symfony\Component\Validator\Mapping\MetadataInterface} instances for values. * - * @since 2.5 - * * @author Bernhard Schussek */ interface MetadataFactoryInterface extends LegacyMetadataFactoryInterface diff --git a/src/Symfony/Component/Validator/Mapping/GenericMetadata.php b/src/Symfony/Component/Validator/Mapping/GenericMetadata.php index 3459074fca..458ad34fca 100644 --- a/src/Symfony/Component/Validator/Mapping/GenericMetadata.php +++ b/src/Symfony/Component/Validator/Mapping/GenericMetadata.php @@ -23,8 +23,6 @@ use Symfony\Component\Validator\ValidationVisitorInterface; * * This class supports serialization and cloning. * - * @since 2.5 - * * @author Bernhard Schussek */ class GenericMetadata implements MetadataInterface diff --git a/src/Symfony/Component/Validator/Mapping/MetadataInterface.php b/src/Symfony/Component/Validator/Mapping/MetadataInterface.php index e5f09e17ed..1e9d3c8929 100644 --- a/src/Symfony/Component/Validator/Mapping/MetadataInterface.php +++ b/src/Symfony/Component/Validator/Mapping/MetadataInterface.php @@ -24,8 +24,6 @@ use Symfony\Component\Validator\MetadataInterface as LegacyMetadataInterface; * against their class' metadata and whether traversable objects should be * traversed or not. * - * @since 2.5 - * * @author Bernhard Schussek * * @see CascadingStrategy diff --git a/src/Symfony/Component/Validator/Mapping/PropertyMetadataInterface.php b/src/Symfony/Component/Validator/Mapping/PropertyMetadataInterface.php index 8a77aa83fa..d7a4114d44 100644 --- a/src/Symfony/Component/Validator/Mapping/PropertyMetadataInterface.php +++ b/src/Symfony/Component/Validator/Mapping/PropertyMetadataInterface.php @@ -24,8 +24,6 @@ use Symfony\Component\Validator\PropertyMetadataInterface as LegacyPropertyMetad * should be validated against their class' metadata and whether traversable * objects should be traversed or not. * - * @since 2.5 - * * @author Bernhard Schussek * * @see MetadataInterface diff --git a/src/Symfony/Component/Validator/Mapping/TraversalStrategy.php b/src/Symfony/Component/Validator/Mapping/TraversalStrategy.php index ae76857aa4..164992b2ea 100644 --- a/src/Symfony/Component/Validator/Mapping/TraversalStrategy.php +++ b/src/Symfony/Component/Validator/Mapping/TraversalStrategy.php @@ -23,8 +23,6 @@ namespace Symfony\Component\Validator\Mapping; * * The traversal strategy is ignored for arrays. Arrays are always iterated. * - * @since 2.1 - * * @author Bernhard Schussek * * @see CascadingStrategy diff --git a/src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php index b5e2a7a97d..230d90bd57 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php @@ -24,8 +24,6 @@ use Symfony\Component\Validator\Mapping\PropertyMetadata; use Symfony\Component\Validator\Validation; /** - * @since 2.5.3 - * * @author Bernhard Schussek */ abstract class AbstractConstraintValidatorTest extends \PHPUnit_Framework_TestCase diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php index eab15ed3bb..002b1336aa 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php @@ -32,8 +32,6 @@ class ConcreteComposite extends Composite } /** - * @since 2.6 - * * @author Bernhard Schussek */ class CompositeTest extends \PHPUnit_Framework_TestCase diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php b/src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php index 84c5a80bf2..bd2f5c94e7 100644 --- a/src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php +++ b/src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php @@ -16,8 +16,6 @@ use Symfony\Component\Validator\GlobalExecutionContextInterface; use Symfony\Component\Validator\ValidationVisitorInterface; /** - * @since 2.5.3 - * * @author Bernhard Schussek * * @deprecated since version 2.5, to be removed in 3.0 diff --git a/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php index 6995d25817..e85177ef59 100644 --- a/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php +++ b/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php @@ -29,8 +29,6 @@ use Symfony\Component\Validator\Validator\ValidatorInterface; /** * Verifies that a validator satisfies the API of Symfony 2.5+. * - * @since 2.5 - * * @author Bernhard Schussek */ abstract class Abstract2Dot5ApiTest extends AbstractValidatorTest diff --git a/src/Symfony/Component/Validator/Tests/Validator/AbstractLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/AbstractLegacyApiTest.php index d78b67bee7..cbbaecfcdd 100644 --- a/src/Symfony/Component/Validator/Tests/Validator/AbstractLegacyApiTest.php +++ b/src/Symfony/Component/Validator/Tests/Validator/AbstractLegacyApiTest.php @@ -23,8 +23,6 @@ use Symfony\Component\Validator\ValidatorInterface as LegacyValidatorInterface; /** * Verifies that a validator satisfies the API of Symfony < 2.5. * - * @since 2.5 - * * @author Bernhard Schussek * @group legacy */ diff --git a/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php index 678a3252a5..7359348432 100644 --- a/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php @@ -23,8 +23,6 @@ use Symfony\Component\Validator\Tests\Fixtures\GroupSequenceProviderEntity; use Symfony\Component\Validator\Tests\Fixtures\Reference; /** - * @since 2.5 - * * @author Bernhard Schussek */ abstract class AbstractValidatorTest extends \PHPUnit_Framework_TestCase diff --git a/src/Symfony/Component/Validator/Util/PropertyPath.php b/src/Symfony/Component/Validator/Util/PropertyPath.php index 3ef8a8b1dc..52546c5ea9 100644 --- a/src/Symfony/Component/Validator/Util/PropertyPath.php +++ b/src/Symfony/Component/Validator/Util/PropertyPath.php @@ -16,8 +16,6 @@ namespace Symfony\Component\Validator\Util; * * For more extensive functionality, use Symfony's PropertyAccess component. * - * @since 2.5 - * * @author Bernhard Schussek */ class PropertyPath diff --git a/src/Symfony/Component/Validator/Validator/ContextualValidatorInterface.php b/src/Symfony/Component/Validator/Validator/ContextualValidatorInterface.php index 048d6c7545..7d7ebe73b0 100644 --- a/src/Symfony/Component/Validator/Validator/ContextualValidatorInterface.php +++ b/src/Symfony/Component/Validator/Validator/ContextualValidatorInterface.php @@ -17,8 +17,6 @@ use Symfony\Component\Validator\ConstraintViolationListInterface; /** * A validator in a specific execution context. * - * @since 2.5 - * * @author Bernhard Schussek */ interface ContextualValidatorInterface diff --git a/src/Symfony/Component/Validator/Validator/LegacyValidator.php b/src/Symfony/Component/Validator/Validator/LegacyValidator.php index e35f4c9140..588baa9013 100644 --- a/src/Symfony/Component/Validator/Validator/LegacyValidator.php +++ b/src/Symfony/Component/Validator/Validator/LegacyValidator.php @@ -16,8 +16,6 @@ namespace Symfony\Component\Validator\Validator; /** * A validator that supports both the API of Symfony < 2.5 and Symfony 2.5+. * - * @since 2.5 - * * @author Bernhard Schussek * * @see \Symfony\Component\Validator\ValidatorInterface diff --git a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php index e27f6f637f..ebbc6a3883 100644 --- a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php +++ b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php @@ -33,8 +33,6 @@ use Symfony\Component\Validator\Util\PropertyPath; /** * Recursive implementation of {@link ContextualValidatorInterface}. * - * @since 2.5 - * * @author Bernhard Schussek */ class RecursiveContextualValidator implements ContextualValidatorInterface diff --git a/src/Symfony/Component/Validator/Validator/RecursiveValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveValidator.php index e4dc0fb057..abd29087bc 100644 --- a/src/Symfony/Component/Validator/Validator/RecursiveValidator.php +++ b/src/Symfony/Component/Validator/Validator/RecursiveValidator.php @@ -24,8 +24,6 @@ use Symfony\Component\Validator\ValidatorInterface as LegacyValidatorInterface; /** * Recursive implementation of {@link ValidatorInterface}. * - * @since 2.5 - * * @author Bernhard Schussek */ class RecursiveValidator implements ValidatorInterface, LegacyValidatorInterface diff --git a/src/Symfony/Component/Validator/Validator/ValidatorInterface.php b/src/Symfony/Component/Validator/Validator/ValidatorInterface.php index 1cc9c6dd55..e9576f5ece 100644 --- a/src/Symfony/Component/Validator/Validator/ValidatorInterface.php +++ b/src/Symfony/Component/Validator/Validator/ValidatorInterface.php @@ -19,8 +19,6 @@ use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface; /** * Validates PHP values against constraints. * - * @since 2.5 - * * @author Bernhard Schussek */ interface ValidatorInterface extends MetadataFactoryInterface diff --git a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php index cceb6dea98..bf887a08ec 100644 --- a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php +++ b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php @@ -20,8 +20,6 @@ use Symfony\Component\Validator\Util\PropertyPath; /** * Default implementation of {@link ConstraintViolationBuilderInterface}. * - * @since 2.5 - * * @author Bernhard Schussek * * @internal You should not instantiate or use this class. Code against diff --git a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php index b7cc2ecfcd..fe5eaa3321 100644 --- a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php +++ b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php @@ -19,8 +19,6 @@ namespace Symfony\Component\Validator\Violation; * Finally, call {@link addViolation()} to add the violation to the current * execution context. * - * @since 2.5 - * * @author Bernhard Schussek */ interface ConstraintViolationBuilderInterface From b08897842c2b09fe7793f8fe81d07fcd70a10659 Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Mon, 4 Jul 2016 13:11:13 +0200 Subject: [PATCH 7/8] [HttpKernel] Clarify deprecation of non-scalar values in surrogate renderer Update UPGRADE-3.1 too Use non-scalar values as deperecated type Update UPGRADE-4.0 too --- UPGRADE-3.1.md | 4 ++-- UPGRADE-4.0.md | 6 +++--- .../Fragment/AbstractSurrogateFragmentRenderer.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/UPGRADE-3.1.md b/UPGRADE-3.1.md index ca60dcbf81..b9163cfff3 100644 --- a/UPGRADE-3.1.md +++ b/UPGRADE-3.1.md @@ -95,9 +95,9 @@ FrameworkBundle HttpKernel ---------- - * Passing objects as URI attributes to the ESI and SSI renderers has been + * Passing non-scalar values as URI attributes to the ESI and SSI renderers has been deprecated and will be removed in Symfony 4.0. The inline fragment - renderer should be used with object attributes. + renderer should be used with non-scalar attributes. * The `ControllerResolver::getArguments()` method has been deprecated and will be removed in 4.0. If you have your own `ControllerResolverInterface` diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md index dbd9c35c44..98e8521520 100644 --- a/UPGRADE-4.0.md +++ b/UPGRADE-4.0.md @@ -84,9 +84,9 @@ FrameworkBundle HttpKernel ---------- - * Possibility to pass objects as URI attributes to the ESI and SSI renderers - has been removed. The inline fragment renderer should be used with object - attributes. + * Possibility to pass non-scalar values as URI attributes to the ESI and SSI + renderers has been removed. The inline fragment renderer should be used with + non-scalar attributes. * The `ControllerResolver::getArguments()` method has been removed. If you have your own `ControllerResolverInterface` implementation, you should diff --git a/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php index 8292fa48a1..0d4d26b676 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php +++ b/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php @@ -65,7 +65,7 @@ abstract class AbstractSurrogateFragmentRenderer extends RoutableFragmentRendere { if (!$this->surrogate || !$this->surrogate->hasSurrogateCapability($request)) { if ($uri instanceof ControllerReference && $this->containsNonScalars($uri->attributes)) { - @trigger_error('Passing objects as part of URI attributes to the ESI and SSI rendering strategies is deprecated since version 3.1, and will be removed in 4.0. Use a different rendering strategy or pass scalar values.', E_USER_DEPRECATED); + @trigger_error('Passing non-scalar values as part of URI attributes to the ESI and SSI rendering strategies is deprecated since version 3.1, and will be removed in 4.0. Use a different rendering strategy or pass scalar values.', E_USER_DEPRECATED); } return $this->inlineStrategy->render($uri, $request, $options); From ab9daeba1333a084081f062d8415e3681cfc12e8 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 5 Jul 2016 08:40:30 +0200 Subject: [PATCH 8/8] [VarDumper] Fix indentation trimming in ExceptionCaster --- .../VarDumper/Caster/ExceptionCaster.php | 25 +++++++++++-------- .../Tests/Caster/ReflectionCasterTest.php | 4 +-- .../VarDumper/Tests/CliDumperTest.php | 2 +- .../VarDumper/Tests/Fixtures/Twig.php | 2 +- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php index 51c70dd5db..2daffea8af 100644 --- a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php +++ b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php @@ -253,19 +253,24 @@ class ExceptionCaster } $ltrim = 0; - while (' ' === $src[0][$ltrim] || "\t" === $src[0][$ltrim]) { - $i = $srcContext << 1; - while ($i > 0 && $src[0][$ltrim] === $src[$i][$ltrim]) { - --$i; - } - if ($i) { - break; + do { + $pad = null; + for ($i = $srcContext << 1; $i >= 0; --$i) { + if (isset($src[$i][$ltrim]) && "\r" !== ($c = $src[$i][$ltrim]) && "\n" !== $c) { + if (null === $pad) { + $pad = $c; + } + if ((' ' !== $c && "\t" !== $c) || $pad !== $c) { + break; + } + } } ++$ltrim; - } - if ($ltrim) { + } while (0 > $i && null !== $pad); + + if (--$ltrim) { foreach ($src as $i => $line) { - $src[$i] = substr($line, $ltrim); + $src[$i] = isset($line[$ltrim]) && "\r" !== $line[$ltrim] ? substr($line, $ltrim) : ltrim($line, " \t"); } } diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php index 52eae49fb0..a716bbabd6 100644 --- a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php @@ -208,8 +208,8 @@ array:2 [ executing: { Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo(): { %sGeneratorDemo.php:10: """ - yield 1;\n - }\n + yield 1;\n + }\n \n """ } diff --git a/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php index b00c0d435b..54a9cdc113 100644 --- a/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php +++ b/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php @@ -200,7 +200,7 @@ EOTXT $twig = << 2); } } -/* foo bar*/ +/* foo bar*/ /* twig source*/ /* */