Turn deprecation from doctrine#10470 into an exception in 3.0.x

Author: mpdude

UPGRADE.md

@@ -1,5 +1,10 @@
 # Upgrade to 3.0
 
+## BC BREAK: Overriding fields or associations declared in other than mapped superclasses
+
+As stated in the documentation, fields and associations may only be overridden when being inherited
+from mapped superclasses. Overriding them for parent entity classes now throws a `MappingException`.
+
 ## BC BREAK: Undeclared entity inheritance now throws a `MappingException`
 
 As soon as an entity class inherits from another entity class, inheritance has to

lib/Doctrine/ORM/Mapping/ClassMetadata.php

@@ -2231,14 +2231,7 @@ public function setAttributeOverride(string $fieldName, array $overrideMapping):
         $mapping = $this->fieldMappings[$fieldName];
 
         if (isset($mapping['inherited'])) {
-            Deprecation::trigger(
-                'doctrine/orm',
-                'https://github.com/doctrine/orm/pull/10470',
-                'Overrides are only allowed for fields or associations declared in mapped superclasses or traits. This is not the case for %s::%s, which was inherited from %s. This is a misconfiguration and will be an error in Doctrine ORM 3.0.',
-                $this->name,
-                $fieldName,
-                $mapping['inherited'],
-            );
+            throw MappingException::illegalOverrideOfInheritedProperty($this->name, $fieldName, $mapping['inherited']);
         }
 
         if (isset($mapping['id'])) {

lib/Doctrine/ORM/Mapping/MappingException.php

@@ -547,13 +547,14 @@ public static function infiniteEmbeddableNesting(string $className, string $prop
         );
     }
 
-    public static function illegalOverrideOfInheritedProperty(string $className, string $propertyName): self
+    public static function illegalOverrideOfInheritedProperty(string $className, string $propertyName, string $inheritFromClass): self
     {
         return new self(
             sprintf(
-                'Overrides are only allowed for fields or associations declared in mapped superclasses or traits, which is not the case for %s::%s.',
+                'Overrides are only allowed for fields or associations declared in mapped superclasses or traits. This is not the case for %s::%s, which was inherited from %s.',
                 $className,
                 $propertyName,
+                $inheritFromClass
             ),
         );
     }

tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php

@@ -260,7 +260,8 @@ public function testInvalidOverrideFieldInheritedFromEntity(): void
     {
         $cm = $this->cmf->getMetadataFor(CompanyFixContract::class);
 
-        $this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/pull/10470');
+        $this->expectException(MappingException::class);
+        $this->expectExceptionMessageMatches('/Overrides are only allowed for fields or associations declared in mapped superclasses or traits./');
 
         $cm->setAttributeOverride('completed', ['name' => 'other_column_name']);
     }