Doctrine

Timestamp:

04/30/08 05:03:15 (14 months ago)

Author:

jwage

Message:

Removing deprecated alias methods.

Location:

branches/0.11

Files:

• lib/Doctrine.php (modified) (2 diffs)
• lib/Doctrine/Cli.php (modified) (3 diffs)
• lib/Doctrine/Data/Import.php (modified) (1 diff)
• lib/Doctrine/Import/Builder.php (modified) (1 diff)
• lib/Doctrine/Import/Schema.php (modified) (2 diffs)
• lib/Doctrine/Migration.php (modified) (1 diff)
• lib/Doctrine/Migration/Builder.php (modified) (2 diffs)
• lib/Doctrine/Table.php (modified) (3 diffs)
• lib/Doctrine/Task.php (modified) (1 diff)
• tests/coverage/Doctrine_Data_Import.html (modified) (1 diff)
• tests/coverage/Doctrine_Import_Builder.html (modified) (1 diff)
• tests/coverage/Doctrine_Import_Schema.html (modified) (3 diffs)
• tests/coverage/Doctrine_Migration.html (modified) (1 diff)
• tests/coverage/Doctrine_Migration_Builder.html (modified) (2 diffs)
• tests/coverage/Doctrine_Table.html (modified) (3 diffs)
• tests/ImportTestCase.php (modified) (1 diff)
• tests/ManagerTestCase.php (modified) (1 diff)

branches/0.11/lib/Doctrine.php

@@ -1001 +1001 @@
 
     /**
-     * fileFinder
-     *
-     * @param string $type
-     * @return void
-     */
-    public static function fileFinder($type)
-    {
-        return Doctrine_FileFinder::type($type);
-    }
-
-    /**
      * compile
      *
@@ -1099 +1088 @@
         return implode("\n", $ret);
     }
-
-    /**
-     * tableize
-     *
-     * returns table name from class name
-     *
-     * @param string $classname
-     * @return string
-     */
-    public static function tableize($className)
-    {
-         return Doctrine_Inflector::tableize($className);
-    }
-
-    /**
-     * classify
-     *
-     * returns class name from table name
-     *
-     * @param string $tablename
-     * @return string
-     */
-    public static function classify($tableName)
-    {
-        return Doctrine_Inflector::classify($tableName);
-    }
-
-    /**
-     * isValidClassName
-     *
-     * checks for valid class name (uses camel case and underscores)
-     *
-     * @param string $classname
-     * @return boolean
-     */
-    public static function isValidClassname($className)
-    {
-        return Doctrine_Lib::isValidClassName($className);
-    }
-
-    /**
-     * makeDirectories
-     *
-     * Makes the directories for a path recursively
-     *
-     * @param string $path
-     * @return void
-     */
-    public static function makeDirectories($path, $mode = 0777)
-    {
-        return Doctrine_Lib::makeDirectories($path, $mode);
-    }
-
-    /**
-     * removeDirectories
-     *
-     * @param string $folderPath
-     * @return void
-     */
-    public static function removeDirectories($folderPath)
-    {
-        return Doctrine_Lib::removeDirectories($folderPath);
-    }
 }

branches/0.11/lib/Doctrine/Cli.php

@@ -103 +103 @@
     {
         $taskName = str_replace('-', '_', $args[1]);
-        $taskClass = 'Doctrine_Task_' . Doctrine::classify($taskName);
+        $taskClass = 'Doctrine_Task_' . Doctrine_Inflector::classify($taskName);
         
         return $taskClass;
@@ -213 +213 @@
     public function printTasks($task = null, $full = false)
     {
-        $task = Doctrine::classify(str_replace('-', '_', $task));
+        $task = Doctrine_Inflector::classify(str_replace('-', '_', $task));
         
         $tasks = $this->getLoadedTasks();
@@ -227 +227 @@
             $className = 'Doctrine_Task_' . $taskName;
             $taskInstance = new $className();
-            $taskInstance->taskName = str_replace('_', '-', Doctrine::tableize($taskName));         
+            $taskInstance->taskName = str_replace('_', '-', Doctrine_Inflector::tableize($taskName));         
             
             $syntax = $this->_scriptName . ' ' . $taskInstance->getTaskName();

branches/0.11/lib/Doctrine/Data/Import.php

@@ -194 +194 @@
             if ($obj->getTable()->hasField($key)) {
                 $obj->set($key, $value);
-            } else if (method_exists($obj, 'set' . Doctrine::classify($key))) {
-                    $func = 'set' . Doctrine::classify($key);
+            } else if (method_exists($obj, 'set' . Doctrine_Inflector::classify($key))) {
+                    $func = 'set' . Doctrine_Inflector::classify($key);
                     $obj->$func($value);
             } else if ($obj->getTable()->hasRelation($key)) {

branches/0.11/lib/Doctrine/Import/Builder.php

@@ -301 +301 @@
     public function setOption($key, $value)
     {
-        $name = 'set' . Doctrine::classify($key);
+        $name = 'set' . Doctrine_Inflector::classify($key);
         
         if (method_exists($this, $name)) {

branches/0.11/lib/Doctrine/Import/Schema.php

@@ -340 +340 @@
                     $tableName = null;
                 } else {
-                    $tableName = Doctrine::tableize($className);
+                    $tableName = Doctrine_Inflector::tableize($className);
                 }
             }
@@ -528 +528 @@
                 // Attempt to guess the local and foreign
                 if (isset($relation['refClass'])) {
-                    $relation['local'] = isset($relation['local']) ? $relation['local']:Doctrine::tableize($name) . '_id';
-                    $relation['foreign'] = isset($relation['foreign']) ? $relation['foreign']:Doctrine::tableize($class) . '_id';
+                    $relation['local'] = isset($relation['local']) ? $relation['local']:Doctrine_Inflector::tableize($name) . '_id';
+                    $relation['foreign'] = isset($relation['foreign']) ? $relation['foreign']:Doctrine_Inflector::tableize($class) . '_id';
                 } else {
-                    $relation['local'] = isset($relation['local']) ? $relation['local']:Doctrine::tableize($relation['class']) . '_id';
+                    $relation['local'] = isset($relation['local']) ? $relation['local']:Doctrine_Inflector::tableize($relation['class']) . '_id';
                     $relation['foreign'] = isset($relation['foreign']) ? $relation['foreign']:'id';
                 }

branches/0.11/lib/Doctrine/Migration.php

@@ -335 +335 @@
             foreach ($this->_changes as $type => $changes) {
                 $process = new Doctrine_Migration_Process();
-                $funcName = 'process' . Doctrine::classify($type);
+                $funcName = 'process' . Doctrine_Inflector::classify($type);
 
                 if ( ! empty($changes)) {

branches/0.11/lib/Doctrine/Migration/Builder.php

@@ -180 +180 @@
             $down = $this->buildDropTable($export);
             
-            $className = 'Add' . Doctrine::classify($export['tableName']);
+            $className = 'Add' . Doctrine_Inflector::classify($export['tableName']);
 
             $this->generateMigrationClass($className, array(), $up, $down);
@@ -281 +281 @@
             $next = (string) $this->migration->getNextVersion();
             
-            $fileName = str_repeat('0', (3 - strlen($next))) . $next . '_' . Doctrine::tableize($className) . $this->suffix;
+            $fileName = str_repeat('0', (3 - strlen($next))) . $next . '_' . Doctrine_Inflector::tableize($className) . $this->suffix;
             
             $class = $this->buildMigrationClass($className, $fileName, $options, $up, $down);

branches/0.11/lib/Doctrine/Table.php

@@ -233 +233 @@
         } else {
             if ( ! isset($this->_options['tableName'])) {
-                $this->_options['tableName'] = Doctrine::tableize($this->_options['name']);
+                $this->_options['tableName'] = Doctrine_Inflector::tableize($this->_options['name']);
             }
         }
@@ -347 +347 @@
 
         if ( ! isset($this->_options['tableName'])) {
-            $this->_options['tableName'] = Doctrine::tableize($class->getName());
+            $this->_options['tableName'] = Doctrine_Inflector::tableize($class->getName());
         }
 
@@ -2126 +2126 @@
             }
 
-            $fieldName = Doctrine::tableize($by);
+            $fieldName = Doctrine_Inflector::tableize($by);
             $hydrationMode = isset($arguments[1]) ? $arguments[1]:null;
 

branches/0.11/lib/Doctrine/Task.php

@@ -54 +54 @@
         $this->dispatcher = $dispatcher;
         
-        $this->taskName = str_replace('_', '-', Doctrine::tableize(str_replace('Doctrine_Task_', '', get_class($this))));
+        $this->taskName = str_replace('_', '-', Doctrine_Inflector::tableize(str_replace('Doctrine_Task_', '', get_class($this))));
     }
 

branches/0.11/tests/coverage/Doctrine_Data_Import.html

@@ -512 +512 @@
 </td></tr>
 <tr><td>168</td>
-<td class="covered">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;else&nbsp;if&nbsp;(method_exists($obj,&nbsp;'set'&nbsp;.&nbsp;Doctrine::classify($key)))&nbsp;{
+<td class="covered">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;else&nbsp;if&nbsp;(method_exists($obj,&nbsp;'set'&nbsp;.&nbsp;Doctrine_Inflector::classify($key)))&nbsp;{
 </td></tr>
 <tr><td>169</td>
-<td class="red">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$func&nbsp;=&nbsp;'set'&nbsp;.&nbsp;Doctrine::classify($key);
+<td class="red">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$func&nbsp;=&nbsp;'set'&nbsp;.&nbsp;Doctrine_Inflector::classify($key);
 </td></tr>
 <tr><td>170</td>

branches/0.11/tests/coverage/Doctrine_Import_Builder.html

@@ -839 +839 @@
 </td></tr>
 <tr><td>277</td>
-<td class="covered">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$name&nbsp;=&nbsp;'set'&nbsp;.&nbsp;Doctrine::classify($key);
+<td class="covered">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$name&nbsp;=&nbsp;'set'&nbsp;.&nbsp;Doctrine_Inflector::classify($key);
 </td></tr>
 <tr><td>278</td>

branches/0.11/tests/coverage/Doctrine_Import_Schema.html

@@ -1016 +1016 @@
 </td></tr>
 <tr><td>336</td>
-<td class="covered">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$tableName&nbsp;=&nbsp;Doctrine::tableize($className);
+<td class="covered">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$tableName&nbsp;=&nbsp;Doctrine_Inflector::tableize($className);
 </td></tr>
 <tr><td>337</td>
@@ -1580 +1580 @@
 </td></tr>
 <tr><td>524</td>
-<td class="red">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$relation['local']&nbsp;=&nbsp;isset($relation['local'])&nbsp;?&nbsp;$relation['local']:Doctrine::tableize($name)&nbsp;.&nbsp;'_id';
+<td class="red">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$relation['local']&nbsp;=&nbsp;isset($relation['local'])&nbsp;?&nbsp;$relation['local']:Doctrine_Inflector::tableize($name)&nbsp;.&nbsp;'_id';
 </td></tr>
 <tr><td>525</td>
-<td class="red">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$relation['foreign']&nbsp;=&nbsp;isset($relation['foreign'])&nbsp;?&nbsp;$relation['foreign']:Doctrine::tableize($class)&nbsp;.&nbsp;'_id';
+<td class="red">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$relation['foreign']&nbsp;=&nbsp;isset($relation['foreign'])&nbsp;?&nbsp;$relation['foreign']:Doctrine_Inflector::tableize($class)&nbsp;.&nbsp;'_id';
 </td></tr>
 <tr><td>526</td>
@@ -1589 +1589 @@
 </td></tr>
 <tr><td>527</td>
-<td class="covered">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$relation['local']&nbsp;=&nbsp;isset($relation['local'])&nbsp;?&nbsp;$relation['local']:Doctrine::tableize($relation['class'])&nbsp;.&nbsp;'_id';
+<td class="covered">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$relation['local']&nbsp;=&nbsp;isset($relation['local'])&nbsp;?&nbsp;$relation['local']:Doctrine_Inflector::tableize($relation['class'])&nbsp;.&nbsp;'_id';
 </td></tr>
 <tr><td>528</td>

branches/0.11/tests/coverage/Doctrine_Migration.html

@@ -1019 +1019 @@
 </td></tr>
 <tr><td>337</td>
-<td class="covered">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$funcName&nbsp;=&nbsp;'process'&nbsp;.&nbsp;Doctrine::classify($type);
+<td class="covered">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$funcName&nbsp;=&nbsp;'process'&nbsp;.&nbsp;Doctrine_Inflector::classify($type);
 </td></tr>
 <tr><td>338</td>

branches/0.11/tests/coverage/Doctrine_Migration_Builder.html

@@ -554 +554 @@
 </td></tr>
 <tr><td>182</td>
-<td class="red">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$className&nbsp;=&nbsp;'Add'&nbsp;.&nbsp;Doctrine::classify($export['tableName']);
+<td class="red">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$className&nbsp;=&nbsp;'Add'&nbsp;.&nbsp;Doctrine_Inflector::classify($export['tableName']);
 </td></tr>
 <tr><td>183</td>
@@ -857 +857 @@
 </td></tr>
 <tr><td>283</td>
-<td class="red">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$fileName&nbsp;=&nbsp;str_repeat('0',&nbsp;(3&nbsp;-&nbsp;strlen($next)))&nbsp;.&nbsp;$next&nbsp;.&nbsp;'_'&nbsp;.&nbsp;Doctrine::tableize($className)&nbsp;.&nbsp;$this-&gt;suffix;
+<td class="red">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$fileName&nbsp;=&nbsp;str_repeat('0',&nbsp;(3&nbsp;-&nbsp;strlen($next)))&nbsp;.&nbsp;$next&nbsp;.&nbsp;'_'&nbsp;.&nbsp;Doctrine_Inflector::tableize($className)&nbsp;.&nbsp;$this-&gt;suffix;
 </td></tr>
 <tr><td>284</td>

branches/0.11/tests/coverage/Doctrine_Table.html

@@ -713 +713 @@
 </td></tr>
 <tr><td>235</td>
-<td class="covered">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$this-&gt;_options['tableName']&nbsp;=&nbsp;Doctrine::tableize($this-&gt;_options['name']);
+<td class="covered">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$this-&gt;_options['tableName']&nbsp;=&nbsp;Doctrine_Inflector::tableize($this-&gt;_options['name']);
 </td></tr>
 <tr><td>236</td>
@@ -1055 +1055 @@
 </td></tr>
 <tr><td>349</td>
-<td class="covered">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$this-&gt;_options['tableName']&nbsp;=&nbsp;Doctrine::tableize($class-&gt;getName());
+<td class="covered">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$this-&gt;_options['tableName']&nbsp;=&nbsp;Doctrine_Inflector::tableize($class-&gt;getName());
 </td></tr>
 <tr><td>350</td>
@@ -6038 +6038 @@
 </td></tr>
 <tr><td>2010</td>
-<td class="covered">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$fieldName&nbsp;=&nbsp;Doctrine::tableize($by);
+<td class="covered">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$fieldName&nbsp;=&nbsp;Doctrine_Inflector::tableize($by);
 </td></tr>
 <tr><td>2011</td>

branches/0.11/tests/ImportTestCase.php

@@ -50 +50 @@
         $this->assertTrue(file_exists('Import/_files/ImportTestUser.php'));
         $this->assertTrue(file_exists('Import/_files/generated/BaseImportTestUser.php'));
-        Doctrine::removeDirectories('Import/_files');
+        Doctrine_Lib::removeDirectories('Import/_files');
     }
 }

branches/0.11/tests/ManagerTestCase.php

@@ -52 +52 @@
     public function testClassifyTableize() {
         $name = "Forum_Category";
-        $this->assertEqual(Doctrine::tableize($name), "forum__category");
-        $this->assertEqual(Doctrine::classify(Doctrine::tableize($name)), $name);
+        $this->assertEqual(Doctrine_Inflector::tableize($name), "forum__category");
+        $this->assertEqual(Doctrine_Inflector::classify(Doctrine_Inflector::tableize($name)), $name);