Merge pull request #1206 from schmittjoh/exclude-on-parent

Consider exclude rules on parents if defined

src/Metadata/ClassMetadata.php

@@ -216,7 +216,9 @@ public function merge(MergeableInterface $object): void
         $this->postDeserializeMethods = array_merge($this->postDeserializeMethods, $object->postDeserializeMethods);
         $this->xmlRootName = $object->xmlRootName;
         $this->xmlRootNamespace = $object->xmlRootNamespace;
-        $this->excludeIf = $object->excludeIf;
+        if (null !== $object->excludeIf) {
+            $this->excludeIf = $object->excludeIf;
+        }
         $this->xmlNamespaces = array_merge($this->xmlNamespaces, $object->xmlNamespaces);
 
         if ($object->accessorOrder) {

tests/Fixtures/PersonAccountOnParent.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace JMS\Serializer\Tests\Fixtures;
+
+use JMS\Serializer\Annotation as Serializer;
+
+class PersonAccountOnParent extends PersonAccountParentWithExclude
+{
+    /**
+     * @Serializer\Type("string")
+     */
+    public $name;
+}

tests/Fixtures/PersonAccountParentWithExclude.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace JMS\Serializer\Tests\Fixtures;
+
+use JMS\Serializer\Annotation as Serializer;
+
+/**
+ * @Serializer\Exclude(if="object.expired")
+ */
+class PersonAccountParentWithExclude
+{
+    /**
+     * @Serializer\Type("boolean")
+     */
+    public $expired;
+}

tests/Serializer/BaseSerializationTest.php

@@ -94,6 +94,7 @@
 use JMS\Serializer\Tests\Fixtures\ParentNoMetadataChildObject;
 use JMS\Serializer\Tests\Fixtures\ParentSkipWithEmptyChild;
 use JMS\Serializer\Tests\Fixtures\PersonAccount;
+use JMS\Serializer\Tests\Fixtures\PersonAccountOnParent;
 use JMS\Serializer\Tests\Fixtures\PersonAccountWithParent;
 use JMS\Serializer\Tests\Fixtures\PersonSecret;
 use JMS\Serializer\Tests\Fixtures\PersonSecretMore;
@@ -330,6 +331,31 @@ public function testExcludeIfOnClassWithParent()
         $this->assertEquals($accountNotExpired->name, $deserialized[0]->name);
     }
 
+    public function testExcludeIfOnParentClass()
+    {
+        $accountNotExpired = new PersonAccountOnParent();
+        $accountNotExpired->name='Not expired account';
+        $accountNotExpired->expired = false;
+
+        $accountExpired = new PersonAccountOnParent();
+        $accountExpired->name='Expired account';
+        $accountExpired->expired = true;
+
+        $accounts = [$accountNotExpired,$accountExpired];
+
+        $language = new ExpressionLanguage();
+
+        $builder = SerializerBuilder::create();
+        $builder->setExpressionEvaluator(new ExpressionEvaluator($language));
+        $serializer = $builder->build();
+
+        $serialized  = $serializer->serialize($accounts, $this->getFormat(), null, sprintf('array<%s>', PersonAccountOnParent::class));
+        $deserialized = $serializer->deserialize($serialized, sprintf('array<%s>', PersonAccountOnParent::class), $this->getFormat());
+
+        $this->assertEquals(1, count($deserialized));
+        $this->assertEquals($accountNotExpired->name, $deserialized[0]->name);
+    }
+
     public function testExpressionExclusionNotConfigured()
     {
         $person = new PersonSecret();