[Validation] some tweaks and phpDoc

src/Symfony/Component/Validator/ConstraintViolation.php

@@ -54,7 +54,7 @@ class ConstraintViolation
      */
     public function getMessage()
     {
-        return str_replace(array_keys($this->messageParameters), array_values($this->messageParameters), $this->messageTemplate);
+        return strtr($this->messageTemplate, $this->messageParameters);
     }
 
     public function getRoot()

src/Symfony/Component/Validator/Constraints/All.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class All extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class All extends Constraint
 {
     public $constraints = array();
 

src/Symfony/Component/Validator/Constraints/Blank.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Blank extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Blank extends Constraint
 {
     public $message = 'This value should be blank';
 }

src/Symfony/Component/Validator/Constraints/Callback.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Callback extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Callback extends Constraint
 {
     public $methods;
 

src/Symfony/Component/Validator/Constraints/Choice.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Choice extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Choice extends Constraint
 {
     public $choices;
     public $callback;

src/Symfony/Component/Validator/Constraints/Collection.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Collection extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Collection extends Constraint
 {
     public $fields;
     public $allowExtraFields = false;

src/Symfony/Component/Validator/Constraints/Country.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Country extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Country extends Constraint
 {
     public $message = 'This value is not a valid country';
 }

src/Symfony/Component/Validator/Constraints/Date.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Date extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Date extends Constraint
 {
     public $message = 'This value is not a valid date';
 }

src/Symfony/Component/Validator/Constraints/DateTime.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class DateTime extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class DateTime extends Constraint
 {
     public $message = 'This value is not a valid datetime';
 }

src/Symfony/Component/Validator/Constraints/Email.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Email extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Email extends Constraint
 {
     public $message = 'This value is not a valid email address';
     public $checkMX = false;

src/Symfony/Component/Validator/Constraints/False.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class False extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class False extends Constraint
 {
     public $message = 'This value should be false';
 }

src/Symfony/Component/Validator/Constraints/File.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class File extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class File extends Constraint
 {
     public $maxSize = null;
     public $mimeTypes = array();

src/Symfony/Component/Validator/Constraints/Ip.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
+use Symfony\Component\Validator\Constraint;
 
 /**
  * Validates that a value is a valid IP address
@@ -19,7 +20,7 @@ use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  * @author Joseph Bielawski <stloyd@gmail.com>
  */
-class Ip extends \Symfony\Component\Validator\Constraint
+class Ip extends Constraint
 {
     const V4 = '4';
     const V6 = '6';

src/Symfony/Component/Validator/Constraints/Language.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Language extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Language extends Constraint
 {
     public $message = 'This value is not a valid language';
 }

src/Symfony/Component/Validator/Constraints/Locale.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Locale extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Locale extends Constraint
 {
     public $message = 'This value is not a valid locale';
 }

src/Symfony/Component/Validator/Constraints/Max.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Max extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Max extends Constraint
 {
     public $message = 'This value should be {{ limit }} or less';
     public $limit;

src/Symfony/Component/Validator/Constraints/MaxLength.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class MaxLength extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class MaxLength extends Constraint
 {
     public $message = 'This value is too long. It should have {{ limit }} characters or less';
     public $limit;

src/Symfony/Component/Validator/Constraints/Min.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Min extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Min extends Constraint
 {
     public $message = 'This value should be {{ limit }} or more';
     public $limit;

src/Symfony/Component/Validator/Constraints/MinLength.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class MinLength extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class MinLength extends Constraint
 {
     public $message = 'This value is too short. It should have {{ limit }} characters or more';
     public $limit;

src/Symfony/Component/Validator/Constraints/NotBlank.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class NotBlank extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class NotBlank extends Constraint
 {
     public $message = 'This value should not be blank';
 }

src/Symfony/Component/Validator/Constraints/NotNull.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class NotNull extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class NotNull extends Constraint
 {
     public $message = 'This value should not be null';
 }

src/Symfony/Component/Validator/Constraints/Null.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Null extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Null extends Constraint
 {
     public $message = 'This value should be null';
 }

src/Symfony/Component/Validator/Constraints/Regex.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Regex extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Regex extends Constraint
 {
     public $message = 'This value is not valid';
     public $pattern;

src/Symfony/Component/Validator/Constraints/Time.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Time extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Time extends Constraint
 {
     public $message = 'This value is not a valid time';
 }

src/Symfony/Component/Validator/Constraints/True.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class True extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class True extends Constraint
 {
     public $message = 'This value should be true';
 }

src/Symfony/Component/Validator/Constraints/Type.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Type extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Type extends Constraint
 {
     public $message = 'This value should be of type {{ type }}';
     public $type;

src/Symfony/Component/Validator/Constraints/Url.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Url extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Url extends Constraint
 {
     public $message = 'This value is not a valid URL';
     public $protocols = array('http', 'https');

src/Symfony/Component/Validator/Constraints/Valid.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Valid extends \Symfony\Component\Validator\Constraint
+use Symfony\Component\Validator\Constraint;
+
+class Valid extends Constraint
 {
     public $traverse = true;
 }

src/Symfony/Component/Validator/Mapping/Loader/FileLoader.php

@@ -24,6 +24,14 @@ abstract class FileLoader implements LoaderInterface
      */
     protected $namespaces;
 
+    /**
+     * Constructor.
+     *
+     * @param string $file The mapping file to load
+     *
+     * @throws MappingException if the mapping file does not exist
+     * @throws MappingException if the mapping file is not readable
+     */
     public function __construct($file)
     {
         if (!file_exists($file)) {

src/Symfony/Component/Validator/ValidatorFactory.php

@@ -93,7 +93,7 @@ class ValidatorFactory implements ValidatorContextInterface
      * @param  string $staticMethod         The name of the static method to
      *                                      use, if static method loading should
      *                                      be enabled
-     * @throws \InvalidArgumentException    If any of the files in $mappingFiles
+     * @throws MappingException             If any of the files in $mappingFiles
      *                                      has neither the extension ".xml" nor
      *                                      ".yml" nor ".yaml"
      */