[Validator] Fixed failing tests

webmozart · webmozart · commit adc1437fab6e · 2014-03-30T18:28:54.000+02:00
diff --git a/src/Symfony/Component/Validator/Mapping/AdHocMetadata.php b/src/Symfony/Component/Validator/Mapping/AdHocMetadata.php
@@ -18,7 +18,7 @@
  * @since  %%NextVersion%%
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class AdHocMetadata extends ElementMetadata
+class AdHocMetadata extends ElementMetadata implements MetadataInterface
 {
     public function __construct(array $constraints)
     {
diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
@@ -14,8 +14,7 @@
 use Symfony\Component\Validator\Constraints\GroupSequence;
 use Symfony\Component\Validator\ValidationVisitorInterface;
 use Symfony\Component\Validator\PropertyMetadataContainerInterface;
-use Symfony\Component\Validator\ClassBasedInterface;
-use Symfony\Component\Validator\MetadataInterface;
+use Symfony\Component\Validator\MetadataInterface as LegacyMetadataInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 use Symfony\Component\Validator\Exception\GroupDefinitionException;
@@ -26,7 +25,7 @@
  * @author Bernhard Schussek <bschussek@gmail.com>
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class ClassMetadata extends ElementMetadata implements MetadataInterface, ClassBasedInterface, PropertyMetadataContainerInterface, ClassMetadataInterface
+class ClassMetadata extends ElementMetadata implements LegacyMetadataInterface, PropertyMetadataContainerInterface, ClassMetadataInterface
 {
     /**
      * @var string
diff --git a/src/Symfony/Component/Validator/Mapping/ElementMetadata.php b/src/Symfony/Component/Validator/Mapping/ElementMetadata.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Validator\Constraint;
 
-abstract class ElementMetadata implements MetadataInterface
+abstract class ElementMetadata
 {
     /**
      * @var Constraint[]
diff --git a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
@@ -177,7 +177,7 @@ public function getTraversalStrategy()
      */
     public function isCascaded()
     {
-        return $this->cascadingStrategy & CascadingStrategy::CASCADE;
+        return (boolean) ($this->cascadingStrategy & CascadingStrategy::CASCADE);
     }
 
     /**
@@ -188,7 +188,7 @@ public function isCascaded()
      */
     public function isCollectionCascaded()
     {
-        return $this->traversalStrategy & TraversalStrategy::TRAVERSE;
+        return (boolean) ($this->traversalStrategy & TraversalStrategy::TRAVERSE);
     }
 
     /**
@@ -199,7 +199,7 @@ public function isCollectionCascaded()
      */
     public function isCollectionCascadedDeeply()
     {
-        return $this->traversalStrategy & TraversalStrategy::RECURSIVE;
+        return (boolean) ($this->traversalStrategy & TraversalStrategy::RECURSIVE);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`* @since %%NextVersion%%`
`19`	`19`	`* @author Bernhard Schussek <[email protected]>`
`20`	`20`	`*/`
`21`		`-class AdHocMetadata extends ElementMetadata`
	`21`	`+class AdHocMetadata extends ElementMetadata implements MetadataInterface`
`22`	`22`	`{`
`23`	`23`	`public function __construct(array $constraints)`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Validator\Constraint;`
`15`	`15`
`16`		`-abstract class ElementMetadata implements MetadataInterface`
	`16`	`+abstract class ElementMetadata`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`	`19`	`* @var Constraint[]`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ public function getTraversalStrategy()`
`177`	`177`	`*/`
`178`	`178`	`public function isCascaded()`
`179`	`179`	`{`
`180`		`- return $this->cascadingStrategy & CascadingStrategy::CASCADE;`
	`180`	`+ return (boolean) ($this->cascadingStrategy & CascadingStrategy::CASCADE);`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`/**`
`@@ -188,7 +188,7 @@ public function isCascaded()`
`188`	`188`	`*/`
`189`	`189`	`public function isCollectionCascaded()`
`190`	`190`	`{`
`191`		`- return $this->traversalStrategy & TraversalStrategy::TRAVERSE;`
	`191`	`+ return (boolean) ($this->traversalStrategy & TraversalStrategy::TRAVERSE);`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`/**`
`@@ -199,7 +199,7 @@ public function isCollectionCascaded()`
`199`	`199`	`*/`
`200`	`200`	`public function isCollectionCascadedDeeply()`
`201`	`201`	`{`
`202`		`- return $this->traversalStrategy & TraversalStrategy::RECURSIVE;`
	`202`	`+ return (boolean) ($this->traversalStrategy & TraversalStrategy::RECURSIVE);`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`/**`