Disabling Accessor setter when value resolution falls back to the pro…

…perty default value
schmittjoh · Aug 10, 2022 · 47aed2b · 47aed2b
1 parent e23f0d1
commit 47aed2b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/phpstan-7-4.neon.dist b/phpstan-7-4.neon.dist
@@ -14,6 +14,7 @@ parameters:
     excludePaths:
         - %currentWorkingDirectory%/tests/Fixtures/TypedProperties/UnionTypedProperties.php
         - %currentWorkingDirectory%/tests/Fixtures/TypedProperties/ConstructorPromotion/Vase.php
+        - %currentWorkingDirectory%/tests/Fixtures/TypedProperties/ConstructorPromotion/DefaultValuesAndAccessors.php
         - %currentWorkingDirectory%/tests/Fixtures/TypedProperties/UnionTypedProperties.php
         - %currentWorkingDirectory%/tests/Metadata/Driver/UnionTypedPropertiesDriverTest.php
         - %currentWorkingDirectory%/tests/Serializer/BaseSerializationTest.php

diff --git a/src/Accessor/DefaultAccessorStrategy.php b/src/Accessor/DefaultAccessorStrategy.php
@@ -7,7 +7,6 @@
 use JMS\Serializer\DeserializationContext;
 use JMS\Serializer\Exception\ExpressionLanguageRequiredException;
 use JMS\Serializer\Exception\LogicException;
-use JMS\Serializer\Exception\NotAcceptableException;
 use JMS\Serializer\Exception\UninitializedPropertyException;
 use JMS\Serializer\Expression\CompilableExpressionEvaluatorInterface;
 use JMS\Serializer\Expression\Expression;

diff --git a/tests/Fixtures/TypedProperties/ConstructorPromotion/DefaultValuesAndAccessors.php b/tests/Fixtures/TypedProperties/ConstructorPromotion/DefaultValuesAndAccessors.php
@@ -28,4 +28,4 @@ public function setPromotedWithSetter(string $value): void
     {
         $this->promotedWithSetter = $value . '_fromsetter';
     }
-}
+}
diff --git a/tests/Fixtures/TypedProperties/ConstructorPromotion/Vase.php b/tests/Fixtures/TypedProperties/ConstructorPromotion/Vase.php
@@ -10,31 +10,29 @@ class Vase
 {
     public function __construct(
         public string $color,
-
         #[JMS\Accessor(setter: 'setSize')]
         public string $size,
-
         public ?string $plant = null,
         public string $typeOfSoil = 'potting mix',
         public int $daysSincePotting = -1,
-
         #[JMS\Accessor(setter: 'setWeight')]
         public int $weight = 10,
     ) {
     }
 
     public function setWeight(int $weight): void
     {
-        $this->weight = $weight+30;
+        $this->weight = $weight + 30;
     }
 
     public function setSize(string $size): void
     {
-        if ($size === 'big') {
+        if ('big' === $size) {
             $this->size = 'huge';
 
             return;
         }
+
         $this->size = $size;
     }
 }
diff --git a/tests/Serializer/ArrayTest.php b/tests/Serializer/ArrayTest.php
@@ -95,7 +95,6 @@ public function testConstructorPromotionWithDefaultValuesOnly()
             $this->markTestSkipped(sprintf('%s requires PHP 8.0', __METHOD__));
         }
 
-        /** @var DefaultValuesAndAccessors $deserialized */
         $deserialized = $this->serializer->fromArray([], DefaultValuesAndAccessors::class);
 
         $expected = [