Merge branch '2.8' into 3.3

nicolas-grekas · nicolas-grekas · commit 3b8dcab695ae · 2017-11-05T16:47:03.000+01:00
* 2.8:
  [Intl] Make intl-data tests pass and save language aliases again
  Remove useless docblocks
  [PropertyInfo] Remove useless docblocks
diff --git a/Constraint.php b/Constraint.php
@@ -33,29 +33,21 @@ abstract class Constraint
 {
     /**
      * The name of the group given to all constraints with no explicit group.
-     *
-     * @var string
      */
     const DEFAULT_GROUP = 'Default';
 
     /**
      * Marks a constraint that can be put onto classes.
-     *
-     * @var string
      */
     const CLASS_CONSTRAINT = 'class';
 
     /**
      * Marks a constraint that can be put onto properties.
-     *
-     * @var string
      */
     const PROPERTY_CONSTRAINT = 'property';
 
     /**
      * Maps error codes to the names of their constants.
-     *
-     * @var array
      */
     protected static $errorNames = array();
 
diff --git a/ConstraintValidator.php b/ConstraintValidator.php
@@ -23,15 +23,11 @@ abstract class ConstraintValidator implements ConstraintValidatorInterface
     /**
      * Whether to format {@link \DateTime} objects as RFC-3339 dates
      * ("Y-m-d H:i:s").
-     *
-     * @var int
      */
     const PRETTY_DATE = 1;
 
     /**
      * Whether to cast objects with a "__toString()" method to strings.
-     *
-     * @var int
      */
     const OBJECT_TO_STRING = 2;
 
diff --git a/Constraints/EmailValidator.php b/Constraints/EmailValidator.php
@@ -23,11 +23,11 @@
  */
 class EmailValidator extends ConstraintValidator
 {
-    /**
-     * @var bool
-     */
     private $isStrict;
 
+    /**
+     * @param bool $strict
+     */
     public function __construct($strict = false)
     {
         $this->isStrict = $strict;
diff --git a/Constraints/ExpressionValidator.php b/Constraints/ExpressionValidator.php
@@ -23,9 +23,6 @@
  */
 class ExpressionValidator extends ConstraintValidator
 {
-    /**
-     * @var ExpressionLanguage
-     */
     private $expressionLanguage;
 
     public function __construct($propertyAccessor = null, ExpressionLanguage $expressionLanguage = null)
diff --git a/Context/ExecutionContextFactory.php b/Context/ExecutionContextFactory.php
@@ -24,14 +24,7 @@
  */
 class ExecutionContextFactory implements ExecutionContextFactoryInterface
 {
-    /**
-     * @var TranslatorInterface
-     */
     private $translator;
-
-    /**
-     * @var string|null
-     */
     private $translationDomain;
 
     /**
diff --git a/Mapping/Factory/LazyLoadingMetadataFactory.php b/Mapping/Factory/LazyLoadingMetadataFactory.php
@@ -38,18 +38,7 @@
  */
 class LazyLoadingMetadataFactory implements MetadataFactoryInterface
 {
-    /**
-     * The loader for loading the class metadata.
-     *
-     * @var LoaderInterface|null
-     */
     protected $loader;
-
-    /**
-     * The cache for caching class metadata.
-     *
-     * @var CacheInterface|null
-     */
     protected $cache;
 
     /**
diff --git a/Mapping/Loader/AnnotationLoader.php b/Mapping/Loader/AnnotationLoader.php
@@ -26,9 +26,6 @@
  */
 class AnnotationLoader implements LoaderInterface
 {
-    /**
-     * @var Reader
-     */
     protected $reader;
 
     public function __construct(Reader $reader)
diff --git a/Mapping/Loader/FileLoader.php b/Mapping/Loader/FileLoader.php
@@ -23,11 +23,6 @@
  */
 abstract class FileLoader extends AbstractLoader
 {
-    /**
-     * The file to load.
-     *
-     * @var string
-     */
     protected $file;
 
     /**
diff --git a/Mapping/Loader/LoaderChain.php b/Mapping/Loader/LoaderChain.php
@@ -25,9 +25,6 @@
  */
 class LoaderChain implements LoaderInterface
 {
-    /**
-     * @var LoaderInterface[]
-     */
     protected $loaders;
 
     /**
diff --git a/Mapping/Loader/StaticMethodLoader.php b/Mapping/Loader/StaticMethodLoader.php
@@ -21,11 +21,6 @@
  */
 class StaticMethodLoader implements LoaderInterface
 {
-    /**
-     * The name of the method to call.
-     *
-     * @var string
-     */
     protected $methodName;
 
     /**
diff --git a/Mapping/MemberMetadata.php b/Mapping/MemberMetadata.php
@@ -29,26 +29,20 @@
 abstract class MemberMetadata extends GenericMetadata implements PropertyMetadataInterface
 {
     /**
-     * @var string
-     *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
      *           {@link getClassName()} instead.
      */
     public $class;
 
     /**
-     * @var string
-     *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
      *           {@link getName()} instead.
      */
     public $name;
 
     /**
-     * @var string
-     *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
      *           {@link getPropertyName()} instead.
diff --git a/Validator/RecursiveContextualValidator.php b/Validator/RecursiveContextualValidator.php
@@ -38,34 +38,11 @@
  */
 class RecursiveContextualValidator implements ContextualValidatorInterface
 {
-    /**
-     * @var ExecutionContextInterface
-     */
     private $context;
-
-    /**
-     * @var string
-     */
     private $defaultPropertyPath;
-
-    /**
-     * @var array
-     */
     private $defaultGroups;
-
-    /**
-     * @var MetadataFactoryInterface
-     */
     private $metadataFactory;
-
-    /**
-     * @var ConstraintValidatorFactoryInterface
-     */
     private $validatorFactory;
-
-    /**
-     * @var ObjectInitializerInterface[]
-     */
     private $objectInitializers;
 
     /**
diff --git a/Validator/RecursiveValidator.php b/Validator/RecursiveValidator.php
@@ -24,24 +24,9 @@
  */
 class RecursiveValidator implements ValidatorInterface
 {
-    /**
-     * @var ExecutionContextFactoryInterface
-     */
     protected $contextFactory;
-
-    /**
-     * @var MetadataFactoryInterface
-     */
     protected $metadataFactory;
-
-    /**
-     * @var ConstraintValidatorFactoryInterface
-     */
     protected $validatorFactory;
-
-    /**
-     * @var ObjectInitializerInterface[]
-     */
     protected $objectInitializers;
 
     /**
diff --git a/ValidatorBuilder.php b/ValidatorBuilder.php
@@ -37,24 +37,9 @@
  */
 class ValidatorBuilder implements ValidatorBuilderInterface
 {
-    /**
-     * @var array
-     */
     private $initializers = array();
-
-    /**
-     * @var array
-     */
     private $xmlMappings = array();
-
-    /**
-     * @var array
-     */
     private $yamlMappings = array();
-
-    /**
-     * @var array
-     */
     private $methodMappings = array();
 
     /**
diff --git a/Violation/ConstraintViolationBuilder.php b/Violation/ConstraintViolationBuilder.php
@@ -27,59 +27,16 @@
  */
 class ConstraintViolationBuilder implements ConstraintViolationBuilderInterface
 {
-    /**
-     * @var ConstraintViolationList
-     */
     private $violations;
-
-    /**
-     * @var string
-     */
     private $message;
-
-    /**
-     * @var array
-     */
     private $parameters;
-
-    /**
-     * @var mixed
-     */
     private $root;
-
-    /**
-     * @var mixed
-     */
     private $invalidValue;
-
-    /**
-     * @var string
-     */
     private $propertyPath;
-
-    /**
-     * @var TranslatorInterface
-     */
     private $translator;
-
-    /**
-     * @var string|null
-     */
     private $translationDomain;
-
-    /**
-     * @var int|null
-     */
     private $plural;
-
-    /**
-     * @var Constraint
-     */
     private $constraint;
-
-    /**
-     * @var mixed
-     */
     private $code;
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,11 @@`
`23`	`23`	`*/`
`24`	`24`	`class EmailValidator extends ConstraintValidator`
`25`	`25`	`{`
`26`		`- /**`
`27`		`- * @var bool`
`28`		`- */`
`29`	`26`	`private $isStrict;`
`30`	`27`
	`28`	`+ /**`
	`29`	`+ * @param bool $strict`
	`30`	`+ */`
`31`	`31`	`public function __construct($strict = false)`
`32`	`32`	`{`
`33`	`33`	`$this->isStrict = $strict;`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,6 @@`
`23`	`23`	`*/`
`24`	`24`	`class ExpressionValidator extends ConstraintValidator`
`25`	`25`	`{`
`26`		`- /**`
`27`		`- * @var ExpressionLanguage`
`28`		`- */`
`29`	`26`	`private $expressionLanguage;`
`30`	`27`
`31`	`28`	`public function __construct($propertyAccessor = null, ExpressionLanguage $expressionLanguage = null)`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,6 @@`
`26`	`26`	`*/`
`27`	`27`	`class AnnotationLoader implements LoaderInterface`
`28`	`28`	`{`
`29`		`- /**`
`30`		`- * @var Reader`
`31`		`- */`
`32`	`29`	`protected $reader;`
`33`	`30`
`34`	`31`	`public function __construct(Reader $reader)`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,6 @@`
`25`	`25`	`*/`
`26`	`26`	`class LoaderChain implements LoaderInterface`
`27`	`27`	`{`
`28`		`- /**`
`29`		`- * @var LoaderInterface[]`
`30`		`- */`
`31`	`28`	`protected $loaders;`
`32`	`29`
`33`	`30`	`/**`