Merge branch '2.5'

* 2.5:
  [Validator] Fixed missing use statements
  [Validators] Fixed failing tests requiring ICU 52.1 which are skipped otherwise
  [FrameworkBundle] Fixed validator factory definition when the Validator API is "auto" for PHP < 5.3.9
  return empty metadata collection if none do exist

Author: webmozart

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];
     }
 

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.'"',
         ));
     }
 

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.'"',
         ));
     }
 

Tests/Constraints/LanguageValidatorTest.php

@@ -88,7 +88,7 @@ public function testInvalidLanguages($language)
         $this->validator->validate($language, $constraint);
 
         $this->assertViolation('myMessage', array(
-            '{{ value }}' => $language,
+            '{{ value }}' => '"'.$language.'"',
         ));
     }
 

Tests/Constraints/LocaleValidatorTest.php

@@ -90,7 +90,7 @@ public function testInvalidLocales($locale)
         $this->validator->validate($locale, $constraint);
 
         $this->assertViolation('myMessage', array(
-            '{{ value }}' => $locale,
+            '{{ value }}' => '"'.$locale.'"',
         ));
     }
 

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');
+    }
 }