minor #11615 [Validator] return empty metadata collection if none do exist (xabbuh)

webmozart · webmozart · commit f825f5d1c330 · 2014-08-19T10:48:01.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [Validator] return empty metadata collection if none do exist | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | [The reference to the documentation PR if any] Backport of #11614 for Symfony 2.3 and 2.4. Commits ------- f5bc18d return empty metadata collection if none do exist
diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
@@ -298,6 +298,10 @@ public function hasMemberMetadatas($property)
      */
     public function getMemberMetadatas($property)
     {
+        if (!isset($this->members[$property])) {
+            return array();
+        }
+
         return $this->members[$property];
     }
 
@@ -314,6 +318,10 @@ public function hasPropertyMetadata($property)
      */
     public function getPropertyMetadata($property)
     {
+        if (!isset($this->members[$property])) {
+            return array();
+        }
+
         return $this->members[$property];
     }
 
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php b/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
@@ -222,4 +222,20 @@ public function testGroupSequenceProvider()
         $metadata->setGroupSequenceProvider(true);
         $this->assertTrue($metadata->isGroupSequenceProvider());
     }
+
+    /**
+     * https://github.com/symfony/symfony/issues/11604
+     */
+    public function testGetMemberMetadatasReturnsEmptyArrayWithoutConfiguredMetadata()
+    {
+        $this->assertCount(0, $this->metadata->getMemberMetadatas('foo'), '->getMemberMetadatas() returns an empty collection if no metadata is configured for the given property');
+    }
+
+    /**
+     * https://github.com/symfony/symfony/issues/11604
+     */
+    public function testGetPropertyMetadataReturnsEmptyArrayWithoutConfiguredMetadata()
+    {
+        $this->assertCount(0, $this->metadata->getPropertyMetadata('foo'), '->getPropertyMetadata() returns an empty collection if no metadata is configured for the given property');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -298,6 +298,10 @@ public function hasMemberMetadatas($property)`
`298`	`298`	`*/`
`299`	`299`	`public function getMemberMetadatas($property)`
`300`	`300`	`{`
	`301`	`+ if (!isset($this->members[$property])) {`
	`302`	`+ return array();`
	`303`	`+ }`
	`304`	`+`
`301`	`305`	`return $this->members[$property];`
`302`	`306`	`}`
`303`	`307`
`@@ -314,6 +318,10 @@ public function hasPropertyMetadata($property)`
`314`	`318`	`*/`
`315`	`319`	`public function getPropertyMetadata($property)`
`316`	`320`	`{`
	`321`	`+ if (!isset($this->members[$property])) {`
	`322`	`+ return array();`
	`323`	`+ }`
	`324`	`+`
`317`	`325`	`return $this->members[$property];`
`318`	`326`	`}`
`319`	`327`