Merge branch '4.4' into 5.0

* 4.4: Fix CS Fix CS
symfony · Feb 4, 2020 · b9faf0f · b9faf0f
2 parents a76fc03 + 6d9a233
commit b9faf0f
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 18 deletions.
diff --git a/Annotation/DiscriminatorMap.php b/Annotation/DiscriminatorMap.php
@@ -39,11 +39,11 @@ class DiscriminatorMap
     public function __construct(array $data)
     {
         if (empty($data['typeProperty'])) {
-            throw new InvalidArgumentException(sprintf('Parameter "typeProperty" of annotation "%s" cannot be empty.', \get_class($this)));
+            throw new InvalidArgumentException(sprintf('Parameter "typeProperty" of annotation "%s" cannot be empty.', static::class));
         }
 
         if (empty($data['mapping'])) {
-            throw new InvalidArgumentException(sprintf('Parameter "mapping" of annotation "%s" cannot be empty.', \get_class($this)));
+            throw new InvalidArgumentException(sprintf('Parameter "mapping" of annotation "%s" cannot be empty.', static::class));
         }
 
         $this->typeProperty = $data['typeProperty'];

diff --git a/Annotation/Groups.php b/Annotation/Groups.php
@@ -34,13 +34,13 @@ class Groups
     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.', static::class));
         }
 
         $value = (array) $data['value'];
         foreach ($value as $group) {
             if (!\is_string($group)) {
-                throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a string or an array of strings.', \get_class($this)));
+                throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a string or an array of strings.', static::class));
             }
         }
 

diff --git a/Annotation/MaxDepth.php b/Annotation/MaxDepth.php
@@ -31,11 +31,11 @@ class MaxDepth
     public function __construct(array $data)
     {
         if (!isset($data['value'])) {
-            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" should be set.', \get_class($this)));
+            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" should be set.', static::class));
         }
 
         if (!\is_int($data['value']) || $data['value'] <= 0) {
-            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a positive integer.', \get_class($this)));
+            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a positive integer.', static::class));
         }
 
         $this->maxDepth = $data['value'];

diff --git a/Annotation/SerializedName.php b/Annotation/SerializedName.php
@@ -31,11 +31,11 @@ final class SerializedName
     public function __construct(array $data)
     {
         if (!isset($data['value'])) {
-            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" should be set.', \get_class($this)));
+            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" should be set.', static::class));
         }
 
         if (!\is_string($data['value']) || empty($data['value'])) {
-            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a non-empty string.', \get_class($this)));
+            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a non-empty string.', static::class));
         }
 
         $this->serializedName = $data['value'];

diff --git a/Normalizer/AbstractNormalizer.php b/Normalizer/AbstractNormalizer.php
@@ -208,7 +208,17 @@ protected function isCircularReference(object $object, array &$context)
      */
     protected function handleCircularReference(object $object, string $format = null, array $context = [])
     {
+<<<<<<< HEAD
         $circularReferenceHandler = $context[self::CIRCULAR_REFERENCE_HANDLER] ?? $this->defaultContext[self::CIRCULAR_REFERENCE_HANDLER];
+=======
+        if (\func_num_args() < 2 && __CLASS__ !== static::class && __CLASS__ !== (new \ReflectionMethod($this, __FUNCTION__))->getDeclaringClass()->getName() && !$this instanceof \PHPUnit\Framework\MockObject\MockObject && !$this instanceof \Prophecy\Prophecy\ProphecySubjectInterface) {
+            @trigger_error(sprintf('The "%s()" method will have two new "string $format = null" and "array $context = []" arguments in version 5.0, not defining it is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
+        }
+        $format = \func_num_args() > 1 ? func_get_arg(1) : null;
+        $context = \func_num_args() > 2 ? func_get_arg(2) : [];
+
+        $circularReferenceHandler = $context[self::CIRCULAR_REFERENCE_HANDLER] ?? $this->defaultContext[self::CIRCULAR_REFERENCE_HANDLER] ?? $this->circularReferenceHandler;
+>>>>>>> 4.4
         if ($circularReferenceHandler) {
             return $circularReferenceHandler($object, $format, $context);
         }

diff --git a/Normalizer/ConstraintViolationListNormalizer.php b/Normalizer/ConstraintViolationListNormalizer.php
@@ -93,6 +93,6 @@ public function supportsNormalization($data, string $format = null)
      */
     public function hasCacheableSupportsMethod(): bool
     {
-        return __CLASS__ === \get_class($this);
+        return __CLASS__ === static::class;
     }
 }
diff --git a/Normalizer/CustomNormalizer.php b/Normalizer/CustomNormalizer.php
@@ -73,6 +73,6 @@ public function supportsDenormalization($data, string $type, string $format = nu
      */
     public function hasCacheableSupportsMethod(): bool
     {
-        return __CLASS__ === \get_class($this);
+        return __CLASS__ === static::class;
     }
 }
diff --git a/Normalizer/DataUriNormalizer.php b/Normalizer/DataUriNormalizer.php
@@ -128,7 +128,7 @@ public function supportsDenormalization($data, string $type, string $format = nu
      */
     public function hasCacheableSupportsMethod(): bool
     {
-        return __CLASS__ === \get_class($this);
+        return __CLASS__ === static::class;
     }
 
     /**

diff --git a/Normalizer/DateIntervalNormalizer.php b/Normalizer/DateIntervalNormalizer.php
@@ -60,7 +60,7 @@ public function supportsNormalization($data, string $format = null)
      */
     public function hasCacheableSupportsMethod(): bool
     {
-        return __CLASS__ === \get_class($this);
+        return __CLASS__ === static::class;
     }
 
     /**

diff --git a/Normalizer/DateTimeNormalizer.php b/Normalizer/DateTimeNormalizer.php
@@ -117,7 +117,7 @@ public function supportsDenormalization($data, string $type, string $format = nu
      */
     public function hasCacheableSupportsMethod(): bool
     {
-        return __CLASS__ === \get_class($this);
+        return __CLASS__ === static::class;
     }
 
     /**

diff --git a/Normalizer/DateTimeZoneNormalizer.php b/Normalizer/DateTimeZoneNormalizer.php
@@ -74,6 +74,6 @@ public function supportsDenormalization($data, string $type, string $format = nu
      */
     public function hasCacheableSupportsMethod(): bool
     {
-        return __CLASS__ === \get_class($this);
+        return __CLASS__ === static::class;
     }
 }
diff --git a/Normalizer/GetSetMethodNormalizer.php b/Normalizer/GetSetMethodNormalizer.php
@@ -57,7 +57,7 @@ public function supportsDenormalization($data, string $type, string $format = nu
      */
     public function hasCacheableSupportsMethod(): bool
     {
-        return __CLASS__ === \get_class($this);
+        return __CLASS__ === static::class;
     }
 
     /**

diff --git a/Normalizer/JsonSerializableNormalizer.php b/Normalizer/JsonSerializableNormalizer.php
@@ -70,6 +70,6 @@ public function denormalize($data, string $type, string $format = null, array $c
      */
     public function hasCacheableSupportsMethod(): bool
     {
-        return __CLASS__ === \get_class($this);
+        return __CLASS__ === static::class;
     }
 }
diff --git a/Normalizer/ObjectNormalizer.php b/Normalizer/ObjectNormalizer.php
@@ -54,7 +54,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
      */
     public function hasCacheableSupportsMethod(): bool
     {
-        return __CLASS__ === \get_class($this);
+        return __CLASS__ === static::class;
     }
 
     /**

diff --git a/Normalizer/PropertyNormalizer.php b/Normalizer/PropertyNormalizer.php
@@ -51,7 +51,7 @@ public function supportsDenormalization($data, string $type, string $format = nu
      */
     public function hasCacheableSupportsMethod(): bool
     {
-        return __CLASS__ === \get_class($this);
+        return __CLASS__ === static::class;
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public function hasCacheableSupportsMethod(): bool
         {
-            return __CLASS__ === \get_class($this);
+            return __CLASS__ === static::class;
         }
         /**
@@ Expand Down @@