Merge pull request #1478 from malarzm/remove-discriminator-fieldname

[2.0] Remove DiscriminatorField's name and fieldName
doctrine · Aug 5, 2016 · a000a45 · a000a45
2 parents 50605d6 + d7004b1
commit a000a45
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 22 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/DiscriminatorField.php b/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/DiscriminatorField.php
@@ -28,18 +28,4 @@
  */
 final class DiscriminatorField extends Annotation
 {
-    /**
-     * Available for BC, but AnnotationDriver will consider $value first.
-     *
-     * @deprecated property was deprecated in 1.2 and will be removed in 2.0
-     */
-    public $name;
-
-    /**
-     * Available for BC, but AnnotationDriver will consider $name and $value
-     * first.
-     *
-     * @deprecated property was deprecated in 1.0.0-BETA10 and will be removed in 2.0
-     */
-    public $fieldName;
 }
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ODM/MongoDB/Mapping/Driver/AnnotationDriver.php
@@ -85,14 +85,7 @@ public function loadMetadataForClass($className, ClassMetadata $class)
             } elseif ($annot instanceof ODM\InheritanceType) {
                 $class->setInheritanceType(constant(MappingClassMetadata::class . '::INHERITANCE_TYPE_'.$annot->value));
             } elseif ($annot instanceof ODM\DiscriminatorField) {
-                // $fieldName property is deprecated, but fall back for BC
-                if (isset($annot->value)) {
-                    $class->setDiscriminatorField($annot->value);
-                } elseif (isset($annot->name)) {
-                    $class->setDiscriminatorField($annot->name);
-                } elseif (isset($annot->fieldName)) {
-                    $class->setDiscriminatorField($annot->fieldName);
-                }
+                $class->setDiscriminatorField($annot->value);
             } elseif ($annot instanceof ODM\DiscriminatorMap) {
                 $class->setDiscriminatorMap($annot->value);
             } elseif ($annot instanceof ODM\DiscriminatorValue) {