From 086843a11b4633848546a144c3d4eede0f8ed9ee Mon Sep 17 00:00:00 2001
From: Marcin Czarnecki <mczarnecki@box.com>
Date: Sun, 2 Feb 2025 01:51:14 +0100
Subject: [PATCH] Do not typehint DNF union types

---
 phpcs.xml.dist                                |  4 ++
 src/Metadata/Driver/TypedPropertiesDriver.php | 10 ++-
 .../TypedProperties/NotSupportedDNFTypes.php  | 71 +++++++++++++++++++
 .../Driver/UnionTypedPropertiesDriverTest.php | 11 +++
 4 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 tests/Fixtures/TypedProperties/NotSupportedDNFTypes.php

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index e2ed35f0c..ceec7fbe5 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -107,6 +107,10 @@
         <exclude-pattern>tests/*</exclude-pattern>
     </rule>
 
+    <rule ref="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps">
+        <exclude-pattern>tests/Fixtures/TypedProperties/NotSupportedDNFTypes.php</exclude-pattern>
+    </rule>
+
     <rule ref="SlevomatCodingStandard.Commenting.DocCommentSpacing">
         <properties>
             <property name="annotationsGroups" type="array">
diff --git a/src/Metadata/Driver/TypedPropertiesDriver.php b/src/Metadata/Driver/TypedPropertiesDriver.php
index 5c447a946..eff62b294 100644
--- a/src/Metadata/Driver/TypedPropertiesDriver.php
+++ b/src/Metadata/Driver/TypedPropertiesDriver.php
@@ -180,7 +180,15 @@ private function shouldTypeHintUnion(?ReflectionType $reflectionType)
             return false;
         }
 
-        foreach ($reflectionType->getTypes() as $type) {
+        $types = $reflectionType->getTypes();
+
+        foreach ($types as $type) {
+            if ($type instanceof \ReflectionIntersectionType) {
+                return false;
+            }
+        }
+
+        foreach ($types as $type) {
             if ($this->shouldTypeHintInsideUnion($type)) {
                 return true;
             }
diff --git a/tests/Fixtures/TypedProperties/NotSupportedDNFTypes.php b/tests/Fixtures/TypedProperties/NotSupportedDNFTypes.php
new file mode 100644
index 000000000..382c5e5fa
--- /dev/null
+++ b/tests/Fixtures/TypedProperties/NotSupportedDNFTypes.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace JMS\Serializer\Tests\Fixtures\TypedProperties;
+
+/**
+ * @link https://wiki.php.net/rfc/dnf_types
+ * Changing this file may create some BC change.
+ */
+class NotSupportedDNFTypes
+{
+    // Accepts an object that implements both A and B,
+    // OR an object that implements D.
+    private (A&B)|D $CandBorD;
+
+    // Accepts an object that implements C,
+    // OR a child of X that also implements D,
+    // OR null.
+    private C|(X&D)|null $CorXandDorNULL;
+
+    // Accepts an object that implements all three of A, B, and D,
+    // OR an int,
+    // OR null.
+    private (A&B&D)|int|null $AandBandCorINTorNULL;
+
+    // Accepts an object that implements both A and B,
+    // OR an object that implements both A and D.
+    private (A&B)|(A&D ) $AandBorAandD;
+
+    // Accepts an object that implements A and B,
+    // OR an object that implements both B and D,
+    // OR a child of W that also implements B,
+    // OR null.
+    private A|(B&D)|(B&W)|null $AorBandDorBandWorNULL;
+
+    public function __construct(
+        private (A&B)|D $promotedCandBorD,
+        private C|(X&D)|null $promotedCorXandDorNULL,
+        private (A&B&D)|int|null $promotedAandBandCorINTorNULL,
+        private (A&B)|(A&D ) $promotedAandBorAandD,
+        private A|(B&D)|(B&W)|null $promotedAorBandDorBandWorNULL,
+    ) {
+    }
+}
+
+interface A
+{
+}
+interface B
+{
+}
+interface C extends A
+{
+}
+interface D
+{
+}
+
+class W implements A
+{
+}
+class X implements B
+{
+}
+class Y implements A, B
+{
+}
+class Z extends Y implements C
+{
+}
diff --git a/tests/Metadata/Driver/UnionTypedPropertiesDriverTest.php b/tests/Metadata/Driver/UnionTypedPropertiesDriverTest.php
index d6e0a3168..9593fa3c5 100644
--- a/tests/Metadata/Driver/UnionTypedPropertiesDriverTest.php
+++ b/tests/Metadata/Driver/UnionTypedPropertiesDriverTest.php
@@ -10,6 +10,7 @@
 use JMS\Serializer\Metadata\Driver\NullDriver;
 use JMS\Serializer\Metadata\Driver\TypedPropertiesDriver;
 use JMS\Serializer\Naming\IdenticalPropertyNamingStrategy;
+use JMS\Serializer\Tests\Fixtures\TypedProperties\NotSupportedDNFTypes;
 use JMS\Serializer\Tests\Fixtures\TypedProperties\UnionTypedProperties;
 use Metadata\Driver\DriverChain;
 use PHPUnit\Framework\TestCase;
@@ -86,6 +87,16 @@ public function testInferUnionTypesShouldIncludeValueTypes()
         );
     }
 
+    public function testDNFTypes()
+    {
+        $m = $this->resolve(NotSupportedDNFTypes::class);
+
+        self::assertCount(10, $m->propertyMetadata);
+        foreach ($m->propertyMetadata as $propertyMetadata) {
+            self::assertNull($propertyMetadata->type, 'Breaking Change: TypeResolved for: ' . $propertyMetadata->name);
+        }
+    }
+
     private function resolve(string $classToResolve): ClassMetadata
     {
         $namingStrategy = new IdenticalPropertyNamingStrategy();