[Solar-svn] Revision 2976

[pmjones at solarphp.com]

Per recommendation of Jeff Moore, renaming memory-releasing __destruct() 
methods to free().  Classes affected are ...

* Solar_Filter
* Solar_Sql_Model
* Solar_Sql_Model_Record

... along with their related tests.


Modified: trunk/Solar/Filter.php
===================================================================
--- trunk/Solar/Filter.php	2007-12-21 17:53:09 UTC (rev 2975)
+++ trunk/Solar/Filter.php	2008-01-03 14:05:49 UTC (rev 2976)
@@ -173,7 +173,7 @@
      * @return void
      * 
      */
-    public function __destruct()
+    public function free()
     {
         // each filter object instance
         foreach ($this->_filter as $key => $val) {

Modified: trunk/Solar/Sql/Model/Record.php
===================================================================
--- trunk/Solar/Sql/Model/Record.php	2007-12-21 17:53:09 UTC (rev 2975)
+++ trunk/Solar/Sql/Model/Record.php	2008-01-03 14:05:49 UTC (rev 2976)
@@ -753,7 +753,7 @@
         $invalid = $filter->getChainInvalid();
         
         // reclaim memory
-        $filter->__destruct();
+        $filter->free();
         unset($filter);
         
         // was it valid?

Modified: trunk/Solar/Sql/Model.php
===================================================================
--- trunk/Solar/Sql/Model.php	2007-12-21 17:53:09 UTC (rev 2975)
+++ trunk/Solar/Sql/Model.php	2008-01-03 14:05:49 UTC (rev 2976)
@@ -468,7 +468,7 @@
      * @return void
      * 
      */
-    public function __destruct()
+    public function free()
     {
         foreach ($this->_related as $key => $val) {
             unset($this->_related[$key]);

Modified: trunk/tests/Test/Solar/Sql/Model.php
===================================================================
--- trunk/tests/Test/Solar/Sql/Model.php	2007-12-21 17:53:09 UTC (rev 2975)
+++ trunk/tests/Test/Solar/Sql/Model.php	2008-01-03 14:05:49 UTC (rev 2976)
@@ -151,7 +151,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -179,7 +179,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -285,7 +285,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -314,7 +314,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -343,7 +343,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -376,7 +376,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -411,7 +411,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -441,7 +441,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -479,7 +479,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -509,7 +509,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -533,7 +533,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -560,7 +560,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -597,7 +597,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -619,7 +619,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -654,7 +654,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -691,7 +691,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -724,7 +724,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -750,7 +750,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -782,7 +782,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -829,7 +829,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -881,7 +881,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -940,7 +940,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -981,7 +981,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -1018,7 +1018,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -1053,7 +1053,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
     
@@ -1134,7 +1134,7 @@
         /**
          * recover memory
          */
-        $model->__destruct();
+        $model->free();
         unset($model);
     }
 

Modified: trunk/tests/Test/Solar/Sql/ModelRelated/BelongsTo.php
===================================================================
--- trunk/tests/Test/Solar/Sql/ModelRelated/BelongsTo.php	2007-12-21 17:53:09 UTC (rev 2975)
+++ trunk/tests/Test/Solar/Sql/ModelRelated/BelongsTo.php	2008-01-03 14:05:49 UTC (rev 2976)
@@ -56,7 +56,7 @@
         $this->assertSame($actual, $expect);
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
     }
     
@@ -92,7 +92,7 @@
         $this->assertEquals($count_final, $count_after);
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
     }
     
@@ -127,7 +127,7 @@
         $this->assertEquals($count_final, $count_after);
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
     }
     
@@ -157,7 +157,7 @@
         $this->assertEquals($count_after, $count_before);
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
     }
     
@@ -184,7 +184,7 @@
         $this->assertEquals($count_after, $count_before);
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
     }
 }

Modified: trunk/tests/Test/Solar/Sql/ModelRelated/HasMany.php
===================================================================
--- trunk/tests/Test/Solar/Sql/ModelRelated/HasMany.php	2007-12-21 17:53:09 UTC (rev 2975)
+++ trunk/tests/Test/Solar/Sql/ModelRelated/HasMany.php	2008-01-03 14:05:49 UTC (rev 2976)
@@ -54,7 +54,7 @@
         $this->assertSame($actual, $expect);
         
         // recover memory
-        $areas->__destruct();
+        $areas->free();
         unset($areas);
     }
     
@@ -91,7 +91,7 @@
         $this->assertEquals($count_final, $count_after);
         
         // recover memory
-        $areas->__destruct();
+        $areas->free();
         unset($areas);
     }
     
@@ -129,7 +129,7 @@
         $this->assertEquals($count_final, $count_after);
         
         // recover memory
-        $areas->__destruct();
+        $areas->free();
         unset($areas);
     }
     
@@ -162,7 +162,7 @@
         $this->assertEquals($count_after, $count_before);
         
         // recover memory
-        $areas->__destruct();
+        $areas->free();
         unset($areas);
     }
     
@@ -192,7 +192,7 @@
         $this->assertEquals($count_after, $count_before);
         
         // recover memory
-        $areas->__destruct();
+        $areas->free();
         unset($areas);
     }
 }

Modified: trunk/tests/Test/Solar/Sql/ModelRelated/HasManyThrough.php
===================================================================
--- trunk/tests/Test/Solar/Sql/ModelRelated/HasManyThrough.php	2007-12-21 17:53:09 UTC (rev 2975)
+++ trunk/tests/Test/Solar/Sql/ModelRelated/HasManyThrough.php	2008-01-03 14:05:49 UTC (rev 2976)
@@ -89,7 +89,7 @@
         $this->assertSame($actual, $expect);
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
     }
     
@@ -148,7 +148,7 @@
         $this->assertEquals($count3, $count2);
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
     }
     
@@ -212,7 +212,7 @@
         $this->assertEquals($count_final, $count_after);
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
     }
     
@@ -244,7 +244,7 @@
         $this->assertEquals($count_after, $count_before);
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
     }
     
@@ -272,7 +272,7 @@
         $this->assertEquals($count_after, $count_before);
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
     }
     
@@ -310,11 +310,11 @@
         $this->assertEquals($count_after, $count_before);
         
         // recover memory
-        $taggings->__destruct();
+        $taggings->free();
         unset($taggings);
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
     }
 }

Modified: trunk/tests/Test/Solar/Sql/ModelRelated/HasOne.php
===================================================================
--- trunk/tests/Test/Solar/Sql/ModelRelated/HasOne.php	2007-12-21 17:53:09 UTC (rev 2975)
+++ trunk/tests/Test/Solar/Sql/ModelRelated/HasOne.php	2008-01-03 14:05:49 UTC (rev 2976)
@@ -83,7 +83,7 @@
         $this->assertEquals($count_final, $count_after);
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
     }
     
@@ -118,7 +118,7 @@
         $this->assertEquals($count_final, $count_after);
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
     }
     
@@ -148,7 +148,7 @@
         $this->assertEquals($count_after, $count_before);
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
     }
     
@@ -175,7 +175,7 @@
         $this->assertEquals($count_after, $count_before);
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
     }
 }

Modified: trunk/tests/Test/Solar/Sql/ModelRelated.php
===================================================================
--- trunk/tests/Test/Solar/Sql/ModelRelated.php	2007-12-21 17:53:09 UTC (rev 2975)
+++ trunk/tests/Test/Solar/Sql/ModelRelated.php	2008-01-03 14:05:49 UTC (rev 2976)
@@ -122,7 +122,7 @@
         }
         
         // recover memory
-        $users->__destruct();
+        $users->free();
         unset($users);
     }
     
@@ -138,7 +138,7 @@
         }   
         
         // recover memory
-        $areas->__destruct();
+        $areas->free();
         unset($areas);
     }
     
@@ -158,7 +158,7 @@
         }
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
     }
     
@@ -175,11 +175,11 @@
         }
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
         
         // recover memory
-        $metas->__destruct();
+        $metas->free();
         unset($metas);
     }
     
@@ -197,7 +197,7 @@
         }
         
         // recover memory
-        $tags->__destruct();
+        $tags->free();
         unset($tags);
     }
     
@@ -244,15 +244,15 @@
         }
         
         // recover memory
-        $tags->__destruct();
+        $tags->free();
         unset($tags);
         
         // recover memory
-        $nodes->__destruct();
+        $nodes->free();
         unset($nodes);
         
         // recover memory
-        $taggings->__destruct();
+        $taggings->free();
         unset($taggings);
     }
 }
\ No newline at end of file