Lots of formatting changes, cleanup, doc block changes.

lib/Doctrine.php

@@ -27,7 +27,6 @@
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -680,4 +679,4 @@ final class Doctrine
 
         return true;
     }
-}
+}

lib/Doctrine/Access.php

@@ -25,8 +25,8 @@
  * and property overload interface for subclasses
  *
  * @package     Doctrine
+ * @subpackage  Access
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Adapter.php

@@ -23,8 +23,8 @@
  * Doctrine_Adapter
  *
  * @package     Doctrine
+ * @subpackage  Adapter
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Adapter/Db2.php

@@ -24,7 +24,7 @@ Doctrine::autoload('Doctrine_Adapter');
  * IBM DB2 Adapter  [BORROWED FROM ZEND FRAMEWORK]
  *
  * @package     Doctrine
- * @subpackage  Doctrine_Adapter
+ * @subpackage  Adapter
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @category    Object Relational Mapping

lib/Doctrine/Adapter/Db2/Exception.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Adapter_Exception');
  * Doctrine_Adapter_Db2_Exception
  *
  * @package     Doctrine
+ * @subpackage  Adapter
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Adapter/Exception.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Exception');
  * Doctrine_Adapter_Exception
  *
  * @package     Doctrine
+ * @subpackage  Adapter
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Adapter/Interface.php

@@ -25,7 +25,7 @@
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @package     Doctrine
- * @category    Object Relational Mapping
+ * @subpackage  Adapter
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Adapter/Mock.php

@@ -23,10 +23,9 @@
  * This class is used for special testing purposes.
  *
  * @package     Doctrine
- * @subpackage  Doctrine_Adapter
+ * @subpackage  Adapter
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Adapter/Mysqli.php

@@ -23,10 +23,9 @@
  * This class is used for special testing purposes.
  *
  * @package     Doctrine
- * @subpackage  Doctrine_Adapter
+ * @subpackage  Adapter
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision: 1080 $

lib/Doctrine/Adapter/Oracle.php

@@ -24,10 +24,9 @@ Doctrine::autoload('Doctrine_Adapter');
  * [BORROWED FROM ZEND FRAMEWORK]
  *
  * @package     Doctrine
- * @subpackage  Doctrine_Adapter
+ * @subpackage  Adapter
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision: 1080 $

lib/Doctrine/Adapter/Statement.php

@@ -24,7 +24,7 @@
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @package     Doctrine
- * @category    Object Relational Mapping
+ * @subpackage  Adapter
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Adapter/Statement/Interface.php

@@ -24,7 +24,7 @@
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @package     Doctrine
- * @category    Object Relational Mapping
+ * @subpackage  Adapter
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Adapter/Statement/Mock.php

@@ -23,10 +23,9 @@
  * This class is used for special testing purposes.
  *
  * @package     Doctrine
- * @subpackage  Doctrine_Adapter
+ * @subpackage  Adapter
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/AuditLog.php

@@ -22,8 +22,8 @@
  * Doctrine_AuditLog
  *
  * @package     Doctrine
+ * @subpackage  AuditLog
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/AuditLog/Listener.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Record_Listener');
  * Doctrine_AuditLog_Listener
  *
  * @package     Doctrine
+ * @subpackage  AuditLog
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Cache.php

@@ -23,10 +23,9 @@ Doctrine::autoload('Doctrine_EventListener');
  * Doctrine_Cache
  *
  * @package     Doctrine
- * @subpackage  Doctrine_Cache
+ * @subpackage  Cache
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Cache/Apc.php

@@ -23,9 +23,8 @@
  * Doctrine_Cache_Apc
  *
  * @package     Doctrine
- * @subpackage  Doctrine_Cache
+ * @subpackage  Cache
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Cache/Array.php

@@ -23,9 +23,8 @@
  * Doctrine_Cache_Interface
  *
  * @package     Doctrine
- * @subpackage  Doctrine_Cache
+ * @subpackage  Cache
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Cache/Db.php

@@ -23,9 +23,8 @@
  * Doctrine_Cache_Db
  *
  * @package     Doctrine
- * @subpackage  Doctrine_Cache
+ * @subpackage  Cache
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -44,13 +43,13 @@ class Doctrine_Cache_Db extends Doctrine_Cache_Driver implements Countable
              ! ($options['connection'] instanceof Doctrine_Connection)) {
 
             throw new Doctrine_Cache_Exception('Connection option not set.');
-        }
+        }
-        
+        
-        if ( ! isset($options['tableName']) ||
+        if ( ! isset($options['tableName']) ||
-             ! is_string($options['tableName'])) {
+             ! is_string($options['tableName'])) {
-             
+             
-             throw new Doctrine_Cache_Exception('Table name option not set.');
+             throw new Doctrine_Cache_Exception('Table name option not set.');
-        }
+        }
         
 
         $this->_options = $options;
@@ -76,7 +75,7 @@ class Doctrine_Cache_Db extends Doctrine_Cache_Driver implements Countable
      */
     public function fetch($id, $testCacheValidity = true)
     {
-        $sql = 'SELECT data, expire FROM ' . $this->_options['tableName']
+        $sql = 'SELECT data, expire FROM ' . $this->_options['tableName']
              . ' WHERE id = ?';
 
         if ($testCacheValidity) {
@@ -84,11 +83,11 @@ class Doctrine_Cache_Db extends Doctrine_Cache_Driver implements Countable
         }
 
         $result = $this->getConnection()->fetchAssoc($sql, array($id));
-        
+        
-        if ( ! isset($result[0])) {
+        if ( ! isset($result[0])) {
-            return false;
+            return false;
-        }
+        }
-        
+        
         return unserialize($result[0]['data']);
     }
     /**
@@ -99,7 +98,7 @@ class Doctrine_Cache_Db extends Doctrine_Cache_Driver implements Countable
      */
     public function contains($id) 
     {
-        $sql = 'SELECT expire FROM ' . $this->_options['tableName']
+        $sql = 'SELECT expire FROM ' . $this->_options['tableName']
              . ' WHERE id = ? AND (expire=0 OR expire > ' . time() . ')';
 
         return $this->getConnection()->fetchOne($sql, array($id));
@@ -116,15 +115,15 @@ class Doctrine_Cache_Db extends Doctrine_Cache_Driver implements Countable
      */
     public function save($data, $id, $lifeTime = false)
     {
-        $sql = 'INSERT INTO ' . $this->_options['tableName']
+        $sql = 'INSERT INTO ' . $this->_options['tableName']
              . ' (id, data, expire) VALUES (?, ?, ?)';
-        
+        
-        if ($lifeTime) {
+        if ($lifeTime) {
-            $expire = time() + $lifeTime;
+            $expire = time() + $lifeTime;
-        } else {
+        } else {
-            $expire = 0;
+            $expire = 0;
-        }
+        }
-        
+        
         $params = array($id, serialize($data), $expire);
 
         return (bool) $this->getConnection()->exec($sql, $params);
@@ -140,19 +139,19 @@ class Doctrine_Cache_Db extends Doctrine_Cache_Driver implements Countable
         $sql = 'DELETE FROM ' . $this->_options['tableName'] . ' WHERE id = ?';
 
         return (bool) $this->getConnection()->exec($sql, array($id));
-    }
+    }
-    
+    
-    /**
+    /**
-     * Removes all cache records
+     * Removes all cache records
-     *
+     *
-     * $return bool true on success, false on failure
+     * $return bool true on success, false on failure
-     */
+     */
-    public function deleteAll()
+    public function deleteAll()
-    {
+    {
-        $sql = 'DELETE FROM ' . $this->_options['tableName'];
+        $sql = 'DELETE FROM ' . $this->_options['tableName'];
-        
+        
-        return (bool) $this->getConnection()->exec($sql);
+        return (bool) $this->getConnection()->exec($sql);
-    }
+    }
     
     /**
      * count
@@ -161,36 +160,36 @@ class Doctrine_Cache_Db extends Doctrine_Cache_Driver implements Countable
      * @return integer
      */
     public function count()
-    {
+    {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->_options['tableName'];
+        $sql = 'SELECT COUNT(*) FROM ' . $this->_options['tableName'];
         
         return (int) $this->getConnection()->fetchOne($sql);
-    }
+    }
-    
+    
-    /**
+    /**
-     * Creates the cache table.
+     * Creates the cache table.
-     */
+     */
-    public function createTable()
+    public function createTable()
-    {
+    {
-        $name = $this->_options['tableName'];
+        $name = $this->_options['tableName'];
-        
+        
-        $fields = array(
+        $fields = array(
-            'id' => array(
+            'id' => array(
-                'type'   => 'string',
+                'type'   => 'string',
-                'length' => 255
+                'length' => 255
-            ),
+            ),
-            'data' => array(
+            'data' => array(
-                'type'    => 'blob'
+                'type'    => 'blob'
-            ),
+            ),
-            'expire' => array(
+            'expire' => array(
-                'type'    => 'timestamp'
+                'type'    => 'timestamp'
-            )
+            )
-        );
+        );
-        
+        
-        $options = array(
+        $options = array(
-            'primary' => array('id')
+            'primary' => array('id')
-        );
+        );
-        
+        
-        $this->getConnection()->export->createTable($name, $fields, $options);
+        $this->getConnection()->export->createTable($name, $fields, $options);
     }
 }

lib/Doctrine/Cache/Driver.php

@@ -23,9 +23,8 @@
  * Doctrine_Cache_Driver
  *
  * @package     Doctrine
- * @subpackage  Doctrine_Cache
+ * @subpackage  Cache
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Cache/Exception.php

@@ -23,9 +23,8 @@ Doctrine::autoload('Doctrine_Exception');
  * Doctrine_Cache_Exception
  *
  * @package     Doctrine
- * @subpackage  Doctrine_Cache
+ * @subpackage  Cache
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Cache/Interface.php

@@ -23,9 +23,8 @@
  * Doctrine_Cache_Interface
  *
  * @package     Doctrine
- * @subpackage  Doctrine_Cache
+ * @subpackage  Cache
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Cache/Memcache.php

@@ -23,9 +23,8 @@ Doctrine::autoload('Doctrine_Cache_Driver');
  * Doctrine_Cache_Memcache
  *
  * @package     Doctrine
- * @subpackage  Doctrine_Cache
+ * @subpackage  Cache
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Collection.php

@@ -24,8 +24,8 @@ Doctrine::autoload('Doctrine_Access');
  * Collection of Doctrine_Record objects.
  *
  * @package     Doctrine
+ * @subpackage  Collection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -716,4 +716,4 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
     {
         return Doctrine_Lib::getCollectionAsString($this);
     }
-}
+}

lib/Doctrine/Collection/Exception.php

@@ -22,12 +22,12 @@
  * Doctrine_Collection_Exception
  *
  * @package     Doctrine
+ * @subpackage  Collection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Collection_Exception extends Doctrine_Exception
-{ }
+{ }

lib/Doctrine/Collection/Iterator.php

@@ -23,8 +23,8 @@
  * iterates through Doctrine_Collection
  *
  * @package     Doctrine
+ * @subpackage  Collection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -108,4 +108,4 @@ abstract class Doctrine_Collection_Iterator implements Iterator
             $this->key   = $this->keys[$i];
         }
     }
-}
+}

lib/Doctrine/Collection/Iterator/Expandable.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Collection_Iterator');
  * Doctrine_Collection_Iterator_Normal
  *
  * @package     Doctrine
+ * @subpackage  Collection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -51,4 +51,4 @@ class Doctrine_Collection_Iterator_Expandable extends Doctrine_Collection_Iterat
             return false;
         }
     }
-}
+}

lib/Doctrine/Collection/Iterator/Normal.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Collection_Iterator');
  * Doctrine_Collection_Iterator_Normal
  *
  * @package     Doctrine
+ * @subpackage  Collection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -39,4 +39,4 @@ class Doctrine_Collection_Iterator_Normal extends Doctrine_Collection_Iterator
     {
         return ($this->index < $this->count);
     }
-}
+}

lib/Doctrine/Collection/Iterator/Offset.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Collection_Iterator');
  * Doctrine_Collection_Iterator_Normal
  *
  * @package     Doctrine
+ * @subpackage  Collection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -34,4 +34,4 @@ class Doctrine_Collection_Iterator_Offset extends Doctrine_Collection_Iterator
 {
     public function valid()
     { }
-}
+}

lib/Doctrine/Collection/Offset.php

@@ -24,8 +24,8 @@ Doctrine::autoload('Doctrine_Collection_Offset');
  * Collection of Doctrine_Record objects.
  *
  * @package     Doctrine
+ * @subpackage  Collection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Column.php

@@ -24,9 +24,9 @@
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @package     Doctrine
+ * @subpackage  Column
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  */
@@ -144,5 +144,4 @@ class Doctrine_Column extends Doctrine_Access implements IteratorAggregate, Coun
     {
         return new ArrayIterator($this->_definition);
     }
-
+}
-}

lib/Doctrine/Compiler.php

@@ -23,9 +23,9 @@
  * This class can be used for compiling the entire Doctrine framework into a single file
  *
  * @package     Doctrine
+ * @subpackage  Compiler
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -99,4 +99,4 @@ class Doctrine_Compiler
         fwrite($fp, $stripped);
         fclose($fp);
     }
-}
+}

lib/Doctrine/Compiler/Exception.php

@@ -22,12 +22,12 @@
  * Doctrine_Compiler_Exception
  *
  * @package     Doctrine
+ * @subpackage  Compiler
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
  */
 class Doctrine_Compiler_Exception extends Doctrine_Exception
-{ }
+{ }

lib/Doctrine/Configurable.php

@@ -24,8 +24,8 @@
  *
  *
  * @package     Doctrine
+ * @subpackage  Configurable
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -348,4 +348,4 @@ abstract class Doctrine_Configurable extends Doctrine_Object
     {
         return $this->parent;
     }
-}
+}

lib/Doctrine/Connection.php

@@ -45,8 +45,8 @@ Doctrine::autoload('Doctrine_Configurable');
  *    Doctrine_Connection::$_modules
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -1132,5 +1132,4 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
     {
         return Doctrine_Lib::getConnectionAsString($this);
     }
-}
+}
-

lib/Doctrine/Connection/Common.php

@@ -23,7 +23,7 @@ Doctrine::autoload('Doctrine_Connection');
  * standard connection, the parent of pgsql, mysql and sqlite
  *
  * @package     Doctrine
- * @category    Object Relational Mapping
+ * @subpackage  Connection
  * @link        www.phpdoctrine.com
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @since       1.0
@@ -54,4 +54,4 @@ class Doctrine_Connection_Common extends Doctrine_Connection
 
         return $query;
     }
-}
+}

lib/Doctrine/Connection/Db2.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Connection');
  * Doctrine_Connection_Db2
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -61,4 +61,4 @@ class Doctrine_Connection_Db2 extends Doctrine_Connection
             return $sql;
         }
     }
-}
+}

lib/Doctrine/Connection/Exception.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Exception');
  * Doctrine_Exception
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -110,4 +110,4 @@ class Doctrine_Connection_Exception extends Doctrine_Exception
         return isset(self::$errorMessages[$value]) ?
            self::$errorMessages[$value] : self::$errorMessages[Doctrine::ERR];
     }
-}
+}

lib/Doctrine/Connection/Firebird.php

@@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Connection');
  * Doctrine_Connection_Firebird
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @author      Lorenzo Alberton <l.alberton@quipo.it> (PEAR MDB2 Interbase driver)
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  */
@@ -105,4 +105,4 @@ class Doctrine_Connection_Firebird extends Doctrine_Connection
         }
         return $query;
     }
-}
+}

lib/Doctrine/Connection/Firebird/Exception.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Connection_Exception');
  * Doctrine_Connection_Firebird_Exception
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -131,4 +131,4 @@ class Doctrine_Connection_Firebird_Exception extends Doctrine_Connection_Excepti
         }
         return $errorInfo;
     }
-}
+}

lib/Doctrine/Connection/Informix.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Connection');
  * Doctrine_Connection_Mysql
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -48,4 +48,4 @@ class Doctrine_Connection_Informix extends Doctrine_Connection
 
         parent::__construct($manager, $adapter);
     }
-}
+}

lib/Doctrine/Connection/Informix/Exception.php

@@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Connection_Exception');
  * Doctrine_Connection_Informix_Exception
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Connection_Informix_Exception extends Doctrine_Connection_Exception
-{ }
+{ }

lib/Doctrine/Connection/Mock.php

@@ -23,11 +23,11 @@ Doctrine::autoload('Doctrine_Connection_Common');
  * Doctrine_Connection_Mysql
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  */
@@ -47,4 +47,4 @@ class Doctrine_Connection_Mock extends Doctrine_Connection_Common
     {
 
     }
-}
+}

lib/Doctrine/Connection/Module.php

@@ -22,8 +22,8 @@
  * Doctrine_Connection_Module
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -75,4 +75,4 @@ class Doctrine_Connection_Module
     {
         return $this->moduleName;
     }
-}
+}

lib/Doctrine/Connection/Mssql.php

@@ -23,11 +23,11 @@ Doctrine::autoload('Doctrine_Connection');
  * Doctrine_Connection_Mssql
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  */
@@ -186,4 +186,4 @@ class Doctrine_Connection_Mssql extends Doctrine_Connection
         }
         return true;
     }
-}
+}

lib/Doctrine/Connection/Mssql/Exception.php

@@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Connection_Exception');
  * Doctrine_Connection_Mssql_Exception
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @since       1.0
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  */
 class Doctrine_Connection_Mssql_Exception extends Doctrine_Connection_Exception
@@ -71,4 +71,4 @@ class Doctrine_Connection_Mssql_Exception extends Doctrine_Connection_Exception
         }
         return false;
     }
-}
+}

lib/Doctrine/Connection/Mysql.php

@@ -23,11 +23,11 @@ Doctrine::autoload('Doctrine_Connection_Common');
  * Doctrine_Connection_Mysql
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  */
@@ -204,4 +204,4 @@ class Doctrine_Connection_Mysql extends Doctrine_Connection_Common
 
         return $this->exec($query);
     }
-}
+}

lib/Doctrine/Connection/Mysql/Exception.php

@@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Connection_Exception');
  * Doctrine_Connection_Mysql_Exception
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @since       1.0
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  */
 class Doctrine_Connection_Mysql_Exception extends Doctrine_Connection_Exception
@@ -81,4 +81,4 @@ class Doctrine_Connection_Mysql_Exception extends Doctrine_Connection_Exception
         }
         return false;
     }
-}
+}

lib/Doctrine/Connection/Oracle.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Connection');
  * Doctrine_Connection_Oracle
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -113,4 +113,4 @@ class Doctrine_Connection_Oracle extends Doctrine_Connection
         }
         return $query;
     }
-}
+}

lib/Doctrine/Connection/Oracle/Exception.php

@@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Connection_Exception');
  * Doctrine_Connection_Oracle_Exception
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @since       1.0
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  */
 class Doctrine_Connection_Oracle_Exception extends Doctrine_Connection_Exception
@@ -76,4 +76,4 @@ class Doctrine_Connection_Oracle_Exception extends Doctrine_Connection_Exception
         }
         return false;
     }
-}
+}

lib/Doctrine/Connection/Pgsql.php

@@ -23,11 +23,11 @@ Doctrine::autoload("Doctrine_Connection_Common");
  * Doctrine_Connection_Pgsql
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  */
@@ -187,4 +187,4 @@ class Doctrine_Connection_Pgsql extends Doctrine_Connection_Common
         }
         return $serverInfo;
     }
-}
+}

lib/Doctrine/Connection/Pgsql/Exception.php

@@ -23,7 +23,7 @@ Doctrine::autoload('Doctrine_Connection_Exception');
  * Doctrine_Connection_Pgsql_Exception
  *
  * @package     Doctrine
- * @category    Object Relational Mapping
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.phpdoctrine.com
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
@@ -104,4 +104,4 @@ class Doctrine_Connection_Pgsql_Exception extends Doctrine_Connection_Exception
         }
         return false;
     }
-}
+}

lib/Doctrine/Connection/Profiler.php

@@ -22,10 +22,10 @@ Doctrine::autoload('Doctrine_Overloadable');
 /**
  * Doctrine_Connection_Profiler
  *
+ * @package     Doctrine
+ * @subpackage  Connection
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @package     Doctrine
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -171,4 +171,4 @@ class Doctrine_Connection_Profiler implements Doctrine_Overloadable, IteratorAgg
         end($this->events);
         return current($this->events);
     }
-}
+}

lib/Doctrine/Connection/Profiler/Exception.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Connection_Profiler_Exception');
  * Doctrine_Connection_Profiler_Exception
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision: 1345 $
@@ -32,4 +32,4 @@ Doctrine::autoload('Doctrine_Connection_Profiler_Exception');
  */
 class Doctrine_Connection_Profiler_Exception extends Doctrine_Exception
 {
-}
+}

lib/Doctrine/Connection/Sqlite.php

@@ -23,11 +23,11 @@ Doctrine::autoload("Doctrine_Connection_Common");
  * Doctrine_Connection_Sqlite
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  */
@@ -111,4 +111,4 @@ class Doctrine_Connection_Sqlite extends Doctrine_Connection_Common
     {
         return $name . '.db';
     }
-}
+}

lib/Doctrine/Connection/Sqlite/Exception.php

@@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Connection_Exception');
  * Doctrine_Connection_Sqlite_Exception
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @since       1.0
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  */
 class Doctrine_Connection_Sqlite_Exception extends Doctrine_Connection_Exception
@@ -74,4 +74,4 @@ class Doctrine_Connection_Sqlite_Exception extends Doctrine_Connection_Exception
         }
         return false;
     }
-}
+}

lib/Doctrine/Connection/Statement.php

@@ -22,10 +22,10 @@ Doctrine::autoload('Doctrine_Adapter_Statement_Interface');
 /**
  * Doctrine_Connection_Statement
  *
+ * @package     Doctrine
+ * @subpackage  Connection
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @package     Doctrine
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision: 1532 $
@@ -435,4 +435,4 @@ class Doctrine_Connection_Statement implements Doctrine_Adapter_Statement_Interf
     {
         return $this->_stmt->setFetchMode($mode, $arg1, $arg2);
     }
-}
+}

lib/Doctrine/Connection/UnitOfWork.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Connection_Module');
  * Doctrine_Connection_UnitOfWork
  *
  * @package     Doctrine
+ * @subpackage  Connection
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -622,4 +622,4 @@ class Doctrine_Connection_UnitOfWork extends Doctrine_Connection_Module
 
         return true;
     }
-}
+}

lib/Doctrine/Data.php

@@ -25,9 +25,9 @@
  * Base Doctrine_Data class
  *
  * @package     Doctrine
+ * @subpackage  Data
  * @author      Jonathan H. Wage <jwage@mac.com>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision: 2552 $

lib/Doctrine/Data/Exception.php

@@ -1,4 +1,34 @@
 <?php
+/*
+ *  $Id: Exception.php 2552 2007-09-19 19:33:00Z Jonathan.Wage $
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.phpdoctrine.com>.
+ */
+
+/**
+ * Doctrine_Data_Exception
+ *
+ * @package     Doctrine
+ * @subpackage  Data
+ * @author      Jonathan H. Wage <jwage@mac.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ * @version     $Revision: 2552 $
+ */
 class Doctrine_Data_Exception extends Doctrine_Exception
-{
+{ }
-}

lib/Doctrine/Data/Export.php

@@ -23,6 +23,7 @@
  * Doctrine_Data_Export
  *
  * @package     Doctrine
+ * @subpackage  Data
  * @author      Jonathan H. Wage <jwage@mac.com>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @category    Object Relational Mapping

lib/Doctrine/Data/Import.php

@@ -23,9 +23,9 @@
  * Doctrine_Data_Import
  *
  * @package     Doctrine
+ * @package     Data
  * @author      Jonathan H. Wage <jwage@mac.com>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision: 2552 $

lib/Doctrine/DataDict.php

@@ -22,8 +22,8 @@
  * Doctrine_DataDict
  *
  * @package     Doctrine
+ * @subpackage  DataDict
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -91,4 +91,4 @@ class Doctrine_DataDict extends Doctrine_Connection_Module
         }
         return $value;
     }
-}
+}

lib/Doctrine/DataDict/Exception.php

@@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Exception');
  * Doctrine_DataDict_Exception
  *
  * @package     Doctrine
+ * @subpackage  DataDict
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_DataDict_Exception extends Doctrine_Exception
-{ }
+{ }

lib/Doctrine/DataDict/Firebird.php

@@ -21,13 +21,12 @@
 Doctrine::autoload('Doctrine_DataDict');
 /**
  * @package     Doctrine
- * @subpackage  Doctrine_DataDict
+ * @subpackage  DataDict
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lorenzo Alberton <l.alberton@quipo.it> (PEAR MDB2 Interbase driver)
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  */
@@ -213,4 +212,4 @@ class Doctrine_DataDict_Firebird extends Doctrine_DataDict
     {
         return 'COLLATE ' . $collation;
     }
-}
+}

lib/Doctrine/DataDict/Informix.php

@@ -21,11 +21,11 @@
 Doctrine::autoload('Doctrine_DataDict');
 /**
  * @package     Doctrine
+ * @subpackage  DataDict
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  */
@@ -107,4 +107,4 @@ class Doctrine_DataDict_Informix extends Doctrine_DataDict
         }
         throw new Doctrine_DataDict_Exception('Unknown field type \'' . $field['type'] .  '\'.');
     }
-}
+}

lib/Doctrine/DataDict/Mssql.php

@@ -21,14 +21,13 @@
 Doctrine::autoload('Doctrine_DataDict');
 /**
  * @package     Doctrine
- * @subpackage  Doctrine_DataDict
+ * @subpackage  DataDict
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @author      Frank M. Kromann <frank@kromann.info> (PEAR MDB2 Mssql driver)
  * @author      David Coallier <davidc@php.net> (PEAR MDB2 Mssql driver)
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  */

lib/Doctrine/DataDict/Mysql.php

@@ -21,12 +21,11 @@
 Doctrine::autoload('Doctrine_DataDict');
 /**
  * @package     Doctrine
- * @subpackage  Doctrine_DataDict
+ * @subpackage  DataDict
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  */
@@ -460,4 +459,4 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict
 
         return $name . ' ' . $this->getNativeDeclaration($field) . $unsigned . $default . $notnull . $autoinc;
     }
-}
+}

lib/Doctrine/DataDict/Oracle.php

@@ -21,11 +21,10 @@
 Doctrine::autoload('Doctrine_DataDict');
 /**
  * @package     Doctrine
- * @subpackage  Doctrine_DataDict
+ * @subpackage  DataDict
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  */
@@ -192,4 +191,4 @@ class Doctrine_DataDict_Oracle extends Doctrine_DataDict
                      'unsigned' => $unsigned,
                      'fixed'    => $fixed);
     }
-}
+}

lib/Doctrine/DataDict/Pgsql.php

@@ -21,13 +21,12 @@
 Doctrine::autoload('Doctrine_DataDict');
 /**
  * @package     Doctrine
- * @subpackage  Doctrine_DataDict
+ * @subpackage  DataDict
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Paul Cooper <pgc@ucecom.com>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  */
@@ -618,4 +617,4 @@ class Doctrine_DataDict_Pgsql extends Doctrine_DataDict
     {
         return $value;
     }
-}
+}

lib/Doctrine/DataDict/Sqlite.php

@@ -21,12 +21,11 @@
 Doctrine::autoload('Doctrine_DataDict');
 /**
  * @package     Doctrine
- * @subpackage  Doctrine_DataDict
+ * @subpackage  DataDict
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @version     $Revision$
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  */
@@ -296,4 +295,4 @@ class Doctrine_DataDict_Sqlite extends Doctrine_DataDict
         $name = $this->conn->quoteIdentifier($name, true);
         return $name . ' ' . $type . $unsigned . $default . $notnull . $autoinc;
     }
-}
+}

lib/Doctrine/DataType.php

@@ -23,8 +23,8 @@
  * Doctrine_DataType
  *
  * @package     Doctrine
+ * @subpackage  DataType
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision: 1986 $

lib/Doctrine/Db.php

@@ -24,7 +24,7 @@
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @package     Doctrine
- * @category    Object Relational Mapping
+ * @subpackage  Db
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Event.php

@@ -24,7 +24,7 @@
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @package     Doctrine
- * @category    Object Relational Mapping
+ * @subpackage  Event
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/EventListener.php

@@ -26,8 +26,8 @@ Doctrine::autoload('Doctrine_EventListener_Interface');
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @package     Doctrine
+ * @subpackage  EventListener
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -117,4 +117,4 @@ class Doctrine_EventListener implements Doctrine_EventListener_Interface
     { }
     public function postStmtExecute(Doctrine_Event $event)
     { }
-}
+}

lib/Doctrine/EventListener/Chain.php

@@ -27,8 +27,8 @@ Doctrine::autoload('Doctrine_Access');
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @package     Doctrine
+ * @subpackage  EventListener
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -385,4 +385,4 @@ class Doctrine_EventListener_Chain extends Doctrine_Access implements Doctrine_E
             $listener->postStmtExecute($event);
         }
     }
-}
+}

lib/Doctrine/EventListener/Exception.php

@@ -23,13 +23,12 @@
  * Doctrine_EventListener_Exception
  *
  * @package     Doctrine
+ * @subpackage  EventListener
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision: 1344 $
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_EventListener_Exception extends Doctrine_Exception
-{  
+{ }
-}

lib/Doctrine/EventListener/Interface.php

@@ -26,8 +26,8 @@ Doctrine::autoload('Doctrine_EventListener_Interface');
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @package     Doctrine
+ * @subpackage  EventListener
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -66,4 +66,4 @@ interface Doctrine_EventListener_Interface
 
     public function preStmtExecute(Doctrine_Event $event);
     public function postStmtExecute(Doctrine_Event $event);
-}
+}

lib/Doctrine/Exception.php

@@ -22,8 +22,8 @@
  * Doctrine_Exception
  *
  * @package     Doctrine
+ * @subpackage  Exception
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$

lib/Doctrine/Export.php

@@ -23,10 +23,10 @@ Doctrine::autoload('Doctrine_Connection_Module');
  * Doctrine_Export
  *
  * @package     Doctrine
+ * @subpackage  Export
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -1143,4 +1143,4 @@ class Doctrine_Export extends Doctrine_Connection_Module
             }
         }
     }
-}
+}

lib/Doctrine/Export/Exception.php

@@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Exception');
  * Doctrine_Export_Exception
  *
  * @package     Doctrine
+ * @subpackage  Export
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Export_Exception extends Doctrine_Exception
-{ }
+{ }

lib/Doctrine/Export/Firebird.php

@@ -23,11 +23,11 @@ Doctrine::autoload('Doctrine_Export');
  * Doctrine_Export_Sqlite
  *
  * @package     Doctrine
+ * @subpackage  Export
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @author      Lorenzo Alberton <l.alberton@quipo.it> (PEAR MDB2 Interbase driver)
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -537,4 +537,4 @@ class Doctrine_Export_Firebird extends Doctrine_Export
         
         return $query;
     }
-}
+}

lib/Doctrine/Export/Frontbase.php

@@ -23,10 +23,10 @@ Doctrine::autoload('Doctrine_Export');
  * Doctrine_Export_Frontbase
  *
  * @package     Doctrine
+ * @subpackage  Export
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -307,4 +307,4 @@ class Doctrine_Export_Frontbase extends Doctrine_Export
 
         return 'ALTER TABLE ' . $table . ' DROP INDEX ' . $name;
     }
-}
+}

lib/Doctrine/Export/Mssql.php

@@ -23,11 +23,11 @@ Doctrine::autoload('Doctrine_Export');
  * Doctrine_Export_Mssql
  *
  * @package     Doctrine
+ * @subpackage  Export
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @author      Frank M. Kromann <frank@kromann.info> (PEAR MDB2 Mssql driver)
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -250,4 +250,4 @@ class Doctrine_Export_Mssql extends Doctrine_Export
         $sequenceName = $this->conn->quoteIdentifier($this->conn->getSequenceName($seqName), true);
         return 'DROP TABLE ' . $sequenceName;
     }
-}
+}

lib/Doctrine/Export/Mysql.php

@@ -23,10 +23,10 @@ Doctrine::autoload('Doctrine_Export');
  * Doctrine_Export_Mysql
  *
  * @package     Doctrine
+ * @subpackage  Export
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -636,5 +636,4 @@ class Doctrine_Export_Mysql extends Doctrine_Export
         $table  = $this->conn->quoteIdentifier($table, true);
         return 'DROP TABLE ' . $table;
     }
-}
+}
-

lib/Doctrine/Export/Oracle.php

@@ -23,10 +23,10 @@ Doctrine::autoload('Doctrine_Export');
  * Doctrine_Export_Oracle
  *
  * @package     Doctrine
+ * @subpackage  Export
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -490,4 +490,4 @@ END;
         $sequenceName = $this->conn->quoteIdentifier($this->conn->formatter->getSequenceName($seqName), true);
         return 'DROP SEQUENCE ' . $sequenceName;
     }
-}
+}

lib/Doctrine/Export/Pgsql.php

@@ -23,10 +23,10 @@ Doctrine::autoload('Doctrine_Export');
  * Doctrine_Export_Pgsql
  *
  * @package     Doctrine
+ * @subpackage  Export
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -347,5 +347,4 @@ class Doctrine_Export_Pgsql extends Doctrine_Export
 
         return $query;
     }
-}
+}
-

lib/Doctrine/Export/Reporter.php

@@ -23,9 +23,9 @@
  * Doctrine_Export_Reporter
  *
  * @package     Doctrine
+ * @subpackage  Export
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -42,4 +42,4 @@ class Doctrine_Export_Reporter implements IteratorAggregate {
     public function getIterator() {
         return new ArrayIterator($this->messages);
     }
-}
+}

lib/Doctrine/Export/Schema.php

@@ -30,7 +30,7 @@
  * independantly from the object itself.
  *
  * @package     Doctrine
- * @category    Object Relational Mapping
+ * @subpackage  Export
  * @link        www.phpdoctrine.com
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @version     $Revision: 1838 $

lib/Doctrine/Export/Sqlite.php

@@ -23,10 +23,10 @@ Doctrine::autoload('Doctrine_Export');
  * Doctrine_Export_Sqlite
  *
  * @package     Doctrine
+ * @subpackage  Export
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -408,4 +408,4 @@ class Doctrine_Export_Sqlite extends Doctrine_Export
         
         return 'ALTER TABLE ' . $name . ' ' . $query;
     }
-}
+}

lib/Doctrine/Expression.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Connection_Module');
  * Doctrine_Expression
  *
  * @package     Doctrine
+ * @subpackage  Expression
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -99,4 +99,4 @@ class Doctrine_Expression
     {
         return $this->getSql();
     }
-}
+}

lib/Doctrine/Expression/Driver.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Connection_Module');
  * Doctrine_Expression_Driver
  *
  * @package     Doctrine
+ * @subpackage  Expression
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -708,4 +708,4 @@ class Doctrine_Expression_Driver extends Doctrine_Connection_Module
         }
         return $m . '(' . implode(', ', $a) . ')';
     }
-}
+}

lib/Doctrine/Expression/Exception.php

@@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Exception');
  * Doctrine_Expression_Exception
  *
  * @package     Doctrine
+ * @subpackage  Expression
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Expression_Exception extends Doctrine_Exception
-{ }
+{ }

lib/Doctrine/Expression/Firebird.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Expression_Driver');
  * Doctrine_Expression_Firebird
  *
  * @package     Doctrine
+ * @subpackage  Expression
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -53,4 +53,4 @@ class Doctrine_Expression_Firebird extends Doctrine_Expression_Driver
     {
         return " ESCAPE '". $this->conn->string_quoting['escape_pattern'] ."'";
     }
-}
+}

lib/Doctrine/Expression/Informix.php

@@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Expression');
  * Doctrine_Expression_Informix
  *
  * @package     Doctrine
+ * @subpackage  Expression
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Expression_Informix extends Doctrine_Expression
-{ }
+{ }

lib/Doctrine/Expression/Mock.php

@@ -24,12 +24,12 @@ Doctrine::autoload('Doctrine_Connection_Module');
  * Mock driver that is used for testing purposes
  *
  * @package     Doctrine
+ * @subpackage  Expression
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Expression_Mock extends Doctrine_Expression_Driver
-{ }
+{ }

lib/Doctrine/Expression/Mssql.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Expression_Driver');
  * Doctrine_Expression_Mssql
  *
  * @package     Doctrine
+ * @subpackage  Expression
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -86,4 +86,4 @@ class Doctrine_Expression_Mssql extends Doctrine_Expression_Driver
     {
         return 'NEWID()';
     }
-}
+}

lib/Doctrine/Expression/Mysql.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Expression_Driver');
  * Doctrine_Expression_Mysql
  *
  * @package     Doctrine
+ * @subpackage  Expression
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -107,4 +107,4 @@ class Doctrine_Expression_Mysql extends Doctrine_Expression_Driver
     {
         return 'UUID()';
     }
-}
+}

lib/Doctrine/Expression/Oracle.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Expression_Driver');
  * Doctrine_Expression_Sqlite
  *
  * @package     Doctrine
+ * @subpackage  Expression
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -101,4 +101,4 @@ class Doctrine_Expression_Oracle extends Doctrine_Expression_Driver
     {
         return 'SYS_GUID()';
     }
-}
+}

lib/Doctrine/Expression/Pgsql.php

@@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Expression_Driver');
  * Doctrine_Expression_Pgsql
  *
  * @package     Doctrine
+ * @subpackage  Expression
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
@@ -221,4 +221,4 @@ class Doctrine_Expression_Pgsql extends Doctrine_Expression_Driver
         $match.= $this->patternEscapeString();
         return $match;
     }
-}
+}