Updates according to feedback and style changes

symfony · Nyholm · Jul 15, 2016 · Jul 17, 2016 · Jul 17, 2016 · Jul 17, 2016
commit 0fe9da5e8c4db0f2b455052297b6aa0843833e78
diff --git a/src/Symfony/Component/Serializer/Annotation/Exclude.php b/src/Symfony/Component/Serializer/Annotation/Exclude.php
@@ -1,8 +1,15 @@
 <?php
 
-namespace Symfony\Component\Serializer\Annotation;
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
-use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+namespace Symfony\Component\Serializer\Annotation;
 
 /**
  * @Annotation

diff --git a/src/Symfony/Component/Serializer/Annotation/ExclusionPolicy.php b/src/Symfony/Component/Serializer/Annotation/ExclusionPolicy.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Serializer\Annotation;
 
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
@@ -23,11 +32,11 @@ final class ExclusionPolicy
     public function __construct(array $data)
     {
         if (!isset($data['value']) || !$data['value']) {
-            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" cannot be empty.', get_class($this)));
+            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" cannot be empty.', \get_class($this)));
         }
 
-        if (!is_string($data['value'])) {
-            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a string.', get_class($this)));
+        if (!\is_string($data['value'])) {
+            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a string.', \get_class($this)));
         }
 
         $this->policy = strtoupper($data['value']);

diff --git a/src/Symfony/Component/Serializer/Annotation/Expose.php b/src/Symfony/Component/Serializer/Annotation/Expose.php
@@ -1,8 +1,15 @@
 <?php
 
-namespace Symfony\Component\Serializer\Annotation;
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
-use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+namespace Symfony\Component\Serializer\Annotation;
 
 /**
  * @Annotation

diff --git a/src/Symfony/Component/Serializer/Annotation/Methods.php b/src/Symfony/Component/Serializer/Annotation/Methods.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Serializer\Annotation;
 
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
@@ -25,23 +34,23 @@ final class Methods
     public function __construct(array $data)
     {
         if (empty($data)) {
-            throw new InvalidArgumentException(
8000
sprintf('Parameter of annotation "%s" cannot be empty.', get_class($this)));
+            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" cannot be empty.', \get_class($this)));
         }
 
         foreach (array('accessor', 'mutator') as $parameter) {
             if (!isset($data[$parameter]) || !$data[$parameter]) {
                 continue;
             }
 
-            if (!is_string($data[$parameter])) {
-                throw new InvalidArgumentException(sprintf('Parameter "%s" of annotation "%s" must be a string.', $parameter, get_class($this)));
+            if (!\is_string($data[$parameter])) {
+                throw new InvalidArgumentException(sprintf('Parameter "%s" of annotation "%s" must be a string.', $parameter, \get_class($this)));
             }
 
             $this->$parameter = $data[$parameter];
         }
 
         if (null === $this->accessor && null === $this->mutator) {
-            throw new InvalidArgumentException(sprintf('Either option "getter" or "setter" must be given for annotation %s', get_class($this)));
+            throw new InvalidArgumentException(sprintf('Either option "getter" or "setter" must be given for annotation %s', \get_class($this)));
         }
     }
 

diff --git a/src/Symfony/Component/Serializer/Annotation/ReadOnly.php b/src/Symfony/Component/Serializer/Annotation/ReadOnly.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Serializer\Annotation;
 
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
@@ -25,8 +34,8 @@ public function __construct(array $data = array())
             return;
         }
 
-        if (!is_bool($data['value'])) {
-            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a boolean.', get_class($this)));
+        if (!\is_bool($data['value'])) {
+            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a boolean.', \get_class($this)));
         }
 
         $this->readOnly = $data['value'];

diff --git a/src/Symfony/Component/Serializer/Annotation/SerializedName.php b/src/Symfony/Component/Serializer/Annotation/SerializedName.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Serializer\Annotation;
 
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
@@ -20,11 +29,11 @@ final class SerializedName
     public function __construct(array $data)
     {
         if (!isset($data['value']) || !$data['value']) {
-            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" cannot be empty.', get_class($this)));
+            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" cannot be empty.', \get_class($this)));
         }
 
-        if (!is_string($data['value'])) {
-            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a string.', get_class($this)));
+        if (!\is_string($data['value'])) {
+            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a string.', \get_class($this)));
         }
 
         $this->name = $data['value'];

diff --git a/src/Symfony/Component/Serializer/Annotation/Type.php b/src/Symfony/Component/Serializer/Annotation/Type.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Serializer\Annotation;
 
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
@@ -20,19 +29,19 @@ final class Type
     public function __construct(array $data)
     {
         if (!isset($data['value']) || !$data['value']) {
-            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" cannot be empty.', get_class($this)));
+            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" cannot be empty.', \get_class($this)));
         }
 
-        if (!is_string($data['value'])) {
-            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a string.', get_class($this)));
+        if (!\is_string($data['value'])) {
+            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a string.', \get_class($this)));
         }
 
         $type = $data['value'];
 
         if (false !== $pos = strpos($type, '\\')) {
             // This is a referencet to a class
-            if ($pos !== 0) {
-                throw new InvalidArgumentException(sprintf('When referring to an class you you must begin the type with backslash (\\) you provided "%s" for annotation "%s".', $type, get_class($this)));
+            if (0 !== $pos) {
+                throw new InvalidArgumentException(sprintf('When referring to an class you you must begin the type with backslash (\\) you provided "%s" for annotation "%s".', $type, \get_class($this)));
             }
         }
 

diff --git a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
@@ -30,7 +30,7 @@ class AttributeMetadata implements AttributeMetadataInterface
      *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
-     *           {@link getGroups()} instead.
+     *           {@link getMethodsAccessor()} instead.
      */
     public $methodsAccessor;
 
@@ -39,7 +39,7 @@ class AttributeMetadata implements AttributeMetadataInterface
      *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
-     *           {@link getGroups()} instead.
+     *           {@link getMethodsMutator()} instead.
      */
     public $methodsMutator;
 
@@ -48,7 +48,7 @@ class AttributeMetadata implements AttributeMetadataInterface
      *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
-     *           {@link getGroups()} instead.
+     *           {@link getExclude()} instead.
      */
     public $exclude;
 
@@ -57,7 +57,7 @@ class AttributeMetadata implements AttributeMetadataInterface
      *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
-     *           {@link getGroups()} instead.
+     *           {@link getExpose()} instead.
      */
     public $expose;
 
@@ -82,7 +82,7 @@ class AttributeMetadata implements AttributeMetadataInterface
      *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
-     *           {@link getGroups()} instead.
+     *           {@link getReadOnly()} instead.
      */
     public $readOnly;
 
@@ -91,7 +91,7 @@ class AttributeMetadata implements AttributeMetadataInterface
      *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
-     *           {@link getGroups()} instead.
+     *           {@link getSerializedName()} instead.
      */
     public $serializedName;
 
@@ -100,7 +100,7 @@ class AttributeMetadata implements AttributeMetadataInterface
      *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
-     *           {@link getGroups()} instead.
+     *           {@link getType()} instead.
      */
     public $type;
 

diff --git a/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php b/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
@@ -30,7 +30,7 @@ class ClassMetadata implements ClassMetadataInterface
      *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
-     *           {@link getName()} instead.
+     *           {@link getExclusionPolicy()} instead.
      */
     public $exclusionPolicy;
 
@@ -39,7 +39,7 @@ class ClassMetadata implements ClassMetadataInterface
      *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
-     *           {@link getName()} instead.
+     *           {@link getReadOnly()} instead.
      */
     public $readOnly;
 

diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/BetterAnnotationLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/BetterAnnotationLoader.php
@@ -29,9 +29,6 @@ class BetterAnnotationLoader implements LoaderInterface
      */
     private $reader;
 
-    /**
-     * @param Reader $reader
-     */
     public function __construct(Reader $reader)
     {
         $this->reader = $reader;

diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -288,11 +288,10 @@ protected function isAllowedAttribute($classOrObject, $attribute, $format = null
      * the denormalization process.
      *
      * @param object|array $data
-     * @param string       $class
      *
      * @return array
      */
-    protected function prepareForDenormalization($data, $class)
+    protected function prepareForDenormalization($data)
     {
         return (array) $data;
     }

diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -340,8 +340,8 @@ private function validateAndDenormalize(string $currentClass, string $attribute,
                     throw new LogicException(sprintf('Cannot denormalize attribute "%s" for class "%s" because injected serializer is not a denormalizer', $attribute, $class));
                 }
 
-                if (!is_array($data) && !$data instanceof \Traversable) {
-                    throw new LogicException(sprintf('Cannot denormalize attribute "%s" for class "%s" because the value is "%s", expected array', $attribute, $class, gettype($data)));
+                if (!\is_array($data) && !$data instanceof \Traversable) {
+                    throw new LogicException(sprintf('Cannot denormalize attribute "%s" for class "%s" because the value is "%s", expected array', $attribute, $class, \gettype($data)));
                 }
 
                 $denormalizedData = array();
@@ -418,6 +418,7 @@ private function getTypes(string $currentClass, string $attribute)
      * Sets an attribute and apply the name converter if necessary.
      *
      * @param mixed $attributeValue
+     *
      * @internal
      */
     protected function updateData(array $data, string $attribute, $attributeValue): array