From cfebe47000d2a56129d1f953c4fb489aeb3e532a Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Thu, 2 May 2013 19:49:45 +0200 Subject: [PATCH 1/9] Fix wrong method in findTaggedServiceIds(), add example to docblock. --- .../DependencyInjection/ContainerBuilder.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index a43e08c7fe..0bff46a2d7 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -848,9 +848,20 @@ class ContainerBuilder extends Container implements TaggedContainerInterface /** * Returns service ids for a given tag. * + * Example: + * + * $container->register('foo')->addTag('my.tag', array('hello' => 'world')); + * + * $serviceIds = $container->findTaggedServiceIds('my.tag'); + * foreach ($serviceIds as $serviceId => $tags) { + * foreach ($tags as $tag) { + * echo $tag['hello']; + * } + * } + * * @param string $name The tag name * - * @return array An array of tags + * @return array An array of tags with the tagged service as key, holding a list of attribute arrays. * * @api */ @@ -858,7 +869,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface { $tags = array(); foreach ($this->getDefinitions() as $id => $definition) { - if ($definition->getTag($name)) { + if ($definition->hasTag($name)) { $tags[$id] = $definition->getTag($name); } } From dcced01fd5667593b67f67cd627ba1f4f0ac903e Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Thu, 2 May 2013 11:57:20 +0200 Subject: [PATCH 2/9] [Form] Improved multi-byte handling of NumberToLocalizedStringTransformer --- .../NumberToLocalizedStringTransformer.php | 31 +++- ...NumberToLocalizedStringTransformerTest.php | 142 +++++++++++++++--- 2 files changed, 141 insertions(+), 32 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php index b5cdae110d..7c21249fad 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php @@ -80,6 +80,9 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface throw new TransformationFailedException($formatter->getErrorMessage()); } + // Convert fixed spaces to normal ones + $value = str_replace("\xc2\xa0", ' ', $value); + return $value; } @@ -130,19 +133,31 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface throw new TransformationFailedException('I don\'t have a clear idea what infinity looks like'); } + if (function_exists('mb_detect_encoding') && false !== $encoding = mb_detect_encoding($value)) { + $strlen = function ($string) use ($encoding) { + return mb_strlen($string, $encoding); + }; + $substr = function ($string, $offset, $length) use ($encoding) { + return mb_substr($string, $offset, $length, $encoding); + }; + } else { + $strlen = 'strlen'; + $substr = 'substr'; + } + + $length = $strlen($value); + // After parsing, position holds the index of the character where the // parsing stopped - if ($position < strlen($value)) { + if ($position < $length) { // Check if there are unrecognized characters at the end of the - // number - $remainder = substr($value, $position); + // number (excluding whitespace characters) + $remainder = trim($substr($value, $position, $length), " \t\n\r\0\x0b\xc2\xa0"); - // Remove all whitespace characters - if ('' !== preg_replace('/[\s\xc2\xa0]*/', '', $remainder)) { + if ('' !== $remainder) { throw new TransformationFailedException( - sprintf('The number contains unrecognized characters: "%s"', - $remainder - )); + sprintf('The number contains unrecognized characters: "%s"', $remainder) + ); } } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php index 151dbc80f6..09af7243d6 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php @@ -22,29 +22,52 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase \Locale::setDefault('de_AT'); } - public function testTransform() + public function provideTransformations() { - $transformer = new NumberToLocalizedStringTransformer(); - - $this->assertEquals('1', $transformer->transform(1)); - $this->assertEquals('1,5', $transformer->transform(1.5)); - $this->assertEquals('1234,5', $transformer->transform(1234.5)); - $this->assertEquals('12345,912', $transformer->transform(12345.9123)); + return array( + array(null, '', 'de_AT'), + array(1, '1', 'de_AT'), + array(1.5, '1,5', 'de_AT'), + array(1234.5, '1234,5', 'de_AT'), + array(12345.912, '12345,912', 'de_AT'), + array(1234.5, '1234,5', 'ru'), + array(1234.5, '1234,5', 'fi'), + ); } - public function testTransformEmpty() + /** + * @dataProvider provideTransformations + */ + public function testTransform($from, $to, $locale) { + \Locale::setDefault($locale); + $transformer = new NumberToLocalizedStringTransformer(); - $this->assertSame('', $transformer->transform(null)); + $this->assertSame($to, $transformer->transform($from)); } - public function testTransformWithGrouping() + public function provideTransformationsWithGrouping() { + return array( + array(1234.5, '1.234,5', 'de_AT'), + array(12345.912, '12.345,912', 'de_AT'), + array(1234.5, '1 234,5', 'fr'), + array(1234.5, '1 234,5', 'ru'), + array(1234.5, '1 234,5', 'fi'), + ); + } + + /** + * @dataProvider provideTransformationsWithGrouping + */ + public function testTransformWithGrouping($from, $to, $locale) + { + \Locale::setDefault($locale); + $transformer = new NumberToLocalizedStringTransformer(null, true); - $this->assertEquals('1.234,5', $transformer->transform(1234.5)); - $this->assertEquals('12.345,912', $transformer->transform(12345.9123)); + $this->assertSame($to, $transformer->transform($from)); } public function testTransformWithPrecision() @@ -65,30 +88,48 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase } - public function testReverseTransform() + /** + * @dataProvider provideTransformations + */ + public function testReverseTransform($to, $from, $locale) { + \Locale::setDefault($locale); + $transformer = new NumberToLocalizedStringTransformer(); - $this->assertEquals(1, $transformer->reverseTransform('1')); - $this->assertEquals(1.5, $transformer->reverseTransform('1,5')); - $this->assertEquals(1234.5, $transformer->reverseTransform('1234,5')); - $this->assertEquals(12345.912, $transformer->reverseTransform('12345,912')); + $this->assertEquals($to, $transformer->reverseTransform($from)); } - public function testReverseTransformEmpty() + /** + * @dataProvider provideTransformationsWithGrouping + */ + public function testReverseTransformWithGrouping($to, $from, $locale) { - $transformer = new NumberToLocalizedStringTransformer(); + \Locale::setDefault($locale); - $this->assertNull($transformer->reverseTransform('')); + $transformer = new NumberToLocalizedStringTransformer(null, true); + + $this->assertEquals($to, $transformer->reverseTransform($from)); } - public function testReverseTransformWithGrouping() + // https://github.com/symfony/symfony/issues/7609 + public function testReverseTransformWithGroupingAndFixedSpaces() + { + if (!extension_loaded('mbstring')) { + $this->markTestSkipped('The "mbstring" extension is required for this test.'); + } + + \Locale::setDefault('ru'); + + $transformer = new NumberToLocalizedStringTransformer(null, true); + + $this->assertEquals(1234.5, $transformer->reverseTransform("1\xc2\xa0234,5")); + } + + public function testReverseTransformWithGroupingButWithoutGroupSeparator() { $transformer = new NumberToLocalizedStringTransformer(null, true); - // completely valid format - $this->assertEquals(1234.5, $transformer->reverseTransform('1.234,5')); - $this->assertEquals(12345.912, $transformer->reverseTransform('12.345,912')); // omit group separator $this->assertEquals(1234.5, $transformer->reverseTransform('1234,5')); $this->assertEquals(12345.912, $transformer->reverseTransform('12345,912')); @@ -299,6 +340,7 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase /** * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException + * @expectedExceptionMessage The number contains unrecognized characters: "foo3" */ public function testReverseTransformDisallowsCenteredExtraCharacters() { @@ -309,6 +351,41 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase /** * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException + * @expectedExceptionMessage The number contains unrecognized characters: "foo8" + */ + public function testReverseTransformDisallowsCenteredExtraCharactersMultibyte() + { + if (!extension_loaded('mbstring')) { + $this->markTestSkipped('The "mbstring" extension is required for this test.'); + } + + \Locale::setDefault('ru'); + + $transformer = new NumberToLocalizedStringTransformer(null, true); + + $transformer->reverseTransform("12\xc2\xa0345,67foo8"); + } + + /** + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException + * @expectedExceptionMessage The number contains unrecognized characters: "foo8" + */ + public function testReverseTransformIgnoresTrailingSpacesInExceptionMessage() + { + if (!extension_loaded('mbstring')) { + $this->markTestSkipped('The "mbstring" extension is required for this test.'); + } + + \Locale::setDefault('ru'); + + $transformer = new NumberToLocalizedStringTransformer(null, true); + + $transformer->reverseTransform("12\xc2\xa0345,67foo8 \xc2\xa0\t"); + } + + /** + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException + * @expectedExceptionMessage The number contains unrecognized characters: "foo" */ public function testReverseTransformDisallowsTrailingExtraCharacters() { @@ -316,4 +393,21 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase $transformer->reverseTransform('123foo'); } + + /** + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException + * @expectedExceptionMessage The number contains unrecognized characters: "foo" + */ + public function testReverseTransformDisallowsTrailingExtraCharactersMultibyte() + { + if (!extension_loaded('mbstring')) { + $this->markTestSkipped('The "mbstring" extension is required for this test.'); + } + + \Locale::setDefault('ru'); + + $transformer = new NumberToLocalizedStringTransformer(null, true); + + $transformer->reverseTransform("12\xc2\xa0345,678foo"); + } } From 0610750378f78f3c402d74bcee2e94184d95809c Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Thu, 2 May 2013 17:25:58 +0200 Subject: [PATCH 3/9] if the repository method returns an array ensure that it's internal poin... --- .../Constraints/UniqueValidatorTest.php | 25 +++++++++++++++++++ .../Constraints/UniqueEntityValidator.php | 2 ++ 2 files changed, 27 insertions(+) diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php index ed21bb0601..efedfd9244 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php @@ -294,6 +294,31 @@ class UniqueValidatorTest extends DoctrineOrmTestCase $this->assertEquals(0, $violationsList->count(), 'Violation is using custom repository method.'); } + public function testValidateUniquenessWithUnrewoundArray() + { + $entity = new SingleIdentEntity(1, 'foo'); + + $entityManagerName = 'foo'; + $repository = $this->createRepositoryMock(); + $repository->expects($this->once()) + ->method('findByCustom') + ->will( + $this->returnCallback(function() use ($entity) { + $returnValue = array( + $entity, + ); + next($returnValue); + return $returnValue; + }) + ) + ; + $em = $this->createEntityManagerMock($repository); + $validator = $this->createValidator($entityManagerName, $em, null, array(), null, 'findByCustom'); + + $violationsList = $validator->validate($entity); + $this->assertCount(0, $violationsList, 'Violation is using unrewound array as return value in the repository method.'); + } + /** * @group GH-1635 */ diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php index 2fca73fb60..440b5c1d32 100644 --- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php +++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php @@ -108,6 +108,8 @@ class UniqueEntityValidator extends ConstraintValidator */ if ($result instanceof \Iterator) { $result->rewind(); + } elseif (is_array($result)) { + reset($result); } /* If no entity matched the query criteria or a single entity matched, From 7b2ebbfa4120f079bbc8eb8d0b46821d30c05d74 Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Fri, 3 May 2013 12:12:06 +0200 Subject: [PATCH 4/9] [Form] Fixed: String validation groups are never interpreted as callbacks --- .../Validator/Constraints/FormValidator.php | 2 +- .../Constraints/FormValidatorTest.php | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php index 65e54f6feb..c0c2085b9b 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php +++ b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php @@ -181,7 +181,7 @@ class FormValidator extends ConstraintValidator $groups = $form->getConfig()->getOption('validation_groups'); if (null !== $groups) { - if (is_callable($groups)) { + if (!is_string($groups) && is_callable($groups)) { $groups = call_user_func($groups, $form); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php index b79fd5d41b..b6e3f82c4d 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php @@ -302,6 +302,24 @@ class FormValidatorTest extends \PHPUnit_Framework_TestCase $this->validator->validate($form, new Form()); } + public function testDontExecuteFunctionNames() + { + $context = $this->getExecutionContext(); + $graphWalker = $context->getGraphWalker(); + $object = $this->getMock('\stdClass'); + $options = array('validation_groups' => 'header'); + $form = $this->getBuilder('name', '\stdClass', $options) + ->setData($object) + ->getForm(); + + $graphWalker->expects($this->once()) + ->method('walkReference') + ->with($object, 'header', 'data', true); + + $this->validator->initialize($context); + $this->validator->validate($form, new Form()); + } + public function testHandleClosureValidationGroups() { $context = $this->getExecutionContext(); From bcb540021a22b1c73957f18f420f2b9024dab464 Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Fri, 3 May 2013 10:51:22 +0200 Subject: [PATCH 5/9] [Form] Fixed transform()/reverseTransform() to always throw TransformationFailedExceptions --- .../CollectionToArrayTransformer.php | 6 ++- .../CollectionToArrayTransformer.php | 6 +-- .../CollectionToArrayTransformerTest.php | 4 +- .../Form/DataTransformerInterface.php | 8 ++-- .../ArrayToPartsTransformer.php | 5 +-- .../BooleanToStringTransformer.php | 10 ++--- .../ChoiceToBooleanArrayTransformer.php | 16 ++++---- .../ChoiceToValueTransformer.php | 3 +- .../ChoicesToBooleanArrayTransformer.php | 20 +++++----- .../ChoicesToValuesTransformer.php | 12 +++--- .../DataTransformer/DataTransformerChain.php | 8 ++-- .../DateTimeToArrayTransformer.php | 23 +++++------ .../DateTimeToLocalizedStringTransformer.php | 20 +++++----- .../DateTimeToRfc3339Transformer.php | 5 +-- .../DateTimeToStringTransformer.php | 18 ++++----- .../DateTimeToTimestampTransformer.php | 18 ++++----- .../IntegerToLocalizedStringTransformer.php | 3 +- .../MoneyToLocalizedStringTransformer.php | 12 +++--- .../NumberToLocalizedStringTransformer.php | 13 +++---- .../PercentToLocalizedStringTransformer.php | 12 +++--- .../ValueToDuplicatesTransformer.php | 7 ++-- .../ArrayToPartsTransformerTest.php | 6 +-- .../BooleanToStringTransformerTest.php | 4 +- .../ChoiceToValueTransformerTest.php | 2 +- .../ChoicesToValuesTransformerTest.php | 4 +- .../DateTimeToArrayTransformerTest.php | 38 +++++++++---------- ...teTimeToLocalizedStringTransformerTest.php | 4 +- .../DateTimeToRfc3339TransformerTest.php | 8 ++-- .../DateTimeToStringTransformerTest.php | 4 +- .../DateTimeToTimestampTransformerTest.php | 4 +- ...ntegerToLocalizedStringTransformerTest.php | 12 +++--- .../MoneyToLocalizedStringTransformerTest.php | 4 +- ...NumberToLocalizedStringTransformerTest.php | 4 +- ...ercentToLocalizedStringTransformerTest.php | 4 +- .../ValueToDuplicatesTransformerTest.php | 6 +-- 35 files changed, 164 insertions(+), 169 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php b/src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php index 2c1e7fefbb..6392474ff1 100644 --- a/src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php +++ b/src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php @@ -11,7 +11,7 @@ namespace Symfony\Bridge\Doctrine\Form\DataTransformer; -use Symfony\Component\Form\Exception\UnexpectedTypeException; +use Symfony\Component\Form\Exception\TransformationFailedException; use Symfony\Component\Form\DataTransformerInterface; use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ArrayCollection; @@ -27,6 +27,8 @@ class CollectionToArrayTransformer implements DataTransformerInterface * @param Collection $collection A collection of entities * * @return mixed An array of entities + * + * @throws TransformationFailedException */ public function transform($collection) { @@ -35,7 +37,7 @@ class CollectionToArrayTransformer implements DataTransformerInterface } if (!$collection instanceof Collection) { - throw new UnexpectedTypeException($collection, 'Doctrine\Common\Collections\Collection'); + throw new TransformationFailedException('Expected a Doctrine\Common\Collections\Collection object.'); } return $collection->toArray(); diff --git a/src/Symfony/Bridge/Propel1/Form/DataTransformer/CollectionToArrayTransformer.php b/src/Symfony/Bridge/Propel1/Form/DataTransformer/CollectionToArrayTransformer.php index 9d3b61f712..a9671cc815 100644 --- a/src/Symfony/Bridge/Propel1/Form/DataTransformer/CollectionToArrayTransformer.php +++ b/src/Symfony/Bridge/Propel1/Form/DataTransformer/CollectionToArrayTransformer.php @@ -13,7 +13,7 @@ namespace Symfony\Bridge\Propel1\Form\DataTransformer; use \PropelObjectCollection; use Symfony\Component\Form\DataTransformerInterface; -use Symfony\Component\Form\Exception\UnexpectedTypeException; +use Symfony\Component\Form\Exception\TransformationFailedException; /** * CollectionToArrayTransformer class. @@ -30,7 +30,7 @@ class CollectionToArrayTransformer implements DataTransformerInterface } if (!$collection instanceof PropelObjectCollection) { - throw new UnexpectedTypeException($collection, '\PropelObjectCollection'); + throw new TransformationFailedException('Expected a \PropelObjectCollection.'); } return $collection->getData(); @@ -45,7 +45,7 @@ class CollectionToArrayTransformer implements DataTransformerInterface } if (!is_array($array)) { - throw new UnexpectedTypeException($array, 'array'); + throw new TransformationFailedException('Expected an array.'); } $collection->setData($array); diff --git a/src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php b/src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php index 625b74806e..13a9f7ffd6 100644 --- a/src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php +++ b/src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php @@ -47,7 +47,7 @@ class CollectionToArrayTransformerTest extends Propel1TestCase } /** - * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testTransformThrowsExceptionIfNotPropelObjectCollection() { @@ -84,7 +84,7 @@ class CollectionToArrayTransformerTest extends Propel1TestCase } /** - * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformThrowsExceptionIfNotArray() { diff --git a/src/Symfony/Component/Form/DataTransformerInterface.php b/src/Symfony/Component/Form/DataTransformerInterface.php index 07183d54b3..432dd36295 100644 --- a/src/Symfony/Component/Form/DataTransformerInterface.php +++ b/src/Symfony/Component/Form/DataTransformerInterface.php @@ -14,7 +14,7 @@ namespace Symfony\Component\Form; /** * Transforms a value between different representations. * - * @author Bernhard Schussek + * @author Bernhard Schussek */ interface DataTransformerInterface { @@ -43,8 +43,7 @@ interface DataTransformerInterface * * @return mixed The value in the transformed representation * - * @throws UnexpectedTypeException when the argument is not a string - * @throws TransformationFailedException when the transformation fails + * @throws \Symfony\Component\Form\Exception\TransformationFailedException When the transformation fails. */ public function transform($value); @@ -70,8 +69,7 @@ interface DataTransformerInterface * * @return mixed The value in the original representation * - * @throws UnexpectedTypeException when the argument is not of the expected type - * @throws TransformationFailedException when the transformation fails + * @throws \Symfony\Component\Form\Exception\TransformationFailedException When the transformation fails. */ public function reverseTransform($value); } diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToPartsTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToPartsTransformer.php index da5737037f..fc080f25c1 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToPartsTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToPartsTransformer.php @@ -13,7 +13,6 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; use Symfony\Component\Form\DataTransformerInterface; use Symfony\Component\Form\Exception\TransformationFailedException; -use Symfony\Component\Form\Exception\UnexpectedTypeException; /** * @author Bernhard Schussek @@ -34,7 +33,7 @@ class ArrayToPartsTransformer implements DataTransformerInterface } if (!is_array($array) ) { - throw new UnexpectedTypeException($array, 'array'); + throw new TransformationFailedException('Expected an array.'); } $result = array(); @@ -53,7 +52,7 @@ class ArrayToPartsTransformer implements DataTransformerInterface public function reverseTransform($array) { if (!is_array($array) ) { - throw new UnexpectedTypeException($array, 'array'); + throw new TransformationFailedException('Expected an array.'); } $result = array(); diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php index e902d89e0c..95e7332d3e 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; use Symfony\Component\Form\DataTransformerInterface; -use Symfony\Component\Form\Exception\UnexpectedTypeException; +use Symfony\Component\Form\Exception\TransformationFailedException; /** * Transforms between a Boolean and a string. @@ -45,7 +45,7 @@ class BooleanToStringTransformer implements DataTransformerInterface * * @return string String value. * - * @throws UnexpectedTypeException if the given value is not a Boolean + * @throws TransformationFailedException If the given value is not a Boolean. */ public function transform($value) { @@ -54,7 +54,7 @@ class BooleanToStringTransformer implements DataTransformerInterface } if (!is_bool($value)) { - throw new UnexpectedTypeException($value, 'Boolean'); + throw new TransformationFailedException('Expected a Boolean.'); } return true === $value ? $this->trueValue : null; @@ -67,7 +67,7 @@ class BooleanToStringTransformer implements DataTransformerInterface * * @return Boolean Boolean value. * - * @throws UnexpectedTypeException if the given value is not a string + * @throws TransformationFailedException If the given value is not a string. */ public function reverseTransform($value) { @@ -76,7 +76,7 @@ class BooleanToStringTransformer implements DataTransformerInterface } if (!is_string($value)) { - throw new UnexpectedTypeException($value, 'string'); + throw new TransformationFailedException('Expected a string.'); } return true; diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php index 7e6203c64d..b8aa95effc 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php @@ -14,7 +14,6 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface; use Symfony\Component\Form\DataTransformerInterface; use Symfony\Component\Form\Exception\TransformationFailedException; -use Symfony\Component\Form\Exception\UnexpectedTypeException; /** * @author Bernhard Schussek @@ -42,12 +41,12 @@ class ChoiceToBooleanArrayTransformer implements DataTransformerInterface * as select tag, the value is not modified. * * @param mixed $choice An array if "multiple" is set to true, a scalar - * value otherwise. + * value otherwise. * * @return mixed An array * - * @throws UnexpectedTypeException if the given value is not scalar - * @throws TransformationFailedException if the choices can not be retrieved + * @throws TransformationFailedException If the given value is not scalar or + * if the choices can not be retrieved. */ public function transform($choice) { @@ -77,14 +76,15 @@ class ChoiceToBooleanArrayTransformer implements DataTransformerInterface * * @return mixed A scalar value * - * @throws UnexpectedTypeException if the given value is not an array - * @throws TransformationFailedException if the recuperation of the choices fails or - * if some choice can't be found + * @throws TransformationFailedException If the given value is not an array, + * if the recuperation of the choices + * fails or if some choice can't be + * found. */ public function reverseTransform($values) { if (!is_array($values)) { - throw new UnexpectedTypeException($values, 'array'); + throw new TransformationFailedException('Expected an array.'); } try { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php index dfab6ec454..887201ab6c 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; use Symfony\Component\Form\DataTransformerInterface; -use Symfony\Component\Form\Exception\UnexpectedTypeException; use Symfony\Component\Form\Exception\TransformationFailedException; use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface; @@ -41,7 +40,7 @@ class ChoiceToValueTransformer implements DataTransformerInterface public function reverseTransform($value) { if (null !== $value && !is_scalar($value)) { - throw new UnexpectedTypeException($value, 'scalar'); + throw new TransformationFailedException('Expected a scalar.'); } // These are now valid ChoiceList values, so we can return null diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php index 9c3b6475d1..0c2ea3a394 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php @@ -14,7 +14,6 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface; use Symfony\Component\Form\DataTransformerInterface; use Symfony\Component\Form\Exception\TransformationFailedException; -use Symfony\Component\Form\Exception\UnexpectedTypeException; /** * @author Bernhard Schussek @@ -40,8 +39,8 @@ class ChoicesToBooleanArrayTransformer implements DataTransformerInterface * * @return mixed An array * - * @throws UnexpectedTypeException if the given value is not an array - * @throws TransformationFailedException if the choices can not be retrieved + * @throws TransformationFailedException If the given value is not an array + * or if the choices can not be retrieved. */ public function transform($array) { @@ -50,7 +49,7 @@ class ChoicesToBooleanArrayTransformer implements DataTransformerInterface } if (!is_array($array)) { - throw new UnexpectedTypeException($array, 'array'); + throw new TransformationFailedException('Expected an array.'); } try { @@ -79,14 +78,15 @@ class ChoicesToBooleanArrayTransformer implements DataTransformerInterface * * @return mixed An array * - * @throws UnexpectedTypeException if the given value is not an array - * @throws TransformationFailedException if the recuperation of the choices fails or - * if some choice can't be found + * @throws TransformationFailedException If the given value is not an array, + * if the recuperation of the choices + * fails or if some choice can't be + * found. */ public function reverseTransform($values) { if (!is_array($values)) { - throw new UnexpectedTypeException($values, 'array'); + throw new TransformationFailedException('Expected an array.'); } try { @@ -109,7 +109,9 @@ class ChoicesToBooleanArrayTransformer implements DataTransformerInterface } if (count($unknown) > 0) { - throw new TransformationFailedException('The choices "' . implode('", "', $unknown) . '" were not found'); + throw new TransformationFailedException( + sprintf('The choices "%s" were not found', implode('", "', $unknown)) + ); } return $result; diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php index e72fcf097e..4492865e5a 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php @@ -14,7 +14,6 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; use Symfony\Component\Form\Exception\TransformationFailedException; use Symfony\Component\Form\DataTransformerInterface; -use Symfony\Component\Form\Exception\UnexpectedTypeException; use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface; /** @@ -39,7 +38,7 @@ class ChoicesToValuesTransformer implements DataTransformerInterface * * @return array * - * @throws UnexpectedTypeException if the given value is not an array + * @throws TransformationFailedException If the given value is not an array. */ public function transform($array) { @@ -48,7 +47,7 @@ class ChoicesToValuesTransformer implements DataTransformerInterface } if (!is_array($array)) { - throw new UnexpectedTypeException($array, 'array'); + throw new TransformationFailedException('Expected an array.'); } return $this->choiceList->getValuesForChoices($array); @@ -59,8 +58,9 @@ class ChoicesToValuesTransformer implements DataTransformerInterface * * @return array * - * @throws UnexpectedTypeException if the given value is not an array - * @throws TransformationFailedException if could not find all matching choices for the given values + * @throws TransformationFailedException If the given value is not an array + * or if no matching choice could be + * found for some given value. */ public function reverseTransform($array) { @@ -69,7 +69,7 @@ class ChoicesToValuesTransformer implements DataTransformerInterface } if (!is_array($array)) { - throw new UnexpectedTypeException($array, 'array'); + throw new TransformationFailedException('Expected an array.'); } $choices = $this->choiceList->getChoicesForValues($array); diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php index 7d434434b9..ec466e1f94 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php @@ -22,7 +22,7 @@ class DataTransformerChain implements DataTransformerInterface { /** * The value transformers - * @var array + * @var DataTransformerInterface[] */ protected $transformers; @@ -48,8 +48,7 @@ class DataTransformerChain implements DataTransformerInterface * * @return mixed The transformed value * - * @throws Symfony\Component\Form\Exception\TransformationFailedException - * @throws Symfony\Component\Form\Exception\UnexpectedTypeException + * @throws \Symfony\Component\Form\Exception\TransformationFailedException */ public function transform($value) { @@ -73,8 +72,7 @@ class DataTransformerChain implements DataTransformerInterface * * @return mixed The reverse-transformed value * - * @throws Symfony\Component\Form\Exception\TransformationFailedException - * @throws Symfony\Component\Form\Exception\UnexpectedTypeException + * @throws \Symfony\Component\Form\Exception\TransformationFailedException */ public function reverseTransform($value) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php index 873a596586..eb4ebec9cd 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; use Symfony\Component\Form\Exception\TransformationFailedException; -use Symfony\Component\Form\Exception\UnexpectedTypeException; /** * Transforms between a normalized time and a localized time string/array. @@ -34,7 +33,7 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer * @param array $fields The date fields * @param Boolean $pad Whether to use padding * - * @throws UnexpectedTypeException if a timezone is not a string + * @throws \Symfony\Component\Form\Exception\UnexpectedTypeException if a timezone is not a string */ public function __construct($inputTimezone = null, $outputTimezone = null, array $fields = null, $pad = false) { @@ -51,12 +50,13 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer /** * Transforms a normalized date into a localized date. * - * @param DateTime $dateTime Normalized date. + * @param \DateTime $dateTime Normalized date. * * @return array Localized date. * - * @throws UnexpectedTypeException if the given value is not an instance of \DateTime - * @throws TransformationFailedException if the output timezone is not supported + * @throws TransformationFailedException If the given value is not an + * instance of \DateTime or if the + * output timezone is not supported. */ public function transform($dateTime) { @@ -72,7 +72,7 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer } if (!$dateTime instanceof \DateTime) { - throw new UnexpectedTypeException($dateTime, '\DateTime'); + throw new TransformationFailedException('Expected a \DateTime.'); } $dateTime = clone $dateTime; @@ -108,11 +108,12 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer * * @param array $value Localized date * - * @return DateTime Normalized date + * @return \DateTime Normalized date * - * @throws UnexpectedTypeException if the given value is not an array - * @throws TransformationFailedException if the value could not be transformed - * @throws TransformationFailedException if the input timezone is not supported + * @throws TransformationFailedException If the given value is not an array, + * if the value could not be transformed + * or if the input timezone is not + * supported. */ public function reverseTransform($value) { @@ -121,7 +122,7 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer } if (!is_array($value)) { - throw new UnexpectedTypeException($value, 'array'); + throw new TransformationFailedException('Expected an array.'); } if ('' === implode('', $value)) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php index 673fd5fde2..bcf877beca 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php @@ -39,8 +39,7 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer * @param integer $calendar One of the \IntlDateFormatter calendar constants * @param string $pattern A pattern to pass to \IntlDateFormatter * - * @throws UnexpectedTypeException If a format is not supported - * @throws UnexpectedTypeException if a timezone is not a string + * @throws UnexpectedTypeException If a format is not supported or if a timezone is not a string */ public function __construct($inputTimezone = null, $outputTimezone = null, $dateFormat = null, $timeFormat = null, $calendar = \IntlDateFormatter::GREGORIAN, $pattern = null) { @@ -73,10 +72,11 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer * * @param \DateTime $dateTime Normalized date. * - * @return string|array Localized date string/array. + * @return string|array Localized date string/array. * - * @throws UnexpectedTypeException if the given value is not an instance of \DateTime - * @throws TransformationFailedException if the date could not be transformed + * @throws TransformationFailedException If the given value is not an instance + * of \DateTime or if the date could not + * be transformed. */ public function transform($dateTime) { @@ -85,7 +85,7 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer } if (!$dateTime instanceof \DateTime) { - throw new UnexpectedTypeException($dateTime, '\DateTime'); + throw new TransformationFailedException('Expected a \DateTime.'); } // convert time to UTC before passing it to the formatter @@ -110,14 +110,14 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer * * @return \DateTime Normalized date * - * @throws UnexpectedTypeException if the given value is not a string - * @throws TransformationFailedException if the date could not be parsed - * @throws TransformationFailedException if the input timezone is not supported + * @throws TransformationFailedException if the given value is not a string, + * if the date could not be parsed or + * if the input timezone is not supported */ public function reverseTransform($value) { if (!is_string($value)) { - throw new UnexpectedTypeException($value, 'string'); + throw new TransformationFailedException('Expected a string.'); } if ('' === $value) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php index 4b8a2b76ae..0eb0742277 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; -use Symfony\Component\Form\Exception\UnexpectedTypeException; use Symfony\Component\Form\Exception\TransformationFailedException; /** @@ -29,7 +28,7 @@ class DateTimeToRfc3339Transformer extends BaseDateTimeTransformer } if (!$dateTime instanceof \DateTime) { - throw new UnexpectedTypeException($dateTime, '\DateTime'); + throw new TransformationFailedException('Expected a \DateTime.'); } if ($this->inputTimezone !== $this->outputTimezone) { @@ -46,7 +45,7 @@ class DateTimeToRfc3339Transformer extends BaseDateTimeTransformer public function reverseTransform($rfc3339) { if (!is_string($rfc3339)) { - throw new UnexpectedTypeException($rfc3339, 'string'); + throw new TransformationFailedException('Expected a string.'); } if ('' === $rfc3339) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php index 2ebfef3626..730d54ef63 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; use Symfony\Component\Form\Exception\TransformationFailedException; -use Symfony\Component\Form\Exception\UnexpectedTypeException; /** * Transforms between a date string and a DateTime object @@ -58,7 +57,7 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer * @param string $format The date format * @param Boolean $parseUsingPipe Whether to parse by appending a pipe "|" to the parse format * - * @throws UnexpectedTypeException if a timezone is not a string + * @throws \Symfony\Component\Form\Exception\UnexpectedTypeException if a timezone is not a string */ public function __construct($inputTimezone = null, $outputTimezone = null, $format = 'Y-m-d H:i:s', $parseUsingPipe = null) { @@ -93,8 +92,9 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer * * @return string A value as produced by PHP's date() function * - * @throws UnexpectedTypeException if the given value is not a \DateTime instance - * @throws TransformationFailedException if the output timezone is not supported + * @throws TransformationFailedException If the given value is not a \DateTime + * instance or if the output timezone + * is not supported. */ public function transform($value) { @@ -103,7 +103,7 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer } if (!$value instanceof \DateTime) { - throw new UnexpectedTypeException($value, '\DateTime'); + throw new TransformationFailedException('Expected a \DateTime.'); } $value = clone $value; @@ -123,9 +123,9 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer * * @return \DateTime An instance of \DateTime * - * @throws UnexpectedTypeException if the given value is not a string - * @throws TransformationFailedException if the date could not be parsed - * @throws TransformationFailedException if the input timezone is not supported + * @throws TransformationFailedException If the given value is not a string, + * if the date could not be parsed or + * if the input timezone is not supported. */ public function reverseTransform($value) { @@ -134,7 +134,7 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer } if (!is_string($value)) { - throw new UnexpectedTypeException($value, 'string'); + throw new TransformationFailedException('Expected a string.'); } try { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToTimestampTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToTimestampTransformer.php index dff3c52083..d2ca6604db 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToTimestampTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToTimestampTransformer.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; use Symfony\Component\Form\Exception\TransformationFailedException; -use Symfony\Component\Form\Exception\UnexpectedTypeException; /** * Transforms between a timestamp and a DateTime object @@ -25,12 +24,13 @@ class DateTimeToTimestampTransformer extends BaseDateTimeTransformer /** * Transforms a DateTime object into a timestamp in the configured timezone. * - * @param DateTime $value A DateTime object + * @param \DateTime $value A \DateTime object * * @return integer A timestamp * - * @throws UnexpectedTypeException if the given value is not an instance of \DateTime - * @throws TransformationFailedException if the output timezone is not supported + * @throws TransformationFailedException If the given value is not an instance + * of \DateTime or if the output + * timezone is not supported. */ public function transform($value) { @@ -39,7 +39,7 @@ class DateTimeToTimestampTransformer extends BaseDateTimeTransformer } if (!$value instanceof \DateTime) { - throw new UnexpectedTypeException($value, '\DateTime'); + throw new TransformationFailedException('Expected a \DateTime.'); } $value = clone $value; @@ -57,10 +57,10 @@ class DateTimeToTimestampTransformer extends BaseDateTimeTransformer * * @param string $value A timestamp * - * @return \DateTime An instance of \DateTime + * @return \DateTime A \DateTime object * - * @throws UnexpectedTypeException if the given value is not a timestamp - * @throws TransformationFailedException if the given timestamp is invalid + * @throws TransformationFailedException If the given value is not a timestamp + * or if the given timestamp is invalid. */ public function reverseTransform($value) { @@ -69,7 +69,7 @@ class DateTimeToTimestampTransformer extends BaseDateTimeTransformer } if (!is_numeric($value)) { - throw new UnexpectedTypeException($value, 'numeric'); + throw new TransformationFailedException('Expected a numeric.'); } try { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php index 4dd04af820..6bb48a9a03 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; use Symfony\Component\Form\Exception\TransformationFailedException; -use Symfony\Component\Form\Exception\UnexpectedTypeException; /** * Transforms between an integer and a localized number with grouping @@ -28,7 +27,7 @@ class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransfo public function reverseTransform($value) { if (!is_string($value)) { - throw new UnexpectedTypeException($value, 'string'); + throw new TransformationFailedException('Expected a string.'); } if ('' === $value) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php index d3b5998b42..5b8e9d9664 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; -use Symfony\Component\Form\Exception\UnexpectedTypeException; +use Symfony\Component\Form\Exception\TransformationFailedException; /** * Transforms between a normalized format and a localized money string. @@ -50,14 +50,14 @@ class MoneyToLocalizedStringTransformer extends NumberToLocalizedStringTransform * * @return string Localized money string. * - * @throws UnexpectedTypeException if the given value is not numeric - * @throws TransformationFailedException if the value can not be transformed + * @throws TransformationFailedException If the given value is not numeric or + * if the value can not be transformed. */ public function transform($value) { if (null !== $value) { if (!is_numeric($value)) { - throw new UnexpectedTypeException($value, 'numeric'); + throw new TransformationFailedException('Expected a numeric.'); } $value /= $this->divisor; @@ -73,8 +73,8 @@ class MoneyToLocalizedStringTransformer extends NumberToLocalizedStringTransform * * @return number Normalized number * - * @throws UnexpectedTypeException if the given value is not a string - * @throws TransformationFailedException if the value can not be transformed + * @throws TransformationFailedException If the given value is not a string + * or if the value can not be transformed. */ public function reverseTransform($value) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php index 41a0ea12e8..f07500f98f 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php @@ -13,7 +13,6 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; use Symfony\Component\Form\DataTransformerInterface; use Symfony\Component\Form\Exception\TransformationFailedException; -use Symfony\Component\Form\Exception\UnexpectedTypeException; /** * Transforms between a number type and a localized number with grouping @@ -60,8 +59,8 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface * * @return string Localized value. * - * @throws UnexpectedTypeException if the given value is not numeric - * @throws TransformationFailedException if the value can not be transformed + * @throws TransformationFailedException If the given value is not numeric + * or if the value can not be transformed. */ public function transform($value) { @@ -70,7 +69,7 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface } if (!is_numeric($value)) { - throw new UnexpectedTypeException($value, 'numeric'); + throw new TransformationFailedException('Expected a numeric.'); } $formatter = $this->getNumberFormatter(); @@ -90,13 +89,13 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface * * @return integer|float The numeric value * - * @throws UnexpectedTypeException if the given value is not a string - * @throws TransformationFailedException if the value can not be transformed + * @throws TransformationFailedException If the given value is not a string + * or if the value can not be transformed. */ public function reverseTransform($value) { if (!is_string($value)) { - throw new UnexpectedTypeException($value, 'string'); + throw new TransformationFailedException('Expected a string.'); } if ('' === $value) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php index bbf66466a0..e099d436bf 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php @@ -70,8 +70,8 @@ class PercentToLocalizedStringTransformer implements DataTransformerInterface * * @return number Percentage value * - * @throws UnexpectedTypeException if the given value is not numeric - * @throws TransformationFailedException if the value could not be transformed + * @throws TransformationFailedException If the given value is not numeric or + * if the value could not be transformed. */ public function transform($value) { @@ -80,7 +80,7 @@ class PercentToLocalizedStringTransformer implements DataTransformerInterface } if (!is_numeric($value)) { - throw new UnexpectedTypeException($value, 'numeric'); + throw new TransformationFailedException('Expected a numeric.'); } if (self::FRACTIONAL == $this->type) { @@ -105,13 +105,13 @@ class PercentToLocalizedStringTransformer implements DataTransformerInterface * * @return number Normalized value. * - * @throws UnexpectedTypeException if the given value is not a string - * @throws TransformationFailedException if the value could not be transformed + * @throws TransformationFailedException If the given value is not a string or + * if the value could not be transformed. */ public function reverseTransform($value) { if (!is_string($value)) { - throw new UnexpectedTypeException($value, 'string'); + throw new TransformationFailedException('Expected a string.'); } if ('' === $value) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php index 22fa01c39a..c34a0139fa 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php @@ -13,7 +13,6 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer; use Symfony\Component\Form\DataTransformerInterface; use Symfony\Component\Form\Exception\TransformationFailedException; -use Symfony\Component\Form\Exception\UnexpectedTypeException; /** * @author Bernhard Schussek @@ -52,13 +51,13 @@ class ValueToDuplicatesTransformer implements DataTransformerInterface * * @return mixed The value * - * @throws UnexpectedTypeException if the given value is not an array - * @throws TransformationFailedException if the given array can not be transformed + * @throws TransformationFailedException If the given value is not an array or + * if the given array can not be transformed. */ public function reverseTransform($array) { if (!is_array($array)) { - throw new UnexpectedTypeException($array, 'array'); + throw new TransformationFailedException('Expected an array.'); } $result = current($array); diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php index 1f946e4b7e..bafe5c098f 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php @@ -68,7 +68,7 @@ class ArrayToPartsTransformerTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testTransformRequiresArray() { @@ -123,7 +123,7 @@ class ArrayToPartsTransformerTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformPartiallyNull() { @@ -140,7 +140,7 @@ class ArrayToPartsTransformerTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformRequiresArray() { diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BooleanToStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BooleanToStringTransformerTest.php index cabdf76f2b..41f8f956d7 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BooleanToStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BooleanToStringTransformerTest.php @@ -38,14 +38,14 @@ class BooleanToStringTransformerTest extends \PHPUnit_Framework_TestCase public function testTransformExpectsBoolean() { - $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException'); + $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException'); $this->transformer->transform('1'); } public function testReverseTransformExpectsString() { - $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException'); + $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException'); $this->transformer->reverseTransform(1); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php index 844e1ff356..bbae0621ce 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php @@ -67,7 +67,7 @@ class ChoiceToValueTransformerTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformExpectsScalar() { diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php index 215b89baad..572971938d 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php @@ -45,7 +45,7 @@ class ChoicesToValuesTransformerTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testTransformExpectsArray() { @@ -67,7 +67,7 @@ class ChoicesToValuesTransformerTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformExpectsArray() { diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php index 3d33e01144..4898b88d34 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php @@ -117,7 +117,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testTransformRequiresDateTime() { @@ -191,7 +191,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformPartiallyEmptyYear() { @@ -206,7 +206,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformPartiallyEmptyMonth() { @@ -221,7 +221,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformPartiallyEmptyDay() { @@ -236,7 +236,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformPartiallyEmptyHour() { @@ -251,7 +251,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformPartiallyEmptyMinute() { @@ -266,7 +266,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformPartiallyEmptySecond() { @@ -326,7 +326,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformRequiresArray() { @@ -335,7 +335,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformWithNegativeYear() { @@ -351,7 +351,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformWithNegativeMonth() { @@ -367,7 +367,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformWithNegativeDay() { @@ -383,7 +383,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformWithNegativeHour() { @@ -399,7 +399,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformWithNegativeMinute() { @@ -415,7 +415,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformWithNegativeSecond() { @@ -431,7 +431,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformWithInvalidMonth() { @@ -447,7 +447,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformWithInvalidDay() { @@ -463,7 +463,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformWithStringDay() { @@ -479,7 +479,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformWithStringMonth() { @@ -495,7 +495,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformWithStringYear() { diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php index 25d582cfcb..afa979e2a8 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php @@ -148,7 +148,7 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase } /** - * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testTransformRequiresValidDateTime() { @@ -231,7 +231,7 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase } /** - * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformRequiresString() { diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php index 4b8dfebd34..f550d4bd20 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php @@ -79,7 +79,7 @@ class DateTimeToRfc3339TransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testTransformRequiresValidDateTime() { @@ -102,7 +102,7 @@ class DateTimeToRfc3339TransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformRequiresString() { @@ -111,7 +111,7 @@ class DateTimeToRfc3339TransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformWithNonExistingDate() { @@ -121,7 +121,7 @@ class DateTimeToRfc3339TransformerTest extends DateTimeTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformExpectsValidDateString() { diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php index 18137fef04..987df1d81c 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php @@ -101,7 +101,7 @@ class DateTimeToStringTransformerTest extends DateTimeTestCase { $transformer = new DateTimeToStringTransformer(); - $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException'); + $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException'); $transformer->transform('1234'); } @@ -156,7 +156,7 @@ class DateTimeToStringTransformerTest extends DateTimeTestCase { $reverseTransformer = new DateTimeToStringTransformer(); - $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException'); + $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException'); $reverseTransformer->reverseTransform(1234); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php index 5c4be26f54..b54f0c4c50 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php @@ -60,7 +60,7 @@ class DateTimeToTimestampTransformerTest extends DateTimeTestCase { $transformer = new DateTimeToTimestampTransformer(); - $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException'); + $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException'); $transformer->transform('1234'); } @@ -97,7 +97,7 @@ class DateTimeToTimestampTransformerTest extends DateTimeTestCase { $reverseTransformer = new DateTimeToTimestampTransformer(); - $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException'); + $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException'); $reverseTransformer->reverseTransform('2010-2010-2010'); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php index c3c28bd5e7..999c4272c5 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php @@ -50,7 +50,7 @@ class IntegerToLocalizedStringTransformerTest extends LocalizedTestCase } /** - * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformExpectsString() { @@ -60,7 +60,7 @@ class IntegerToLocalizedStringTransformerTest extends LocalizedTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformExpectsValidNumber() { @@ -70,7 +70,7 @@ class IntegerToLocalizedStringTransformerTest extends LocalizedTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformDisallowsNaN() { @@ -80,7 +80,7 @@ class IntegerToLocalizedStringTransformerTest extends LocalizedTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformDisallowsNaN2() { @@ -90,7 +90,7 @@ class IntegerToLocalizedStringTransformerTest extends LocalizedTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformDisallowsInfinity() { @@ -100,7 +100,7 @@ class IntegerToLocalizedStringTransformerTest extends LocalizedTestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformDisallowsNegativeInfinity() { diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php index 8ff5c16ac0..843ad32fc5 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php @@ -33,7 +33,7 @@ class MoneyToLocalizedStringTransformerTest extends LocalizedTestCase { $transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100); - $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException'); + $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException'); $transformer->transform('abcd'); } @@ -56,7 +56,7 @@ class MoneyToLocalizedStringTransformerTest extends LocalizedTestCase { $transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100); - $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException'); + $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException'); $transformer->reverseTransform(12345); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php index 9ce30d6a8a..63b4b765f1 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php @@ -207,7 +207,7 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase } /** - * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testTransformExpectsNumeric() { @@ -217,7 +217,7 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase } /** - * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformExpectsString() { diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php index 6cbca5a402..07bf26766e 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php @@ -94,7 +94,7 @@ class PercentToLocalizedStringTransformerTest extends LocalizedTestCase { $transformer = new PercentToLocalizedStringTransformer(); - $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException'); + $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException'); $transformer->transform('foo'); } @@ -103,7 +103,7 @@ class PercentToLocalizedStringTransformerTest extends LocalizedTestCase { $transformer = new PercentToLocalizedStringTransformer(); - $this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException'); + $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException'); $transformer->reverseTransform(1); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php index b8952c6850..2c5298da50 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php @@ -83,7 +83,7 @@ class ValueToDuplicatesTransformerTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformPartiallyNull() { @@ -97,7 +97,7 @@ class ValueToDuplicatesTransformerTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException Symfony\Component\Form\Exception\TransformationFailedException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformDifferences() { @@ -111,7 +111,7 @@ class ValueToDuplicatesTransformerTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException + * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException */ public function testReverseTransformRequiresArray() { From 59b78c7c166ad4e201d09fd31629f0162618a507 Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Fri, 3 May 2013 15:20:58 +0200 Subject: [PATCH 6/9] [Validator] Fixed: $traverse and $deep is passed to the visitor from Validator::validate() --- src/Symfony/Component/Validator/Validator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Validator/Validator.php b/src/Symfony/Component/Validator/Validator.php index 202e1e2f10..2b7bacef51 100644 --- a/src/Symfony/Component/Validator/Validator.php +++ b/src/Symfony/Component/Validator/Validator.php @@ -87,7 +87,7 @@ class Validator implements ValidatorInterface $visitor = $this->createVisitor($value); foreach ($this->resolveGroups($groups) as $group) { - $visitor->validate($value, $group, ''); + $visitor->validate($value, $group, '', $traverse, $deep); } return $visitor->getViolations(); From b0e3ea5f5fdf138323e06a42e6c04dde22bfca77 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 4 May 2013 10:54:37 +0200 Subject: [PATCH 7/9] [Validator] fixed wrong URL for XSD --- .../Validator/Tests/Mapping/Loader/constraint-mapping.xml | 2 +- .../Component/Validator/Tests/Mapping/Loader/withdoctype.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.xml b/src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.xml index e815dcea55..88cc4a3a83 100644 --- a/src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.xml +++ b/src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd"> Symfony\Component\Validator\Tests\Fixtures\ diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/withdoctype.xml b/src/Symfony/Component/Validator/Tests/Mapping/Loader/withdoctype.xml index 0c5e890cbd..0beacc32cd 100644 --- a/src/Symfony/Component/Validator/Tests/Mapping/Loader/withdoctype.xml +++ b/src/Symfony/Component/Validator/Tests/Mapping/Loader/withdoctype.xml @@ -2,6 +2,6 @@ + xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd"> From 5b7e1e6f682354e086d8129e48fc2f245aea6fb1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 5 May 2013 18:35:57 +0200 Subject: [PATCH 8/9] added a missing check for the provider key --- .../Http/Firewall/AbstractPreAuthenticatedListener.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php index 66041be7b6..1a0999e1f4 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php @@ -47,7 +47,7 @@ abstract class AbstractPreAuthenticatedListener implements ListenerInterface } /** - * Handles X509 authentication. + * Handles pre-authentication. * * @param GetResponseEvent $event A GetResponseEvent instance */ @@ -62,7 +62,7 @@ abstract class AbstractPreAuthenticatedListener implements ListenerInterface list($user, $credentials) = $this->getPreAuthenticatedData($request); if (null !== $token = $this->securityContext->getToken()) { - if ($token instanceof PreAuthenticatedToken && $token->isAuthenticated() && $token->getUsername() === $user) { + if ($token instanceof PreAuthenticatedToken && $this->providerKey == $token->getProviderKey() && $token->isAuthenticated() && $token->getUsername() === $user) { return; } } From 7deb9232361820835c9436e26c9277d92aa1a645 Mon Sep 17 00:00:00 2001 From: Stefan Warman Date: Tue, 30 Apr 2013 20:39:15 +0100 Subject: [PATCH 9/9] added additional tests to cover invalid argument exceptions in OutputFormatterStyle component --- .../Tests/Formatter/OutputFormatterStyleTest.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php index b2875e9f4d..6890a9b839 100644 --- a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php +++ b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php @@ -73,5 +73,21 @@ class OutputFormatterStyleTest extends \PHPUnit_Framework_TestCase $style->setOptions(array('bold')); $this->assertEquals("\033[1mfoo\033[0m", $style->apply('foo')); + + try { + $style->setOption('foo'); + $this->fail('->setOption() throws an \InvalidArgumentException when the option does not exist in the available options'); + } catch (\Exception $e) { + $this->assertInstanceOf('\InvalidArgumentException', $e, '->setOption() throws an \InvalidArgumentException when the option does not exist in the available options'); + $this->assertContains('Invalid option specified: "foo"', $e->getMessage(), '->setOption() throws an \InvalidArgumentException when the option does not exist in the available options'); + } + + try { + $style->unsetOption('foo'); + $this->fail('->unsetOption() throws an \InvalidArgumentException when the option does not exist in the available options'); + } catch (\Exception $e) { + $this->assertInstanceOf('\InvalidArgumentException', $e, '->unsetOption() throws an \InvalidArgumentException when the option does not exist in the available options'); + $this->assertContains('Invalid option specified: "foo"', $e->getMessage(), '->unsetOption() throws an \InvalidArgumentException when the option does not exist in the available options'); + } } }