Replace hardcoded FQCN with use of ::class magic constant

Jefersson Nathan · Jefersson Nathan · commit d7d6ae95f137 · 2015-12-22T13:45:27.000-03:00
diff --git a/lib/Doctrine/ODM/MongoDB/Configuration.php b/lib/Doctrine/ODM/MongoDB/Configuration.php
@@ -22,6 +22,9 @@
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Cache\Cache;
 use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
+use Doctrine\Common\Persistence\ObjectRepository;
+use Doctrine\ODM\MongoDB\DocumentRepository;
+use Doctrine\ODM\MongoDB\Mapping\ClassMetadataFactory;
 use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver;
 use Doctrine\ODM\MongoDB\Repository\DefaultRepositoryFactory;
 use Doctrine\ODM\MongoDB\Repository\RepositoryFactory;
@@ -356,7 +359,7 @@ public function setClassMetadataFactoryName($cmfName)
     public function getClassMetadataFactoryName()
     {
         if ( ! isset($this->attributes['classMetadataFactoryName'])) {
-            $this->attributes['classMetadataFactoryName'] = 'Doctrine\ODM\MongoDB\Mapping\ClassMetadataFactory';
+            $this->attributes['classMetadataFactoryName'] = ClassMetadataFactory::class;
         }
         return $this->attributes['classMetadataFactoryName'];
     }
@@ -441,7 +444,7 @@ public function setDefaultRepositoryClassName($className)
     {
         $reflectionClass = new \ReflectionClass($className);
 
-        if ( ! $reflectionClass->implementsInterface('Doctrine\Common\Persistence\ObjectRepository')) {
+        if ( ! $reflectionClass->implementsInterface(ObjectRepository::class)) {
             throw MongoDBException::invalidDocumentRepository($className);
         }
 
@@ -457,7 +460,7 @@ public function getDefaultRepositoryClassName()
     {
         return isset($this->attributes['defaultRepositoryClassName'])
             ? $this->attributes['defaultRepositoryClassName']
-            : 'Doctrine\ODM\MongoDB\DocumentRepository';
+            : DocumentRepository::class;
     }
 
     /**
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php
@@ -19,6 +19,7 @@
 
 namespace Doctrine\ODM\MongoDB\Mapping;
 
+use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Doctrine\ODM\MongoDB\Utility\CollectionHelper;
 use Doctrine\ODM\MongoDB\LockException;
 use Doctrine\ODM\MongoDB\Mapping\MappingException;
@@ -1127,7 +1128,7 @@ public function mapField(array $mapping)
             $mapping['name'] = '_id';
             $this->identifier = $mapping['fieldName'];
             if (isset($mapping['strategy'])) {
-                $this->generatorType = constant('Doctrine\ODM\MongoDB\Mapping\ClassMetadata::GENERATOR_TYPE_' . strtoupper($mapping['strategy']));
+                $this->generatorType = constant(ClassMetadata::class . '::GENERATOR_TYPE_' . strtoupper($mapping['strategy']));
             }
             $this->generatorOptions = isset($mapping['options']) ? $mapping['options'] : array();
             switch ($this->generatorType) {
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ODM/MongoDB/Mapping/Driver/AnnotationDriver.php
@@ -26,6 +26,11 @@
 use Doctrine\Common\Persistence\Mapping\Driver\AnnotationDriver as AbstractAnnotationDriver;
 use Doctrine\ODM\MongoDB\Events;
 use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+use Doctrine\ODM\MongoDB\Mapping\Annotations\Document;
+use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbeddedDocument;
+use Doctrine\ODM\MongoDB\Mapping\Annotations\HasLifecycleCallbacks;
+use Doctrine\ODM\MongoDB\Mapping\Annotations\MappedSuperclass;
+use Doctrine\ODM\MongoDB\Mapping\ClassMetadata as MappingClassMetadata;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo;
 use Doctrine\ODM\MongoDB\Mapping\MappingException;
 
@@ -35,13 +40,14 @@
  * @since       1.0
  * @author      Jonathan H. Wage <jonwage@gmail.com>
  * @author      Roman Borschel <roman@code-factory.org>
+ * @author      Jefersson Nathan <malukenho@phpse.net>
  */
 class AnnotationDriver extends AbstractAnnotationDriver
 {
     protected $entityAnnotationClasses = array(
-        'Doctrine\\ODM\\MongoDB\\Mapping\\Annotations\\Document' => 1,
-        'Doctrine\\ODM\\MongoDB\\Mapping\\Annotations\\MappedSuperclass' => 2,
-        'Doctrine\\ODM\\MongoDB\\Mapping\\Annotations\\EmbeddedDocument' => 3,
+        Document::class         => 1,
+        MappedSuperclass::class => 2,
+        EmbeddedDocument::class => 3,
     );
 
     /**
@@ -84,7 +90,7 @@ public function loadMetadataForClass($className, ClassMetadata $class)
                     $this->addIndex($class, $index);
                 }
             } elseif ($annot instanceof ODM\InheritanceType) {
-                $class->setInheritanceType(constant('Doctrine\\ODM\\MongoDB\\Mapping\\ClassMetadata::INHERITANCE_TYPE_'.$annot->value));
+                $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)) {
@@ -99,7 +105,7 @@ public function loadMetadataForClass($className, ClassMetadata $class)
             } elseif ($annot instanceof ODM\DiscriminatorValue) {
                 $class->setDiscriminatorValue($annot->value);
             } elseif ($annot instanceof ODM\ChangeTrackingPolicy) {
-                $class->setChangeTrackingPolicy(constant('Doctrine\\ODM\\MongoDB\\Mapping\\ClassMetadata::CHANGETRACKING_'.$annot->value));
+                $class->setChangeTrackingPolicy(constant(MappingClassMetadata::class . '::CHANGETRACKING_'.$annot->value));
             } elseif ($annot instanceof ODM\DefaultDiscriminatorValue) {
                 $class->setDefaultDiscriminatorValue($annot->value);
             }
@@ -114,9 +120,9 @@ public function loadMetadataForClass($className, ClassMetadata $class)
         ksort($documentAnnots);
         $documentAnnot = reset($documentAnnots);
 
-        if ($documentAnnot instanceof ODM\MappedSuperclass) {
+        if ($documentAnnot instanceof MappedSuperclass) {
             $class->isMappedSuperclass = true;
-        } elseif ($documentAnnot instanceof ODM\EmbeddedDocument) {
+        } elseif ($documentAnnot instanceof EmbeddedDocument) {
             $class->isEmbeddedDocument = true;
         }
         if (isset($documentAnnot->db)) {
@@ -199,7 +205,7 @@ public function loadMetadataForClass($className, ClassMetadata $class)
                     $class->registerAlsoLoadMethod($method->getName(), $annot->value);
                 }
 
-                if ( ! isset($classAnnotations['Doctrine\ODM\MongoDB\Mapping\Annotations\HasLifecycleCallbacks'])) {
+                if ( ! isset($classAnnotations[HasLifecycleCallbacks::class])) {
                     continue;
                 }
 
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php
@@ -21,6 +21,7 @@
 
 use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\Common\Persistence\Mapping\Driver\FileDriver;
+use Doctrine\ODM\MongoDB\Mapping\ClassMetadata as MappingClassMetadata;
 use Doctrine\ODM\MongoDB\Utility\CollectionHelper;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo;
 
@@ -30,6 +31,7 @@
  * @since       1.0
  * @author      Jonathan H. Wage <jonwage@gmail.com>
  * @author      Roman Borschel <roman@code-factory.org>
+ * @author      Jefersson Nathan <malukenho@phpse.net>
  */
 class XmlDriver extends FileDriver
 {
@@ -87,10 +89,10 @@ public function loadMetadataForClass($className, ClassMetadata $class)
         }
         if (isset($xmlRoot['inheritance-type'])) {
             $inheritanceType = (string) $xmlRoot['inheritance-type'];
-            $class->setInheritanceType(constant('Doctrine\ODM\MongoDB\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceType));
+            $class->setInheritanceType(constant(MappingClassMetadata::class . '::INHERITANCE_TYPE_' . $inheritanceType));
         }
         if (isset($xmlRoot['change-tracking-policy'])) {
-            $class->setChangeTrackingPolicy(constant('Doctrine\ODM\MongoDB\Mapping\ClassMetadata::CHANGETRACKING_' . strtoupper((string) $xmlRoot['change-tracking-policy'])));
+            $class->setChangeTrackingPolicy(constant(MappingClassMetadata::class . '::CHANGETRACKING_' . strtoupper((string) $xmlRoot['change-tracking-policy'])));
         }
         if (isset($xmlRoot->{'discriminator-field'})) {
             $discrField = $xmlRoot->{'discriminator-field'};
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ODM/MongoDB/Mapping/Driver/YamlDriver.php
@@ -21,6 +21,7 @@
 
 use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\Common\Persistence\Mapping\Driver\FileDriver;
+use Doctrine\ODM\MongoDB\Mapping\ClassMetadata as MappingClassMetadata;
 use Doctrine\ODM\MongoDB\Utility\CollectionHelper;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo;
 use Symfony\Component\Yaml\Yaml;
@@ -31,6 +32,7 @@
  * @since       1.0
  * @author      Jonathan H. Wage <jonwage@gmail.com>
  * @author      Roman Borschel <roman@code-factory.org>
+ * @author      Jefersson Nathan <malukenho@phpse.net>
  */
 class YamlDriver extends FileDriver
 {
@@ -80,7 +82,7 @@ public function loadMetadataForClass($className, ClassMetadata $class)
             }
         }
         if (isset($element['inheritanceType'])) {
-            $class->setInheritanceType(constant('Doctrine\ODM\MongoDB\Mapping\ClassMetadata::INHERITANCE_TYPE_' . strtoupper($element['inheritanceType'])));
+            $class->setInheritanceType(constant(MappingClassMetadata::class . '::INHERITANCE_TYPE_' . strtoupper($element['inheritanceType'])));
         }
         if (isset($element['discriminatorField'])) {
             $class->setDiscriminatorField($this->parseDiscriminatorField($element['discriminatorField']));
@@ -92,8 +94,7 @@ public function loadMetadataForClass($className, ClassMetadata $class)
             $class->setDefaultDiscriminatorValue($element['defaultDiscriminatorValue']);
         }
         if (isset($element['changeTrackingPolicy'])) {
-            $class->setChangeTrackingPolicy(constant('Doctrine\ODM\MongoDB\Mapping\ClassMetadata::CHANGETRACKING_'
-                    . strtoupper($element['changeTrackingPolicy'])));
+            $class->setChangeTrackingPolicy(constant(MappingClassMetadata::class . '::CHANGETRACKING_' . strtoupper($element['changeTrackingPolicy'])));
         }
         if (isset($element['requireIndexes'])) {
             $class->setRequireIndexes($element['requireIndexes']);
diff --git a/lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php b/lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php
@@ -931,7 +931,7 @@ public function prepareQueryOrNewObj(array $query)
             list($key, $value) = $this->prepareQueryElement($key, $value, null, true);
 
             $preparedQuery[$key] = is_array($value)
-                ? array_map('Doctrine\ODM\MongoDB\Types\Type::convertPHPToDatabaseValue', $value)
+                ? array_map('\Doctrine\ODM\MongoDB\Types\Type::convertPHPToDatabaseValue', $value)
                 : Type::convertPHPToDatabaseValue($value);
         }
 
diff --git a/lib/Doctrine/ODM/MongoDB/Proxy/ProxyFactory.php b/lib/Doctrine/ODM/MongoDB/Proxy/ProxyFactory.php
@@ -30,6 +30,7 @@
 use Doctrine\Common\Proxy\Proxy as BaseProxy;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata as BaseClassMetadata;
 use Doctrine\ODM\MongoDB\Persisters\DocumentPersister;
+use Doctrine\ODM\MongoDB\Proxy\Proxy;
 use ReflectionProperty;
 
 /**
@@ -75,7 +76,7 @@ public function __construct(DocumentManager $documentManager, $proxyDir, $proxyN
         $this->proxyNamespace  = $proxyNamespace;
         $proxyGenerator        = new ProxyGenerator($proxyDir, $proxyNamespace);
 
-        $proxyGenerator->setPlaceholder('baseProxyInterface', 'Doctrine\ODM\MongoDB\Proxy\Proxy');
+        $proxyGenerator->setPlaceholder('baseProxyInterface', Proxy::class);
 
         parent::__construct($proxyGenerator, $this->metadataFactory, $autoGenerate);
     }
diff --git a/lib/Doctrine/ODM/MongoDB/Query/Query.php b/lib/Doctrine/ODM/MongoDB/Query/Query.php
@@ -22,8 +22,6 @@
 use Doctrine\MongoDB\Collection;
 use Doctrine\MongoDB\Cursor as BaseCursor;
 use Doctrine\MongoDB\CursorInterface;
-use Doctrine\MongoDB\EagerCursor as BaseEagerCursor;
-use Doctrine\MongoDB\Iterator;
 use Doctrine\ODM\MongoDB\Cursor;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\EagerCursor;
@@ -296,7 +294,7 @@ protected function prepareCursor(BaseCursor $cursor)
         $cursor = parent::prepareCursor($cursor);
 
         // Convert the base Cursor into an ODM Cursor
-        $cursorClass = ( ! empty($this->query['eagerCursor'])) ? 'Doctrine\ODM\MongoDB\EagerCursor' : 'Doctrine\ODM\MongoDB\Cursor';
+        $cursorClass = ( ! empty($this->query['eagerCursor'])) ? EagerCursor::class : Cursor::class;
         $cursor = new $cursorClass($cursor, $this->dm->getUnitOfWork(), $this->class);
 
         $cursor->hydrate($this->hydrate);
diff --git a/lib/Doctrine/ODM/MongoDB/Types/Type.php b/lib/Doctrine/ODM/MongoDB/Types/Type.php
@@ -20,13 +20,15 @@
 namespace Doctrine\ODM\MongoDB\Types;
 
 use Doctrine\ODM\MongoDB\Mapping\MappingException;
+use Doctrine\ODM\MongoDB\Types;
 
 /**
  * The Type interface.
  *
  * @since       1.0
  * @author      Jonathan H. Wage <jonwage@gmail.com>
  * @author      Roman Borschel <roman@code-factory.org>
+ * @author      Jefersson Nathan <malukenho@phpse.net>
  */
 abstract class Type
 {
@@ -61,31 +63,31 @@ abstract class Type
 
     /** The map of supported doctrine mapping types. */
     private static $typesMap = array(
-        self::ID => 'Doctrine\ODM\MongoDB\Types\IdType',
-        self::INTID => 'Doctrine\ODM\MongoDB\Types\IntIdType',
-        self::CUSTOMID => 'Doctrine\ODM\MongoDB\Types\CustomIdType',
-        self::BOOL => 'Doctrine\ODM\MongoDB\Types\BooleanType',
-        self::BOOLEAN => 'Doctrine\ODM\MongoDB\Types\BooleanType',
-        self::INT => 'Doctrine\ODM\MongoDB\Types\IntType',
-        self::INTEGER => 'Doctrine\ODM\MongoDB\Types\IntType',
-        self::FLOAT => 'Doctrine\ODM\MongoDB\Types\FloatType',
-        self::STRING => 'Doctrine\ODM\MongoDB\Types\StringType',
-        self::DATE => 'Doctrine\ODM\MongoDB\Types\DateType',
-        self::KEY => 'Doctrine\ODM\MongoDB\Types\KeyType',
-        self::TIMESTAMP => 'Doctrine\ODM\MongoDB\Types\TimestampType',
-        self::BINDATA => 'Doctrine\ODM\MongoDB\Types\BinDataType',
-        self::BINDATAFUNC => 'Doctrine\ODM\MongoDB\Types\BinDataFuncType',
-        self::BINDATABYTEARRAY => 'Doctrine\ODM\MongoDB\Types\BinDataByteArrayType',
-        self::BINDATAUUID => 'Doctrine\ODM\MongoDB\Types\BinDataUUIDType',
-        self::BINDATAUUIDRFC4122 => 'Doctrine\ODM\MongoDB\Types\BinDataUUIDRFC4122Type',
-        self::BINDATAMD5 => 'Doctrine\ODM\MongoDB\Types\BinDataMD5Type',
-        self::BINDATACUSTOM => 'Doctrine\ODM\MongoDB\Types\BinDataCustomType',
-        self::FILE => 'Doctrine\ODM\MongoDB\Types\FileType',
-        self::HASH => 'Doctrine\ODM\MongoDB\Types\HashType',
-        self::COLLECTION => 'Doctrine\ODM\MongoDB\Types\CollectionType',
-        self::INCREMENT => 'Doctrine\ODM\MongoDB\Types\IncrementType',
-        self::OBJECTID => 'Doctrine\ODM\MongoDB\Types\ObjectIdType',
-        self::RAW => 'Doctrine\ODM\MongoDB\Types\RawType',
+        self::ID => Types\IdType::class,
+        self::INTID => Types\IntIdType::class,
+        self::CUSTOMID => Types\CustomIdType::class,
+        self::BOOL => Types\BooleanType::class,
+        self::BOOLEAN => Types\BooleanType::class,
+        self::INT => Types\IntType::class,
+        self::INTEGER => Types\IntType::class,
+        self::FLOAT => Types\FloatType::class,
+        self::STRING => Types\StringType::class,
+        self::DATE => Types\DateType::class,
+        self::KEY => Types\KeyType::class,
+        self::TIMESTAMP => Types\TimestampType::class,
+        self::BINDATA => Types\BinDataType::class,
+        self::BINDATAFUNC => Types\BinDataFuncType::class,
+        self::BINDATABYTEARRAY => Types\BinDataByteArrayType::class,
+        self::BINDATAUUID => Types\BinDataUUIDType::class,
+        self::BINDATAUUIDRFC4122 => Types\BinDataUUIDRFC4122Type::class,
+        self::BINDATAMD5 => Types\BinDataMD5Type::class,
+        self::BINDATACUSTOM => Types\BinDataCustomType::class,
+        self::FILE => Types\FileType::class,
+        self::HASH => Types\HashType::class,
+        self::COLLECTION => Types\CollectionType::class,
+        self::INCREMENT => Types\IncrementType::class,
+        self::OBJECTID => Types\ObjectIdType::class,
+        self::RAW => Types\RawType::class,
     );
 
     /* Prevent instantiation and force use of the factory method. */

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@`
`22`	`22`	`use Doctrine\Common\Annotations\AnnotationReader;`
`23`	`23`	`use Doctrine\Common\Cache\Cache;`
`24`	`24`	`use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;`
	`25`	`+use Doctrine\Common\Persistence\ObjectRepository;`
	`26`	`+use Doctrine\ODM\MongoDB\DocumentRepository;`
	`27`	`+use Doctrine\ODM\MongoDB\Mapping\ClassMetadataFactory;`
`25`	`28`	`use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver;`
`26`	`29`	`use Doctrine\ODM\MongoDB\Repository\DefaultRepositoryFactory;`
`27`	`30`	`use Doctrine\ODM\MongoDB\Repository\RepositoryFactory;`
`@@ -356,7 +359,7 @@ public function setClassMetadataFactoryName($cmfName)`
`356`	`359`	`public function getClassMetadataFactoryName()`
`357`	`360`	`{`
`358`	`361`	`if ( ! isset($this->attributes['classMetadataFactoryName'])) {`
`359`		`- $this->attributes['classMetadataFactoryName'] = 'Doctrine\ODM\MongoDB\Mapping\ClassMetadataFactory';`
	`362`	`+ $this->attributes['classMetadataFactoryName'] = ClassMetadataFactory::class;`
`360`	`363`	`}`
`361`	`364`	`return $this->attributes['classMetadataFactoryName'];`
`362`	`365`	`}`
`@@ -441,7 +444,7 @@ public function setDefaultRepositoryClassName($className)`
`441`	`444`	`{`
`442`	`445`	`$reflectionClass = new \ReflectionClass($className);`
`443`	`446`
`444`		`- if ( ! $reflectionClass->implementsInterface('Doctrine\Common\Persistence\ObjectRepository')) {`
	`447`	`+ if ( ! $reflectionClass->implementsInterface(ObjectRepository::class)) {`
`445`	`448`	`throw MongoDBException::invalidDocumentRepository($className);`
`446`	`449`	`}`
`447`	`450`
`@@ -457,7 +460,7 @@ public function getDefaultRepositoryClassName()`
`457`	`460`	`{`
`458`	`461`	`return isset($this->attributes['defaultRepositoryClassName'])`
`459`	`462`	`? $this->attributes['defaultRepositoryClassName']`
`460`		`- : 'Doctrine\ODM\MongoDB\DocumentRepository';`
	`463`	`+ : DocumentRepository::class;`
`461`	`464`	`}`
`462`	`465`
`463`	`466`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`
`22`	`22`	`use Doctrine\Common\Persistence\Mapping\ClassMetadata;`
`23`	`23`	`use Doctrine\Common\Persistence\Mapping\Driver\FileDriver;`
	`24`	`+use Doctrine\ODM\MongoDB\Mapping\ClassMetadata as MappingClassMetadata;`
`24`	`25`	`use Doctrine\ODM\MongoDB\Utility\CollectionHelper;`
`25`	`26`	`use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo;`
`26`	`27`	`use Symfony\Component\Yaml\Yaml;`
`@@ -31,6 +32,7 @@`
`31`	`32`	`* @since 1.0`
`32`	`33`	`* @author Jonathan H. Wage <jonwage@gmail.com>`
`33`	`34`	`* @author Roman Borschel <roman@code-factory.org>`
	`35`	`+ * @author Jefersson Nathan <malukenho@phpse.net>`
`34`	`36`	`*/`
`35`	`37`	`class YamlDriver extends FileDriver`
`36`	`38`	`{`
`@@ -80,7 +82,7 @@ public function loadMetadataForClass($className, ClassMetadata $class)`
`80`	`82`	`}`
`81`	`83`	`}`
`82`	`84`	`if (isset($element['inheritanceType'])) {`
`83`		`- $class->setInheritanceType(constant('Doctrine\ODM\MongoDB\Mapping\ClassMetadata::INHERITANCE_TYPE_' . strtoupper($element['inheritanceType'])));`
	`85`	`+ $class->setInheritanceType(constant(MappingClassMetadata::class . '::INHERITANCE_TYPE_' . strtoupper($element['inheritanceType'])));`
`84`	`86`	`}`
`85`	`87`	`if (isset($element['discriminatorField'])) {`
`86`	`88`	`$class->setDiscriminatorField($this->parseDiscriminatorField($element['discriminatorField']));`
`@@ -92,8 +94,7 @@ public function loadMetadataForClass($className, ClassMetadata $class)`
`92`	`94`	`$class->setDefaultDiscriminatorValue($element['defaultDiscriminatorValue']);`
`93`	`95`	`}`
`94`	`96`	`if (isset($element['changeTrackingPolicy'])) {`
`95`		`- $class->setChangeTrackingPolicy(constant('Doctrine\ODM\MongoDB\Mapping\ClassMetadata::CHANGETRACKING_'`
`96`		`- . strtoupper($element['changeTrackingPolicy'])));`
	`97`	`+ $class->setChangeTrackingPolicy(constant(MappingClassMetadata::class . '::CHANGETRACKING_' . strtoupper($element['changeTrackingPolicy'])));`
`97`	`98`	`}`
`98`	`99`	`if (isset($element['requireIndexes'])) {`
`99`	`100`	`$class->setRequireIndexes($element['requireIndexes']);`
Original file line number	Diff line number	Diff line change
`@@ -931,7 +931,7 @@ public function prepareQueryOrNewObj(array $query)`
`931`	`931`	`list($key, $value) = $this->prepareQueryElement($key, $value, null, true);`
`932`	`932`
`933`	`933`	`$preparedQuery[$key] = is_array($value)`
`934`		`- ? array_map('Doctrine\ODM\MongoDB\Types\Type::convertPHPToDatabaseValue', $value)`
	`934`	`+ ? array_map('\Doctrine\ODM\MongoDB\Types\Type::convertPHPToDatabaseValue', $value)`
`935`	`935`	`: Type::convertPHPToDatabaseValue($value);`
`936`	`936`	`}`
`937`	`937`