Merge pull request #546 from doctrine/refactor-types

Refactor types to be consistent with other Doctrine adapters
doctrine · May 30, 2013 · 2a2a5cf · 2a2a5cf
2 parents 84ea729 + dda08d6
commit 2a2a5cf
Show file tree

Hide file tree

Showing 30 changed files with 101 additions and 73 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Hydrator/HydratorFactory.php b/lib/Doctrine/ODM/MongoDB/Hydrator/HydratorFactory.php
@@ -25,8 +25,8 @@
 use Doctrine\ODM\MongoDB\Event\PreLoadEventArgs;
 use Doctrine\ODM\MongoDB\Events;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
-use Doctrine\ODM\MongoDB\Mapping\Types\Type;
 use Doctrine\ODM\MongoDB\Proxy\Proxy;
+use Doctrine\ODM\MongoDB\Types\Type;
 use Doctrine\ODM\MongoDB\UnitOfWork;
 
 /**

diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php
@@ -22,6 +22,7 @@
 use Doctrine\ODM\MongoDB\LockException;
 use Doctrine\ODM\MongoDB\Mapping\MappingException;
 use Doctrine\ODM\MongoDB\Proxy\Proxy;
+use Doctrine\ODM\MongoDB\Types\Type;
 use InvalidArgumentException;
 
 /**
@@ -1290,7 +1291,7 @@ public function setIdGenerator($generator)
     public function getPHPIdentifierValue($id)
     {
         $idType = $this->fieldMappings[$this->identifier]['type'];
-        return Types\Type::getType($idType)->convertToPHPValue($id);
+        return Type::getType($idType)->convertToPHPValue($id);
     }
 
     /**
@@ -1302,7 +1303,7 @@ public function getPHPIdentifierValue($id)
     public function getDatabaseIdentifierValue($id)
     {
         $idType = $this->fieldMappings[$this->identifier]['type'];
-        return Types\Type::getType($idType)->convertToDatabaseValue($id);
+        return Type::getType($idType)->convertToDatabaseValue($id);
     }
 
     /**

diff --git a/lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php b/lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php
@@ -31,11 +31,11 @@
 use Doctrine\ODM\MongoDB\LockException;
 use Doctrine\ODM\MongoDB\LockMode;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
-use Doctrine\ODM\MongoDB\Mapping\Types\Type;
 use Doctrine\ODM\MongoDB\MongoDBException;
 use Doctrine\ODM\MongoDB\PersistentCollection;
 use Doctrine\ODM\MongoDB\Proxy\Proxy;
 use Doctrine\ODM\MongoDB\Query\Query;
+use Doctrine\ODM\MongoDB\Types\Type;
 use Doctrine\ODM\MongoDB\UnitOfWork;
 
 /**

diff --git a/lib/Doctrine/ODM/MongoDB/Persisters/PersistenceBuilder.php b/lib/Doctrine/ODM/MongoDB/Persisters/PersistenceBuilder.php
@@ -20,7 +20,7 @@
 
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
-use Doctrine\ODM\MongoDB\Mapping\Types\Type;
+use Doctrine\ODM\MongoDB\Types\Type;
 use Doctrine\ODM\MongoDB\UnitOfWork;
 
 /**

diff --git a/lib/Doctrine/ODM/MongoDB/Tools/DocumentGenerator.php b/lib/Doctrine/ODM/MongoDB/Tools/DocumentGenerator.php
@@ -717,7 +717,7 @@ private function generateDocumentStubMethod(ClassMetadataInfo $metadata, $type,
 
         $variableType = $typeHint ? $typeHint . ' ' : null;
 
-        $types = \Doctrine\ODM\MongoDB\Mapping\Types\Type::getTypesMap();
+        $types = \Doctrine\ODM\MongoDB\Types\Type::getTypesMap();
         $methodTypeHint = $typeHint && ! isset($types[$typeHint]) ? '\\' . $typeHint . ' ' : null;
 
         $replacements = array(

diff --git a/...ngoDB/Mapping/Types/BinDataCustomType.php → ...e/ODM/MongoDB/Types/BinDataCustomType.php b/...ngoDB/Mapping/Types/BinDataCustomType.php → ...e/ODM/MongoDB/Types/BinDataCustomType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The BinDataCustom type.

diff --git a/...MongoDB/Mapping/Types/BinDataFuncType.php → ...ine/ODM/MongoDB/Types/BinDataFuncType.php b/...MongoDB/Mapping/Types/BinDataFuncType.php → ...ine/ODM/MongoDB/Types/BinDataFuncType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The BinDataFunc type.

diff --git a/.../MongoDB/Mapping/Types/BinDataMD5Type.php → ...rine/ODM/MongoDB/Types/BinDataMD5Type.php b/.../MongoDB/Mapping/Types/BinDataMD5Type.php → ...rine/ODM/MongoDB/Types/BinDataMD5Type.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The BinDataMD5 type.

diff --git a/...ODM/MongoDB/Mapping/Types/BinDataType.php → ...octrine/ODM/MongoDB/Types/BinDataType.php b/...ODM/MongoDB/Mapping/Types/BinDataType.php → ...octrine/ODM/MongoDB/Types/BinDataType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The BinData type.

diff --git a/...MongoDB/Mapping/Types/BinDataUUIDType.php → ...ine/ODM/MongoDB/Types/BinDataUUIDType.php b/...MongoDB/Mapping/Types/BinDataUUIDType.php → ...ine/ODM/MongoDB/Types/BinDataUUIDType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The BinDataUUID type.

diff --git a/...ODM/MongoDB/Mapping/Types/BooleanType.php → ...octrine/ODM/MongoDB/Types/BooleanType.php b/...ODM/MongoDB/Mapping/Types/BooleanType.php → ...octrine/ODM/MongoDB/Types/BooleanType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The Boolean type.

diff --git a/.../MongoDB/Mapping/Types/CollectionType.php → ...rine/ODM/MongoDB/Types/CollectionType.php b/.../MongoDB/Mapping/Types/CollectionType.php → ...rine/ODM/MongoDB/Types/CollectionType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The Collection type.

diff --git a/...DM/MongoDB/Mapping/Types/CustomIdType.php → ...ctrine/ODM/MongoDB/Types/CustomIdType.php b/...DM/MongoDB/Mapping/Types/CustomIdType.php → ...ctrine/ODM/MongoDB/Types/CustomIdType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The Id type.

diff --git a/...ne/ODM/MongoDB/Mapping/Types/DateType.php → lib/Doctrine/ODM/MongoDB/Types/DateType.php b/...ne/ODM/MongoDB/Mapping/Types/DateType.php → lib/Doctrine/ODM/MongoDB/Types/DateType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The Date type.

diff --git a/...ne/ODM/MongoDB/Mapping/Types/FileType.php → lib/Doctrine/ODM/MongoDB/Types/FileType.php b/...ne/ODM/MongoDB/Mapping/Types/FileType.php → lib/Doctrine/ODM/MongoDB/Types/FileType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The File type.

diff --git a/...e/ODM/MongoDB/Mapping/Types/FloatType.php → lib/Doctrine/ODM/MongoDB/Types/FloatType.php b/...e/ODM/MongoDB/Mapping/Types/FloatType.php → lib/Doctrine/ODM/MongoDB/Types/FloatType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The Float type.

diff --git a/...ne/ODM/MongoDB/Mapping/Types/HashType.php → lib/Doctrine/ODM/MongoDB/Types/HashType.php b/...ne/ODM/MongoDB/Mapping/Types/HashType.php → lib/Doctrine/ODM/MongoDB/Types/HashType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The Array type.

diff --git a/...rine/ODM/MongoDB/Mapping/Types/IdType.php → lib/Doctrine/ODM/MongoDB/Types/IdType.php b/...rine/ODM/MongoDB/Mapping/Types/IdType.php → lib/Doctrine/ODM/MongoDB/Types/IdType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The Id type.

diff --git a/...M/MongoDB/Mapping/Types/IncrementType.php → ...trine/ODM/MongoDB/Types/IncrementType.php b/...M/MongoDB/Mapping/Types/IncrementType.php → ...trine/ODM/MongoDB/Types/IncrementType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The Increment type.

diff --git a/...e/ODM/MongoDB/Mapping/Types/IntIdType.php → lib/Doctrine/ODM/MongoDB/Types/IntIdType.php b/...e/ODM/MongoDB/Mapping/Types/IntIdType.php → lib/Doctrine/ODM/MongoDB/Types/IntIdType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The Integer Id type.

diff --git a/...ine/ODM/MongoDB/Mapping/Types/IntType.php → lib/Doctrine/ODM/MongoDB/Types/IntType.php b/...ine/ODM/MongoDB/Mapping/Types/IntType.php → lib/Doctrine/ODM/MongoDB/Types/IntType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The Int type.

diff --git a/...ine/ODM/MongoDB/Mapping/Types/KeyType.php → lib/Doctrine/ODM/MongoDB/Types/KeyType.php b/...ine/ODM/MongoDB/Mapping/Types/KeyType.php → lib/Doctrine/ODM/MongoDB/Types/KeyType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The Key type.

diff --git a/...DM/MongoDB/Mapping/Types/ObjectIdType.php → ...ctrine/ODM/MongoDB/Types/ObjectIdType.php b/...DM/MongoDB/Mapping/Types/ObjectIdType.php → ...ctrine/ODM/MongoDB/Types/ObjectIdType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The ObjectId type.

diff --git a/...ine/ODM/MongoDB/Mapping/Types/RawType.php → lib/Doctrine/ODM/MongoDB/Types/RawType.php b/...ine/ODM/MongoDB/Mapping/Types/RawType.php → lib/Doctrine/ODM/MongoDB/Types/RawType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * Raw data type.

diff --git a/.../ODM/MongoDB/Mapping/Types/StringType.php → ...Doctrine/ODM/MongoDB/Types/StringType.php b/.../ODM/MongoDB/Mapping/Types/StringType.php → ...Doctrine/ODM/MongoDB/Types/StringType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The String type.
@@ -26,7 +26,7 @@
  * @author      Jonathan H. Wage <jonwage@gmail.com>
  * @author      Roman Borschel <roman@code-factory.org>
  */
-class StringType  extends Type
+class StringType extends Type
 {
     public function convertToDatabaseValue($value)
     {

diff --git a/...M/MongoDB/Mapping/Types/TimestampType.php → ...trine/ODM/MongoDB/Types/TimestampType.php b/...M/MongoDB/Mapping/Types/TimestampType.php → ...trine/ODM/MongoDB/Types/TimestampType.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ODM\MongoDB\Mapping\Types;
+namespace Doctrine\ODM\MongoDB\Types;
 
 /**
  * The Timestamp type.
@@ -26,7 +26,7 @@
  * @author      Jonathan H. Wage <jonwage@gmail.com>
  * @author      Roman Borschel <roman@code-factory.org>
  */
-class TimestampType  extends Type
+class TimestampType extends Type
 {
     public function convertToDatabaseValue($value)
     {