From 0a6f216efaedb6b2a05073bd40557763eb6db737 Mon Sep 17 00:00:00 2001 From: "Jonathan.Wage" Date: Wed, 3 Oct 2007 21:43:22 +0000 Subject: [PATCH] Lots of formatting changes, cleanup, doc block changes. --- lib/Doctrine.php | 3 +- lib/Doctrine/Access.php | 2 +- lib/Doctrine/Adapter.php | 2 +- lib/Doctrine/Adapter/Db2.php | 2 +- lib/Doctrine/Adapter/Db2/Exception.php | 2 +- lib/Doctrine/Adapter/Exception.php | 2 +- lib/Doctrine/Adapter/Interface.php | 2 +- lib/Doctrine/Adapter/Mock.php | 3 +- lib/Doctrine/Adapter/Mysqli.php | 3 +- lib/Doctrine/Adapter/Oracle.php | 3 +- lib/Doctrine/Adapter/Statement.php | 2 +- lib/Doctrine/Adapter/Statement/Interface.php | 2 +- lib/Doctrine/Adapter/Statement/Mock.php | 3 +- lib/Doctrine/AuditLog.php | 2 +- lib/Doctrine/AuditLog/Listener.php | 2 +- lib/Doctrine/Cache.php | 3 +- lib/Doctrine/Cache/Apc.php | 3 +- lib/Doctrine/Cache/Array.php | 3 +- lib/Doctrine/Cache/Db.php | 131 +++++++++--------- lib/Doctrine/Cache/Driver.php | 3 +- lib/Doctrine/Cache/Exception.php | 3 +- lib/Doctrine/Cache/Interface.php | 3 +- lib/Doctrine/Cache/Memcache.php | 3 +- lib/Doctrine/Collection.php | 4 +- lib/Doctrine/Collection/Exception.php | 4 +- lib/Doctrine/Collection/Iterator.php | 4 +- .../Collection/Iterator/Expandable.php | 4 +- lib/Doctrine/Collection/Iterator/Normal.php | 4 +- lib/Doctrine/Collection/Iterator/Offset.php | 4 +- lib/Doctrine/Collection/Offset.php | 2 +- lib/Doctrine/Column.php | 5 +- lib/Doctrine/Compiler.php | 4 +- lib/Doctrine/Compiler/Exception.php | 4 +- lib/Doctrine/Configurable.php | 4 +- lib/Doctrine/Connection.php | 5 +- lib/Doctrine/Connection/Common.php | 4 +- lib/Doctrine/Connection/Db2.php | 4 +- lib/Doctrine/Connection/Exception.php | 4 +- lib/Doctrine/Connection/Firebird.php | 4 +- .../Connection/Firebird/Exception.php | 4 +- lib/Doctrine/Connection/Informix.php | 4 +- .../Connection/Informix/Exception.php | 4 +- lib/Doctrine/Connection/Mock.php | 4 +- lib/Doctrine/Connection/Module.php | 4 +- lib/Doctrine/Connection/Mssql.php | 4 +- lib/Doctrine/Connection/Mssql/Exception.php | 4 +- lib/Doctrine/Connection/Mysql.php | 4 +- lib/Doctrine/Connection/Mysql/Exception.php | 4 +- lib/Doctrine/Connection/Oracle.php | 4 +- lib/Doctrine/Connection/Oracle/Exception.php | 4 +- lib/Doctrine/Connection/Pgsql.php | 4 +- lib/Doctrine/Connection/Pgsql/Exception.php | 4 +- lib/Doctrine/Connection/Profiler.php | 6 +- .../Connection/Profiler/Exception.php | 4 +- lib/Doctrine/Connection/Sqlite.php | 4 +- lib/Doctrine/Connection/Sqlite/Exception.php | 4 +- lib/Doctrine/Connection/Statement.php | 6 +- lib/Doctrine/Connection/UnitOfWork.php | 4 +- lib/Doctrine/Data.php | 2 +- lib/Doctrine/Data/Exception.php | 34 ++++- lib/Doctrine/Data/Export.php | 1 + lib/Doctrine/Data/Import.php | 2 +- lib/Doctrine/DataDict.php | 4 +- lib/Doctrine/DataDict/Exception.php | 4 +- lib/Doctrine/DataDict/Firebird.php | 5 +- lib/Doctrine/DataDict/Informix.php | 4 +- lib/Doctrine/DataDict/Mssql.php | 3 +- lib/Doctrine/DataDict/Mysql.php | 5 +- lib/Doctrine/DataDict/Oracle.php | 5 +- lib/Doctrine/DataDict/Pgsql.php | 5 +- lib/Doctrine/DataDict/Sqlite.php | 5 +- lib/Doctrine/DataType.php | 2 +- lib/Doctrine/Db.php | 2 +- lib/Doctrine/Event.php | 2 +- lib/Doctrine/EventListener.php | 4 +- lib/Doctrine/EventListener/Chain.php | 4 +- lib/Doctrine/EventListener/Exception.php | 5 +- lib/Doctrine/EventListener/Interface.php | 4 +- lib/Doctrine/Exception.php | 2 +- lib/Doctrine/Export.php | 4 +- lib/Doctrine/Export/Exception.php | 4 +- lib/Doctrine/Export/Firebird.php | 4 +- lib/Doctrine/Export/Frontbase.php | 4 +- lib/Doctrine/Export/Mssql.php | 4 +- lib/Doctrine/Export/Mysql.php | 5 +- lib/Doctrine/Export/Oracle.php | 4 +- lib/Doctrine/Export/Pgsql.php | 5 +- lib/Doctrine/Export/Reporter.php | 4 +- lib/Doctrine/Export/Schema.php | 2 +- lib/Doctrine/Export/Sqlite.php | 4 +- lib/Doctrine/Expression.php | 4 +- lib/Doctrine/Expression/Driver.php | 4 +- lib/Doctrine/Expression/Exception.php | 4 +- lib/Doctrine/Expression/Firebird.php | 4 +- lib/Doctrine/Expression/Informix.php | 4 +- lib/Doctrine/Expression/Mock.php | 4 +- lib/Doctrine/Expression/Mssql.php | 4 +- lib/Doctrine/Expression/Mysql.php | 4 +- lib/Doctrine/Expression/Oracle.php | 4 +- lib/Doctrine/Expression/Pgsql.php | 4 +- lib/Doctrine/Expression/Sqlite.php | 4 +- lib/Doctrine/File.php | 6 +- lib/Doctrine/File/Index.php | 6 +- lib/Doctrine/Formatter.php | 4 +- lib/Doctrine/Hook.php | 4 +- lib/Doctrine/Hook/Equal.php | 4 +- lib/Doctrine/Hook/Integer.php | 4 +- lib/Doctrine/Hook/Parser.php | 4 +- lib/Doctrine/Hook/Parser/Complex.php | 4 +- lib/Doctrine/Hook/WordLike.php | 4 +- lib/Doctrine/Hydrate.php | 2 +- lib/Doctrine/Hydrate/Array.php | 4 +- lib/Doctrine/Hydrate/Exception.php | 4 +- lib/Doctrine/Hydrate/Record.php | 4 +- lib/Doctrine/I18n.php | 4 +- lib/Doctrine/I18n/Exception.php | 4 +- lib/Doctrine/Import.php | 4 +- lib/Doctrine/Import/Builder.php | 4 +- lib/Doctrine/Import/Builder/BaseClass.php | 5 +- lib/Doctrine/Import/Builder/Exception.php | 5 +- lib/Doctrine/Import/Exception.php | 4 +- lib/Doctrine/Import/Firebird.php | 6 +- lib/Doctrine/Import/Informix.php | 6 +- lib/Doctrine/Import/Mssql.php | 4 +- lib/Doctrine/Import/Mysql.php | 4 +- lib/Doctrine/Import/Oracle.php | 4 +- lib/Doctrine/Import/Pgsql.php | 4 +- lib/Doctrine/Import/Reader.php | 12 +- lib/Doctrine/Import/Reader/Db.php | 16 +-- lib/Doctrine/Import/Reader/Exception.php | 12 +- lib/Doctrine/Import/Reader/Propel.php | 13 +- lib/Doctrine/Import/Schema.php | 2 +- lib/Doctrine/Import/Sqlite.php | 5 +- lib/Doctrine/IntegrityMapper.php | 4 +- lib/Doctrine/Lib.php | 4 +- lib/Doctrine/Locking/Exception.php | 3 +- lib/Doctrine/Locking/Manager/Pessimistic.php | 4 +- lib/Doctrine/Manager.php | 4 +- lib/Doctrine/Manager/Exception.php | 4 +- lib/Doctrine/Migration.php | 4 +- lib/Doctrine/Migration/Exception.php | 4 +- .../IrreversibleMigrationException.php | 4 +- lib/Doctrine/Migration/Process.php | 4 +- lib/Doctrine/Node.php | 4 +- lib/Doctrine/Node/AdjacencyList.php | 5 +- .../Node/AdjacencyList/LevelOrderIterator.php | 4 +- .../Node/AdjacencyList/PostOrderIterator.php | 4 +- .../Node/AdjacencyList/PreOrderIterator.php | 4 +- lib/Doctrine/Node/Exception.php | 4 +- lib/Doctrine/Node/Interface.php | 4 +- lib/Doctrine/Node/MaterializedPath.php | 5 +- .../MaterializedPath/LevelOrderIterator.php | 4 +- .../MaterializedPath/PostOrderIterator.php | 4 +- .../MaterializedPath/PreOrderIterator.php | 4 +- lib/Doctrine/Node/NestedSet.php | 4 +- .../Node/NestedSet/LevelOrderIterator.php | 4 +- .../Node/NestedSet/PostOrderIterator.php | 4 +- .../Node/NestedSet/PreOrderIterator.php | 4 +- lib/Doctrine/Null.php | 4 +- lib/Doctrine/Object.php | 4 +- lib/Doctrine/Overloadable.php | 4 +- lib/Doctrine/Parser.php | 4 +- lib/Doctrine/Parser/Exception.php | 4 +- lib/Doctrine/Parser/Json.php | 4 +- lib/Doctrine/Parser/Serialize.php | 4 +- lib/Doctrine/Parser/Xml.php | 4 +- lib/Doctrine/Parser/Yml.php | 4 +- lib/Doctrine/Plugin.php | 3 +- lib/Doctrine/Plugin/Exception.php | 4 +- lib/Doctrine/Query.php | 4 +- lib/Doctrine/Query/Abstract.php | 3 +- lib/Doctrine/Query/Check.php | 4 +- lib/Doctrine/Query/Condition.php | 4 +- lib/Doctrine/Query/Exception.php | 4 +- lib/Doctrine/Query/Filter.php | 4 +- lib/Doctrine/Query/Filter/Chain.php | 4 +- lib/Doctrine/Query/Filter/Interface.php | 4 +- lib/Doctrine/Query/From.php | 5 +- lib/Doctrine/Query/Groupby.php | 4 +- lib/Doctrine/Query/Having.php | 4 +- lib/Doctrine/Query/JoinCondition.php | 4 +- lib/Doctrine/Query/Limit.php | 4 +- lib/Doctrine/Query/Offset.php | 4 +- lib/Doctrine/Query/Orderby.php | 4 +- lib/Doctrine/Query/Parser.php | 6 +- lib/Doctrine/Query/Part.php | 4 +- lib/Doctrine/Query/Registry.php | 4 +- lib/Doctrine/Query/Registry/Exception.php | 4 +- lib/Doctrine/Query/Select.php | 4 +- lib/Doctrine/Query/Set.php | 5 +- lib/Doctrine/Query/Where.php | 4 +- lib/Doctrine/RawSql.php | 5 +- lib/Doctrine/RawSql/Exception.php | 4 +- lib/Doctrine/Record.php | 6 +- lib/Doctrine/Record/Abstract.php | 6 +- lib/Doctrine/Record/Exception.php | 4 +- lib/Doctrine/Record/Filter.php | 6 +- lib/Doctrine/Record/Filter/Compound.php | 6 +- lib/Doctrine/Record/Filter/Standard.php | 6 +- lib/Doctrine/Record/Iterator.php | 33 ++++- lib/Doctrine/Record/Listener.php | 7 +- lib/Doctrine/Record/Listener/Chain.php | 5 +- lib/Doctrine/Record/Listener/Interface.php | 7 +- lib/Doctrine/Record/State/Exception.php | 3 +- lib/Doctrine/Relation.php | 4 +- lib/Doctrine/Relation/Association.php | 4 +- lib/Doctrine/Relation/Association/Self.php | 5 +- lib/Doctrine/Relation/Exception.php | 4 +- lib/Doctrine/Relation/ForeignKey.php | 6 +- lib/Doctrine/Relation/LocalKey.php | 31 ++--- lib/Doctrine/Relation/Nest.php | 4 +- lib/Doctrine/Relation/Parser.php | 6 +- lib/Doctrine/Relation/Parser/Exception.php | 4 +- lib/Doctrine/Resource.php | 4 +- lib/Doctrine/Resource/Access.php | 4 +- lib/Doctrine/Resource/Client.php | 4 +- lib/Doctrine/Resource/Collection.php | 4 +- lib/Doctrine/Resource/Config.php | 4 +- lib/Doctrine/Resource/Exception.php | 3 +- lib/Doctrine/Resource/Params.php | 4 +- lib/Doctrine/Resource/Query.php | 4 +- lib/Doctrine/Resource/Record.php | 4 +- lib/Doctrine/Resource/Request.php | 4 +- lib/Doctrine/Resource/Server.php | 4 +- lib/Doctrine/Resource/Table.php | 4 +- lib/Doctrine/Schema.php | 10 +- lib/Doctrine/Schema/Column.php | 11 +- lib/Doctrine/Schema/Database.php | 11 +- lib/Doctrine/Schema/Exception.php | 11 +- lib/Doctrine/Schema/Object.php | 2 +- lib/Doctrine/Schema/Relation.php | 11 +- lib/Doctrine/Schema/Table.php | 11 +- lib/Doctrine/Search.php | 4 +- lib/Doctrine/Search/Analyzer.php | 6 +- lib/Doctrine/Search/Analyzer/Exception.php | 8 +- lib/Doctrine/Search/Analyzer/Interface.php | 6 +- lib/Doctrine/Search/Analyzer/Standard.php | 6 +- lib/Doctrine/Search/Exception.php | 8 +- lib/Doctrine/Search/Indexer.php | 6 +- lib/Doctrine/Search/Indexer/Dir.php | 6 +- lib/Doctrine/Search/Indexer/Exception.php | 6 +- lib/Doctrine/Search/Listener.php | 6 +- lib/Doctrine/Search/Parser.php | 6 +- lib/Doctrine/Search/Query.php | 8 +- lib/Doctrine/Search/Record.php | 6 +- lib/Doctrine/Search/Scorer.php | 9 +- lib/Doctrine/Search/Template.php | 6 +- lib/Doctrine/Sequence.php | 4 +- lib/Doctrine/Sequence/Db2.php | 4 +- lib/Doctrine/Sequence/Exception.php | 4 +- lib/Doctrine/Sequence/Firebird.php | 4 +- lib/Doctrine/Sequence/Informix.php | 6 +- lib/Doctrine/Sequence/Mssql.php | 4 +- lib/Doctrine/Sequence/Mysql.php | 4 +- lib/Doctrine/Sequence/Oracle.php | 4 +- lib/Doctrine/Sequence/Pgsql.php | 4 +- lib/Doctrine/Sequence/Sqlite.php | 4 +- lib/Doctrine/Table.php | 4 +- lib/Doctrine/Table/Exception.php | 4 +- lib/Doctrine/Table/Repository.php | 3 +- lib/Doctrine/Table/Repository/Exception.php | 3 +- lib/Doctrine/Template.php | 4 +- lib/Doctrine/Template/I18n.php | 4 +- lib/Doctrine/Template/NestedSet.php | 4 +- lib/Doctrine/Template/Searchable.php | 4 +- lib/Doctrine/Template/Taggable.php | 6 +- lib/Doctrine/Template/Versionable.php | 4 +- lib/Doctrine/Tokenizer.php | 4 +- lib/Doctrine/Transaction.php | 4 +- lib/Doctrine/Transaction/Exception.php | 3 +- lib/Doctrine/Transaction/Firebird.php | 4 +- lib/Doctrine/Transaction/Informix.php | 4 +- lib/Doctrine/Transaction/Mock.php | 5 +- lib/Doctrine/Transaction/Mssql.php | 4 +- lib/Doctrine/Transaction/Mysql.php | 4 +- lib/Doctrine/Transaction/Oracle.php | 4 +- lib/Doctrine/Transaction/Pgsql.php | 4 +- lib/Doctrine/Transaction/Sqlite.php | 4 +- lib/Doctrine/Tree.php | 4 +- lib/Doctrine/Tree/AdjacencyList.php | 4 +- lib/Doctrine/Tree/Exception.php | 4 +- lib/Doctrine/Tree/Interface.php | 4 +- lib/Doctrine/Tree/MaterializedPath.php | 4 +- lib/Doctrine/Tree/NestedSet.php | 4 +- lib/Doctrine/Util.php | 5 +- lib/Doctrine/Validator.php | 4 +- lib/Doctrine/Validator/Country.php | 5 +- lib/Doctrine/Validator/Creditcard.php | 4 +- lib/Doctrine/Validator/Date.php | 4 +- lib/Doctrine/Validator/Driver.php | 4 +- lib/Doctrine/Validator/Email.php | 5 +- lib/Doctrine/Validator/ErrorStack.php | 6 +- lib/Doctrine/Validator/Exception.php | 10 +- lib/Doctrine/Validator/Future.php | 2 +- lib/Doctrine/Validator/Htmlcolor.php | 4 +- lib/Doctrine/Validator/Ip.php | 4 +- lib/Doctrine/Validator/Minlength.php | 5 +- lib/Doctrine/Validator/Nospace.php | 4 +- lib/Doctrine/Validator/Notblank.php | 4 +- lib/Doctrine/Validator/Notnull.php | 4 +- lib/Doctrine/Validator/Past.php | 2 +- lib/Doctrine/Validator/Range.php | 4 +- lib/Doctrine/Validator/Regexp.php | 4 +- lib/Doctrine/Validator/Unique.php | 4 +- lib/Doctrine/Validator/Unsigned.php | 4 +- lib/Doctrine/Validator/Usstate.php | 12 +- lib/Doctrine/View.php | 3 +- lib/Doctrine/View/Exception.php | 6 +- playground/index.php | 41 +++--- 309 files changed, 786 insertions(+), 825 deletions(-) diff --git a/lib/Doctrine.php b/lib/Doctrine.php index d5f624c42..b00114aa9 100644 --- a/lib/Doctrine.php +++ b/lib/Doctrine.php @@ -27,7 +27,6 @@ * @author Konsta Vesterinen * @author Lukas Smith (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Access.php b/lib/Doctrine/Access.php index caabe6514..65ba67b68 100644 --- a/lib/Doctrine/Access.php +++ b/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$ diff --git a/lib/Doctrine/Adapter.php b/lib/Doctrine/Adapter.php index edf1fb875..3ad92b500 100644 --- a/lib/Doctrine/Adapter.php +++ b/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$ diff --git a/lib/Doctrine/Adapter/Db2.php b/lib/Doctrine/Adapter/Db2.php index 9ee156d81..26447f5fe 100644 --- a/lib/Doctrine/Adapter/Db2.php +++ b/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 * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @category Object Relational Mapping diff --git a/lib/Doctrine/Adapter/Db2/Exception.php b/lib/Doctrine/Adapter/Db2/Exception.php index 9faba8448..c4448e79e 100644 --- a/lib/Doctrine/Adapter/Db2/Exception.php +++ b/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$ diff --git a/lib/Doctrine/Adapter/Exception.php b/lib/Doctrine/Adapter/Exception.php index b6d4b157f..bab103ebc 100644 --- a/lib/Doctrine/Adapter/Exception.php +++ b/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$ diff --git a/lib/Doctrine/Adapter/Interface.php b/lib/Doctrine/Adapter/Interface.php index b4a897cd5..499ad252d 100644 --- a/lib/Doctrine/Adapter/Interface.php +++ b/lib/Doctrine/Adapter/Interface.php @@ -25,7 +25,7 @@ * @author Konsta Vesterinen * @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$ diff --git a/lib/Doctrine/Adapter/Mock.php b/lib/Doctrine/Adapter/Mock.php index 4e916a051..1d6b4f997 100644 --- a/lib/Doctrine/Adapter/Mock.php +++ b/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 * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ diff --git a/lib/Doctrine/Adapter/Mysqli.php b/lib/Doctrine/Adapter/Mysqli.php index c4de89d75..25c6c7be8 100644 --- a/lib/Doctrine/Adapter/Mysqli.php +++ b/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 * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1080 $ diff --git a/lib/Doctrine/Adapter/Oracle.php b/lib/Doctrine/Adapter/Oracle.php index 602591e75..1666425b6 100644 --- a/lib/Doctrine/Adapter/Oracle.php +++ b/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 * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1080 $ diff --git a/lib/Doctrine/Adapter/Statement.php b/lib/Doctrine/Adapter/Statement.php index ffa59820c..e8e9f19a1 100644 --- a/lib/Doctrine/Adapter/Statement.php +++ b/lib/Doctrine/Adapter/Statement.php @@ -24,7 +24,7 @@ * @author Konsta Vesterinen * @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$ diff --git a/lib/Doctrine/Adapter/Statement/Interface.php b/lib/Doctrine/Adapter/Statement/Interface.php index 3a22d57c8..3af9c69f3 100644 --- a/lib/Doctrine/Adapter/Statement/Interface.php +++ b/lib/Doctrine/Adapter/Statement/Interface.php @@ -24,7 +24,7 @@ * @author Konsta Vesterinen * @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$ diff --git a/lib/Doctrine/Adapter/Statement/Mock.php b/lib/Doctrine/Adapter/Statement/Mock.php index d29d0abf6..7e67d5f10 100644 --- a/lib/Doctrine/Adapter/Statement/Mock.php +++ b/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 * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ diff --git a/lib/Doctrine/AuditLog.php b/lib/Doctrine/AuditLog.php index e813c209b..eb1f46697 100644 --- a/lib/Doctrine/AuditLog.php +++ b/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$ diff --git a/lib/Doctrine/AuditLog/Listener.php b/lib/Doctrine/AuditLog/Listener.php index d22935228..645b1807e 100644 --- a/lib/Doctrine/AuditLog/Listener.php +++ b/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$ diff --git a/lib/Doctrine/Cache.php b/lib/Doctrine/Cache.php index da40c4fa7..3a7738d38 100644 --- a/lib/Doctrine/Cache.php +++ b/lib/Doctrine/Cache.php @@ -23,10 +23,9 @@ Doctrine::autoload('Doctrine_EventListener'); * Doctrine_Cache * * @package Doctrine - * @subpackage Doctrine_Cache + * @subpackage Cache * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ diff --git a/lib/Doctrine/Cache/Apc.php b/lib/Doctrine/Cache/Apc.php index e0ee5e691..8117bfcb6 100644 --- a/lib/Doctrine/Cache/Apc.php +++ b/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$ diff --git a/lib/Doctrine/Cache/Array.php b/lib/Doctrine/Cache/Array.php index 92e635e95..6c218018b 100644 --- a/lib/Doctrine/Cache/Array.php +++ b/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$ diff --git a/lib/Doctrine/Cache/Db.php b/lib/Doctrine/Cache/Db.php index 485e30c31..0bf1e156a 100644 --- a/lib/Doctrine/Cache/Db.php +++ b/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']) || - ! is_string($options['tableName'])) { - - throw new Doctrine_Cache_Exception('Table name option not set.'); - } + } + + if ( ! isset($options['tableName']) || + ! is_string($options['tableName'])) { + + 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])) { - return false; - } - + + if ( ! isset($result[0])) { + 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) { - $expire = time() + $lifeTime; - } else { - $expire = 0; - } - + + if ($lifeTime) { + $expire = time() + $lifeTime; + } else { + $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 - * - * $return bool true on success, false on failure - */ - public function deleteAll() - { - $sql = 'DELETE FROM ' . $this->_options['tableName']; - - return (bool) $this->getConnection()->exec($sql); - } + } + + /** + * Removes all cache records + * + * $return bool true on success, false on failure + */ + public function deleteAll() + { + $sql = 'DELETE FROM ' . $this->_options['tableName']; + + 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. - */ - public function createTable() - { - $name = $this->_options['tableName']; - - $fields = array( - 'id' => array( - 'type' => 'string', - 'length' => 255 - ), - 'data' => array( - 'type' => 'blob' - ), - 'expire' => array( - 'type' => 'timestamp' - ) - ); - - $options = array( - 'primary' => array('id') - ); - - $this->getConnection()->export->createTable($name, $fields, $options); + } + + /** + * Creates the cache table. + */ + public function createTable() + { + $name = $this->_options['tableName']; + + $fields = array( + 'id' => array( + 'type' => 'string', + 'length' => 255 + ), + 'data' => array( + 'type' => 'blob' + ), + 'expire' => array( + 'type' => 'timestamp' + ) + ); + + $options = array( + 'primary' => array('id') + ); + + $this->getConnection()->export->createTable($name, $fields, $options); } } diff --git a/lib/Doctrine/Cache/Driver.php b/lib/Doctrine/Cache/Driver.php index b7f6d72cc..b9ccee062 100644 --- a/lib/Doctrine/Cache/Driver.php +++ b/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$ diff --git a/lib/Doctrine/Cache/Exception.php b/lib/Doctrine/Cache/Exception.php index 23aec3f76..a47fdf3ec 100644 --- a/lib/Doctrine/Cache/Exception.php +++ b/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$ diff --git a/lib/Doctrine/Cache/Interface.php b/lib/Doctrine/Cache/Interface.php index 19abaccd9..4e143d3bd 100644 --- a/lib/Doctrine/Cache/Interface.php +++ b/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$ diff --git a/lib/Doctrine/Cache/Memcache.php b/lib/Doctrine/Cache/Memcache.php index 88c67a5c2..df0d33be3 100644 --- a/lib/Doctrine/Cache/Memcache.php +++ b/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$ diff --git a/lib/Doctrine/Collection.php b/lib/Doctrine/Collection.php index 864bc5c3f..24bdb3dcb 100644 --- a/lib/Doctrine/Collection.php +++ b/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); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Collection/Exception.php b/lib/Doctrine/Collection/Exception.php index 7d3481edb..afcfd6c88 100644 --- a/lib/Doctrine/Collection/Exception.php +++ b/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 */ class Doctrine_Collection_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Collection/Iterator.php b/lib/Doctrine/Collection/Iterator.php index 47b03a171..23c0550cd 100644 --- a/lib/Doctrine/Collection/Iterator.php +++ b/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]; } } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Collection/Iterator/Expandable.php b/lib/Doctrine/Collection/Iterator/Expandable.php index f83573539..685322754 100644 --- a/lib/Doctrine/Collection/Iterator/Expandable.php +++ b/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; } } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Collection/Iterator/Normal.php b/lib/Doctrine/Collection/Iterator/Normal.php index 11230e504..818d9c9e0 100644 --- a/lib/Doctrine/Collection/Iterator/Normal.php +++ b/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); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Collection/Iterator/Offset.php b/lib/Doctrine/Collection/Iterator/Offset.php index f5e4d2d92..87cf45df0 100644 --- a/lib/Doctrine/Collection/Iterator/Offset.php +++ b/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() { } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Collection/Offset.php b/lib/Doctrine/Collection/Offset.php index 3775dc3c0..d4ddcc475 100644 --- a/lib/Doctrine/Collection/Offset.php +++ b/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$ diff --git a/lib/Doctrine/Column.php b/lib/Doctrine/Column.php index a1784ec2a..341ed2548 100644 --- a/lib/Doctrine/Column.php +++ b/lib/Doctrine/Column.php @@ -24,9 +24,9 @@ * * @author Konsta Vesterinen * @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); } - -} +} \ No newline at end of file diff --git a/lib/Doctrine/Compiler.php b/lib/Doctrine/Compiler.php index e70517ae7..670fa12a7 100644 --- a/lib/Doctrine/Compiler.php +++ b/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 * @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); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Compiler/Exception.php b/lib/Doctrine/Compiler/Exception.php index e89d25222..23ae43241 100644 --- a/lib/Doctrine/Compiler/Exception.php +++ b/lib/Doctrine/Compiler/Exception.php @@ -22,12 +22,12 @@ * Doctrine_Compiler_Exception * * @package Doctrine + * @subpackage Compiler * @author Konsta Vesterinen * @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 -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Configurable.php b/lib/Doctrine/Configurable.php index 55847bf79..baf3b7b36 100644 --- a/lib/Doctrine/Configurable.php +++ b/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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection.php b/lib/Doctrine/Connection.php index ec9129b5e..0a7205209 100644 --- a/lib/Doctrine/Connection.php +++ b/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); } -} - +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Common.php b/lib/Doctrine/Connection/Common.php index 8e3c64d6e..c9aa17975 100644 --- a/lib/Doctrine/Connection/Common.php +++ b/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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Db2.php b/lib/Doctrine/Connection/Db2.php index 33d27a7be..ac0b66233 100644 --- a/lib/Doctrine/Connection/Db2.php +++ b/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; } } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Exception.php b/lib/Doctrine/Connection/Exception.php index 80f7ead1b..1eb538cdf 100644 --- a/lib/Doctrine/Connection/Exception.php +++ b/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]; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Firebird.php b/lib/Doctrine/Connection/Firebird.php index 75f4440fb..03515fb36 100644 --- a/lib/Doctrine/Connection/Firebird.php +++ b/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 * @author Lukas Smith (PEAR MDB2 library) * @author Lorenzo Alberton (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Firebird/Exception.php b/lib/Doctrine/Connection/Firebird/Exception.php index a59e32fe1..ac0d7195e 100644 --- a/lib/Doctrine/Connection/Firebird/Exception.php +++ b/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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Informix.php b/lib/Doctrine/Connection/Informix.php index f8f284a96..510246ed2 100644 --- a/lib/Doctrine/Connection/Informix.php +++ b/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); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Informix/Exception.php b/lib/Doctrine/Connection/Informix/Exception.php index 7d95c67d7..a115b7d61 100644 --- a/lib/Doctrine/Connection/Informix/Exception.php +++ b/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 */ class Doctrine_Connection_Informix_Exception extends Doctrine_Connection_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Connection/Mock.php b/lib/Doctrine/Connection/Mock.php index e7ccda759..213ceada0 100644 --- a/lib/Doctrine/Connection/Mock.php +++ b/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 * @author Lukas Smith (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 { } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Module.php b/lib/Doctrine/Connection/Module.php index 127bdbe17..6b7a21ca4 100644 --- a/lib/Doctrine/Connection/Module.php +++ b/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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Mssql.php b/lib/Doctrine/Connection/Mssql.php index 356c33f00..88c75b9b8 100644 --- a/lib/Doctrine/Connection/Mssql.php +++ b/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 * @author Lukas Smith (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Mssql/Exception.php b/lib/Doctrine/Connection/Mssql/Exception.php index f747cd04e..35f99f6f9 100644 --- a/lib/Doctrine/Connection/Mssql/Exception.php +++ b/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 * @author Lukas Smith (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Mysql.php b/lib/Doctrine/Connection/Mysql.php index 3ab49b6e4..cc8400244 100644 --- a/lib/Doctrine/Connection/Mysql.php +++ b/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 * @author Lukas Smith (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); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Mysql/Exception.php b/lib/Doctrine/Connection/Mysql/Exception.php index 1240772e4..c8fb4d9ce 100644 --- a/lib/Doctrine/Connection/Mysql/Exception.php +++ b/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 * @author Lukas Smith (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Oracle.php b/lib/Doctrine/Connection/Oracle.php index b1e278434..3d7ebebfa 100644 --- a/lib/Doctrine/Connection/Oracle.php +++ b/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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Oracle/Exception.php b/lib/Doctrine/Connection/Oracle/Exception.php index 782492b6a..a9634d41d 100644 --- a/lib/Doctrine/Connection/Oracle/Exception.php +++ b/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 * @author Lukas Smith (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Pgsql.php b/lib/Doctrine/Connection/Pgsql.php index 8776f35a5..51848b8d5 100644 --- a/lib/Doctrine/Connection/Pgsql.php +++ b/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 * @author Lukas Smith (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Pgsql/Exception.php b/lib/Doctrine/Connection/Pgsql/Exception.php index addafbc49..644306cfb 100644 --- a/lib/Doctrine/Connection/Pgsql/Exception.php +++ b/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 @@ -104,4 +104,4 @@ class Doctrine_Connection_Pgsql_Exception extends Doctrine_Connection_Exception } return false; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Profiler.php b/lib/Doctrine/Connection/Profiler.php index c62868327..7714e14ac 100644 --- a/lib/Doctrine/Connection/Profiler.php +++ b/lib/Doctrine/Connection/Profiler.php @@ -22,10 +22,10 @@ Doctrine::autoload('Doctrine_Overloadable'); /** * Doctrine_Connection_Profiler * + * @package Doctrine + * @subpackage Connection * @author Konsta Vesterinen * @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); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Profiler/Exception.php b/lib/Doctrine/Connection/Profiler/Exception.php index 873814ab0..53e487ba7 100644 --- a/lib/Doctrine/Connection/Profiler/Exception.php +++ b/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 { -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Sqlite.php b/lib/Doctrine/Connection/Sqlite.php index b3e8e8342..db7d492c6 100644 --- a/lib/Doctrine/Connection/Sqlite.php +++ b/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 * @author Lukas Smith (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'; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Sqlite/Exception.php b/lib/Doctrine/Connection/Sqlite/Exception.php index 872962ea1..38406086b 100644 --- a/lib/Doctrine/Connection/Sqlite/Exception.php +++ b/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 * @author Lukas Smith (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/Statement.php b/lib/Doctrine/Connection/Statement.php index 74c867527..425ca349f 100644 --- a/lib/Doctrine/Connection/Statement.php +++ b/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 * @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); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Connection/UnitOfWork.php b/lib/Doctrine/Connection/UnitOfWork.php index ca93fe6ee..d8effa1c8 100644 --- a/lib/Doctrine/Connection/UnitOfWork.php +++ b/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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Data.php b/lib/Doctrine/Data.php index 333b0e9e5..b8c034c28 100644 --- a/lib/Doctrine/Data.php +++ b/lib/Doctrine/Data.php @@ -25,9 +25,9 @@ * Base Doctrine_Data class * * @package Doctrine + * @subpackage Data * @author Jonathan H. Wage * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 2552 $ diff --git a/lib/Doctrine/Data/Exception.php b/lib/Doctrine/Data/Exception.php index 44c83e978..f05c1d9ac 100644 --- a/lib/Doctrine/Data/Exception.php +++ b/lib/Doctrine/Data/Exception.php @@ -1,4 +1,34 @@ . + */ + +/** + * Doctrine_Data_Exception + * + * @package Doctrine + * @subpackage Data + * @author Jonathan H. Wage + * @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 -{ -} \ No newline at end of file +{ } \ No newline at end of file diff --git a/lib/Doctrine/Data/Export.php b/lib/Doctrine/Data/Export.php index 8da5fdec3..71cc99e74 100644 --- a/lib/Doctrine/Data/Export.php +++ b/lib/Doctrine/Data/Export.php @@ -23,6 +23,7 @@ * Doctrine_Data_Export * * @package Doctrine + * @subpackage Data * @author Jonathan H. Wage * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @category Object Relational Mapping diff --git a/lib/Doctrine/Data/Import.php b/lib/Doctrine/Data/Import.php index fb4a3efc7..528cdd0f7 100644 --- a/lib/Doctrine/Data/Import.php +++ b/lib/Doctrine/Data/Import.php @@ -23,9 +23,9 @@ * Doctrine_Data_Import * * @package Doctrine + * @package Data * @author Jonathan H. Wage * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 2552 $ diff --git a/lib/Doctrine/DataDict.php b/lib/Doctrine/DataDict.php index 21173910f..3d105d4af 100644 --- a/lib/Doctrine/DataDict.php +++ b/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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/DataDict/Exception.php b/lib/Doctrine/DataDict/Exception.php index 493ea4672..a5f00b010 100644 --- a/lib/Doctrine/DataDict/Exception.php +++ b/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 */ class Doctrine_DataDict_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/DataDict/Firebird.php b/lib/Doctrine/DataDict/Firebird.php index 5ab726bde..5d75d8d29 100644 --- a/lib/Doctrine/DataDict/Firebird.php +++ b/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 * @author Lorenzo Alberton (PEAR MDB2 Interbase driver) * @author Lukas Smith (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/DataDict/Informix.php b/lib/Doctrine/DataDict/Informix.php index 29b6faff6..850fd75a7 100644 --- a/lib/Doctrine/DataDict/Informix.php +++ b/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 * @author Lukas Smith (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'] . '\'.'); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/DataDict/Mssql.php b/lib/Doctrine/DataDict/Mssql.php index 542785f40..258022a7a 100644 --- a/lib/Doctrine/DataDict/Mssql.php +++ b/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 * @author Lukas Smith (PEAR MDB2 library) * @author Frank M. Kromann (PEAR MDB2 Mssql driver) * @author David Coallier (PEAR MDB2 Mssql driver) * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ diff --git a/lib/Doctrine/DataDict/Mysql.php b/lib/Doctrine/DataDict/Mysql.php index 7123f3998..48380f3b9 100644 --- a/lib/Doctrine/DataDict/Mysql.php +++ b/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 * @author Lukas Smith (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/DataDict/Oracle.php b/lib/Doctrine/DataDict/Oracle.php index cbc68f15c..a7edaf4b6 100644 --- a/lib/Doctrine/DataDict/Oracle.php +++ b/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 * @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); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/DataDict/Pgsql.php b/lib/Doctrine/DataDict/Pgsql.php index 41d523c6a..a07904c17 100644 --- a/lib/Doctrine/DataDict/Pgsql.php +++ b/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 * @author Paul Cooper * @author Lukas Smith (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/DataDict/Sqlite.php b/lib/Doctrine/DataDict/Sqlite.php index 81af656fe..793c347ea 100644 --- a/lib/Doctrine/DataDict/Sqlite.php +++ b/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 * @author Lukas Smith (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/DataType.php b/lib/Doctrine/DataType.php index 8d6a081fe..7085a7778 100644 --- a/lib/Doctrine/DataType.php +++ b/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 $ diff --git a/lib/Doctrine/Db.php b/lib/Doctrine/Db.php index 36c120134..9e77d4140 100644 --- a/lib/Doctrine/Db.php +++ b/lib/Doctrine/Db.php @@ -24,7 +24,7 @@ * @author Konsta Vesterinen * @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$ diff --git a/lib/Doctrine/Event.php b/lib/Doctrine/Event.php index 970fdbfab..ad80eaeb4 100644 --- a/lib/Doctrine/Event.php +++ b/lib/Doctrine/Event.php @@ -24,7 +24,7 @@ * @author Konsta Vesterinen * @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$ diff --git a/lib/Doctrine/EventListener.php b/lib/Doctrine/EventListener.php index 14fe7575a..7c0887b78 100644 --- a/lib/Doctrine/EventListener.php +++ b/lib/Doctrine/EventListener.php @@ -26,8 +26,8 @@ Doctrine::autoload('Doctrine_EventListener_Interface'); * * @author Konsta Vesterinen * @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) { } -} +} \ No newline at end of file diff --git a/lib/Doctrine/EventListener/Chain.php b/lib/Doctrine/EventListener/Chain.php index 9c5f964d5..de8b3756b 100644 --- a/lib/Doctrine/EventListener/Chain.php +++ b/lib/Doctrine/EventListener/Chain.php @@ -27,8 +27,8 @@ Doctrine::autoload('Doctrine_Access'); * * @author Konsta Vesterinen * @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); } } -} +} \ No newline at end of file diff --git a/lib/Doctrine/EventListener/Exception.php b/lib/Doctrine/EventListener/Exception.php index 43784a5da..f96b8248d 100644 --- a/lib/Doctrine/EventListener/Exception.php +++ b/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 */ class Doctrine_EventListener_Exception extends Doctrine_Exception -{ -} +{ } \ No newline at end of file diff --git a/lib/Doctrine/EventListener/Interface.php b/lib/Doctrine/EventListener/Interface.php index bcc10209c..b7d489dcb 100644 --- a/lib/Doctrine/EventListener/Interface.php +++ b/lib/Doctrine/EventListener/Interface.php @@ -26,8 +26,8 @@ Doctrine::autoload('Doctrine_EventListener_Interface'); * * @author Konsta Vesterinen * @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); -} +} \ No newline at end of file diff --git a/lib/Doctrine/Exception.php b/lib/Doctrine/Exception.php index 30a5f9e81..bc87eadef 100644 --- a/lib/Doctrine/Exception.php +++ b/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$ diff --git a/lib/Doctrine/Export.php b/lib/Doctrine/Export.php index c1213d379..c21980f03 100644 --- a/lib/Doctrine/Export.php +++ b/lib/Doctrine/Export.php @@ -23,10 +23,10 @@ Doctrine::autoload('Doctrine_Connection_Module'); * Doctrine_Export * * @package Doctrine + * @subpackage Export * @author Konsta Vesterinen * @author Lukas Smith (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 } } } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Export/Exception.php b/lib/Doctrine/Export/Exception.php index 60b4d5856..50a6561cf 100644 --- a/lib/Doctrine/Export/Exception.php +++ b/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 */ class Doctrine_Export_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Export/Firebird.php b/lib/Doctrine/Export/Firebird.php index e1d0d8269..b031d7a13 100644 --- a/lib/Doctrine/Export/Firebird.php +++ b/lib/Doctrine/Export/Firebird.php @@ -23,11 +23,11 @@ Doctrine::autoload('Doctrine_Export'); * Doctrine_Export_Sqlite * * @package Doctrine + * @subpackage Export * @author Konsta Vesterinen * @author Lukas Smith (PEAR MDB2 library) * @author Lorenzo Alberton (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Export/Frontbase.php b/lib/Doctrine/Export/Frontbase.php index 17b76a1ed..db16c29c9 100644 --- a/lib/Doctrine/Export/Frontbase.php +++ b/lib/Doctrine/Export/Frontbase.php @@ -23,10 +23,10 @@ Doctrine::autoload('Doctrine_Export'); * Doctrine_Export_Frontbase * * @package Doctrine + * @subpackage Export * @author Konsta Vesterinen * @author Lukas Smith (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Export/Mssql.php b/lib/Doctrine/Export/Mssql.php index 475c9fc32..eff5e6160 100644 --- a/lib/Doctrine/Export/Mssql.php +++ b/lib/Doctrine/Export/Mssql.php @@ -23,11 +23,11 @@ Doctrine::autoload('Doctrine_Export'); * Doctrine_Export_Mssql * * @package Doctrine + * @subpackage Export * @author Konsta Vesterinen * @author Lukas Smith (PEAR MDB2 library) * @author Frank M. Kromann (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Export/Mysql.php b/lib/Doctrine/Export/Mysql.php index 680738d50..d6e848866 100644 --- a/lib/Doctrine/Export/Mysql.php +++ b/lib/Doctrine/Export/Mysql.php @@ -23,10 +23,10 @@ Doctrine::autoload('Doctrine_Export'); * Doctrine_Export_Mysql * * @package Doctrine + * @subpackage Export * @author Konsta Vesterinen * @author Lukas Smith (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; } -} - +} \ No newline at end of file diff --git a/lib/Doctrine/Export/Oracle.php b/lib/Doctrine/Export/Oracle.php index b6c8df140..d46628c38 100644 --- a/lib/Doctrine/Export/Oracle.php +++ b/lib/Doctrine/Export/Oracle.php @@ -23,10 +23,10 @@ Doctrine::autoload('Doctrine_Export'); * Doctrine_Export_Oracle * * @package Doctrine + * @subpackage Export * @author Konsta Vesterinen * @author Lukas Smith (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Export/Pgsql.php b/lib/Doctrine/Export/Pgsql.php index ef8328c17..89ff3fd60 100644 --- a/lib/Doctrine/Export/Pgsql.php +++ b/lib/Doctrine/Export/Pgsql.php @@ -23,10 +23,10 @@ Doctrine::autoload('Doctrine_Export'); * Doctrine_Export_Pgsql * * @package Doctrine + * @subpackage Export * @author Konsta Vesterinen * @author Lukas Smith (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; } -} - +} \ No newline at end of file diff --git a/lib/Doctrine/Export/Reporter.php b/lib/Doctrine/Export/Reporter.php index 180783ed0..dd6218c73 100644 --- a/lib/Doctrine/Export/Reporter.php +++ b/lib/Doctrine/Export/Reporter.php @@ -23,9 +23,9 @@ * Doctrine_Export_Reporter * * @package Doctrine + * @subpackage Export * @author Konsta Vesterinen * @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); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Export/Schema.php b/lib/Doctrine/Export/Schema.php index a691fc802..2dff68716 100644 --- a/lib/Doctrine/Export/Schema.php +++ b/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 $ diff --git a/lib/Doctrine/Export/Sqlite.php b/lib/Doctrine/Export/Sqlite.php index 3d908cf55..904112805 100644 --- a/lib/Doctrine/Export/Sqlite.php +++ b/lib/Doctrine/Export/Sqlite.php @@ -23,10 +23,10 @@ Doctrine::autoload('Doctrine_Export'); * Doctrine_Export_Sqlite * * @package Doctrine + * @subpackage Export * @author Konsta Vesterinen * @author Lukas Smith (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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Expression.php b/lib/Doctrine/Expression.php index d3c72b725..5d8c37218 100644 --- a/lib/Doctrine/Expression.php +++ b/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(); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Expression/Driver.php b/lib/Doctrine/Expression/Driver.php index dd35438ba..b58165466 100644 --- a/lib/Doctrine/Expression/Driver.php +++ b/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) . ')'; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Expression/Exception.php b/lib/Doctrine/Expression/Exception.php index 121588c0c..a4f468ee8 100644 --- a/lib/Doctrine/Expression/Exception.php +++ b/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 */ class Doctrine_Expression_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Expression/Firebird.php b/lib/Doctrine/Expression/Firebird.php index 68ebfe8f3..eadc6ac7b 100644 --- a/lib/Doctrine/Expression/Firebird.php +++ b/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'] ."'"; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Expression/Informix.php b/lib/Doctrine/Expression/Informix.php index 45ab8478a..6940fffc2 100644 --- a/lib/Doctrine/Expression/Informix.php +++ b/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 */ class Doctrine_Expression_Informix extends Doctrine_Expression -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Expression/Mock.php b/lib/Doctrine/Expression/Mock.php index 4048ce131..a2987e6c3 100644 --- a/lib/Doctrine/Expression/Mock.php +++ b/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 */ class Doctrine_Expression_Mock extends Doctrine_Expression_Driver -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Expression/Mssql.php b/lib/Doctrine/Expression/Mssql.php index 88ef21c03..97124a387 100644 --- a/lib/Doctrine/Expression/Mssql.php +++ b/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()'; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Expression/Mysql.php b/lib/Doctrine/Expression/Mysql.php index 332612069..755f63e82 100644 --- a/lib/Doctrine/Expression/Mysql.php +++ b/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()'; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Expression/Oracle.php b/lib/Doctrine/Expression/Oracle.php index d70215484..c649c5b1d 100644 --- a/lib/Doctrine/Expression/Oracle.php +++ b/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()'; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Expression/Pgsql.php b/lib/Doctrine/Expression/Pgsql.php index 8dc642c95..845279bf5 100644 --- a/lib/Doctrine/Expression/Pgsql.php +++ b/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; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Expression/Sqlite.php b/lib/Doctrine/Expression/Sqlite.php index 00913932b..7bf2d8c84 100644 --- a/lib/Doctrine/Expression/Sqlite.php +++ b/lib/Doctrine/Expression/Sqlite.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$ @@ -162,4 +162,4 @@ class Doctrine_Expression_Sqlite extends Doctrine_Expression_Driver } return 'SUBSTR(' . $value . ', ' . $position . ', LENGTH(' . $value . '))'; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/File.php b/lib/Doctrine/File.php index 03216dce1..be2095430 100644 --- a/lib/Doctrine/File.php +++ b/lib/Doctrine/File.php @@ -22,11 +22,11 @@ /** * Doctrine_File * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage File + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -50,4 +50,4 @@ class Doctrine_File extends Doctrine_Record } return parent::get($name, $load); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/File/Index.php b/lib/Doctrine/File/Index.php index 65df4afb6..94811ca61 100644 --- a/lib/Doctrine/File/Index.php +++ b/lib/Doctrine/File/Index.php @@ -22,11 +22,11 @@ /** * Doctrine_File_Index * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage File + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -53,4 +53,4 @@ class Doctrine_File_Index extends Doctrine_Record 'onDelete' => 'CASCADE', 'onUpdate' => 'CASCADE')); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Formatter.php b/lib/Doctrine/Formatter.php index 6089e0500..adea6ef7b 100644 --- a/lib/Doctrine/Formatter.php +++ b/lib/Doctrine/Formatter.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Connection_Module'); * Doctrine_Formatter * * @package Doctrine + * @subpackage Formatter * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -219,4 +219,4 @@ class Doctrine_Formatter extends Doctrine_Connection_Module return sprintf($this->conn->getAttribute(Doctrine::ATTR_IDXNAME_FORMAT), preg_replace('/[^a-z0-9_\$]/i', '_', $idx)); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Hook.php b/lib/Doctrine/Hook.php index 21bb1f89e..81b84df84 100644 --- a/lib/Doctrine/Hook.php +++ b/lib/Doctrine/Hook.php @@ -23,8 +23,8 @@ * Doctrine_Hook * * @package Doctrine + * @subpackage Hook * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -212,4 +212,4 @@ class Doctrine_Hook { $this->query->offset((int) $offset); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Hook/Equal.php b/lib/Doctrine/Hook/Equal.php index 9db62db93..7e179ebff 100644 --- a/lib/Doctrine/Hook/Equal.php +++ b/lib/Doctrine/Hook/Equal.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Hook_Parser'); * Doctrine_Hook_Equal * * @package Doctrine + * @subpackage Hook * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -49,4 +49,4 @@ class Doctrine_Hook_Equal extends Doctrine_Hook_Parser $this->params = (array) $value; $this->condition = $alias . '.' . $field . ' = ?'; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Hook/Integer.php b/lib/Doctrine/Hook/Integer.php index a8a1ffac9..eb3a3b99f 100644 --- a/lib/Doctrine/Hook/Integer.php +++ b/lib/Doctrine/Hook/Integer.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Hook_Parser_Complex'); * Doctrine_Hook_Integer * * @package Doctrine + * @subpackage Hook * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -72,4 +72,4 @@ class Doctrine_Hook_Integer extends Doctrine_Hook_Parser_Complex } return implode(' OR ', $a); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Hook/Parser.php b/lib/Doctrine/Hook/Parser.php index fd55d77c4..13adc6d61 100644 --- a/lib/Doctrine/Hook/Parser.php +++ b/lib/Doctrine/Hook/Parser.php @@ -23,8 +23,8 @@ * Doctrine_Hook_Parser * * @package Doctrine + * @subpackage Hook * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -62,4 +62,4 @@ abstract class Doctrine_Hook_Parser * @return void */ abstract public function parse($alias, $field, $value); -} +} \ No newline at end of file diff --git a/lib/Doctrine/Hook/Parser/Complex.php b/lib/Doctrine/Hook/Parser/Complex.php index e196ad430..36dda756b 100644 --- a/lib/Doctrine/Hook/Parser/Complex.php +++ b/lib/Doctrine/Hook/Parser/Complex.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Hook_Parser'); * Doctrine_Hook_Parser_Complex * * @package Doctrine + * @subpackage Hook * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -92,4 +92,4 @@ abstract class Doctrine_Hook_Parser_Complex extends Doctrine_Hook_Parser * @return void */ abstract public function parseSingle($alias, $field, $value); -} +} \ No newline at end of file diff --git a/lib/Doctrine/Hook/WordLike.php b/lib/Doctrine/Hook/WordLike.php index 946ec1976..8257011a1 100644 --- a/lib/Doctrine/Hook/WordLike.php +++ b/lib/Doctrine/Hook/WordLike.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Hook_Parser'); * Doctrine_Hook_WordLike * * @package Doctrine + * @subpackage Hook * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -63,4 +63,4 @@ class Doctrine_Hook_WordLike extends Doctrine_Hook_Parser_Complex } return implode(' OR ', $a); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Hydrate.php b/lib/Doctrine/Hydrate.php index a777f7274..0f84e1529 100644 --- a/lib/Doctrine/Hydrate.php +++ b/lib/Doctrine/Hydrate.php @@ -25,8 +25,8 @@ * * * @package Doctrine + * @subpackage Hydrate * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ diff --git a/lib/Doctrine/Hydrate/Array.php b/lib/Doctrine/Hydrate/Array.php index 02b8eb50a..24e321638 100644 --- a/lib/Doctrine/Hydrate/Array.php +++ b/lib/Doctrine/Hydrate/Array.php @@ -24,8 +24,8 @@ * defines an array fetching strategy for Doctrine_Hydrate * * @package Doctrine + * @subpackage Hydrate * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -79,4 +79,4 @@ class Doctrine_Hydrate_Array { } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Hydrate/Exception.php b/lib/Doctrine/Hydrate/Exception.php index 73c4f77ee..ce6333427 100644 --- a/lib/Doctrine/Hydrate/Exception.php +++ b/lib/Doctrine/Hydrate/Exception.php @@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Exception'); * Doctrine_Hydrate_Exception * * @package Doctrine + * @subpackage Hydrate * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1080 $ * @author Konsta Vesterinen */ class Doctrine_Hydrate_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Hydrate/Record.php b/lib/Doctrine/Hydrate/Record.php index 3f9c3f2d9..9a7dc0566 100644 --- a/lib/Doctrine/Hydrate/Record.php +++ b/lib/Doctrine/Hydrate/Record.php @@ -24,8 +24,8 @@ * defines a record fetching strategy for Doctrine_Hydrate * * @package Doctrine + * @subpackage Hydrate * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -119,4 +119,4 @@ class Doctrine_Hydrate_Record extends Doctrine_Object $table->setAttribute(Doctrine::ATTR_LOAD_REFERENCES, true); } } -} +} \ No newline at end of file diff --git a/lib/Doctrine/I18n.php b/lib/Doctrine/I18n.php index 48a8e80b7..4e9f9c9e2 100644 --- a/lib/Doctrine/I18n.php +++ b/lib/Doctrine/I18n.php @@ -22,8 +22,8 @@ * Doctrine_I18n * * @package Doctrine + * @subpackage I18n * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -114,4 +114,4 @@ class Doctrine_I18n extends Doctrine_Plugin return true; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/I18n/Exception.php b/lib/Doctrine/I18n/Exception.php index 8fa77499f..8966695be 100644 --- a/lib/Doctrine/I18n/Exception.php +++ b/lib/Doctrine/I18n/Exception.php @@ -23,12 +23,12 @@ * Doctrine_I18n_Exception * * @package Doctrine + * @subpackage I18n * @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 */ class Doctrine_I18n_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Import.php b/lib/Doctrine/Import.php index 1d56d2f8c..8d2b69059 100644 --- a/lib/Doctrine/Import.php +++ b/lib/Doctrine/Import.php @@ -26,7 +26,7 @@ Doctrine::autoload('Doctrine_Connection_Module'); * builds a Doctrine data model. * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Import * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 @@ -200,4 +200,4 @@ class Doctrine_Import extends Doctrine_Connection_Module return $classes; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Import/Builder.php b/lib/Doctrine/Import/Builder.php index 2fc025096..c519a75c0 100644 --- a/lib/Doctrine/Import/Builder.php +++ b/lib/Doctrine/Import/Builder.php @@ -25,7 +25,7 @@ * based on a database schema. * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Import * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 @@ -294,4 +294,4 @@ END; throw new Doctrine_Import_Builder_Exception("Couldn't write file " . $options['fileName']); } } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Import/Builder/BaseClass.php b/lib/Doctrine/Import/Builder/BaseClass.php index f0f2b01f9..a306ef096 100644 --- a/lib/Doctrine/Import/Builder/BaseClass.php +++ b/lib/Doctrine/Import/Builder/BaseClass.php @@ -29,8 +29,9 @@ Doctrine::autoload('Doctrine_Import_Builder'); /** * class Doctrine_Import_Builder_BaseClass * Builds a Doctrine_Record base class definition based on a schema. + * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Import * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 @@ -39,4 +40,4 @@ Doctrine::autoload('Doctrine_Import_Builder'); */ class Doctrine_Import_Builder_BaseClass extends Doctrine_Import_Builder { -} +} \ No newline at end of file diff --git a/lib/Doctrine/Import/Builder/Exception.php b/lib/Doctrine/Import/Builder/Exception.php index 22ff1b5e5..2c1592663 100644 --- a/lib/Doctrine/Import/Builder/Exception.php +++ b/lib/Doctrine/Import/Builder/Exception.php @@ -21,6 +21,7 @@ Doctrine::autoload('Doctrine_Import_Exception'); /** * @package Doctrine + * @subpackage Import * @url http://www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @author Jukka Hassinen @@ -29,7 +30,7 @@ Doctrine::autoload('Doctrine_Import_Exception'); /** * class Doctrine_Import_Builder_Exception * @package Doctrine - * @category Object Relational Mapping + * @subpackage Import * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 @@ -37,4 +38,4 @@ Doctrine::autoload('Doctrine_Import_Exception'); * @author Konsta Vesterinen */ class Doctrine_Import_Builder_Exception extends Doctrine_Import_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Import/Exception.php b/lib/Doctrine/Import/Exception.php index a15f3ba01..2d58df343 100644 --- a/lib/Doctrine/Import/Exception.php +++ b/lib/Doctrine/Import/Exception.php @@ -23,7 +23,7 @@ Doctrine::autoload('Doctrine_Exception'); * class Doctrine_Import_Exception * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Import * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 @@ -31,4 +31,4 @@ Doctrine::autoload('Doctrine_Exception'); * @author Konsta Vesterinen */ class Doctrine_Import_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Import/Firebird.php b/lib/Doctrine/Import/Firebird.php index dc7948b3f..a3514cf3f 100644 --- a/lib/Doctrine/Import/Firebird.php +++ b/lib/Doctrine/Import/Firebird.php @@ -20,13 +20,13 @@ */ Doctrine::autoload('Doctrine_Import'); /** - * @package Doctrine + * @package Doctrine + * @subpackage Import * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @author Konsta Vesterinen * @author Lorenzo Alberton (PEAR MDB2 Interbase driver) * @author Lukas Smith (PEAR MDB2 library) * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -119,4 +119,4 @@ class Doctrine_Import_Firebird extends Doctrine_Import return $this->conn->fetchColumn($query); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Import/Informix.php b/lib/Doctrine/Import/Informix.php index 60056554b..b30c55c37 100644 --- a/lib/Doctrine/Import/Informix.php +++ b/lib/Doctrine/Import/Informix.php @@ -20,12 +20,12 @@ */ Doctrine::autoload('Doctrine_Import'); /** - * @package Doctrine + * @package Doctrine + * @subpackage Import * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @author Konsta Vesterinen * @author Lukas Smith (PEAR MDB2 library) * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -52,4 +52,4 @@ class Doctrine_Import_Informix extends Doctrine_Import and s2.constrid=r.primary and i2.idxname=s2.idxname", ); -} +} \ No newline at end of file diff --git a/lib/Doctrine/Import/Mssql.php b/lib/Doctrine/Import/Mssql.php index c6e38884c..618416f3c 100644 --- a/lib/Doctrine/Import/Mssql.php +++ b/lib/Doctrine/Import/Mssql.php @@ -21,13 +21,13 @@ Doctrine::autoload('Doctrine_Import'); /** * @package Doctrine + * @subpackage Import * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @author Konsta Vesterinen * @author Lukas Smith (PEAR MDB2 library) * @author Frank M. Kromann (PEAR MDB2 Mssql driver) * @author David Coallier (PEAR MDB2 Mssql driver) * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -189,4 +189,4 @@ class Doctrine_Import_Mssql extends Doctrine_Import return $this->conn->fetchColumn($query); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Import/Mysql.php b/lib/Doctrine/Import/Mysql.php index 932086254..a7b99a7e0 100644 --- a/lib/Doctrine/Import/Mysql.php +++ b/lib/Doctrine/Import/Mysql.php @@ -21,11 +21,11 @@ Doctrine::autoload('Doctrine_Import'); /** * @package Doctrine + * @subpackage Import * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @author Konsta Vesterinen * @author Lukas Smith (PEAR MDB2 library) * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -201,4 +201,4 @@ class Doctrine_Import_Mysql extends Doctrine_Import return $this->conn->fetchColumn($query); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Import/Oracle.php b/lib/Doctrine/Import/Oracle.php index f3991c0ea..23ad73506 100644 --- a/lib/Doctrine/Import/Oracle.php +++ b/lib/Doctrine/Import/Oracle.php @@ -21,10 +21,10 @@ Doctrine::autoload('Doctrine_Import'); /** * @package Doctrine + * @subpackage Import * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @author Konsta Vesterinen * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -222,4 +222,4 @@ class Doctrine_Import_Oracle extends Doctrine_Import $query = 'SELECT view_name FROM sys.user_views'; return $this->conn->fetchColumn($query); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Import/Pgsql.php b/lib/Doctrine/Import/Pgsql.php index 870eda21f..561de2912 100644 --- a/lib/Doctrine/Import/Pgsql.php +++ b/lib/Doctrine/Import/Pgsql.php @@ -21,12 +21,12 @@ Doctrine::autoload('Doctrine_Import'); /** * @package Doctrine + * @subpackage Import * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @author Konsta Vesterinen * @author Paul Cooper * @author Lukas Smith (PEAR MDB2 library) * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -231,4 +231,4 @@ class Doctrine_Import_Pgsql extends Doctrine_Import { return $this->conn->fetchColumn($query); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Import/Reader.php b/lib/Doctrine/Import/Reader.php index aadb25c92..2a1125975 100644 --- a/lib/Doctrine/Import/Reader.php +++ b/lib/Doctrine/Import/Reader.php @@ -18,19 +18,13 @@ * and is licensed under the LGPL. For more information, see * . */ - -/** - * @package Doctrine - * @url http://www.phpdoctrine.com - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @author Jukka Hassinen - * @version $Id$ /** * class Doctrine_Import_Reader * Is responsible of reading a database definitions from a source and costructing a * database schema + * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Import * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 @@ -54,4 +48,4 @@ abstract class Doctrine_Import_Reader */ abstract public function read( ); -} // end of Doctrine_Import_Reader +} \ No newline at end of file diff --git a/lib/Doctrine/Import/Reader/Db.php b/lib/Doctrine/Import/Reader/Db.php index df613660e..9668ed051 100644 --- a/lib/Doctrine/Import/Reader/Db.php +++ b/lib/Doctrine/Import/Reader/Db.php @@ -19,19 +19,13 @@ * . */ Doctrine::autoload('Doctrine_Import_Reader'); -/** - * @package Doctrine - * @url http://www.phpdoctrine.com - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @author Jukka Hassinen - * @version $Id$ - */ /** * class Doctrine_Import_Reader_Db * Reads a database using the given PDO connection and constructs a database * schema + * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Import * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 @@ -40,7 +34,6 @@ Doctrine::autoload('Doctrine_Import_Reader'); */ class Doctrine_Import_Reader_Db extends Doctrine_Import_Reader { - /** Aggregations: */ /** Compositions: */ @@ -67,7 +60,7 @@ class Doctrine_Import_Reader_Db extends Doctrine_Import_Reader * @return Doctrine_Schema * @access public */ - public function read( ) + public function read() { $dataDict = Doctrine_Manager::getInstance()->getCurrentConnection()->getDataDict(); @@ -98,5 +91,4 @@ class Doctrine_Import_Reader_Db extends Doctrine_Import_Reader return $schema; } - -} // end of Doctrine_Import_Reader_Db +} \ No newline at end of file diff --git a/lib/Doctrine/Import/Reader/Exception.php b/lib/Doctrine/Import/Reader/Exception.php index 9623f6f31..7f0392dff 100644 --- a/lib/Doctrine/Import/Reader/Exception.php +++ b/lib/Doctrine/Import/Reader/Exception.php @@ -18,17 +18,11 @@ * and is licensed under the LGPL. For more information, see * . */ - -/** - * @package Doctrine - * @url http://www.phpdoctrine.com - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @author Jukka Hassinen - * @version $Id$ /** * class Doctrine_Import_Reader_Exception + * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Import * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 @@ -44,4 +38,4 @@ class Doctrine_Import_Reader_Exception /*** Attributes: ***/ -} // end of Doctrine_Import_Reader_Exception +} \ No newline at end of file diff --git a/lib/Doctrine/Import/Reader/Propel.php b/lib/Doctrine/Import/Reader/Propel.php index d54cc75d1..d84c31829 100644 --- a/lib/Doctrine/Import/Reader/Propel.php +++ b/lib/Doctrine/Import/Reader/Propel.php @@ -19,17 +19,11 @@ * . */ Doctrine::autoload('Doctrine_Import_Reader'); -/** - * @package Doctrine - * @url http://www.phpdoctrine.com - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @author Jukka Hassinen - * @version $Id$ - */ /** * class Doctrine_Import_Reader_Xml_Propel + * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Import * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 @@ -62,5 +56,4 @@ class Doctrine_Import_Reader_Xml_Propel extends Doctrine_Import_Reader public function read() { } - -} // end of Doctrine_Import_Reader_Xml_Propel +} \ No newline at end of file diff --git a/lib/Doctrine/Import/Schema.php b/lib/Doctrine/Import/Schema.php index 763ce66f2..029327b6b 100644 --- a/lib/Doctrine/Import/Schema.php +++ b/lib/Doctrine/Import/Schema.php @@ -30,7 +30,7 @@ * independantly from the object itself. * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Import * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision: 1838 $ diff --git a/lib/Doctrine/Import/Sqlite.php b/lib/Doctrine/Import/Sqlite.php index ab4d275af..e935e9002 100644 --- a/lib/Doctrine/Import/Sqlite.php +++ b/lib/Doctrine/Import/Sqlite.php @@ -21,11 +21,11 @@ Doctrine::autoload('Doctrine_Import'); /** * @package Doctrine + * @subpackage Import * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @author Konsta Vesterinen * @author Lukas Smith (PEAR MDB2 library) * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -227,5 +227,4 @@ class Doctrine_Import_Sqlite extends Doctrine_Import return $this->conn->fetchColumn($query); } -} - +} \ No newline at end of file diff --git a/lib/Doctrine/IntegrityMapper.php b/lib/Doctrine/IntegrityMapper.php index db647707e..42ec5206e 100644 --- a/lib/Doctrine/IntegrityMapper.php +++ b/lib/Doctrine/IntegrityMapper.php @@ -23,8 +23,8 @@ * Doctrine_IntegrityMapper * * @package Doctrine + * @subpackage IntegrityMapper * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -139,4 +139,4 @@ class Doctrine_IntegrityMapper } } } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Lib.php b/lib/Doctrine/Lib.php index d7ec0f4d4..b159336f0 100644 --- a/lib/Doctrine/Lib.php +++ b/lib/Doctrine/Lib.php @@ -22,8 +22,8 @@ * Doctrine_Lib has not commonly used static functions, mostly for debugging purposes * * @package Doctrine + * @subpackage Lib * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -257,4 +257,4 @@ class Doctrine_Lib $r[] = ""; return implode("\n",$r); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Locking/Exception.php b/lib/Doctrine/Locking/Exception.php index a89eda0bb..d487abf75 100644 --- a/lib/Doctrine/Locking/Exception.php +++ b/lib/Doctrine/Locking/Exception.php @@ -4,8 +4,9 @@ * * A loking exception represents an error that occured during a locking process * (obtain/release locks). + * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Locking * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 diff --git a/lib/Doctrine/Locking/Manager/Pessimistic.php b/lib/Doctrine/Locking/Manager/Pessimistic.php index 4dc7dbfba..3c65a200f 100644 --- a/lib/Doctrine/Locking/Manager/Pessimistic.php +++ b/lib/Doctrine/Locking/Manager/Pessimistic.php @@ -23,14 +23,14 @@ * a time-consuming task on a record or many records, which is spread over several * page requests can't be interfered by other users. * + * @package Doctrine + * @subpackage Locking * @link www.phpdoctrine.com * @author Roman Borschel * @author Pierre Minnieur * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 - * @package Doctrine - * @category Object Relational Mapping * @version $Revision$ */ class Doctrine_Locking_Manager_Pessimistic diff --git a/lib/Doctrine/Manager.php b/lib/Doctrine/Manager.php index e9f12660e..638d356bd 100644 --- a/lib/Doctrine/Manager.php +++ b/lib/Doctrine/Manager.php @@ -24,8 +24,8 @@ * It opens and keeps track of all connections (database connections). * * @package Doctrine + * @subpackage Manager * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -591,4 +591,4 @@ class Doctrine_Manager extends Doctrine_Configurable implements Countable, Itera $r[] = ""; return implode("\n",$r); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Manager/Exception.php b/lib/Doctrine/Manager/Exception.php index 939dcadd7..065fbc978 100644 --- a/lib/Doctrine/Manager/Exception.php +++ b/lib/Doctrine/Manager/Exception.php @@ -22,12 +22,12 @@ * Doctrine_Manager_Exception * * @package Doctrine + * @subpackage Manager * @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 */ class Doctrine_Manager_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Migration.php b/lib/Doctrine/Migration.php index aed8f9345..ef35c5eee 100644 --- a/lib/Doctrine/Migration.php +++ b/lib/Doctrine/Migration.php @@ -23,13 +23,13 @@ * * this class represents a database view * - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Migration * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1080 $ + * @author Jonathan H. Wage */ class Doctrine_Migration { diff --git a/lib/Doctrine/Migration/Exception.php b/lib/Doctrine/Migration/Exception.php index ea7ccbd5a..53f172e75 100644 --- a/lib/Doctrine/Migration/Exception.php +++ b/lib/Doctrine/Migration/Exception.php @@ -21,13 +21,13 @@ /** * Doctrine_Migration_Exception * - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Migration * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1080 $ + * @author Jonathan H. Wage */ class Doctrine_Migration_Exception extends Doctrine_Exception { diff --git a/lib/Doctrine/Migration/IrreversibleMigrationException.php b/lib/Doctrine/Migration/IrreversibleMigrationException.php index 650c4fa69..e191b3f1d 100644 --- a/lib/Doctrine/Migration/IrreversibleMigrationException.php +++ b/lib/Doctrine/Migration/IrreversibleMigrationException.php @@ -21,13 +21,13 @@ /** * Doctrine_Migration_IrreversibleMigration * - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Migration * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1080 $ + * @author Jonathan H. Wage */ class Doctrine_Migration_IrreversibleMigrationException extends Doctrine_Migration_Exception { diff --git a/lib/Doctrine/Migration/Process.php b/lib/Doctrine/Migration/Process.php index b87f87304..139330ab2 100644 --- a/lib/Doctrine/Migration/Process.php +++ b/lib/Doctrine/Migration/Process.php @@ -21,13 +21,13 @@ /** * Doctrine_Migration_Process * - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Migration * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1080 $ + * @author Jonathan H. Wage */ class Doctrine_Migration_Process { diff --git a/lib/Doctrine/Node.php b/lib/Doctrine/Node.php index 618f91d4e..507141131 100644 --- a/lib/Doctrine/Node.php +++ b/lib/Doctrine/Node.php @@ -22,8 +22,8 @@ * Doctrine_Node * * @package Doctrine + * @subpackage Node * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -177,4 +177,4 @@ class Doctrine_Node implements IteratorAggregate { $this->iteratorOptions = $options; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Node/AdjacencyList.php b/lib/Doctrine/Node/AdjacencyList.php index 7a6abf65f..de3c3780f 100644 --- a/lib/Doctrine/Node/AdjacencyList.php +++ b/lib/Doctrine/Node/AdjacencyList.php @@ -22,13 +22,12 @@ * Doctrine_Node_AdjacencyList * * @package Doctrine + * @subpackage Node * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ * @author Joe Simms */ abstract class Doctrine_Node_AdjacencyList extends Doctrine_Node implements Doctrine_Node_Interface -{} - +{ } \ No newline at end of file diff --git a/lib/Doctrine/Node/AdjacencyList/LevelOrderIterator.php b/lib/Doctrine/Node/AdjacencyList/LevelOrderIterator.php index eff1d5db2..8c8a658a5 100644 --- a/lib/Doctrine/Node/AdjacencyList/LevelOrderIterator.php +++ b/lib/Doctrine/Node/AdjacencyList/LevelOrderIterator.php @@ -22,12 +22,12 @@ * Doctrine_Node_AdjacencyList_LevelOrderIterator * * @package Doctrine + * @subpackage Node * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ * @author Joe Simms */ abstract class Doctrine_Node_AdjacencyList_LevelOrderIterator implements Iterator -{} +{ } \ No newline at end of file diff --git a/lib/Doctrine/Node/AdjacencyList/PostOrderIterator.php b/lib/Doctrine/Node/AdjacencyList/PostOrderIterator.php index 500979e13..2c849534b 100644 --- a/lib/Doctrine/Node/AdjacencyList/PostOrderIterator.php +++ b/lib/Doctrine/Node/AdjacencyList/PostOrderIterator.php @@ -22,12 +22,12 @@ * Doctrine_Node_AdjacencyList_PostOrderIterator * * @package Doctrine + * @subpackage Node * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ * @author Joe Simms */ abstract class Doctrine_Node_AdjacencyList_PostOrderIterator implements Iterator -{} +{ } \ No newline at end of file diff --git a/lib/Doctrine/Node/AdjacencyList/PreOrderIterator.php b/lib/Doctrine/Node/AdjacencyList/PreOrderIterator.php index baf33964e..538f9acfe 100644 --- a/lib/Doctrine/Node/AdjacencyList/PreOrderIterator.php +++ b/lib/Doctrine/Node/AdjacencyList/PreOrderIterator.php @@ -22,12 +22,12 @@ * Doctrine_Node_AdjacencyList_PreOrderIterator * * @package Doctrine + * @subpackage Node * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ * @author Joe Simms */ abstract class Doctrine_Node_AdjacencyList_PreOrderIterator implements Iterator -{} +{ } \ No newline at end of file diff --git a/lib/Doctrine/Node/Exception.php b/lib/Doctrine/Node/Exception.php index 099bbe673..6de9e018d 100644 --- a/lib/Doctrine/Node/Exception.php +++ b/lib/Doctrine/Node/Exception.php @@ -22,12 +22,12 @@ * Doctrine_Node_Exception * * @package Doctrine + * @subpackage Node * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ * @author Joe Simms */ class Doctrine_Node_Exception extends Doctrine_Exception -{} +{ } \ No newline at end of file diff --git a/lib/Doctrine/Node/Interface.php b/lib/Doctrine/Node/Interface.php index c6a6ce394..9c6ee5c51 100644 --- a/lib/Doctrine/Node/Interface.php +++ b/lib/Doctrine/Node/Interface.php @@ -22,8 +22,8 @@ * Doctrine_Node_Interface * * @package Doctrine + * @subpackage Node * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -264,4 +264,4 @@ interface Doctrine_Node_Interface { * */ public function delete(); -} +} \ No newline at end of file diff --git a/lib/Doctrine/Node/MaterializedPath.php b/lib/Doctrine/Node/MaterializedPath.php index 57862088c..08528b224 100644 --- a/lib/Doctrine/Node/MaterializedPath.php +++ b/lib/Doctrine/Node/MaterializedPath.php @@ -22,13 +22,12 @@ * Doctrine_Node_MaterializedPath * * @package Doctrine + * @subpackage Node * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ * @author Joe Simms */ abstract class Doctrine_Node_MaterializedPath extends Doctrine_Node implements Doctrine_Node_Interface -{} - +{ } \ No newline at end of file diff --git a/lib/Doctrine/Node/MaterializedPath/LevelOrderIterator.php b/lib/Doctrine/Node/MaterializedPath/LevelOrderIterator.php index fe43dc6c5..9decbf086 100644 --- a/lib/Doctrine/Node/MaterializedPath/LevelOrderIterator.php +++ b/lib/Doctrine/Node/MaterializedPath/LevelOrderIterator.php @@ -22,8 +22,8 @@ * Doctrine_Node_MaterializedPath_LevelOrderIterator * * @package Doctrine + * @subpackage Node * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -64,4 +64,4 @@ class Doctrine_Node_MaterializedPath_LevelOrderIterator implements Iterator { throw new Doctrine_Exception('Not yet implemented'); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Node/MaterializedPath/PostOrderIterator.php b/lib/Doctrine/Node/MaterializedPath/PostOrderIterator.php index ae65bd11c..1a860b3b4 100644 --- a/lib/Doctrine/Node/MaterializedPath/PostOrderIterator.php +++ b/lib/Doctrine/Node/MaterializedPath/PostOrderIterator.php @@ -22,8 +22,8 @@ * Doctrine_Node_MaterializedPath_PostOrderIterator * * @package Doctrine + * @subpackage Node * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -64,4 +64,4 @@ class Doctrine_Node_MaterializedPath_PostOrderIterator implements Iterator { throw new Doctrine_Exception('Not yet implemented'); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Node/MaterializedPath/PreOrderIterator.php b/lib/Doctrine/Node/MaterializedPath/PreOrderIterator.php index e76420d67..2cc4a9b3f 100644 --- a/lib/Doctrine/Node/MaterializedPath/PreOrderIterator.php +++ b/lib/Doctrine/Node/MaterializedPath/PreOrderIterator.php @@ -22,8 +22,8 @@ * Doctrine_Node_MaterializedPath_PreOrderIterator * * @package Doctrine + * @subpackage Node * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -64,4 +64,4 @@ class Doctrine_Node_MaterializedPath_PreOrderIterator implements Iterator { throw new Doctrine_Exception('Not yet implemented'); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Node/NestedSet.php b/lib/Doctrine/Node/NestedSet.php index 08c941c44..de4988179 100644 --- a/lib/Doctrine/Node/NestedSet.php +++ b/lib/Doctrine/Node/NestedSet.php @@ -22,8 +22,8 @@ * Doctrine_Node_NestedSet * * @package Doctrine + * @subpackage Node * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -990,4 +990,4 @@ class Doctrine_Node_NestedSet extends Doctrine_Node implements Doctrine_Node_Int $this->record->set($this->_tree->getAttribute('rootColumnName'), $value); } } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Node/NestedSet/LevelOrderIterator.php b/lib/Doctrine/Node/NestedSet/LevelOrderIterator.php index dc5c3ac5c..d56ecbd9f 100644 --- a/lib/Doctrine/Node/NestedSet/LevelOrderIterator.php +++ b/lib/Doctrine/Node/NestedSet/LevelOrderIterator.php @@ -22,12 +22,12 @@ * Doctrine_Node_NestedSet_LevelOrderIterator * * @package Doctrine + * @subpackage Node * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ * @author Joe Simms */ class Doctrine_Node_NestedSet_LevelOrderIterator -{} +{ } \ No newline at end of file diff --git a/lib/Doctrine/Node/NestedSet/PostOrderIterator.php b/lib/Doctrine/Node/NestedSet/PostOrderIterator.php index 6c9bcba4c..f8c2a5ef9 100644 --- a/lib/Doctrine/Node/NestedSet/PostOrderIterator.php +++ b/lib/Doctrine/Node/NestedSet/PostOrderIterator.php @@ -22,12 +22,12 @@ * Doctrine_Node_NestedSet_PostOrderIterator * * @package Doctrine + * @subpackage Node * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ * @author Joe Simms */ class Doctrine_Node_NestedSet_PostOrderIterator -{} +{ } \ No newline at end of file diff --git a/lib/Doctrine/Node/NestedSet/PreOrderIterator.php b/lib/Doctrine/Node/NestedSet/PreOrderIterator.php index 09f7f641d..d6e49d198 100644 --- a/lib/Doctrine/Node/NestedSet/PreOrderIterator.php +++ b/lib/Doctrine/Node/NestedSet/PreOrderIterator.php @@ -22,8 +22,8 @@ * Doctrine_Node_NestedSet_PreOrderIterator * * @package Doctrine + * @subpackage Node * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -173,4 +173,4 @@ class Doctrine_Node_NestedSet_PreOrderIterator implements Iterator return false; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Null.php b/lib/Doctrine/Null.php index 94461b7b1..f7efb5539 100644 --- a/lib/Doctrine/Null.php +++ b/lib/Doctrine/Null.php @@ -25,8 +25,8 @@ * used for extra fast null value testing with isset() rather than array_key_exists() * * @package Doctrine + * @subpackage Null * @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 @@ final class Doctrine_Null { return ''; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Object.php b/lib/Doctrine/Object.php index 4b62d10d9..77ce87049 100644 --- a/lib/Doctrine/Object.php +++ b/lib/Doctrine/Object.php @@ -23,8 +23,8 @@ * Doctrine_Object * * @package Doctrine + * @subpackage Object * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -57,4 +57,4 @@ class Doctrine_Object { return self::$_null; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Overloadable.php b/lib/Doctrine/Overloadable.php index 430f68a1b..61b930152 100644 --- a/lib/Doctrine/Overloadable.php +++ b/lib/Doctrine/Overloadable.php @@ -24,8 +24,8 @@ * a very generic overloading interface * * @package Doctrine + * @subpackage Overloadable * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -41,4 +41,4 @@ interface Doctrine_Overloadable { * @return mixed anything */ public function __call($m, $a); -} +} \ No newline at end of file diff --git a/lib/Doctrine/Parser.php b/lib/Doctrine/Parser.php index a9548eaf9..4a04a7d96 100644 --- a/lib/Doctrine/Parser.php +++ b/lib/Doctrine/Parser.php @@ -21,13 +21,13 @@ /** * Doctrine_Parser * - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Parser * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1080 $ + * @author Jonathan H. Wage */ abstract class Doctrine_Parser { diff --git a/lib/Doctrine/Parser/Exception.php b/lib/Doctrine/Parser/Exception.php index f07b15392..c15f3418b 100644 --- a/lib/Doctrine/Parser/Exception.php +++ b/lib/Doctrine/Parser/Exception.php @@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Exception'); * Doctrine_Parser_Exception * * @package Doctrine + * @subpackage Parser * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1080 $ - * @author Konsta Vesterinen + * @author Jonathan H. Wage */ class Doctrine_Parser_Exception extends Doctrine_Exception { } \ No newline at end of file diff --git a/lib/Doctrine/Parser/Json.php b/lib/Doctrine/Parser/Json.php index 6754d06ea..3b0d07355 100644 --- a/lib/Doctrine/Parser/Json.php +++ b/lib/Doctrine/Parser/Json.php @@ -21,13 +21,13 @@ /** * Doctrine_Parser_Json * - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Parser * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1080 $ + * @author Jonathan H. Wage */ class Doctrine_Parser_Json extends Doctrine_Parser { diff --git a/lib/Doctrine/Parser/Serialize.php b/lib/Doctrine/Parser/Serialize.php index 449119164..04e1a57bb 100644 --- a/lib/Doctrine/Parser/Serialize.php +++ b/lib/Doctrine/Parser/Serialize.php @@ -21,13 +21,13 @@ /** * Doctrine_Parser_Serialize * - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Parser * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1080 $ + * @author Jonathan H. Wage */ class Doctrine_Parser_Serialize extends Doctrine_Parser { diff --git a/lib/Doctrine/Parser/Xml.php b/lib/Doctrine/Parser/Xml.php index 5fa3c12a0..b30fb2d98 100644 --- a/lib/Doctrine/Parser/Xml.php +++ b/lib/Doctrine/Parser/Xml.php @@ -21,13 +21,13 @@ /** * Doctrine_Parser_Xml * - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Parser * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1080 $ + * @author Jonathan H. Wage */ class Doctrine_Parser_Xml extends Doctrine_Parser { diff --git a/lib/Doctrine/Parser/Yml.php b/lib/Doctrine/Parser/Yml.php index a306a44ec..d071b3f36 100644 --- a/lib/Doctrine/Parser/Yml.php +++ b/lib/Doctrine/Parser/Yml.php @@ -23,13 +23,13 @@ require_once('spyc.php'); /** * Doctrine_Parser_Yml * - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Parser * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1080 $ + * @author Jonathan H. Wage */ class Doctrine_Parser_Yml extends Doctrine_Parser { diff --git a/lib/Doctrine/Plugin.php b/lib/Doctrine/Plugin.php index c727db582..f56e1b89a 100644 --- a/lib/Doctrine/Plugin.php +++ b/lib/Doctrine/Plugin.php @@ -24,6 +24,7 @@ * * @author Konsta Vesterinen * @package Doctrine + * @subpackage Plugin * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ * @category Object Relational Mapping @@ -98,4 +99,4 @@ class Doctrine_Plugin { return $this->_options; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Plugin/Exception.php b/lib/Doctrine/Plugin/Exception.php index 55d7a148a..8747ec8b6 100644 --- a/lib/Doctrine/Plugin/Exception.php +++ b/lib/Doctrine/Plugin/Exception.php @@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Exception'); * Doctrine_Plugin_Exception * * @package Doctrine + * @subpackage Plugin * @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 */ class Doctrine_Plugin_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Query.php b/lib/Doctrine/Query.php index eee7698b1..eb5ccb630 100644 --- a/lib/Doctrine/Query.php +++ b/lib/Doctrine/Query.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Query_Abstract'); * Doctrine_Query * * @package Doctrine + * @subpackage Query * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -1677,4 +1677,4 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable $this->_dqlParts = array(); $this->_enumParams = array(); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/Abstract.php b/lib/Doctrine/Query/Abstract.php index 01dce1dc8..a7b38176b 100644 --- a/lib/Doctrine/Query/Abstract.php +++ b/lib/Doctrine/Query/Abstract.php @@ -23,6 +23,7 @@ Doctrine::autoload('Doctrine_Hydrate'); * Doctrine_Query_Abstract * * @package Doctrine + * @subpackage Query * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @category Object Relational Mapping * @link www.phpdoctrine.com @@ -353,4 +354,4 @@ abstract class Doctrine_Query_Abstract extends Doctrine_Hydrate * @return Doctrine_Query this object */ abstract public function parseQueryPart($queryPartName, $queryPart, $append = false); -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/Check.php b/lib/Doctrine/Query/Check.php index 546154f36..5581a606a 100644 --- a/lib/Doctrine/Query/Check.php +++ b/lib/Doctrine/Query/Check.php @@ -23,8 +23,8 @@ * Doctrine_Query_Check * * @package Doctrine + * @subpackage Query * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1080 $ @@ -156,4 +156,4 @@ class Doctrine_Query_Check { return $this->sql; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/Condition.php b/lib/Doctrine/Query/Condition.php index 8895aad42..180f50cea 100644 --- a/lib/Doctrine/Query/Condition.php +++ b/lib/Doctrine/Query/Condition.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Query_Part'); * Doctrine_Query_Condition * * @package Doctrine + * @subpackage Query * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -109,4 +109,4 @@ abstract class Doctrine_Query_Condition extends Doctrine_Query_Part return $value; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/Exception.php b/lib/Doctrine/Query/Exception.php index 23f713c1a..25d4b9906 100644 --- a/lib/Doctrine/Query/Exception.php +++ b/lib/Doctrine/Query/Exception.php @@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Exception'); * Doctrine_Query_Exception * * @package Doctrine + * @subpackage Query * @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 */ class Doctrine_Query_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Query/Filter.php b/lib/Doctrine/Query/Filter.php index c0cf65184..170462495 100644 --- a/lib/Doctrine/Query/Filter.php +++ b/lib/Doctrine/Query/Filter.php @@ -23,8 +23,8 @@ * Doctrine_Query_Filter * * @package Doctrine + * @subpackage Query * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -59,4 +59,4 @@ class Doctrine_Query_Filter implements Doctrine_Query_Filter_Interface { } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/Filter/Chain.php b/lib/Doctrine/Query/Filter/Chain.php index f5a0e532b..e586013bd 100644 --- a/lib/Doctrine/Query/Filter/Chain.php +++ b/lib/Doctrine/Query/Filter/Chain.php @@ -23,8 +23,8 @@ * Doctrine_Query_Filter_Chain * * @package Doctrine + * @subpackage Query * @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_Query_Filter_Chain $filter->postQuery($query); } } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/Filter/Interface.php b/lib/Doctrine/Query/Filter/Interface.php index 4ad8e22ec..a6519ac3d 100644 --- a/lib/Doctrine/Query/Filter/Interface.php +++ b/lib/Doctrine/Query/Filter/Interface.php @@ -23,8 +23,8 @@ * Doctrine_Query_Filter_Interface * * @package Doctrine + * @subpackage Query * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -54,4 +54,4 @@ interface Doctrine_Query_Filter_Interface * @return void */ public function postQuery(Doctrine_Query $query); -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/From.php b/lib/Doctrine/Query/From.php index e5247c3c8..15902e141 100644 --- a/lib/Doctrine/Query/From.php +++ b/lib/Doctrine/Query/From.php @@ -23,8 +23,8 @@ Doctrine::autoload("Doctrine_Query_Part"); * Doctrine_Query_From * * @package Doctrine + * @subpackage Query * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -87,5 +87,4 @@ class Doctrine_Query_From extends Doctrine_Query_Part } return null; } - -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/Groupby.php b/lib/Doctrine/Query/Groupby.php index 88c6d8ee7..1f1810da8 100644 --- a/lib/Doctrine/Query/Groupby.php +++ b/lib/Doctrine/Query/Groupby.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Query_Part'); * Doctrine_Query_Groupby * * @package Doctrine + * @subpackage Query * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -59,4 +59,4 @@ class Doctrine_Query_Groupby extends Doctrine_Query_Part } return implode(', ', $r); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/Having.php b/lib/Doctrine/Query/Having.php index 509c4e15d..0fa81119b 100644 --- a/lib/Doctrine/Query/Having.php +++ b/lib/Doctrine/Query/Having.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Query_Condition'); * Doctrine_Query_Having * * @package Doctrine + * @subpackage Query * @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_Query_Having extends Doctrine_Query_Condition return $r; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/JoinCondition.php b/lib/Doctrine/Query/JoinCondition.php index 896f95d09..3c3507b9a 100644 --- a/lib/Doctrine/Query/JoinCondition.php +++ b/lib/Doctrine/Query/JoinCondition.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Query_Part'); * Doctrine_Query_JoinCondition * * @package Doctrine + * @subpackage Query * @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_Query_JoinCondition extends Doctrine_Query_Condition } return $condition; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/Limit.php b/lib/Doctrine/Query/Limit.php index 195ecaa0e..1e802fd84 100644 --- a/lib/Doctrine/Query/Limit.php +++ b/lib/Doctrine/Query/Limit.php @@ -23,8 +23,8 @@ * Doctrine_Query_Limit * * @package Doctrine + * @subpackage Query * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1352 $ @@ -36,4 +36,4 @@ class Doctrine_Query_Limit extends Doctrine_Query_Part { return (int) $limit; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/Offset.php b/lib/Doctrine/Query/Offset.php index 16de40e9b..600b3b9da 100644 --- a/lib/Doctrine/Query/Offset.php +++ b/lib/Doctrine/Query/Offset.php @@ -23,8 +23,8 @@ * Doctrine_Query_Offset * * @package Doctrine + * @subpackage Query * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1352 $ @@ -36,4 +36,4 @@ class Doctrine_Query_Offset extends Doctrine_Query_Part { return (int) $offset; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/Orderby.php b/lib/Doctrine/Query/Orderby.php index 1049b2234..d57825fa4 100644 --- a/lib/Doctrine/Query/Orderby.php +++ b/lib/Doctrine/Query/Orderby.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Query_Part'); * Doctrine_Query_Orderby * * @package Doctrine + * @subpackage Query * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -71,4 +71,4 @@ class Doctrine_Query_Orderby extends Doctrine_Query_Part } return $ret; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/Parser.php b/lib/Doctrine/Query/Parser.php index 4ef893361..835556e9e 100644 --- a/lib/Doctrine/Query/Parser.php +++ b/lib/Doctrine/Query/Parser.php @@ -23,14 +23,12 @@ * Doctrine_Query_Parser * * @package Doctrine + * @subpackage Query * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1296 $ * @author Konsta Vesterinen */ class Doctrine_Query_Parser -{ - -} +{ } \ No newline at end of file diff --git a/lib/Doctrine/Query/Part.php b/lib/Doctrine/Query/Part.php index 0afa8eb18..062f09ba8 100644 --- a/lib/Doctrine/Query/Part.php +++ b/lib/Doctrine/Query/Part.php @@ -23,8 +23,8 @@ * Doctrine_Query_Part * * @package Doctrine + * @subpackage Query * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -50,4 +50,4 @@ abstract class Doctrine_Query_Part { return $this->query; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/Registry.php b/lib/Doctrine/Query/Registry.php index 3afce6c28..fc48d68c3 100644 --- a/lib/Doctrine/Query/Registry.php +++ b/lib/Doctrine/Query/Registry.php @@ -23,9 +23,9 @@ * Doctrine_Query_Registry * * @package Doctrine + * @subpackage Query * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -67,4 +67,4 @@ class Doctrine_Query_Registry return $query; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/Registry/Exception.php b/lib/Doctrine/Query/Registry/Exception.php index a43367c6b..f6f05c7dd 100644 --- a/lib/Doctrine/Query/Registry/Exception.php +++ b/lib/Doctrine/Query/Registry/Exception.php @@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Query_Exception'); * Doctrine_Query_Exception * * @package Doctrine + * @subpackage Query * @author Konsta Vesterinen * @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_Query_Registry_Exception extends Doctrine_Query_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Query/Select.php b/lib/Doctrine/Query/Select.php index de23724cd..48066bffa 100644 --- a/lib/Doctrine/Query/Select.php +++ b/lib/Doctrine/Query/Select.php @@ -23,8 +23,8 @@ Doctrine::autoload("Doctrine_Query_Part"); * Doctrine_Query_Select * * @package Doctrine + * @subpackage Query * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1080 $ @@ -36,4 +36,4 @@ class Doctrine_Query_Select extends Doctrine_Query_Part { $this->query->parseSelect($dql); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Query/Set.php b/lib/Doctrine/Query/Set.php index edf95000a..f2111d90c 100644 --- a/lib/Doctrine/Query/Set.php +++ b/lib/Doctrine/Query/Set.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Query_Part'); * Doctrine_Query * * @package Doctrine + * @subpackage Query * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -57,5 +57,4 @@ class Doctrine_Query_Set extends Doctrine_Query_Part return $dql; } -} - +} \ No newline at end of file diff --git a/lib/Doctrine/Query/Where.php b/lib/Doctrine/Query/Where.php index 6502b78e7..90934eb13 100644 --- a/lib/Doctrine/Query/Where.php +++ b/lib/Doctrine/Query/Where.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Query_Condition'); * Doctrine_Query_Where * * @package Doctrine + * @subpackage Query * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -173,4 +173,4 @@ class Doctrine_Query_Where extends Doctrine_Query_Condition return $operator . ' (' . $this->query->createSubquery()->parseQuery($sub, false)->getQuery() . ')'; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/RawSql.php b/lib/Doctrine/RawSql.php index 12e82e175..48db122fa 100644 --- a/lib/Doctrine/RawSql.php +++ b/lib/Doctrine/RawSql.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Query_Abstract'); * Doctrine_RawSql * * @package Doctrine + * @subpackage RawSql * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -278,5 +278,4 @@ class Doctrine_RawSql extends Doctrine_Query_Abstract return $this; } - -} +} \ No newline at end of file diff --git a/lib/Doctrine/RawSql/Exception.php b/lib/Doctrine/RawSql/Exception.php index fe465228f..aa5b0aadd 100644 --- a/lib/Doctrine/RawSql/Exception.php +++ b/lib/Doctrine/RawSql/Exception.php @@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Exception'); * Doctrine_RawSql_Exception * * @package Doctrine + * @subpackage RawSql * @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 */ class Doctrine_RawSql_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Record.php b/lib/Doctrine/Record.php index c7af6e8e6..c20cbcc3b 100644 --- a/lib/Doctrine/Record.php +++ b/lib/Doctrine/Record.php @@ -23,10 +23,10 @@ Doctrine::autoload('Doctrine_Record_Abstract'); * Doctrine_Record * All record classes should inherit this super class * + * @package Doctrine + * @subpackage Record * @author Konsta Vesterinen * @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$ @@ -1631,4 +1631,4 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count { return (string) $this->_oid; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Record/Abstract.php b/lib/Doctrine/Record/Abstract.php index 623dc9b98..a2250f10b 100644 --- a/lib/Doctrine/Record/Abstract.php +++ b/lib/Doctrine/Record/Abstract.php @@ -22,10 +22,10 @@ Doctrine::autoload('Doctrine_Access'); /** * Doctrine_Record_Abstract * + * @package Doctrine + * @subpackage Record * @author Konsta Vesterinen * @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$ @@ -305,4 +305,4 @@ abstract class Doctrine_Record_Abstract extends Doctrine_Access } return $this; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Record/Exception.php b/lib/Doctrine/Record/Exception.php index 346e73462..3326a9df0 100644 --- a/lib/Doctrine/Record/Exception.php +++ b/lib/Doctrine/Record/Exception.php @@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Exception'); * Doctrine_Exception * * @package Doctrine + * @subpackage Record * @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 */ class Doctrine_Record_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Record/Filter.php b/lib/Doctrine/Record/Filter.php index 23ecde382..ffa167453 100644 --- a/lib/Doctrine/Record/Filter.php +++ b/lib/Doctrine/Record/Filter.php @@ -23,10 +23,10 @@ * Doctrine_Record_Filter * Filters the record getters and setters * + * @package Doctrine + * @subpackage Record * @author Konsta Vesterinen * @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: 1298 $ @@ -57,4 +57,4 @@ abstract class Doctrine_Record_Filter * @param mixed $name name of the property or related component */ abstract public function filterGet(Doctrine_Record $record, $name); -} +} \ No newline at end of file diff --git a/lib/Doctrine/Record/Filter/Compound.php b/lib/Doctrine/Record/Filter/Compound.php index 03b4ec540..032ddc7b9 100644 --- a/lib/Doctrine/Record/Filter/Compound.php +++ b/lib/Doctrine/Record/Filter/Compound.php @@ -22,10 +22,10 @@ /** * Doctrine_Record_Filter_Compound * + * @package Doctrine + * @subpackage Record * @author Konsta Vesterinen * @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: 1298 $ @@ -96,4 +96,4 @@ class Doctrine_Record_Filter_Compound extends Doctrine_Record_Filter } } } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Record/Filter/Standard.php b/lib/Doctrine/Record/Filter/Standard.php index 24da62148..6e33175d6 100644 --- a/lib/Doctrine/Record/Filter/Standard.php +++ b/lib/Doctrine/Record/Filter/Standard.php @@ -23,10 +23,10 @@ * Doctrine_Record_Filter_Standard * Filters the record getters and setters * + * @package Doctrine + * @subpackage Record * @author Konsta Vesterinen * @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: 1298 $ @@ -53,4 +53,4 @@ class Doctrine_Record_Filter_Standard extends Doctrine_Record_Filter { throw new Doctrine_Record_Exception('Unknown record property / related component \'' . $name . '\'.'); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Record/Iterator.php b/lib/Doctrine/Record/Iterator.php index 3b258b10c..d62e8b532 100644 --- a/lib/Doctrine/Record/Iterator.php +++ b/lib/Doctrine/Record/Iterator.php @@ -1,4 +1,35 @@ . + */ + +/** + * Doctrine_Record_Iterator + * + * @package Doctrine + * @subpackage Record + * @author Konsta Vesterinen + * @license http://www.opensource.org/licenses/lgpl-license.php LGPL + * @link www.phpdoctrine.com + * @since 1.0 + * @version $Revision$ + */ class Doctrine_Record_Iterator extends ArrayIterator { /** @@ -43,4 +74,4 @@ class Doctrine_Record_Iterator extends ArrayIterator return $value; } } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Record/Listener.php b/lib/Doctrine/Record/Listener.php index 2b1e65a57..2e895a1d6 100644 --- a/lib/Doctrine/Record/Listener.php +++ b/lib/Doctrine/Record/Listener.php @@ -22,17 +22,16 @@ /** * Doctrine_Record_Listener * + * @package Doctrine + * @subpackage Record * @author Konsta Vesterinen * @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$ */ class Doctrine_Record_Listener implements Doctrine_Record_Listener_Interface { - public function preSerialize(Doctrine_Event $event) { } @@ -68,4 +67,4 @@ class Doctrine_Record_Listener implements Doctrine_Record_Listener_Interface public function postInsert(Doctrine_Event $event) { } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Record/Listener/Chain.php b/lib/Doctrine/Record/Listener/Chain.php index e6910d365..d417a9a29 100644 --- a/lib/Doctrine/Record/Listener/Chain.php +++ b/lib/Doctrine/Record/Listener/Chain.php @@ -25,8 +25,9 @@ Doctrine::autoload('Doctrine_Access'); * this class represents a chain of different listeners, * useful for having multiple listeners listening the events at the same time * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage Record + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @category Object Relational Mapping * @link www.phpdoctrine.com @@ -169,4 +170,4 @@ class Doctrine_Record_Listener_Chain extends Doctrine_Access implements Doctrine $listener->postInsert($event); } } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Record/Listener/Interface.php b/lib/Doctrine/Record/Listener/Interface.php index ca2502d4a..e8f33bd03 100644 --- a/lib/Doctrine/Record/Listener/Interface.php +++ b/lib/Doctrine/Record/Listener/Interface.php @@ -22,17 +22,16 @@ /** * Doctrine_Record_Listener * + * @package Doctrine + * @subpackage Record * @author Konsta Vesterinen * @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$ */ interface Doctrine_Record_Listener_Interface { - public function preSerialize(Doctrine_Event $event); public function postSerialize(Doctrine_Event $event); @@ -56,4 +55,4 @@ interface Doctrine_Record_Listener_Interface public function preInsert(Doctrine_Event $event); public function postInsert(Doctrine_Event $event); -} +} \ No newline at end of file diff --git a/lib/Doctrine/Record/State/Exception.php b/lib/Doctrine/Record/State/Exception.php index 178f53e3d..9ecffc250 100644 --- a/lib/Doctrine/Record/State/Exception.php +++ b/lib/Doctrine/Record/State/Exception.php @@ -23,6 +23,7 @@ Doctrine::autoload('Doctrine_Record_Exception'); * Doctrine_Exception * * @package Doctrine + * @subpackage Record * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @category Object Relational Mapping * @link www.phpdoctrine.com @@ -31,4 +32,4 @@ Doctrine::autoload('Doctrine_Record_Exception'); * @author Konsta Vesterinen */ class Doctrine_Record_State_Exception extends Doctrine_Record_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Relation.php b/lib/Doctrine/Relation.php index 95bd495b6..f605fafb4 100644 --- a/lib/Doctrine/Relation.php +++ b/lib/Doctrine/Relation.php @@ -23,8 +23,8 @@ * This class represents a relation between components * * @package Doctrine + * @subpackage Relation * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -310,4 +310,4 @@ abstract class Doctrine_Relation implements ArrayAccess $r[] = ""; return implode("\n", $r); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Relation/Association.php b/lib/Doctrine/Relation/Association.php index 35aa947f3..0ac7c2340 100644 --- a/lib/Doctrine/Relation/Association.php +++ b/lib/Doctrine/Relation/Association.php @@ -26,8 +26,8 @@ Doctrine::autoload('Doctrine_Relation'); * * * @package Doctrine + * @subpackage Relation * @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_Relation_Association extends Doctrine_Relation $coll->setReference($record, $this); return $coll; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Relation/Association/Self.php b/lib/Doctrine/Relation/Association/Self.php index 3975374c3..eb5653335 100644 --- a/lib/Doctrine/Relation/Association/Self.php +++ b/lib/Doctrine/Relation/Association/Self.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Relation_Association'); * Doctrine_Relation_Association_Self * * @package Doctrine + * @subpackage Relation * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -105,5 +105,4 @@ class Doctrine_Relation_Association_Self extends Doctrine_Relation_Association return $q->execute(array($id, $id)); } -} - +} \ No newline at end of file diff --git a/lib/Doctrine/Relation/Exception.php b/lib/Doctrine/Relation/Exception.php index cd1198fb0..f7d9e0a2e 100644 --- a/lib/Doctrine/Relation/Exception.php +++ b/lib/Doctrine/Relation/Exception.php @@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Exception'); * Doctrine_Relation_Exception * * @package Doctrine + * @subpackage Relation * @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 */ class Doctrine_Relation_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Relation/ForeignKey.php b/lib/Doctrine/Relation/ForeignKey.php index 57d210e99..b19cd20b1 100644 --- a/lib/Doctrine/Relation/ForeignKey.php +++ b/lib/Doctrine/Relation/ForeignKey.php @@ -23,10 +23,10 @@ Doctrine::autoload('Doctrine_Relation'); * Doctrine_Relation_ForeignKey * This class represents a foreign key relation * + * @package Doctrine + * @subpackage Relation * @author Konsta Vesterinen * @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$ @@ -95,4 +95,4 @@ class Doctrine_Relation_ForeignKey extends Doctrine_Relation } return implode(' AND ', $conditions); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Relation/LocalKey.php b/lib/Doctrine/Relation/LocalKey.php index 72e5e5eec..e5c3b8260 100644 --- a/lib/Doctrine/Relation/LocalKey.php +++ b/lib/Doctrine/Relation/LocalKey.php @@ -23,10 +23,10 @@ Doctrine::autoload('Doctrine_Relation'); * Doctrine_Relation_LocalKey * This class represents a local key relation * + * @package Doctrine + * @subpackage Relation * @author Konsta Vesterinen * @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$ @@ -43,40 +43,39 @@ class Doctrine_Relation_LocalKey extends Doctrine_Relation */ public function fetchRelatedFor(Doctrine_Record $record) { - $id = $record->get($this->definition['local']); - + $id = $record->get($this->definition['local']); + if (empty($id) || ! $this->definition['table']->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) { $related = $this->getTable()->create(); } else { $dql = 'FROM ' . $this->getTable()->getComponentName() . ' WHERE ' . $this->getCondition(); - - $related = $this->getTable() - ->getConnection() - ->query($dql, array($id)) + + $related = $this->getTable() + ->getConnection() + ->query($dql, array($id)) ->getFirst(); if ( ! $related || empty($related)) { - $related = $this->getTable()->create(); + $related = $this->getTable()->create(); } } - + $record->set($this->definition['local'], $related, false); return $related; - } - + } + /** * getCondition * * @param string $alias */ public function getCondition($alias = null) - { + { if ( ! $alias) { $alias = $this->getTable()->getComponentName(); - } + } return $alias . '.' . $this->definition['foreign'] . ' = ?'; } - -} +} \ No newline at end of file diff --git a/lib/Doctrine/Relation/Nest.php b/lib/Doctrine/Relation/Nest.php index 6ba0a0b58..9ad1c5b24 100644 --- a/lib/Doctrine/Relation/Nest.php +++ b/lib/Doctrine/Relation/Nest.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Relation_Association'); * Doctrine_Relation_Association_Self * * @package Doctrine + * @subpackage Relation * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1434 $ @@ -139,4 +139,4 @@ class Doctrine_Relation_Nest extends Doctrine_Relation_Association return $q->execute($params); } } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Relation/Parser.php b/lib/Doctrine/Relation/Parser.php index c58213f7e..b1a44db9d 100644 --- a/lib/Doctrine/Relation/Parser.php +++ b/lib/Doctrine/Relation/Parser.php @@ -21,11 +21,11 @@ /** * Doctrine_Relation_Parser * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage Relation + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision: 1397 $ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -459,4 +459,4 @@ class Doctrine_Relation_Parser } return $def; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Relation/Parser/Exception.php b/lib/Doctrine/Relation/Parser/Exception.php index c9c10cf9a..e4d43185f 100644 --- a/lib/Doctrine/Relation/Parser/Exception.php +++ b/lib/Doctrine/Relation/Parser/Exception.php @@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Relation_Exception'); * Doctrine_Relation_Parser_Exception * * @package Doctrine + * @subpackage Relation * @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 */ class Doctrine_Relation_Parser_Exception extends Doctrine_Relation_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Resource.php b/lib/Doctrine/Resource.php index 486296586..73c236d61 100644 --- a/lib/Doctrine/Resource.php +++ b/lib/Doctrine/Resource.php @@ -22,9 +22,9 @@ /** * Doctrine_Resource * - * @author Konsta Vesterinen - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Resource + * @author Jonathan H. Wage * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ * @category Object Relational Mapping diff --git a/lib/Doctrine/Resource/Access.php b/lib/Doctrine/Resource/Access.php index 27c23666e..555adfc5c 100644 --- a/lib/Doctrine/Resource/Access.php +++ b/lib/Doctrine/Resource/Access.php @@ -22,9 +22,9 @@ /** * Doctrine_Resource_Access * - * @author Konsta Vesterinen - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Resource + * @author Jonathan H. Wage * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ * @category Object Relational Mapping diff --git a/lib/Doctrine/Resource/Client.php b/lib/Doctrine/Resource/Client.php index a7a0d643a..bf896ce7e 100644 --- a/lib/Doctrine/Resource/Client.php +++ b/lib/Doctrine/Resource/Client.php @@ -22,9 +22,9 @@ /** * Doctrine_Resource_Client * - * @author Konsta Vesterinen - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Resource + * @author Jonathan H. Wage * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ * @category Object Relational Mapping diff --git a/lib/Doctrine/Resource/Collection.php b/lib/Doctrine/Resource/Collection.php index cc3f0f2cd..0b2141b71 100644 --- a/lib/Doctrine/Resource/Collection.php +++ b/lib/Doctrine/Resource/Collection.php @@ -22,9 +22,9 @@ /** * Doctrine_Resource_Collection * - * @author Konsta Vesterinen - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Resource + * @author Jonathan H. Wage * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ * @category Object Relational Mapping diff --git a/lib/Doctrine/Resource/Config.php b/lib/Doctrine/Resource/Config.php index 39c4adeab..f0f0cd7b7 100644 --- a/lib/Doctrine/Resource/Config.php +++ b/lib/Doctrine/Resource/Config.php @@ -22,9 +22,9 @@ /** * Doctrine_Resource_Config * - * @author Konsta Vesterinen - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Resource + * @author Jonathan H. Wage * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ * @category Object Relational Mapping diff --git a/lib/Doctrine/Resource/Exception.php b/lib/Doctrine/Resource/Exception.php index acc980889..082bfeeec 100644 --- a/lib/Doctrine/Resource/Exception.php +++ b/lib/Doctrine/Resource/Exception.php @@ -22,8 +22,9 @@ /** * Doctrine_Resource_Exception * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage Resource + * @author Jonathan H. Wage * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ * @category Object Relational Mapping diff --git a/lib/Doctrine/Resource/Params.php b/lib/Doctrine/Resource/Params.php index b0ecde656..b75c2d908 100644 --- a/lib/Doctrine/Resource/Params.php +++ b/lib/Doctrine/Resource/Params.php @@ -22,9 +22,9 @@ /** * Doctrine_Resource_Params * - * @author Konsta Vesterinen - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Resource + * @author Jonathan H. Wage * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ * @category Object Relational Mapping diff --git a/lib/Doctrine/Resource/Query.php b/lib/Doctrine/Resource/Query.php index 5dfbc5e66..799473381 100644 --- a/lib/Doctrine/Resource/Query.php +++ b/lib/Doctrine/Resource/Query.php @@ -22,9 +22,9 @@ /** * Doctrine_Resource_Query * - * @author Konsta Vesterinen - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Resource + * @author Jonathan H. Wage * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ * @category Object Relational Mapping diff --git a/lib/Doctrine/Resource/Record.php b/lib/Doctrine/Resource/Record.php index 69a8da882..540a1ddfc 100644 --- a/lib/Doctrine/Resource/Record.php +++ b/lib/Doctrine/Resource/Record.php @@ -22,9 +22,9 @@ /** * Doctrine_Resource_Record * - * @author Konsta Vesterinen - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Resource + * @author Jonathan H. Wage * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ * @category Object Relational Mapping diff --git a/lib/Doctrine/Resource/Request.php b/lib/Doctrine/Resource/Request.php index f0f4ed826..99a7e8539 100644 --- a/lib/Doctrine/Resource/Request.php +++ b/lib/Doctrine/Resource/Request.php @@ -22,9 +22,9 @@ /** * Doctrine_Resource_Request * - * @author Konsta Vesterinen - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Resource + * @author Jonathan H. Wage * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ * @category Object Relational Mapping diff --git a/lib/Doctrine/Resource/Server.php b/lib/Doctrine/Resource/Server.php index 17d1c36a0..aa294f4b1 100644 --- a/lib/Doctrine/Resource/Server.php +++ b/lib/Doctrine/Resource/Server.php @@ -22,9 +22,9 @@ /** * Doctrine_Resource_Server * - * @author Konsta Vesterinen - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Resource + * @author Jonathan H. Wage * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ * @category Object Relational Mapping diff --git a/lib/Doctrine/Resource/Table.php b/lib/Doctrine/Resource/Table.php index 65f942825..6da08e691 100644 --- a/lib/Doctrine/Resource/Table.php +++ b/lib/Doctrine/Resource/Table.php @@ -22,9 +22,9 @@ /** * Doctrine_Resource_Table * - * @author Konsta Vesterinen - * @author Jonathan H. Wage * @package Doctrine + * @subpackage Resource + * @author Jonathan H. Wage * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ * @category Object Relational Mapping diff --git a/lib/Doctrine/Schema.php b/lib/Doctrine/Schema.php index ae086f7ee..daee1c2e1 100644 --- a/lib/Doctrine/Schema.php +++ b/lib/Doctrine/Schema.php @@ -18,18 +18,12 @@ * and is licensed under the LGPL. For more information, see * . */ - -/** - * @package Doctrine - * @url http://www.phpdoctrine.com - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @author Jukka Hassinen - * @version $Id$ /** * class Doctrine_Schema * Holds information on one to many databases + * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Schema * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 diff --git a/lib/Doctrine/Schema/Column.php b/lib/Doctrine/Schema/Column.php index fc465744a..167e7684b 100644 --- a/lib/Doctrine/Schema/Column.php +++ b/lib/Doctrine/Schema/Column.php @@ -19,23 +19,18 @@ * . */ Doctrine::autoload('Doctrine_Schema_Object'); -/** - * @package Doctrine - * @url http://www.phpdoctrine.com - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @author Jukka Hassinen - * @version $Id$ - */ /** * class Doctrine_Schema_Column * Holds information on a database table field + * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Schema * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 * @version $Revision$ * @author Konsta Vesterinen + * @author Jukka Hassinen */ class Doctrine_Schema_Column extends Doctrine_Schema_Object implements IteratorAggregate { diff --git a/lib/Doctrine/Schema/Database.php b/lib/Doctrine/Schema/Database.php index 7a918740b..78a0675a0 100644 --- a/lib/Doctrine/Schema/Database.php +++ b/lib/Doctrine/Schema/Database.php @@ -19,23 +19,18 @@ * . */ Doctrine::autoload('Doctrine_Schema_Object'); -/** - * @package Doctrine - * @url http://www.phpdoctrine.com - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @author Jukka Hassinen - * @version $Id$ - */ /** * class Doctrine_Schema_Database * Holds information on a database + * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Schema * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 * @version $Revision$ * @author Konsta Vesterinen + * @author Jukka Hassinen */ class Doctrine_Schema_Database extends Doctrine_Schema_Object { diff --git a/lib/Doctrine/Schema/Exception.php b/lib/Doctrine/Schema/Exception.php index 9a072efd0..98954c3bb 100644 --- a/lib/Doctrine/Schema/Exception.php +++ b/lib/Doctrine/Schema/Exception.php @@ -19,22 +19,17 @@ * . */ Doctrine::autoload('Doctrine_Exception'); -/** - * @package Doctrine - * @url http://www.phpdoctrine.com - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @author Jukka Hassinen - * @version $Id$ - */ /** * class Doctrine_Schema_Exception + * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Schema * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 * @version $Revision$ * @author Konsta Vesterinen + * @author Jukka Hassinen */ class Doctrine_Schema_Exception extends Exception { } diff --git a/lib/Doctrine/Schema/Object.php b/lib/Doctrine/Schema/Object.php index b0dd8af03..5355d1295 100644 --- a/lib/Doctrine/Schema/Object.php +++ b/lib/Doctrine/Schema/Object.php @@ -24,7 +24,7 @@ Doctrine::autoload('Doctrine_Access'); * Catches any non-property call from child classes and throws an exception. * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Schema * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 diff --git a/lib/Doctrine/Schema/Relation.php b/lib/Doctrine/Schema/Relation.php index 1ccd15f9d..33f729662 100644 --- a/lib/Doctrine/Schema/Relation.php +++ b/lib/Doctrine/Schema/Relation.php @@ -19,23 +19,18 @@ * . */ Doctrine::autoload('Doctrine_Schema_Object'); -/** - * @package Doctrine - * @url http://www.phpdoctrine.com - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @author Jukka Hassinen - * @version $Id$ - */ /** * class Doctrine_Schema_Relation * Holds information on a foreign key relation. + * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Schema * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 * @version $Revision$ * @author Konsta Vesterinen + * @author Jukka Hassinen */ class Doctrine_Schema_Relation extends Doctrine_Schema_Object { diff --git a/lib/Doctrine/Schema/Table.php b/lib/Doctrine/Schema/Table.php index 60f341a5d..bb5a13b9c 100644 --- a/lib/Doctrine/Schema/Table.php +++ b/lib/Doctrine/Schema/Table.php @@ -19,23 +19,18 @@ * . */ Doctrine::autoload('Doctrine_Schema_Object'); -/** - * @package Doctrine - * @url http://www.phpdoctrine.com - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @author Jukka Hassinen - * @version $Id$ - */ /** * class Doctrine_Schema_Table * Holds information on a database table + * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Schema * @link www.phpdoctrine.com * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @since 1.0 * @version $Revision$ * @author Konsta Vesterinen + * @author Jukka Hassinen */ class Doctrine_Schema_Table extends Doctrine_Schema_Object implements Countable, IteratorAggregate { diff --git a/lib/Doctrine/Search.php b/lib/Doctrine/Search.php index 3fafc1507..5028603e8 100644 --- a/lib/Doctrine/Search.php +++ b/lib/Doctrine/Search.php @@ -22,11 +22,11 @@ /** * Doctrine_Search * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage Search + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ diff --git a/lib/Doctrine/Search/Analyzer.php b/lib/Doctrine/Search/Analyzer.php index a4d30bceb..dc316fd8d 100644 --- a/lib/Doctrine/Search/Analyzer.php +++ b/lib/Doctrine/Search/Analyzer.php @@ -22,11 +22,11 @@ /** * Doctrine_Search_Analyzer * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage Search + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -36,4 +36,4 @@ class Doctrine_Search_Analyzer implements Doctrine_Search_Analyzer_Interface { } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Search/Analyzer/Exception.php b/lib/Doctrine/Search/Analyzer/Exception.php index 65490d0f4..eb6237415 100644 --- a/lib/Doctrine/Search/Analyzer/Exception.php +++ b/lib/Doctrine/Search/Analyzer/Exception.php @@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Search_Exception'); * Doctrine_Search_Analyzer_Exception * * @package Doctrine + * @subpackage Search + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping + * @version $Revision$ * @link www.phpdoctrine.com * @since 1.0 - * @version $Revision$ - * @author Konsta Vesterinen */ class Doctrine_Search_Analyzer_Exception extends Doctrine_Search_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Search/Analyzer/Interface.php b/lib/Doctrine/Search/Analyzer/Interface.php index 696e891e6..a429fa023 100644 --- a/lib/Doctrine/Search/Analyzer/Interface.php +++ b/lib/Doctrine/Search/Analyzer/Interface.php @@ -22,15 +22,15 @@ /** * Doctrine_Search_Analyzer_Interface * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage Search + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ interface Doctrine_Search_Analyzer_Interface { public function analyze($text); -} +} \ No newline at end of file diff --git a/lib/Doctrine/Search/Analyzer/Standard.php b/lib/Doctrine/Search/Analyzer/Standard.php index cad02d8a9..34f96c87c 100644 --- a/lib/Doctrine/Search/Analyzer/Standard.php +++ b/lib/Doctrine/Search/Analyzer/Standard.php @@ -22,11 +22,11 @@ /** * Doctrine_Search_Analyzer_Standard * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage Search + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -288,4 +288,4 @@ class Doctrine_Search_Analyzer_Standard implements Doctrine_Search_Analyzer_Inte } return $ret; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Search/Exception.php b/lib/Doctrine/Search/Exception.php index 0766c26fa..16d23e905 100644 --- a/lib/Doctrine/Search/Exception.php +++ b/lib/Doctrine/Search/Exception.php @@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Exception'); * Doctrine_Search_Exception * * @package Doctrine + * @subpackage Search + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping + * @version $Revision$ * @link www.phpdoctrine.com * @since 1.0 - * @version $Revision$ - * @author Konsta Vesterinen */ class Doctrine_Search_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Search/Indexer.php b/lib/Doctrine/Search/Indexer.php index d413041d2..52d5bb917 100644 --- a/lib/Doctrine/Search/Indexer.php +++ b/lib/Doctrine/Search/Indexer.php @@ -22,11 +22,11 @@ /** * Doctrine_Search_Indexer * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage Search + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -72,4 +72,4 @@ class Doctrine_Search_Indexer $coll->save(); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Search/Indexer/Dir.php b/lib/Doctrine/Search/Indexer/Dir.php index 98c03fd7b..2df5f8629 100644 --- a/lib/Doctrine/Search/Indexer/Dir.php +++ b/lib/Doctrine/Search/Indexer/Dir.php @@ -22,11 +22,11 @@ /** * Doctrine_Search_Indexer_Dir * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage Search + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -44,4 +44,4 @@ class Doctrine_Search_Indexer_Dir $this->indexFile($file); } } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Search/Indexer/Exception.php b/lib/Doctrine/Search/Indexer/Exception.php index f99297ac7..f7a812476 100644 --- a/lib/Doctrine/Search/Indexer/Exception.php +++ b/lib/Doctrine/Search/Indexer/Exception.php @@ -22,13 +22,13 @@ /** * Doctrine_Search_Indexer * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage Search + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ class Doctrine_Search_Indexer_Exception extends Doctrine_Search_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Search/Listener.php b/lib/Doctrine/Search/Listener.php index c3d0633e5..310ffe683 100644 --- a/lib/Doctrine/Search/Listener.php +++ b/lib/Doctrine/Search/Listener.php @@ -22,11 +22,11 @@ /** * Doctrine_Search_Listener * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage Search + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -53,4 +53,4 @@ class Doctrine_Search_Listener extends Doctrine_Record_Listener $this->_search->updateIndex($record); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Search/Parser.php b/lib/Doctrine/Search/Parser.php index 51173d88c..8243544a5 100644 --- a/lib/Doctrine/Search/Parser.php +++ b/lib/Doctrine/Search/Parser.php @@ -22,11 +22,11 @@ /** * Doctrine_Search_Parser_Standard * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage Search + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -38,4 +38,4 @@ class Doctrine_Search_Parser return array('url' => $file, 'contents' => $contents); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Search/Query.php b/lib/Doctrine/Search/Query.php index 1b70c8cc6..195c20476 100644 --- a/lib/Doctrine/Search/Query.php +++ b/lib/Doctrine/Search/Query.php @@ -23,12 +23,12 @@ * Doctrine_Search_Query * * @package Doctrine + * @subpackage Search + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping + * @version $Revision$ * @link www.phpdoctrine.com * @since 1.0 - * @version $Revision: 1939 $ - * @author Konsta Vesterinen */ class Doctrine_Search_Query { @@ -234,4 +234,4 @@ class Doctrine_Search_Query return $resultSet; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Search/Record.php b/lib/Doctrine/Search/Record.php index 28684965c..069acf3f7 100644 --- a/lib/Doctrine/Search/Record.php +++ b/lib/Doctrine/Search/Record.php @@ -22,11 +22,11 @@ /** * Doctrine_Search_Record * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage Search + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -44,4 +44,4 @@ class Doctrine_Search_Record extends Doctrine_Template { $this->hasOne('[Component]', array('onDelete' => 'CASCADE')); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Search/Scorer.php b/lib/Doctrine/Search/Scorer.php index 431ead8f0..4cefe2058 100644 --- a/lib/Doctrine/Search/Scorer.php +++ b/lib/Doctrine/Search/Scorer.php @@ -22,17 +22,16 @@ /** * Doctrine_Search_Scorer * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage Search + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ class Doctrine_Search_Scorer { - protected $_resultSet; protected $_components = array(); @@ -61,6 +60,4 @@ class Doctrine_Search_Scorer } } } - - -} +} \ No newline at end of file diff --git a/lib/Doctrine/Search/Template.php b/lib/Doctrine/Search/Template.php index 10749ef7d..366ee3371 100644 --- a/lib/Doctrine/Search/Template.php +++ b/lib/Doctrine/Search/Template.php @@ -22,11 +22,11 @@ /** * Doctrine_Search_Template * - * @author Konsta Vesterinen * @package Doctrine + * @subpackage Search + * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -57,4 +57,4 @@ class Doctrine_Search_Template extends Doctrine_Template $this->addListener(new Doctrine_Search_Listener($this->_search)); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Sequence.php b/lib/Doctrine/Sequence.php index 0ca61c28f..517a40c88 100644 --- a/lib/Doctrine/Sequence.php +++ b/lib/Doctrine/Sequence.php @@ -24,9 +24,9 @@ Doctrine::autoload('Doctrine_Connection_Module'); * The base class for sequence handling drivers. * * @package Doctrine + * @subpackage Sequence * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -69,4 +69,4 @@ class Doctrine_Sequence extends Doctrine_Connection_Module sequence value, the sequence value was incremented'; return $this->nextId($seqName); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Sequence/Db2.php b/lib/Doctrine/Sequence/Db2.php index b6e882cf3..eb371ab21 100644 --- a/lib/Doctrine/Sequence/Db2.php +++ b/lib/Doctrine/Sequence/Db2.php @@ -23,9 +23,9 @@ Doctrine::autoload('Doctrine_Sequence'); * Doctrine_Sequence_Db2 * * @package Doctrine + * @subpackage Sequence * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -120,4 +120,4 @@ class Doctrine_Sequence_Db2 extends Doctrine_Sequence return null; } } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Sequence/Exception.php b/lib/Doctrine/Sequence/Exception.php index b80528b60..9dfc406c2 100644 --- a/lib/Doctrine/Sequence/Exception.php +++ b/lib/Doctrine/Sequence/Exception.php @@ -23,12 +23,12 @@ Doctrine::autoload('Doctrine_Exception'); * Doctrine_Sequence_Exception * * @package Doctrine + * @subpackage Sequence * @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 */ class Doctrine_Sequence_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Sequence/Firebird.php b/lib/Doctrine/Sequence/Firebird.php index 01c6aac85..f32bc230b 100644 --- a/lib/Doctrine/Sequence/Firebird.php +++ b/lib/Doctrine/Sequence/Firebird.php @@ -23,9 +23,9 @@ Doctrine::autoload('Doctrine_Sequence'); * Doctrine_Sequence_Firebird * * @package Doctrine + * @subpackage Sequence * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -102,4 +102,4 @@ class Doctrine_Sequence_Firebird extends Doctrine_Sequence } return $value; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Sequence/Informix.php b/lib/Doctrine/Sequence/Informix.php index 9cc8aae70..377f4a3cf 100644 --- a/lib/Doctrine/Sequence/Informix.php +++ b/lib/Doctrine/Sequence/Informix.php @@ -23,14 +23,12 @@ * Doctrine_Sequence_Informix * * @package Doctrine + * @subpackage Sequence * @author Konsta Vesterinen * @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_Sequence_Informix extends Doctrine_Sequence -{ - -} +{ } \ No newline at end of file diff --git a/lib/Doctrine/Sequence/Mssql.php b/lib/Doctrine/Sequence/Mssql.php index ad0a1d7cb..4daf7c13b 100644 --- a/lib/Doctrine/Sequence/Mssql.php +++ b/lib/Doctrine/Sequence/Mssql.php @@ -23,9 +23,9 @@ Doctrine::autoload('Doctrine_Sequence'); * Doctrine_Sequence_Mssql * * @package Doctrine + * @subpackage Sequence * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -152,4 +152,4 @@ class Doctrine_Sequence_Mssql extends Doctrine_Sequence sequence value, the sequence value was incremented'; return $this->nextId($seqName); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Sequence/Mysql.php b/lib/Doctrine/Sequence/Mysql.php index 7ecb904d8..76c208b5b 100644 --- a/lib/Doctrine/Sequence/Mysql.php +++ b/lib/Doctrine/Sequence/Mysql.php @@ -23,9 +23,9 @@ Doctrine::autoload('Doctrine_Sequence'); * Doctrine_Sequence_Mysql * * @package Doctrine + * @subpackage Sequence * @author Konsta Vesterinen * @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_Sequence_Mysql extends Doctrine_Sequence return (int) $this->conn->fetchOne($query); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Sequence/Oracle.php b/lib/Doctrine/Sequence/Oracle.php index 44a53288f..be9ca48a7 100644 --- a/lib/Doctrine/Sequence/Oracle.php +++ b/lib/Doctrine/Sequence/Oracle.php @@ -23,9 +23,9 @@ Doctrine::autoload('Doctrine_Sequence'); * Doctrine_Sequence_Oracle * * @package Doctrine + * @subpackage Sequence * @author Konsta Vesterinen * @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_Sequence_Oracle extends Doctrine_Sequence return $this->conn->fetchOne($query); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Sequence/Pgsql.php b/lib/Doctrine/Sequence/Pgsql.php index cd222b051..28b29acc8 100644 --- a/lib/Doctrine/Sequence/Pgsql.php +++ b/lib/Doctrine/Sequence/Pgsql.php @@ -23,9 +23,9 @@ Doctrine::autoload('Doctrine_Sequence'); * Doctrine_Sequence_Pgsql * * @package Doctrine + * @subpackage Sequence * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -89,4 +89,4 @@ class Doctrine_Sequence_Pgsql extends Doctrine_Sequence $sequenceName = $this->conn->quoteIdentifier($this->conn->formatter->getSequenceName($seqName), true); return (int) $this->conn->fetchOne('SELECT last_value FROM ' . $sequenceName); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Sequence/Sqlite.php b/lib/Doctrine/Sequence/Sqlite.php index 9639cbd4a..496996d2a 100644 --- a/lib/Doctrine/Sequence/Sqlite.php +++ b/lib/Doctrine/Sequence/Sqlite.php @@ -23,9 +23,9 @@ Doctrine::autoload('Doctrine_Sequence'); * Doctrine_Sequence_Sqlite * * @package Doctrine + * @subpackage Sequence * @author Konsta Vesterinen * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -109,4 +109,4 @@ class Doctrine_Sequence_Sqlite extends Doctrine_Sequence return (int) $this->conn->fetchOne($query); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Table.php b/lib/Doctrine/Table.php index 9651473dc..87ca69a15 100644 --- a/lib/Doctrine/Table.php +++ b/lib/Doctrine/Table.php @@ -25,9 +25,9 @@ * * @author Konsta Vesterinen * @package Doctrine + * @subpackage Table * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -1315,4 +1315,4 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable { return Doctrine_Lib::getTableAsString($this); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Table/Exception.php b/lib/Doctrine/Table/Exception.php index 6577dd658..9a6eb51dc 100644 --- a/lib/Doctrine/Table/Exception.php +++ b/lib/Doctrine/Table/Exception.php @@ -24,8 +24,8 @@ Doctrine::autoload('Doctrine_Exception'); * while there already exists an instance of that table * * @package Doctrine + * @subpackage Table * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -38,4 +38,4 @@ class Doctrine_Table_Exception extends Doctrine_Exception to get on instance of a Doctrine_Table.") { parent::__construct($message); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Table/Repository.php b/lib/Doctrine/Table/Repository.php index 6f5cdbe32..93d84f830 100644 --- a/lib/Doctrine/Table/Repository.php +++ b/lib/Doctrine/Table/Repository.php @@ -25,6 +25,7 @@ * * @author Konsta Vesterinen * @package Doctrine + * @subpackage Table * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @category Object Relational Mapping * @link www.phpdoctrine.com @@ -148,4 +149,4 @@ class Doctrine_Table_Repository implements Countable, IteratorAggregate { $this->table->findAll(); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Table/Repository/Exception.php b/lib/Doctrine/Table/Repository/Exception.php index 6b4ab3a40..5bf102439 100644 --- a/lib/Doctrine/Table/Repository/Exception.php +++ b/lib/Doctrine/Table/Repository/Exception.php @@ -23,6 +23,7 @@ Doctrine::autoload('Doctrine_Exception'); * Doctrine_Table_Repository_Exception * * @package Doctrine + * @subpackage Table * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @category Object Relational Mapping * @link www.phpdoctrine.com @@ -31,4 +32,4 @@ Doctrine::autoload('Doctrine_Exception'); * @author Konsta Vesterinen */ class Doctrine_Table_Repository_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Template.php b/lib/Doctrine/Template.php index 7ec712f27..79ee884d1 100644 --- a/lib/Doctrine/Template.php +++ b/lib/Doctrine/Template.php @@ -23,8 +23,8 @@ Doctrine::autoload('Doctrine_Record_Abstract'); * Doctrine_Template * * @package Doctrine + * @subpackage Template * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -97,4 +97,4 @@ class Doctrine_Template extends Doctrine_Record_Abstract { } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Template/I18n.php b/lib/Doctrine/Template/I18n.php index badc937bf..6a58a248e 100644 --- a/lib/Doctrine/Template/I18n.php +++ b/lib/Doctrine/Template/I18n.php @@ -22,8 +22,8 @@ * Doctrine_Template_I18n * * @package Doctrine + * @subpackage Template * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -69,4 +69,4 @@ class Doctrine_Template_I18n extends Doctrine_Template { return $this->_plugin; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Template/NestedSet.php b/lib/Doctrine/Template/NestedSet.php index 22ca1babb..a7b2b4346 100644 --- a/lib/Doctrine/Template/NestedSet.php +++ b/lib/Doctrine/Template/NestedSet.php @@ -22,8 +22,8 @@ * Doctrine_Template_NestedSet * * @package Doctrine + * @subpackage Template * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -43,4 +43,4 @@ class Doctrine_Template_NestedSet extends Doctrine_Template $this->_table->setOption('treeOptions', $this->_options); $this->_table->setOption('treeImpl', 'NestedSet'); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Template/Searchable.php b/lib/Doctrine/Template/Searchable.php index 038171e24..893a77ef2 100644 --- a/lib/Doctrine/Template/Searchable.php +++ b/lib/Doctrine/Template/Searchable.php @@ -24,9 +24,9 @@ * * @author Konsta Vesterinen * @package Doctrine + * @subpackage Template * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ @@ -60,4 +60,4 @@ class Doctrine_Template_Searchable extends Doctrine_Template $this->addListener(new Doctrine_Search_Listener($this->_search)); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Template/Taggable.php b/lib/Doctrine/Template/Taggable.php index bc7f4c5f8..73adaf1d7 100644 --- a/lib/Doctrine/Template/Taggable.php +++ b/lib/Doctrine/Template/Taggable.php @@ -24,13 +24,11 @@ * * @author Konsta Vesterinen * @package Doctrine + * @subpackage Template * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 */ class Doctrine_Template_Taggable extends Doctrine_Template -{ - -} +{ } \ No newline at end of file diff --git a/lib/Doctrine/Template/Versionable.php b/lib/Doctrine/Template/Versionable.php index 46bf84f72..df715d6af 100644 --- a/lib/Doctrine/Template/Versionable.php +++ b/lib/Doctrine/Template/Versionable.php @@ -22,8 +22,8 @@ * Doctrine_Template_Versionable * * @package Doctrine + * @subpackage Template * @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_Template_Versionable extends Doctrine_Template { return $this->_auditLog; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Tokenizer.php b/lib/Doctrine/Tokenizer.php index a48e6c8bd..eaee80ded 100644 --- a/lib/Doctrine/Tokenizer.php +++ b/lib/Doctrine/Tokenizer.php @@ -23,8 +23,8 @@ * Doctrine_Tokenizer * * @package Doctrine + * @subpackage Tokenizer * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision: 1080 $ @@ -314,4 +314,4 @@ class Doctrine_Tokenizer return $term; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Transaction.php b/lib/Doctrine/Transaction.php index 4c82f107a..b641fc141 100644 --- a/lib/Doctrine/Transaction.php +++ b/lib/Doctrine/Transaction.php @@ -27,7 +27,7 @@ Doctrine::autoload('Doctrine_Connection_Module'); * @author Lukas Smith (PEAR MDB2 library) * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @package Doctrine - * @category Object Relational Mapping + * @subpackage Transaction * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -426,4 +426,4 @@ class Doctrine_Transaction extends Doctrine_Connection_Module { throw new Doctrine_Transaction_Exception('Fetching transaction isolation level not supported by this driver.'); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Transaction/Exception.php b/lib/Doctrine/Transaction/Exception.php index 98a071f36..792698119 100644 --- a/lib/Doctrine/Transaction/Exception.php +++ b/lib/Doctrine/Transaction/Exception.php @@ -23,6 +23,7 @@ Doctrine::autoload('Doctrine_Exception'); * Doctrine_Transaction_Exception * * @package Doctrine + * @subpackage Transaction * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @author Konsta Vesterinen * @since 1.0 @@ -31,4 +32,4 @@ Doctrine::autoload('Doctrine_Exception'); * @link www.phpdoctrine.com */ class Doctrine_Transaction_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Transaction/Firebird.php b/lib/Doctrine/Transaction/Firebird.php index 946e0c788..50f846425 100644 --- a/lib/Doctrine/Transaction/Firebird.php +++ b/lib/Doctrine/Transaction/Firebird.php @@ -25,7 +25,7 @@ Doctrine::autoload('Doctrine_Transaction'); * @author Lukas Smith (PEAR MDB2 library) * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @package Doctrine - * @category Object Relational Mapping + * @subpackage Transaction * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -134,4 +134,4 @@ class Doctrine_Transaction_Firebird extends Doctrine_Transaction $this->conn->execute($query); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Transaction/Informix.php b/lib/Doctrine/Transaction/Informix.php index 4685aa377..e299bfde6 100644 --- a/lib/Doctrine/Transaction/Informix.php +++ b/lib/Doctrine/Transaction/Informix.php @@ -25,10 +25,10 @@ Doctrine::autoload('Doctrine_Transaction'); * @author Lukas Smith (PEAR MDB2 library) * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @package Doctrine - * @category Object Relational Mapping + * @subpackage Transaction * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ */ class Doctrine_Transaction_Informix extends Doctrine_Transaction -{ } +{ } \ No newline at end of file diff --git a/lib/Doctrine/Transaction/Mock.php b/lib/Doctrine/Transaction/Mock.php index 7f337c496..1ee643189 100644 --- a/lib/Doctrine/Transaction/Mock.php +++ b/lib/Doctrine/Transaction/Mock.php @@ -27,11 +27,10 @@ Doctrine::autoload('Doctrine_Transaction'); * @author Lukas Smith (PEAR MDB2 library) * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @package Doctrine - * @category Object Relational Mapping + * @subpackage Transaction * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ */ class Doctrine_Transaction_Mock extends Doctrine_Transaction -{ -} +{ } \ No newline at end of file diff --git a/lib/Doctrine/Transaction/Mssql.php b/lib/Doctrine/Transaction/Mssql.php index f0e32113b..bd5008379 100644 --- a/lib/Doctrine/Transaction/Mssql.php +++ b/lib/Doctrine/Transaction/Mssql.php @@ -25,7 +25,7 @@ Doctrine::autoload('Doctrine_Transaction'); * @author Lukas Smith (PEAR MDB2 library) * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @package Doctrine - * @category Object Relational Mapping + * @subpackage Transaction * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -65,4 +65,4 @@ class Doctrine_Transaction_Mssql extends Doctrine_Transaction $this->conn->execute($query); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Transaction/Mysql.php b/lib/Doctrine/Transaction/Mysql.php index 534a05056..0d55b8ab1 100644 --- a/lib/Doctrine/Transaction/Mysql.php +++ b/lib/Doctrine/Transaction/Mysql.php @@ -25,7 +25,7 @@ Doctrine::autoload('Doctrine_Transaction'); * @author Lukas Smith (PEAR MDB2 library) * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @package Doctrine - * @category Object Relational Mapping + * @subpackage Transaction * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -109,4 +109,4 @@ class Doctrine_Transaction_Mysql extends Doctrine_Transaction { return $this->conn->fetchOne('SELECT @@tx_isolation'); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Transaction/Oracle.php b/lib/Doctrine/Transaction/Oracle.php index 0d0654a06..449e84e6a 100644 --- a/lib/Doctrine/Transaction/Oracle.php +++ b/lib/Doctrine/Transaction/Oracle.php @@ -25,7 +25,7 @@ Doctrine::autoload('Doctrine_Transaction'); * @author Lukas Smith (PEAR MDB2 library) * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @package Doctrine - * @category Object Relational Mapping + * @subpackage Transaction * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -100,4 +100,4 @@ class Doctrine_Transaction_Oracle extends Doctrine_Transaction $query = 'ALTER SESSION ISOLATION LEVEL ' . $isolation; return $this->conn->execute($query); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Transaction/Pgsql.php b/lib/Doctrine/Transaction/Pgsql.php index 568b640ea..77d43f027 100644 --- a/lib/Doctrine/Transaction/Pgsql.php +++ b/lib/Doctrine/Transaction/Pgsql.php @@ -26,7 +26,7 @@ Doctrine::autoload('Doctrine_Transaction'); * @author Lukas Smith (PEAR MDB2 library) * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @package Doctrine - * @category Object Relational Mapping + * @subpackage Transaction * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -99,4 +99,4 @@ class Doctrine_Transaction_Pgsql extends Doctrine_Transaction $query = 'SET SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL ' . $isolation; return $this->conn->execute($query); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Transaction/Sqlite.php b/lib/Doctrine/Transaction/Sqlite.php index 76fa2e3ae..77ceefc6c 100644 --- a/lib/Doctrine/Transaction/Sqlite.php +++ b/lib/Doctrine/Transaction/Sqlite.php @@ -25,7 +25,7 @@ Doctrine::autoload('Doctrine_Transaction'); * @author Lukas Smith (PEAR MDB2 library) * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @package Doctrine - * @category Object Relational Mapping + * @subpackage Transaction * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -63,4 +63,4 @@ class Doctrine_Transaction_Sqlite extends Doctrine_Transaction return $this->conn->execute($query); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Tree.php b/lib/Doctrine/Tree.php index 46db570c6..4e3b927e2 100644 --- a/lib/Doctrine/Tree.php +++ b/lib/Doctrine/Tree.php @@ -22,8 +22,8 @@ * Doctrine_Tree * * @package Doctrine + * @subpackage Tree * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -127,4 +127,4 @@ class Doctrine_Tree { return $this->_baseComponent; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Tree/AdjacencyList.php b/lib/Doctrine/Tree/AdjacencyList.php index 25957b004..138c9a094 100644 --- a/lib/Doctrine/Tree/AdjacencyList.php +++ b/lib/Doctrine/Tree/AdjacencyList.php @@ -22,12 +22,12 @@ * Doctrine_Tree_AdjacencyList * * @package Doctrine + * @subpackage Tree * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ * @author Joe Simms */ abstract class Doctrine_Tree_AdjacencyList extends Doctrine_Tree implements Doctrine_Tree_Interface -{} +{ } \ No newline at end of file diff --git a/lib/Doctrine/Tree/Exception.php b/lib/Doctrine/Tree/Exception.php index 423d0df0c..5bba42f31 100644 --- a/lib/Doctrine/Tree/Exception.php +++ b/lib/Doctrine/Tree/Exception.php @@ -22,12 +22,12 @@ * Doctrine_Tree_Exception * * @package Doctrine + * @subpackage Tree * @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 */ class Doctrine_Tree_Exception extends Doctrine_Exception -{} +{ } \ No newline at end of file diff --git a/lib/Doctrine/Tree/Interface.php b/lib/Doctrine/Tree/Interface.php index 7c365fee5..8feeb4fb7 100644 --- a/lib/Doctrine/Tree/Interface.php +++ b/lib/Doctrine/Tree/Interface.php @@ -22,8 +22,8 @@ * Doctrine_Tree_Interface * * @package Doctrine + * @subpackage Tree * @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 @@ interface Doctrine_Tree_Interface { * @return iterator instance of Doctrine_Node__PreOrderIterator */ public function fetchBranch($pk, $options = array()); -} +} \ No newline at end of file diff --git a/lib/Doctrine/Tree/MaterializedPath.php b/lib/Doctrine/Tree/MaterializedPath.php index 79c661471..b1fc807b7 100644 --- a/lib/Doctrine/Tree/MaterializedPath.php +++ b/lib/Doctrine/Tree/MaterializedPath.php @@ -22,12 +22,12 @@ * Doctrine_Tree_MaterializedPath * * @package Doctrine + * @subpackage Tree * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ * @author Joe Simms */ abstract class Doctrine_Tree_MaterializedPath extends Doctrine_Tree implements Doctrine_Tree_Interface -{} +{ } \ No newline at end of file diff --git a/lib/Doctrine/Tree/NestedSet.php b/lib/Doctrine/Tree/NestedSet.php index ef62b1118..cd7d22f22 100644 --- a/lib/Doctrine/Tree/NestedSet.php +++ b/lib/Doctrine/Tree/NestedSet.php @@ -22,8 +22,8 @@ * Doctrine_Tree_NestedSet * * @package Doctrine + * @subpackage Tree * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -352,4 +352,4 @@ class Doctrine_Tree_NestedSet extends Doctrine_Tree implements Doctrine_Tree_Int return $tree; } */ -} +} \ No newline at end of file diff --git a/lib/Doctrine/Util.php b/lib/Doctrine/Util.php index d2c374cbc..7f9ad5719 100644 --- a/lib/Doctrine/Util.php +++ b/lib/Doctrine/Util.php @@ -23,6 +23,7 @@ Doctrine::autoload('Doctrine_Connection_Module'); * Doctrine_Util * * @package Doctrine + * @subpackage Util * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @category Object Relational Mapping * @link www.phpdoctrine.com @@ -31,6 +32,4 @@ Doctrine::autoload('Doctrine_Connection_Module'); * @author Konsta Vesterinen */ class Doctrine_Util extends Doctrine_Connection_Module -{ - -} +{ } \ No newline at end of file diff --git a/lib/Doctrine/Validator.php b/lib/Doctrine/Validator.php index e2ed5284e..b86f9a33a 100644 --- a/lib/Doctrine/Validator.php +++ b/lib/Doctrine/Validator.php @@ -23,8 +23,8 @@ * Doctrine_Validator performs validations in record properties * * @package Doctrine + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @category Object Relational Mapping * @link www.phpdoctrine.com * @since 1.0 * @version $Revision$ @@ -317,4 +317,4 @@ class Doctrine_Validator extends Doctrine_Object return $type; } }*/ -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Country.php b/lib/Doctrine/Validator/Country.php index 22c901cf9..b88e94db1 100644 --- a/lib/Doctrine/Validator/Country.php +++ b/lib/Doctrine/Validator/Country.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Country * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 @@ -297,5 +297,4 @@ class Doctrine_Validator_Country return isset(self::$countries[$value]); } - -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Creditcard.php b/lib/Doctrine/Validator/Creditcard.php index 56e5b80a1..e9b5fb502 100644 --- a/lib/Doctrine/Validator/Creditcard.php +++ b/lib/Doctrine/Validator/Creditcard.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Creditcard * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 @@ -44,4 +44,4 @@ class Doctrine_Validator_Creditcard return preg_match('#^((4\d{3})|(5[1-5]\d{2})|(6011)|(7\d{3}))-?\d{4}-?\d{4}-?\d{4}|3[4,7]\d{13}$#', $value); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Date.php b/lib/Doctrine/Validator/Date.php index 32cf7a2b8..9175c155d 100644 --- a/lib/Doctrine/Validator/Date.php +++ b/lib/Doctrine/Validator/Date.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Date * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 @@ -50,4 +50,4 @@ class Doctrine_Validator_Date } return checkdate($e[1], $e[2], $e[0]); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Driver.php b/lib/Doctrine/Validator/Driver.php index 8e6a7d17e..a11cff922 100644 --- a/lib/Doctrine/Validator/Driver.php +++ b/lib/Doctrine/Validator/Driver.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Driver * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 @@ -107,4 +107,4 @@ class Doctrine_Validator_Driver { return $this->_args; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Email.php b/lib/Doctrine/Validator/Email.php index 2ae67514e..aa0d3b91e 100644 --- a/lib/Doctrine/Validator/Email.php +++ b/lib/Doctrine/Validator/Email.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Email * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 @@ -75,5 +75,4 @@ class Doctrine_Validator_Email return (bool) preg_match("!^$addrSpec$!D", $value); } - -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/ErrorStack.php b/lib/Doctrine/Validator/ErrorStack.php index 7919fa77e..ab0d03fa6 100644 --- a/lib/Doctrine/Validator/ErrorStack.php +++ b/lib/Doctrine/Validator/ErrorStack.php @@ -21,11 +21,11 @@ /** * Doctrine_Validator_ErrorStack * + * @package Doctrine + * @subpackage Validator * @author Konsta Vesterinen * @author Roman Borschel * @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$ @@ -138,4 +138,4 @@ class Doctrine_Validator_ErrorStack extends Doctrine_Access implements Countable public function getClassname(){ return $this->classname; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Exception.php b/lib/Doctrine/Validator/Exception.php index 374b8f1f7..1cd7d3c13 100644 --- a/lib/Doctrine/Validator/Exception.php +++ b/lib/Doctrine/Validator/Exception.php @@ -22,10 +22,10 @@ Doctrine::autoload('Doctrine_Exception'); /** * Doctrine_Validator_Exception * + * @package Doctrine + * @subpackage Validator * @author Konsta Vesterinen * @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$ @@ -89,10 +89,10 @@ class Doctrine_Validator_Exception extends Doctrine_Exception implements Countab * @param mixed Either string with function name or array with object, * functionname. See call_user_func in php manual for more inforamtion */ - public function inspect($function){ + public function inspect($function) + { foreach ($this->invalid as $record) { call_user_func($function, $record->getErrorStack()); } } - -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Future.php b/lib/Doctrine/Validator/Future.php index 76f4cc63a..875253200 100644 --- a/lib/Doctrine/Validator/Future.php +++ b/lib/Doctrine/Validator/Future.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Future * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 diff --git a/lib/Doctrine/Validator/Htmlcolor.php b/lib/Doctrine/Validator/Htmlcolor.php index 9d72f9379..219359486 100644 --- a/lib/Doctrine/Validator/Htmlcolor.php +++ b/lib/Doctrine/Validator/Htmlcolor.php @@ -23,7 +23,7 @@ * Doctrine_Validator_HtmlColor * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 @@ -45,4 +45,4 @@ class Doctrine_Validator_HtmlColor } return true; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Ip.php b/lib/Doctrine/Validator/Ip.php index d10fc11bf..31d8125cb 100644 --- a/lib/Doctrine/Validator/Ip.php +++ b/lib/Doctrine/Validator/Ip.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Ip * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 @@ -42,4 +42,4 @@ class Doctrine_Validator_Ip { return (bool) ip2long(str_replace("\0", '', $value)); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Minlength.php b/lib/Doctrine/Validator/Minlength.php index 999c8c1de..0b2f1bcac 100644 --- a/lib/Doctrine/Validator/Minlength.php +++ b/lib/Doctrine/Validator/Minlength.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Regexp * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 @@ -46,5 +46,4 @@ class Doctrine_Validator_Minlength return true; } -} - +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Nospace.php b/lib/Doctrine/Validator/Nospace.php index ff8f72f31..5e0ba613b 100644 --- a/lib/Doctrine/Validator/Nospace.php +++ b/lib/Doctrine/Validator/Nospace.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Nospace * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 @@ -42,4 +42,4 @@ class Doctrine_Validator_Nospace extends Doctrine_Validator_Driver { return ($value === null || ! preg_match('/\s\t\r\n/', $value)); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Notblank.php b/lib/Doctrine/Validator/Notblank.php index a2bc3ef9e..00f6c1267 100644 --- a/lib/Doctrine/Validator/Notblank.php +++ b/lib/Doctrine/Validator/Notblank.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Notblank * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 @@ -43,4 +43,4 @@ class Doctrine_Validator_Notblank extends Doctrine_Validator_Driver { return (trim($value) !== '' && $value !== null); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Notnull.php b/lib/Doctrine/Validator/Notnull.php index 376e6d20a..13d380670 100644 --- a/lib/Doctrine/Validator/Notnull.php +++ b/lib/Doctrine/Validator/Notnull.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Notnull * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 @@ -42,4 +42,4 @@ class Doctrine_Validator_Notnull extends Doctrine_Validator_Driver { return ($value !== null); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Past.php b/lib/Doctrine/Validator/Past.php index 8cda1607c..c41d67b70 100644 --- a/lib/Doctrine/Validator/Past.php +++ b/lib/Doctrine/Validator/Past.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Past * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 diff --git a/lib/Doctrine/Validator/Range.php b/lib/Doctrine/Validator/Range.php index 4c429e646..479408a6d 100644 --- a/lib/Doctrine/Validator/Range.php +++ b/lib/Doctrine/Validator/Range.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Range * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 @@ -48,4 +48,4 @@ class Doctrine_Validator_Range } return true; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Regexp.php b/lib/Doctrine/Validator/Regexp.php index 742440099..e00d49e3b 100644 --- a/lib/Doctrine/Validator/Regexp.php +++ b/lib/Doctrine/Validator/Regexp.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Regexp * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 @@ -59,4 +59,4 @@ class Doctrine_Validator_Regexp return false; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Unique.php b/lib/Doctrine/Validator/Unique.php index 65f383d38..dce2f0164 100644 --- a/lib/Doctrine/Validator/Unique.php +++ b/lib/Doctrine/Validator/Unique.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Unique * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 @@ -68,4 +68,4 @@ class Doctrine_Validator_Unique return ( ! is_array($stmt->fetch())); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Unsigned.php b/lib/Doctrine/Validator/Unsigned.php index 27cd5dfc4..267419747 100644 --- a/lib/Doctrine/Validator/Unsigned.php +++ b/lib/Doctrine/Validator/Unsigned.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Unsigned * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 @@ -47,4 +47,4 @@ class Doctrine_Validator_Unsigned } return true; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Validator/Usstate.php b/lib/Doctrine/Validator/Usstate.php index a9397fbce..01bebd4bc 100644 --- a/lib/Doctrine/Validator/Usstate.php +++ b/lib/Doctrine/Validator/Usstate.php @@ -23,7 +23,7 @@ * Doctrine_Validator_Usstate * * @package Doctrine - * @category Object Relational Mapping + * @subpackage Validator * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.phpdoctrine.com * @since 1.0 @@ -32,8 +32,8 @@ */ class Doctrine_Validator_Usstate { - private static $states = array ( - 'AK' => true, + private static $states = array( + 'AK' => true, 'AL' => true, 'AR' => true, 'AZ' => true, @@ -84,8 +84,8 @@ class Doctrine_Validator_Usstate 'VT' => true, 'WA' => true, 'WI' => true, - 'WV' => true, - 'WY' => true + 'WV' => true, + 'WY' => true ); public function getStates() { @@ -101,4 +101,4 @@ class Doctrine_Validator_Usstate { return isset(self::$states[$value]); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/View.php b/lib/Doctrine/View.php index 68b3812ae..76f0cacea 100644 --- a/lib/Doctrine/View.php +++ b/lib/Doctrine/View.php @@ -25,6 +25,7 @@ * * @author Konsta Vesterinen * @package Doctrine + * @subpackage View * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @category Object Relational Mapping * @link www.phpdoctrine.com @@ -153,4 +154,4 @@ class Doctrine_View { return sprintf(self::SELECT, $this->name); } -} +} \ No newline at end of file diff --git a/lib/Doctrine/View/Exception.php b/lib/Doctrine/View/Exception.php index ecfd5494d..dc218546b 100644 --- a/lib/Doctrine/View/Exception.php +++ b/lib/Doctrine/View/Exception.php @@ -22,13 +22,13 @@ Doctrine::autoload('Doctrine_View_Exception'); /** * Doctrine_Validator_Exception * + * @package Doctrine + * @subpackage View * @author Konsta Vesterinen * @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$ */ class Doctrine_View_Exception extends Doctrine_Exception -{ } +{ } \ No newline at end of file diff --git a/playground/index.php b/playground/index.php index 84188199f..894636259 100644 --- a/playground/index.php +++ b/playground/index.php @@ -1,27 +1,20 @@ $tables); - - $server = Doctrine_Resource_Server::getInstance($name, $config); - $server->run($_REQUEST); - -} else { - $url = 'http://localhost/~jwage/doctrine_trunk/playground/index.php?server'; - $config = array('format' => 'json'); - - // Instantiate a new client - $client = Doctrine_Resource_Client::getInstance($url, $config); - - $query = new Doctrine_Resource_Query(); - - $users = $query->from('User u, u.Phonenumber p, u.Email e, u.Address a')->execute(); - - print_r($users->toArray(true)); -} \ No newline at end of file +$dsn = 'mysql://jwage:elite1baller@localhost/doctrine_playground'; +$conn = Doctrine_Manager::connection($dsn); +$manager = Doctrine_Manager::getInstance(); + +$models = Doctrine::loadModels('test_models'); + +$manager->setAttribute(Doctrine::ATTR_EXPORT, Doctrine::EXPORT_ALL); + +$conn->export->exportClasses($models); + +$query = new Doctrine_Search_Query('Article'); + +$query->search('test'); + +$results = $query->execute(); + +print_r($results); \ No newline at end of file