Merge pull request #11215 from greg0ire/remove-array-access

Remove array access

UPGRADE.md

@@ -1,3 +1,15 @@
+# Upgrade to 4.0
+
+## Remove array access
+
+Using array access on instances of the following classes is no longer possible:
+
+- `Doctrine\ORM\Mapping\DiscriminatorColumnMapping`
+- `Doctrine\ORM\Mapping\EmbedClassMapping`
+- `Doctrine\ORM\Mapping\FieldMapping`
+- `Doctrine\ORM\Mapping\JoinColumnMapping`
+- `Doctrine\ORM\Mapping\JoinTableMapping`
+
 # Upgrade to 3.1
 
 ## Deprecate array access

src/Mapping/AssociationMapping.php

@@ -4,7 +4,6 @@
 
 namespace Doctrine\ORM\Mapping;
 
-use ArrayAccess;
 use Exception;
 use OutOfRangeException;
 
@@ -14,8 +13,7 @@
 use function property_exists;
 use function sprintf;
 
-/** @template-implements ArrayAccess<string, mixed> */
-abstract class AssociationMapping implements ArrayAccess
+abstract class AssociationMapping
 {
     /**
      * The names of persistence operations to cascade on the association.

src/Mapping/DiscriminatorColumnMapping.php

@@ -4,18 +4,14 @@
 
 namespace Doctrine\ORM\Mapping;
 
-use ArrayAccess;
 use BackedEnum;
 use Exception;
 
 use function in_array;
 use function property_exists;
 
-/** @template-implements ArrayAccess<string, mixed> */
-final class DiscriminatorColumnMapping implements ArrayAccess
+final class DiscriminatorColumnMapping
 {
-    use ArrayAccessImplementation;
-
     /** The database length of the column. Optional. Default value taken from the type. */
     public int|null $length = null;
 

src/Mapping/EmbeddedClassMapping.php

@@ -4,15 +4,10 @@
 
 namespace Doctrine\ORM\Mapping;
 
-use ArrayAccess;
-
 use function property_exists;
 
-/** @template-implements ArrayAccess<string, mixed> */
-final class EmbeddedClassMapping implements ArrayAccess
+final class EmbeddedClassMapping
 {
-    use ArrayAccessImplementation;
-
     public string|false|null $columnPrefix = null;
     public string|null $declaredField      = null;
     public string|null $originalField      = null;

src/Mapping/FieldMapping.php

@@ -4,17 +4,13 @@
 
 namespace Doctrine\ORM\Mapping;
 
-use ArrayAccess;
 use BackedEnum;
 
 use function in_array;
 use function property_exists;
 
-/** @template-implements ArrayAccess<string, mixed> */
-final class FieldMapping implements ArrayAccess
+final class FieldMapping
 {
-    use ArrayAccessImplementation;
-
     /** The database length of the column. Optional. Default value taken from the type. */
     public int|null $length = null;
     /**

src/Mapping/JoinColumnMapping.php

@@ -4,15 +4,10 @@
 
 namespace Doctrine\ORM\Mapping;
 
-use ArrayAccess;
-
 use function property_exists;
 
-/** @template-implements ArrayAccess<string, mixed> */
-final class JoinColumnMapping implements ArrayAccess
+final class JoinColumnMapping
 {
-    use ArrayAccessImplementation;
-
     public bool|null $unique             = null;
     public bool|null $quoted             = null;
     public string|null $fieldName        = null;

src/Mapping/JoinTableMapping.php

@@ -4,16 +4,11 @@
 
 namespace Doctrine\ORM\Mapping;
 
-use ArrayAccess;
-
 use function array_map;
 use function in_array;
 
-/** @template-implements ArrayAccess<string, mixed> */
-final class JoinTableMapping implements ArrayAccess
+final class JoinTableMapping
 {
-    use ArrayAccessImplementation;
-
     public bool|null $quoted = null;
 
     /** @var list<JoinColumnMapping> */

tests/Tests/ORM/Mapping/AssociationMappingTest.php

@@ -6,7 +6,6 @@
 
 use Doctrine\ORM\Mapping\AssociationMapping;
 use Doctrine\ORM\Mapping\ClassMetadata;
-use OutOfRangeException;
 use PHPUnit\Framework\TestCase;
 
 use function assert;
@@ -50,45 +49,6 @@ public function testItSurvivesSerialization(): void
         self::assertTrue($resurrectedMapping->orphanRemoval);
         self::assertTrue($resurrectedMapping->unique);
     }
-
-    public function testItThrowsWhenAccessingUnknownProperty(): void
-    {
-        $mapping = new MyAssociationMapping(
-            fieldName: 'foo',
-            sourceEntity: self::class,
-            targetEntity: self::class,
-        );
-
-        $this->expectException(OutOfRangeException::class);
-
-        $mapping['foo'];
-    }
-
-    public function testItThrowsWhenSettingUnknownProperty(): void
-    {
-        $mapping = new MyAssociationMapping(
-            fieldName: 'foo',
-            sourceEntity: self::class,
-            targetEntity: self::class,
-        );
-
-        $this->expectException(OutOfRangeException::class);
-
-        $mapping['foo'] = 'bar';
-    }
-
-    public function testItThrowsWhenUnsettingUnknownProperty(): void
-    {
-        $mapping = new MyAssociationMapping(
-            fieldName: 'foo',
-            sourceEntity: self::class,
-            targetEntity: self::class,
-        );
-
-        $this->expectException(OutOfRangeException::class);
-
-        unset($mapping['foo']);
-    }
 }
 
 class MyAssociationMapping extends AssociationMapping