Merge branch '2.4' into 2.5

webmozart · webmozart · commit 59cd05f5b78b · 2014-08-19T10:56:37.000+02:00
* 2.4:
  [Validators] Fixed failing tests requiring ICU 52.1 which are skipped otherwise
  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
@@ -371,6 +371,10 @@ public function hasMemberMetadatas($property)
      */
     public function getMemberMetadatas($property)
     {
+        if (!isset($this->members[$property])) {
+            return array();
+        }
+
         return $this->members[$property];
     }
 
@@ -387,6 +391,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/Constraints/CountryValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php
@@ -88,7 +88,7 @@ public function testInvalidCountries($country)
         $this->validator->validate($country, $constraint);
 
         $this->assertViolation('myMessage', array(
-            '{{ value }}' => $country,
+            '{{ value }}' => '"'.$country.'"',
         ));
     }
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php
@@ -102,7 +102,7 @@ public function testInvalidCurrencies($currency)
         $this->validator->validate($currency, $constraint);
 
         $this->assertViolation('myMessage', array(
-            '{{ value }}' => $currency,
+            '{{ value }}' => '"'.$currency.'"',
         ));
     }
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LanguageValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LanguageValidatorTest.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Intl\Util\IntlTestHelper;
 use Symfony\Component\Validator\Constraints\Language;
 use Symfony\Component\Validator\Constraints\LanguageValidator;
-use Symfony\Component\Validator\Validation;
 
 class LanguageValidatorTest extends AbstractConstraintValidatorTest
 {
@@ -88,7 +87,7 @@ public function testInvalidLanguages($language)
         $this->validator->validate($language, $constraint);
 
         $this->assertViolation('myMessage', array(
-            '{{ value }}' => $language,
+            '{{ value }}' => '"'.$language.'"',
         ));
     }
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Intl\Util\IntlTestHelper;
 use Symfony\Component\Validator\Constraints\Locale;
 use Symfony\Component\Validator\Constraints\LocaleValidator;
-use Symfony\Component\Validator\Validation;
 
 class LocaleValidatorTest extends AbstractConstraintValidatorTest
 {
@@ -90,7 +89,7 @@ public function testInvalidLocales($locale)
         $this->validator->validate($locale, $constraint);
 
         $this->assertViolation('myMessage', array(
-            '{{ value }}' => $locale,
+            '{{ value }}' => '"'.$locale.'"',
         ));
     }
 
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php b/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
@@ -220,4 +220,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
`@@ -371,6 +371,10 @@ public function hasMemberMetadatas($property)`
`371`	`371`	`*/`
`372`	`372`	`public function getMemberMetadatas($property)`
`373`	`373`	`{`
	`374`	`+ if (!isset($this->members[$property])) {`
	`375`	`+ return array();`
	`376`	`+ }`
	`377`	`+`
`374`	`378`	`return $this->members[$property];`
`375`	`379`	`}`
`376`	`380`
`@@ -387,6 +391,10 @@ public function hasPropertyMetadata($property)`
`387`	`391`	`*/`
`388`	`392`	`public function getPropertyMetadata($property)`
`389`	`393`	`{`
	`394`	`+ if (!isset($this->members[$property])) {`
	`395`	`+ return array();`
	`396`	`+ }`
	`397`	`+`
`390`	`398`	`return $this->members[$property];`
`391`	`399`	`}`
`392`	`400`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function testInvalidCountries($country)`
`88`	`88`	`$this->validator->validate($country, $constraint);`
`89`	`89`
`90`	`90`	`$this->assertViolation('myMessage', array(`
`91`		`- '{{ value }}' => $country,`
	`91`	`+ '{{ value }}' => '"'.$country.'"',`
`92`	`92`	`));`
`93`	`93`	`}`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function testInvalidCurrencies($currency)`
`102`	`102`	`$this->validator->validate($currency, $constraint);`
`103`	`103`
`104`	`104`	`$this->assertViolation('myMessage', array(`
`105`		`- '{{ value }}' => $currency,`
	`105`	`+ '{{ value }}' => '"'.$currency.'"',`
`106`	`106`	`));`
`107`	`107`	`}`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`use Symfony\Component\Intl\Util\IntlTestHelper;`
`15`	`15`	`use Symfony\Component\Validator\Constraints\Language;`
`16`	`16`	`use Symfony\Component\Validator\Constraints\LanguageValidator;`
`17`		`-use Symfony\Component\Validator\Validation;`
`18`	`17`
`19`	`18`	`class LanguageValidatorTest extends AbstractConstraintValidatorTest`
`20`	`19`	`{`
`@@ -88,7 +87,7 @@ public function testInvalidLanguages($language)`
`88`	`87`	`$this->validator->validate($language, $constraint);`
`89`	`88`
`90`	`89`	`$this->assertViolation('myMessage', array(`
`91`		`- '{{ value }}' => $language,`
	`90`	`+ '{{ value }}' => '"'.$language.'"',`
`92`	`91`	`));`
`93`	`92`	`}`
`94`	`93`