[Validator] Fixed tests under PHP<5.3.9

webmozart · webmozart · commit 6fc6ecdd8e89 · 2014-03-30T18:28:57.000+02:00
The new implementation is disabled on those PHP versions.
diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadataInterface.php b/src/Symfony/Component/Validator/Mapping/ClassMetadataInterface.php
@@ -12,30 +12,16 @@
 namespace Symfony\Component\Validator\Mapping;
 
 use Symfony\Component\Validator\ClassBasedInterface;
+use Symfony\Component\Validator\PropertyMetadataContainerInterface as LegacyPropertyMetadataContainerInterface;;
 
 /**
  * @since  %%NextVersion%%
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-interface ClassMetadataInterface extends MetadataInterface, ClassBasedInterface
+interface ClassMetadataInterface extends MetadataInterface, LegacyPropertyMetadataContainerInterface, ClassBasedInterface
 {
     public function getConstrainedProperties();
 
-    public function hasPropertyMetadata($property);
-
-    /**
-     * Returns all metadata instances for the given named property.
-     *
-     * If your implementation does not support properties, simply throw an
-     * exception in this method (for example a <tt>BadMethodCallException</tt>).
-     *
-     * @param string $property The property name.
-     *
-     * @return PropertyMetadataInterface[] A list of metadata instances. Empty if
-     *                                     no metadata exists for the property.
-     */
-    public function getPropertyMetadata($property);
-
     public function hasGroupSequence();
 
     public function getGroupSequence();
diff --git a/src/Symfony/Component/Validator/Mapping/GenericMetadata.php b/src/Symfony/Component/Validator/Mapping/GenericMetadata.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints\Valid;
+use Symfony\Component\Validator\ValidationVisitorInterface;
 
 /**
  * @since  %%NextVersion%%
@@ -149,4 +150,12 @@ public function getTraversalStrategy()
     {
         return $this->traversalStrategy;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function accept(ValidationVisitorInterface $visitor, $value, $group, $propertyPath)
+    {
+        // Thanks PHP < 5.3.9
+    }
 }
diff --git a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
@@ -13,11 +13,10 @@
 
 use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\ValidationVisitorInterface;
-use Symfony\Component\Validator\PropertyMetadataInterface as LegacyPropertyMetadataInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 
-abstract class MemberMetadata extends ElementMetadata implements PropertyMetadataInterface, LegacyPropertyMetadataInterface
+abstract class MemberMetadata extends ElementMetadata implements PropertyMetadataInterface
 {
     public $class;
     public $name;
diff --git a/src/Symfony/Component/Validator/Mapping/MetadataInterface.php b/src/Symfony/Component/Validator/Mapping/MetadataInterface.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Validator\Mapping;
 
+use Symfony\Component\Validator\MetadataInterface as LegacyMetadataInterface;
+
 /**
  * A container for validation metadata.
  *
@@ -42,17 +44,8 @@
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-interface MetadataInterface
+interface MetadataInterface extends LegacyMetadataInterface
 {
-    /**
-     * Returns all constraints for a given validation group.
-     *
-     * @param string $group The validation group.
-     *
-     * @return \Symfony\Component\Validator\Constraint[] A list of constraint instances.
-     */
-    public function findConstraints($group);
-
     public function getCascadingStrategy();
 
     public function getTraversalStrategy();
diff --git a/src/Symfony/Component/Validator/Mapping/PropertyMetadataInterface.php b/src/Symfony/Component/Validator/Mapping/PropertyMetadataInterface.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Validator\Mapping;
 
 use Symfony\Component\Validator\ClassBasedInterface;
+use Symfony\Component\Validator\PropertyMetadataInterface as LegacyPropertyMetadataInterface;
 
 /**
  * A container for validation metadata of a property.
@@ -26,21 +27,6 @@
  *
  * @see MetadataInterface
  */
-interface PropertyMetadataInterface extends MetadataInterface, ClassBasedInterface
+interface PropertyMetadataInterface extends MetadataInterface, LegacyPropertyMetadataInterface, ClassBasedInterface
 {
-    /**
-     * Returns the name of the property.
-     *
-     * @return string The property name.
-     */
-    public function getPropertyName();
-
-    /**
-     * Extracts the value of the property from the given object.
-     *
-     * @param mixed $object The object to extract the property value from.
-     *
-     * @return mixed The value of the property.
-     */
-    public function getPropertyValue($object);
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php
@@ -22,7 +22,7 @@ class CountryValidatorTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        IntlTestHelper::requireIntl($this);
+        IntlTestHelper::requireFullIntl($this);
 
         $this->context = $this->getMock('Symfony\Component\Validator\ExecutionContext', array(), array(), '', false);
         $this->validator = new CountryValidator();
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php
@@ -22,7 +22,7 @@ class CurrencyValidatorTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        IntlTestHelper::requireIntl($this);
+        IntlTestHelper::requireFullIntl($this);
 
         $this->context = $this->getMock('Symfony\Component\Validator\ExecutionContext', array(), array(), '', false);
         $this->validator = new CurrencyValidator();
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LanguageValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LanguageValidatorTest.php
@@ -22,7 +22,7 @@ class LanguageValidatorTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        IntlTestHelper::requireIntl($this);
+        IntlTestHelper::requireFullIntl($this);
 
         $this->context = $this->getMock('Symfony\Component\Validator\ExecutionContext', array(), array(), '', false);
         $this->validator = new LanguageValidator();
diff --git a/src/Symfony/Component/Validator/Tests/Context/ExecutionContextTest.php b/src/Symfony/Component/Validator/Tests/Context/ExecutionContextTest.php
@@ -46,6 +46,10 @@ class ExecutionContextTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
+        if (version_compare(PHP_VERSION, '5.3.9', '<')) {
+            $this->markTestSkipped('Not supported prior to PHP 5.3.9');
+        }
+
         $this->validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');
         $this->groupManager = $this->getMock('Symfony\Component\Validator\Group\GroupManagerInterface');
         $this->translator = $this->getMock('Symfony\Component\Translation\TranslatorInterface');
diff --git a/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php
@@ -35,17 +35,17 @@ abstract class AbstractValidatorTest extends \PHPUnit_Framework_TestCase
     /**
      * @var FakeMetadataFactory
      */
-    protected $metadataFactory;
+    public $metadataFactory;
 
     /**
      * @var ClassMetadata
      */
-    protected $metadata;
+    public $metadata;
 
     /**
      * @var ClassMetadata
      */
-    protected $referenceMetadata;
+    public $referenceMetadata;
 
     protected function setUp()
     {
diff --git a/src/Symfony/Component/Validator/Tests/Validator/LegacyValidator2Dot5ApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/LegacyValidator2Dot5ApiTest.php
@@ -23,6 +23,15 @@
 
 class LegacyValidator2Dot5ApiTest extends Abstract2Dot5ApiTest
 {
+    protected function setUp()
+    {
+        if (version_compare(PHP_VERSION, '5.3.9', '<')) {
+            $this->markTestSkipped('Not supported prior to PHP 5.3.9');
+        }
+
+        parent::setUp();
+    }
+
     protected function createValidator(MetadataFactoryInterface $metadataFactory)
     {
         $nodeTraverser = new NodeTraverser($metadataFactory);
diff --git a/src/Symfony/Component/Validator/Tests/Validator/LegacyValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/LegacyValidatorLegacyApiTest.php
@@ -23,6 +23,15 @@
 
 class LegacyValidatorLegacyApiTest extends AbstractLegacyApiTest
 {
+    protected function setUp()
+    {
+        if (version_compare(PHP_VERSION, '5.3.9', '<')) {
+            $this->markTestSkipped('Not supported prior to PHP 5.3.9');
+        }
+
+        parent::setUp();
+    }
+
     protected function createValidator(MetadataFactoryInterface $metadataFactory)
     {
         $nodeTraverser = new NodeTraverser($metadataFactory);
diff --git a/src/Symfony/Component/Validator/Tests/Validator/Validator2Dot5ApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/Validator2Dot5ApiTest.php
@@ -23,6 +23,15 @@
 
 class Validator2Dot5ApiTest extends Abstract2Dot5ApiTest
 {
+    protected function setUp()
+    {
+        if (version_compare(PHP_VERSION, '5.3.9', '<')) {
+            $this->markTestSkipped('Not supported prior to PHP 5.3.9');
+        }
+
+        parent::setUp();
+    }
+
     protected function createValidator(MetadataFactoryInterface $metadataFactory)
     {
         $nodeTraverser = new NodeTraverser($metadataFactory);

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Validator\Constraint;`
`15`	`15`	`use Symfony\Component\Validator\Constraints\Valid;`
	`16`	`+use Symfony\Component\Validator\ValidationVisitorInterface;`
`16`	`17`
`17`	`18`	`/**`
`18`	`19`	`* @since %%NextVersion%%`
`@@ -149,4 +150,12 @@ public function getTraversalStrategy()`
`149`	`150`	`{`
`150`	`151`	`return $this->traversalStrategy;`
`151`	`152`	`}`
	`153`	`+`
	`154`	`+ /**`
	`155`	`+ * {@inheritdoc}`
	`156`	`+ */`
	`157`	`+ public function accept(ValidationVisitorInterface $visitor, $value, $group, $propertyPath)`
	`158`	`+ {`
	`159`	`+ // Thanks PHP < 5.3.9`
	`160`	`+ }`
`152`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class CountryValidatorTest extends \PHPUnit_Framework_TestCase`
`22`	`22`
`23`	`23`	`protected function setUp()`
`24`	`24`	`{`
`25`		`- IntlTestHelper::requireIntl($this);`
	`25`	`+ IntlTestHelper::requireFullIntl($this);`
`26`	`26`
`27`	`27`	`$this->context = $this->getMock('Symfony\Component\Validator\ExecutionContext', array(), array(), '', false);`
`28`	`28`	`$this->validator = new CountryValidator();`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class CurrencyValidatorTest extends \PHPUnit_Framework_TestCase`
`22`	`22`
`23`	`23`	`protected function setUp()`
`24`	`24`	`{`
`25`		`- IntlTestHelper::requireIntl($this);`
	`25`	`+ IntlTestHelper::requireFullIntl($this);`
`26`	`26`
`27`	`27`	`$this->context = $this->getMock('Symfony\Component\Validator\ExecutionContext', array(), array(), '', false);`
`28`	`28`	`$this->validator = new CurrencyValidator();`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class LanguageValidatorTest extends \PHPUnit_Framework_TestCase`
`22`	`22`
`23`	`23`	`protected function setUp()`
`24`	`24`	`{`
`25`		`- IntlTestHelper::requireIntl($this);`
	`25`	`+ IntlTestHelper::requireFullIntl($this);`
`26`	`26`
`27`	`27`	`$this->context = $this->getMock('Symfony\Component\Validator\ExecutionContext', array(), array(), '', false);`
`28`	`28`	`$this->validator = new LanguageValidator();`