Changeset 4911 for trunk/lib/Doctrine

Timestamp:

09/12/08 09:59:44 (4 months ago)

Author:

romanb

Message:

moved Null/Type/Platform

Location:

trunk/lib/Doctrine

Files:

• Configuration.php (modified) (1 diff)
• DatabasePlatform.php (deleted)
• DataType.php (deleted)
• DBAL/Types/Type.php (added)
• Entity.php (modified) (7 diffs)
• EntityManager.php (modified) (1 diff)
• EntityPersister/Abstract.php (modified) (2 diffs)
• Hydrator/Abstract.php (modified) (1 diff)
• Hydrator/RecordDriver.php (modified) (1 diff)
• Null.php (deleted)
• ORM/Internal/Null.php (added)

trunk/lib/Doctrine/Configuration.php

@@ -60 +60 @@
     public function __construct()
     {
-        $this->_nullObject = Doctrine_Null::$INSTANCE;
+        $this->_nullObject = Doctrine_ORM_Internal_Null::$INSTANCE;
         $this->_initAttributes();
     }

trunk/lib/Doctrine/Entity.php

@@ -239 +239 @@
             $name = $this->_class->getIdentifier();
             $name = $name[0];
-            if (isset($this->_data[$name]) && $this->_data[$name] !== Doctrine_Null::$INSTANCE) {
+            if (isset($this->_data[$name]) && $this->_data[$name] !== Doctrine_ORM_Internal_Null::$INSTANCE) {
                 $this->_id[$name] = $this->_data[$name];
             }
@@ -392 +392 @@
     final protected function _get($fieldName)
     {
-        $nullObj = Doctrine_Null::$INSTANCE;
+        $nullObj = Doctrine_ORM_Internal_Null::$INSTANCE;
         if (isset($this->_data[$fieldName])) {
             return $this->_data[$fieldName] !== $nullObj ?
@@ -482 +482 @@
     final public function _internalGetField($fieldName)
     {
-        if ($this->_data[$fieldName] === Doctrine_Null::$INSTANCE) {
+        if ($this->_data[$fieldName] === Doctrine_ORM_Internal_Null::$INSTANCE) {
             return null;
         }
@@ -515 +515 @@
     final public function _internalGetReference($fieldName)
     {
-        if ($this->_references[$fieldName] === Doctrine_Null::$INSTANCE) {
+        if ($this->_references[$fieldName] === Doctrine_ORM_Internal_Null::$INSTANCE) {
             return null;
         }
@@ -535 +535 @@
     final public function _internalSetReference($name, $value, $completeBidirectional = false)
     {
-        if (is_null($value) || $value === Doctrine_Null::$INSTANCE) {
+        if (is_null($value) || $value === Doctrine_ORM_Internal_Null::$INSTANCE) {
             $this->_references[$name] = $value;
             return; // early exit!
@@ -679 +679 @@
     {
         if (isset($this->_data[$fieldName])) {
-            if ($this->_data[$fieldName] === Doctrine_Null::$INSTANCE) {
+            if ($this->_data[$fieldName] === Doctrine_ORM_Internal_Null::$INSTANCE) {
                 return false;
             }
@@ -688 +688 @@
         }
         if (isset($this->_references[$fieldName]) &&
-                $this->_references[$fieldName] !== Doctrine_Null::$INSTANCE) {
+                $this->_references[$fieldName] !== Doctrine_ORM_Internal_Null::$INSTANCE) {
             return true;
         }

trunk/lib/Doctrine/EntityManager.php

@@ -159 +159 @@
                 $this, new Doctrine_ClassMetadata_CodeDriver());
         $this->_unitOfWork = new Doctrine_Connection_UnitOfWork($this);
-        $this->_nullObject = Doctrine_Null::$INSTANCE;
+        $this->_nullObject = Doctrine_ORM_Internal_Null::$INSTANCE;
     }
     

trunk/lib/Doctrine/EntityPersister/Abstract.php

@@ -81 +81 @@
         $this->_conn = $em->getConnection();
         $this->_classMetadata = $classMetadata;
-        $this->_nullObject = Doctrine_Null::$INSTANCE;
+        $this->_nullObject = Doctrine_ORM_Internal_Null::$INSTANCE;
     }
     
@@ -288 +288 @@
             $columnName = $entity->getClass()->getColumnName($field);
 
-            if ($newVal === Doctrine_Null::$INSTANCE) {
+            if ($newVal === Doctrine_ORM_Internal_Null::$INSTANCE) {
                 $result[$columnName] = null;
                 continue;

trunk/lib/Doctrine/Hydrator/Abstract.php

@@ -68 +68 @@
     {
         $this->_em = $em;
-        $this->_nullObject = Doctrine_Null::$INSTANCE;
+        $this->_nullObject = Doctrine_ORM_Internal_Null::$INSTANCE;
     }
 

trunk/lib/Doctrine/Hydrator/RecordDriver.php

@@ -44 +44 @@
     public function __construct(Doctrine_EntityManager $em)
     {
-        $this->_nullObject = Doctrine_Null::$INSTANCE;
+        $this->_nullObject = Doctrine_ORM_Internal_Null::$INSTANCE;
         $this->_em = $em;
     }