From 41ee9173f1cc374cb7a6779ad16beb6629874fd2 Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Sun, 17 Sep 2006 17:59:04 +0000
Subject: [PATCH] method name changes for better custom getter/setter
 compatibility

Doctrine_Record::getID() -> obtainIdentifier()
Doctrine_Record::setID() -> assignIdentifier()
---
 Doctrine/Collection.php                  |  2 +-
 Doctrine/Collection/Batch.php            |  4 +--
 Doctrine/Connection.php                  | 10 ++++----
 Doctrine/Lib.php                         |  4 +--
 Doctrine/Locking/Manager/Pessimistic.php |  4 +--
 Doctrine/Record.php                      |  8 +++---
 Doctrine/Session.php                     | 10 ++++----
 tests/AccessTestCase.php                 |  6 ++---
 tests/BatchIteratorTestCase.php          |  4 +--
 tests/CacheFileTestCase.php              |  2 +-
 tests/CacheSqliteTestCase.php            |  2 +-
 tests/ConnectionTestCase.php             |  2 +-
 tests/CustomPrimaryKeyTestCase.php       |  6 ++---
 tests/RecordTestCase.php                 | 32 ++++++++++++------------
 14 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/Doctrine/Collection.php b/Doctrine/Collection.php
index f99bf1c33..3f8cafb9b 100644
--- a/Doctrine/Collection.php
+++ b/Doctrine/Collection.php
@@ -298,7 +298,7 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
                 if( ! isset($this->reference))
                     return false;
 
-                $id = $this->reference->getID();
+                $id = $this->reference->obtainIdentifier();
 
                 if(empty($id))
                     return false;
diff --git a/Doctrine/Collection/Batch.php b/Doctrine/Collection/Batch.php
index cd0f8c7bb..42ce5156e 100644
--- a/Doctrine/Collection/Batch.php
+++ b/Doctrine/Collection/Batch.php
@@ -57,11 +57,11 @@ class Doctrine_Collection_Batch extends Doctrine_Collection {
         if(empty($this->data))
             return false;
 
-        $id  = $record->getID();
+        $id  = $record->obtainIdentifier();
         $identifier = $this->table->getIdentifier();
         foreach($this->data as $key => $v) {
             if(is_object($v)) {
-                if($v->getID() == $id)
+                if($v->obtainIdentifier() == $id)
                     break;
 
             } elseif(is_array($v[$identifier])) {
diff --git a/Doctrine/Connection.php b/Doctrine/Connection.php
index 9aa20c628..b623a6e85 100644
--- a/Doctrine/Connection.php
+++ b/Doctrine/Connection.php
@@ -576,10 +576,10 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
                             $id = $table->getMaxIdentifier();
                     }
     
-                    $record->setID($id);
+                    $record->assignIdentifier($id);
                     $id++;
                 } else
-                    $record->setID(true);
+                    $record->assignIdentifier(true);
 
                 // listen the onInsert event
                 $table->getAttribute(Doctrine::ATTR_LISTENER)->onInsert($record);
@@ -652,7 +652,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
             $ids    = array();
             foreach($deletes as $k => $record) {
                 $ids[] = $record->getIncremented();
-                $record->setID(false);
+                $record->assignIdentifier(false);
             }
             if($record instanceof Doctrine_Record) {
                 $table  = $record->getTable();
@@ -794,7 +794,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
         }
 
         $params   = array_values($array);
-        $id       = $record->getID();
+        $id       = $record->obtainIdentifier();
 
 
         if( ! is_array($id))
@@ -809,7 +809,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
         $stmt = $this->dbh->prepare($sql);
         $stmt->execute($params);
 
-        $record->setID(true);
+        $record->assignIdentifier(true);
 
         return true;
     }
diff --git a/Doctrine/Lib.php b/Doctrine/Lib.php
index 84aae85ff..fd551d7aa 100644
--- a/Doctrine/Lib.php
+++ b/Doctrine/Lib.php
@@ -59,7 +59,7 @@ class Doctrine_Lib {
     public static function getRecordAsString(Doctrine_Record $record) {
         $r[] = "<pre>";
         $r[] = "Component  : ".$record->getTable()->getComponentName();
-        $r[] = "ID         : ".$record->getID();
+        $r[] = "ID         : ".$record->obtainIdentifier();
         $r[] = "References : ".count($record->getReferences());
         $r[] = "State      : ".Doctrine_Lib::getRecordStateAsString($record->getState());
         $r[] = "OID        : ".$record->getOID();
@@ -181,7 +181,7 @@ class Doctrine_Lib {
         $r[] = get_class($collection);
 
         foreach($collection as $key => $record) {
-            $r[] = "Key : ".$key." ID : ".$record->getID();
+            $r[] = "Key : ".$key." ID : ".$record->obtainIdentifier();
         }
         $r[] = "</pre>";
         return implode("\n",$r);
diff --git a/Doctrine/Locking/Manager/Pessimistic.php b/Doctrine/Locking/Manager/Pessimistic.php
index 5ecba4927..b246bb8aa 100644
--- a/Doctrine/Locking/Manager/Pessimistic.php
+++ b/Doctrine/Locking/Manager/Pessimistic.php
@@ -80,7 +80,7 @@ class Doctrine_Locking_Manager_Pessimistic
     public function getLock(Doctrine_Record $record, $userIdent)
     {
         $objectType = $record->getTable()->getComponentName();
-        $key        = $record->getID();
+        $key        = $record->obtainIdentifier();
         
         $gotLock = false;
         
@@ -154,7 +154,7 @@ class Doctrine_Locking_Manager_Pessimistic
     public function releaseLock(Doctrine_Record $record, $userIdent)
     {
         $objectType = $record->getTable()->getComponentName();
-        $key        = $record->getID();
+        $key        = $record->obtainIdentifier();
         
         if(is_array($key))
         {
diff --git a/Doctrine/Record.php b/Doctrine/Record.php
index aa411732b..3382808cc 100644
--- a/Doctrine/Record.php
+++ b/Doctrine/Record.php
@@ -479,7 +479,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
      * @return boolean
      */
     final public function refresh() {
-        $id = $this->getID();
+        $id = $this->obtainIdentifier();
         if( ! is_array($id))
             $id = array($id);
 
@@ -1000,7 +1000,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
 
                 switch($fk->getType()):
                     case Doctrine_Relation::ONE_COMPOSITE:
-                        if(isset($this->originals[$alias]) && $this->originals[$alias]->getID() != $this->references[$alias]->getID())
+                        if(isset($this->originals[$alias]) && $this->originals[$alias]->obtainIdentifier() != $this->references[$alias]->obtainIdentifier())
                             $this->originals[$alias]->delete();
 
                     break;
@@ -1055,7 +1055,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
      * @param integer $id
      * @return void
      */
-    final public function setID($id = false) {
+    final public function assignIdentifier($id = false) {
         if($id === false) {
             $this->id       = array();
             $this->cleanData();
@@ -1078,7 +1078,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
      *
      * @return array
      */
-    final public function getID() {
+    final public function obtainIdentifier() {
         return $this->id;
     }
     /**
diff --git a/Doctrine/Session.php b/Doctrine/Session.php
index 8fb6fe94d..e9c0f5c4d 100644
--- a/Doctrine/Session.php
+++ b/Doctrine/Session.php
@@ -567,10 +567,10 @@ abstract class Doctrine_Session extends Doctrine_Configurable implements Countab
                             $id = $table->getMaxIdentifier();
                     }
     
-                    $record->setID($id);
+                    $record->assignIdentifier($id);
                     $id++;
                 } else
-                    $record->setID(true);
+                    $record->assignIdentifier(true);
 
                 // listen the onInsert event
                 $table->getAttribute(Doctrine::ATTR_LISTENER)->onInsert($record);
@@ -643,7 +643,7 @@ abstract class Doctrine_Session extends Doctrine_Configurable implements Countab
             $ids    = array();
             foreach($deletes as $k => $record) {
                 $ids[] = $record->getIncremented();
-                $record->setID(false);
+                $record->assignIdentifier(false);
             }
             if($record instanceof Doctrine_Record) {
                 $table  = $record->getTable();
@@ -785,7 +785,7 @@ abstract class Doctrine_Session extends Doctrine_Configurable implements Countab
         }
 
         $params   = array_values($array);
-        $id       = $record->getID();
+        $id       = $record->obtainIdentifier();
 
 
         if( ! is_array($id))
@@ -800,7 +800,7 @@ abstract class Doctrine_Session extends Doctrine_Configurable implements Countab
         $stmt = $this->dbh->prepare($sql);
         $stmt->execute($params);
 
-        $record->setID(true);
+        $record->assignIdentifier(true);
 
         return true;
     }
diff --git a/tests/AccessTestCase.php b/tests/AccessTestCase.php
index 43494dd2c..99268aad2 100644
--- a/tests/AccessTestCase.php
+++ b/tests/AccessTestCase.php
@@ -39,7 +39,7 @@ class Doctrine_AccessTestCase extends Doctrine_UnitTestCase {
 
         $user->save();
 
-        $user = $this->connection->getTable("User")->find($user->getID());
+        $user = $this->connection->getTable("User")->find($user->obtainIdentifier());
         $this->assertEqual($user->name,"Jack");
 
         $user["name"] = "Jack";
@@ -57,7 +57,7 @@ class Doctrine_AccessTestCase extends Doctrine_UnitTestCase {
         
         $user->save();
 
-        $user = $this->connection->getTable("User")->find($user->getID());
+        $user = $this->connection->getTable("User")->find($user->obtainIdentifier());
         $this->assertEqual($user->name,"Jack");
 
         $user->name = "Jack";
@@ -74,7 +74,7 @@ class Doctrine_AccessTestCase extends Doctrine_UnitTestCase {
 
         $user->save();
 
-        $user = $this->connection->getTable("User")->find($user->getID());
+        $user = $this->connection->getTable("User")->find($user->obtainIdentifier());
 
         $this->assertEqual($user->get("name"),"Jack");
 
diff --git a/tests/BatchIteratorTestCase.php b/tests/BatchIteratorTestCase.php
index 101ed5f2d..55d800920 100644
--- a/tests/BatchIteratorTestCase.php
+++ b/tests/BatchIteratorTestCase.php
@@ -40,12 +40,12 @@ class Doctrine_BatchIteratorTestCase extends Doctrine_UnitTestCase {
 
         $user->save();
         
-        $user = $user->getTable()->find($user->getID());
+        $user = $user->getTable()->find($user->obtainIdentifier());
         $this->assertEqual($user->name, "tester");
         $this->assertEqual($user->Address[0]->address, "street 1");
         $this->assertEqual($user->Address[1]->address, "street 2");
         
-        $user = $user->getTable()->find($user->getID());
+        $user = $user->getTable()->find($user->obtainIdentifier());
         $a = array();
         foreach($user->Address as $address) {
             $a[] = $address->address;
diff --git a/tests/CacheFileTestCase.php b/tests/CacheFileTestCase.php
index 64ab875ed..4c0663ab1 100644
--- a/tests/CacheFileTestCase.php
+++ b/tests/CacheFileTestCase.php
@@ -12,7 +12,7 @@ class Doctrine_Cache_FileTestCase extends Doctrine_UnitTestCase {
 
         $record = $this->cache->fetch(4);
         $this->assertTrue($record instanceof Doctrine_Record);
-        $this->assertTrue($record->getID() == $this->old->getID());
+        $this->assertTrue($record->obtainIdentifier() == $this->old->obtainIdentifier());
         
         $this->assertTrue($this->cache->getTable() == $this->objTable);
     }
diff --git a/tests/CacheSqliteTestCase.php b/tests/CacheSqliteTestCase.php
index 7bd4d475a..ec7f2e251 100644
--- a/tests/CacheSqliteTestCase.php
+++ b/tests/CacheSqliteTestCase.php
@@ -26,7 +26,7 @@ class Doctrine_Cache_SqliteTestCase extends Doctrine_UnitTestCase {
         foreach($this->old as $name => $value) {
             $this->assertEqual($record->get($name), $value);
         }
-        $this->assertEqual($record->getID(), $this->old->getID());
+        $this->assertEqual($record->obtainIdentifier(), $this->old->obtainIdentifier());
 
     }
     public function testFetchMultiple() {
diff --git a/tests/ConnectionTestCase.php b/tests/ConnectionTestCase.php
index 480945a8d..88153657b 100644
--- a/tests/ConnectionTestCase.php
+++ b/tests/ConnectionTestCase.php
@@ -109,7 +109,7 @@ class Doctrine_ConnectionTestCase extends Doctrine_UnitTestCase {
         $u1->name = "Jean Reno";
         $u1->save();
 
-        $id = $u1->getID();
+        $id = $u1->obtainIdentifier();
         $u1->delete();
 
     }
diff --git a/tests/CustomPrimaryKeyTestCase.php b/tests/CustomPrimaryKeyTestCase.php
index 0905c3d52..0e288413f 100644
--- a/tests/CustomPrimaryKeyTestCase.php
+++ b/tests/CustomPrimaryKeyTestCase.php
@@ -12,15 +12,15 @@ class Doctrine_CustomPrimaryKeyTestCase extends Doctrine_UnitTestCase {
         $this->assertTrue($c instanceof Doctrine_Record);
 
         $c->name = "custom pk test";
-        $this->assertEqual($c->getID(), array());
+        $this->assertEqual($c->obtainIdentifier(), array());
         
         $c->save();
-        $this->assertEqual($c->getID(), array("uid" => 1));
+        $this->assertEqual($c->obtainIdentifier(), array("uid" => 1));
         $this->connection->clear();
         
         $c = $this->connection->getTable('CustomPK')->find(1);
     
-        $this->assertEqual($c->getID(), array("uid" => 1));
+        $this->assertEqual($c->obtainIdentifier(), array("uid" => 1));
     }
 }
 ?>
diff --git a/tests/RecordTestCase.php b/tests/RecordTestCase.php
index df7920e07..ac76e4d19 100644
--- a/tests/RecordTestCase.php
+++ b/tests/RecordTestCase.php
@@ -290,7 +290,7 @@ class Doctrine_RecordTestCase extends Doctrine_UnitTestCase {
         $user2 = unserialize($str);
 
         $this->assertTrue($user2 instanceof User);
-        $this->assertEqual($user2->getID(),$user->getID());
+        $this->assertEqual($user2->obtainIdentifier(),$user->obtainIdentifier());
     }
 
     public function testCallback() {
@@ -308,7 +308,7 @@ class Doctrine_RecordTestCase extends Doctrine_UnitTestCase {
         $record = new EntityReference();
         $this->assertEqual($record->getTable()->getIdentifier(), array("entity1","entity2"));
         $this->assertEqual($record->getTable()->getIdentifierType(), Doctrine_Identifier::COMPOSITE);
-        $this->assertEqual($record->getID(), array("entity1" => null, "entity2" => null));
+        $this->assertEqual($record->obtainIdentifier(), array("entity1" => null, "entity2" => null));
         $this->assertEqual($record->getState(), Doctrine_Record::STATE_TCLEAN);
 
         $record->entity1 = 3;
@@ -316,45 +316,45 @@ class Doctrine_RecordTestCase extends Doctrine_UnitTestCase {
         $this->assertEqual($record->entity2, 4);
         $this->assertEqual($record->entity1, 3);
         $this->assertEqual($record->getState(), Doctrine_Record::STATE_TDIRTY);
-        $this->assertEqual($record->getID(), array("entity1" => null, "entity2" => null));
+        $this->assertEqual($record->obtainIdentifier(), array("entity1" => null, "entity2" => null));
 
         $record->save();
         $this->assertEqual($record->getState(), Doctrine_Record::STATE_CLEAN);
         $this->assertEqual($record->entity2, 4);
         $this->assertEqual($record->entity1, 3);
-        $this->assertEqual($record->getID(), array("entity1" => 3, "entity2" => 4));
+        $this->assertEqual($record->obtainIdentifier(), array("entity1" => 3, "entity2" => 4));
 
-        $record = $record->getTable()->find($record->getID());
+        $record = $record->getTable()->find($record->obtainIdentifier());
         $this->assertEqual($record->getState(), Doctrine_Record::STATE_CLEAN);
         $this->assertEqual($record->entity2, 4);
         $this->assertEqual($record->entity1, 3);
 
-        $this->assertEqual($record->getID(), array("entity1" => 3, "entity2" => 4));
+        $this->assertEqual($record->obtainIdentifier(), array("entity1" => 3, "entity2" => 4));
         
         $record->entity2 = 5;
         $record->entity1 = 2;
         $this->assertEqual($record->getState(), Doctrine_Record::STATE_DIRTY);
         $this->assertEqual($record->entity2, 5);
         $this->assertEqual($record->entity1, 2);
-        $this->assertEqual($record->getID(), array("entity1" => 3, "entity2" => 4));
+        $this->assertEqual($record->obtainIdentifier(), array("entity1" => 3, "entity2" => 4));
 
         $record->save();
         $this->assertEqual($record->getState(), Doctrine_Record::STATE_CLEAN);
         $this->assertEqual($record->entity2, 5);
         $this->assertEqual($record->entity1, 2);
-        $this->assertEqual($record->getID(), array("entity1" => 2, "entity2" => 5));
-        $record = $record->getTable()->find($record->getID());
+        $this->assertEqual($record->obtainIdentifier(), array("entity1" => 2, "entity2" => 5));
+        $record = $record->getTable()->find($record->obtainIdentifier());
 
         $this->assertEqual($record->getState(), Doctrine_Record::STATE_CLEAN);
         $this->assertEqual($record->entity2, 5);
         $this->assertEqual($record->entity1, 2);
-        $this->assertEqual($record->getID(), array("entity1" => 2, "entity2" => 5));
+        $this->assertEqual($record->obtainIdentifier(), array("entity1" => 2, "entity2" => 5));
         
         $record->refresh();
         $this->assertEqual($record->getState(), Doctrine_Record::STATE_CLEAN);
         $this->assertEqual($record->entity2, 5);
         $this->assertEqual($record->entity1, 2);
-        $this->assertEqual($record->getID(), array("entity1" => 2, "entity2" => 5));
+        $this->assertEqual($record->obtainIdentifier(), array("entity1" => 2, "entity2" => 5));
 
         $record = new EntityReference();
         $record->entity2 = 6;
@@ -405,7 +405,7 @@ class Doctrine_RecordTestCase extends Doctrine_UnitTestCase {
 
         $this->connection->flush();
 
-        $task = $task->getTable()->find($task->getID());
+        $task = $task->getTable()->find($task->obtainIdentifier());
 
         $this->assertEqual($task->name, "Task 1");
         $this->assertEqual($task->ResourceAlias[0]->name, "Resource 1");
@@ -475,7 +475,7 @@ class Doctrine_RecordTestCase extends Doctrine_UnitTestCase {
         $this->assertEqual($user->created, null);
         $this->assertEqual($user->updated, null);
         $user->save();
-        $id = $user->getID();
+        $id = $user->obtainIdentifier();
         $user = $user->getTable()->find($id);
         $this->assertEqual($user->name, "Jack Daniels");
         $this->assertEqual($user->created, null);
@@ -539,7 +539,7 @@ class Doctrine_RecordTestCase extends Doctrine_UnitTestCase {
         $this->assertEqual($c->name, "child 1");
 
         $this->assertEqual($e->Child[0]->parent_id, 1);
-        $this->assertEqual($e->Child[0]->Parent->getID(), $e->getID());
+        $this->assertEqual($e->Child[0]->Parent->obtainIdentifier(), $e->obtainIdentifier());
 
 
         $this->assertEqual($e->Child[1]->parent_id, 1);
@@ -865,8 +865,8 @@ class Doctrine_RecordTestCase extends Doctrine_UnitTestCase {
         $user->save();
 
         $this->assertEqual($user->Group->count(), 1);
-        $this->assertEqual($user->Group[0]->getID(), $record2->getID());
-        $this->assertFalse($user->Group[0]->getID() == $record->getID());
+        $this->assertEqual($user->Group[0]->obtainIdentifier(), $record2->obtainIdentifier());
+        $this->assertFalse($user->Group[0]->obtainIdentifier() == $record->obtainIdentifier());
 
 
         $user->Group[0] = $record;