From 65442c74882a898a5844719e3b2ff76cd091fa1f Mon Sep 17 00:00:00 2001
From: guilhermeblanco <guilhermeblanco@625475ce-881a-0410-a577-b389adb331d8>
Date: Fri, 29 Feb 2008 19:33:31 +0000
Subject: [PATCH] Added free( = false) support in Doctrine_Record and
Doctrine_Collection (trunk)
---
lib/Doctrine/Collection.php | 18 ++++++++++++++++++
lib/Doctrine/Record.php | 23 +++++++++++++++++------
2 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/lib/Doctrine/Collection.php b/lib/Doctrine/Collection.php
index 511c7ce70..5aadbc0d7 100644
--- a/lib/Doctrine/Collection.php
+++ b/lib/Doctrine/Collection.php
@@ -912,6 +912,24 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
return $this;
}
+
+ public function free($deep = false)
+ {
+ foreach ($this->getData() as $key => $record) {
+ if ( ! ($record instanceof Doctrine_Null)) {
+ $record->free($deep);
+ }
+ }
+
+ $this->data = array();
+
+ if ($this->reference) {
+ $this->reference->free($deep);
+ $this->reference = null;
+ }
+ }
+
+
/**
* getIterator
* @return object ArrayIterator
diff --git a/lib/Doctrine/Record.php b/lib/Doctrine/Record.php
index 3cc4ce5ee..ddad411b6 100644
--- a/lib/Doctrine/Record.php
+++ b/lib/Doctrine/Record.php
@@ -1902,11 +1902,22 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
*/
public function free()
{
- $this->_mapper->detach($this);
- $this->_mapper->removeRecord($this);
- $this->_data = array();
- $this->_id = array();
- $this->_references = array();
+ if ($this->_state != self::STATE_LOCKED) {
+ $this->_mapper->detach($this);
+ $this->_mapper->removeRecord($this);
+ $this->_data = array();
+ $this->_id = array();
+
+ if ($deep) {
+ foreach ($this->_references as $name => $reference) {
+ if ( ! ($reference instanceof Doctrine_Null)) {
+ $reference->free($deep);
+ }
+ }
+ }
+
+ $this->_references = array();
+ }
}
-
+
}