From 44820ec14a0339e4742d2068b0d658e37a304c65 Mon Sep 17 00:00:00 2001 From: "Jonathan.Wage" Date: Sat, 5 Jan 2008 07:39:25 +0000 Subject: [PATCH] Preparation for new organization of code in to sub packages. Changed autoload() to work with new structure. --- lib/Doctrine.php | 389 ++++++++++-------- lib/{Doctrine => orm}/Access.php | 0 lib/{Doctrine => orm}/Adapter.php | 0 lib/{Doctrine => orm}/Adapter/Db2.php | 0 .../Adapter/Db2/Exception.php | 0 lib/{Doctrine => orm}/Adapter/Exception.php | 0 lib/{Doctrine => orm}/Adapter/Interface.php | 0 lib/{Doctrine => orm}/Adapter/Mock.php | 0 lib/{Doctrine => orm}/Adapter/Mysqli.php | 0 lib/{Doctrine => orm}/Adapter/Oracle.php | 0 lib/{Doctrine => orm}/Adapter/Resource.php | 0 lib/{Doctrine => orm}/Adapter/Statement.php | 0 .../Adapter/Statement/Interface.php | 0 .../Adapter/Statement/Mock.php | 0 lib/{Doctrine => orm}/AuditLog.php | 0 lib/{Doctrine => orm}/AuditLog/Listener.php | 0 lib/{Doctrine => orm}/Cache.php | 0 lib/{Doctrine => orm}/Cache/Apc.php | 0 lib/{Doctrine => orm}/Cache/Array.php | 0 lib/{Doctrine => orm}/Cache/Db.php | 0 lib/{Doctrine => orm}/Cache/Driver.php | 0 lib/{Doctrine => orm}/Cache/Exception.php | 0 lib/{Doctrine => orm}/Cache/Interface.php | 0 lib/{Doctrine => orm}/Cache/Memcache.php | 0 lib/{Doctrine => orm}/Cache/Xcache.php | 0 lib/{Doctrine => orm}/Cli.php | 0 .../Cli/AnsiColorFormatter.php | 0 lib/{Doctrine => orm}/Cli/Exception.php | 0 lib/{Doctrine => orm}/Cli/Formatter.php | 0 lib/{Doctrine => orm}/Collection.php | 0 .../Collection/Exception.php | 0 lib/{Doctrine => orm}/Collection/Iterator.php | 0 .../Collection/Iterator/Expandable.php | 0 .../Collection/Iterator/Normal.php | 0 .../Collection/Iterator/Offset.php | 0 lib/{Doctrine => orm}/Collection/Offset.php | 0 lib/{Doctrine => orm}/Column.php | 0 lib/{Doctrine => orm}/Compiler.php | 0 lib/{Doctrine => orm}/Compiler/Exception.php | 0 lib/{Doctrine => orm}/Configurable.php | 0 lib/{Doctrine => orm}/Connection.php | 0 lib/{Doctrine => orm}/Connection/Common.php | 0 lib/{Doctrine => orm}/Connection/Db2.php | 0 .../Connection/Exception.php | 0 lib/{Doctrine => orm}/Connection/Firebird.php | 0 .../Connection/Firebird/Exception.php | 0 lib/{Doctrine => orm}/Connection/Informix.php | 0 .../Connection/Informix/Exception.php | 0 lib/{Doctrine => orm}/Connection/Mock.php | 0 lib/{Doctrine => orm}/Connection/Module.php | 0 lib/{Doctrine => orm}/Connection/Mssql.php | 0 .../Connection/Mssql/Exception.php | 0 lib/{Doctrine => orm}/Connection/Mysql.php | 0 .../Connection/Mysql/Exception.php | 0 lib/{Doctrine => orm}/Connection/Oracle.php | 0 .../Connection/Oracle/Exception.php | 0 lib/{Doctrine => orm}/Connection/Pgsql.php | 0 .../Connection/Pgsql/Exception.php | 0 lib/{Doctrine => orm}/Connection/Profiler.php | 0 .../Connection/Profiler/Exception.php | 0 lib/{Doctrine => orm}/Connection/Sqlite.php | 0 .../Connection/Sqlite/Exception.php | 0 .../Connection/Statement.php | 0 .../Connection/UnitOfWork.php | 0 lib/{Doctrine => orm}/Data.php | 0 lib/{Doctrine => orm}/Data/Exception.php | 0 lib/{Doctrine => orm}/Data/Export.php | 0 lib/{Doctrine => orm}/Data/Import.php | 0 lib/{Doctrine => orm}/DataDict.php | 0 lib/{Doctrine => orm}/DataDict/Exception.php | 0 lib/{Doctrine => orm}/DataDict/Firebird.php | 0 lib/{Doctrine => orm}/DataDict/Informix.php | 0 lib/{Doctrine => orm}/DataDict/Mssql.php | 0 lib/{Doctrine => orm}/DataDict/Mysql.php | 0 lib/{Doctrine => orm}/DataDict/Oracle.php | 0 lib/{Doctrine => orm}/DataDict/Pgsql.php | 0 lib/{Doctrine => orm}/DataDict/Sqlite.php | 0 lib/{Doctrine => orm}/DataType.php | 0 lib/{Doctrine => orm}/Db.php | 0 lib/{Doctrine => orm}/Event.php | 0 lib/{Doctrine => orm}/EventListener.php | 0 lib/{Doctrine => orm}/EventListener/Chain.php | 0 .../EventListener/Exception.php | 0 .../EventListener/Interface.php | 0 lib/{Doctrine => orm}/Exception.php | 0 lib/{Doctrine => orm}/Export.php | 0 lib/{Doctrine => orm}/Export/Exception.php | 0 lib/{Doctrine => orm}/Export/Firebird.php | 0 lib/{Doctrine => orm}/Export/Frontbase.php | 0 lib/{Doctrine => orm}/Export/Mssql.php | 0 lib/{Doctrine => orm}/Export/Mysql.php | 0 lib/{Doctrine => orm}/Export/Oracle.php | 0 lib/{Doctrine => orm}/Export/Pgsql.php | 0 lib/{Doctrine => orm}/Export/Reporter.php | 0 lib/{Doctrine => orm}/Export/Schema.php | 0 lib/{Doctrine => orm}/Export/Sqlite.php | 0 lib/{Doctrine => orm}/Expression.php | 0 lib/{Doctrine => orm}/Expression/Driver.php | 0 .../Expression/Exception.php | 0 lib/{Doctrine => orm}/Expression/Firebird.php | 0 lib/{Doctrine => orm}/Expression/Informix.php | 0 lib/{Doctrine => orm}/Expression/Mock.php | 0 lib/{Doctrine => orm}/Expression/Mssql.php | 0 lib/{Doctrine => orm}/Expression/Mysql.php | 0 lib/{Doctrine => orm}/Expression/Oracle.php | 0 lib/{Doctrine => orm}/Expression/Pgsql.php | 0 lib/{Doctrine => orm}/Expression/Sqlite.php | 0 lib/{Doctrine => orm}/File.php | 0 lib/{Doctrine => orm}/File/Index.php | 0 lib/{Doctrine => orm}/FileFinder.php | 0 .../FileFinder/GlobToRegex.php | 0 .../FileFinder/NumberCompare.php | 0 lib/{Doctrine => orm}/Formatter.php | 0 lib/{Doctrine => orm}/Hook.php | 0 lib/{Doctrine => orm}/Hook/Equal.php | 0 lib/{Doctrine => orm}/Hook/Integer.php | 0 lib/{Doctrine => orm}/Hook/Parser.php | 0 lib/{Doctrine => orm}/Hook/Parser/Complex.php | 0 lib/{Doctrine => orm}/Hook/WordLike.php | 0 lib/{Doctrine => orm}/Hydrator.php | 0 lib/{Doctrine => orm}/Hydrator/Abstract.php | 0 .../Hydrator/ArrayDriver.php | 0 lib/{Doctrine => orm}/Hydrator/Exception.php | 0 .../Hydrator/RecordDriver.php | 0 lib/{Doctrine => orm}/I18n.php | 0 lib/{Doctrine => orm}/I18n/Exception.php | 0 lib/{Doctrine => orm}/Import.php | 0 lib/{Doctrine => orm}/Import/Builder.php | 0 .../Import/Builder/BaseClass.php | 0 .../Import/Builder/Exception.php | 0 lib/{Doctrine => orm}/Import/Exception.php | 0 lib/{Doctrine => orm}/Import/Firebird.php | 0 lib/{Doctrine => orm}/Import/Informix.php | 0 lib/{Doctrine => orm}/Import/Mssql.php | 0 lib/{Doctrine => orm}/Import/Mysql.php | 0 lib/{Doctrine => orm}/Import/Oracle.php | 0 lib/{Doctrine => orm}/Import/Pgsql.php | 0 lib/{Doctrine => orm}/Import/Reader.php | 0 lib/{Doctrine => orm}/Import/Reader/Db.php | 0 .../Import/Reader/Exception.php | 0 .../Import/Reader/Propel.php | 0 lib/{Doctrine => orm}/Import/Schema.php | 0 lib/{Doctrine => orm}/Import/Sqlite.php | 0 lib/{Doctrine => orm}/Inflector.php | 0 lib/{Doctrine => orm}/IntegrityMapper.php | 0 lib/{Doctrine => orm}/Lib.php | 0 lib/{Doctrine => orm}/Locator.php | 0 lib/{Doctrine => orm}/Locator/Exception.php | 0 lib/{Doctrine => orm}/Locator/Injectable.php | 0 lib/{Doctrine => orm}/Locking/Exception.php | 0 .../Locking/Manager/Pessimistic.php | 0 lib/{Doctrine => orm}/Log.php | 0 lib/{Doctrine => orm}/Log/Exception.php | 0 .../Log/Filter/Interface.php | 0 lib/{Doctrine => orm}/Log/Filter/Message.php | 0 lib/{Doctrine => orm}/Log/Filter/Priority.php | 0 lib/{Doctrine => orm}/Log/Filter/Suppress.php | 0 .../Log/Formatter/Interface.php | 0 .../Log/Formatter/Simple.php | 0 lib/{Doctrine => orm}/Log/Formatter/Xml.php | 0 lib/{Doctrine => orm}/Log/Writer/Abstract.php | 0 lib/{Doctrine => orm}/Log/Writer/Db.php | 0 lib/{Doctrine => orm}/Log/Writer/Mock.php | 0 lib/{Doctrine => orm}/Log/Writer/Null.php | 0 lib/{Doctrine => orm}/Log/Writer/Stream.php | 0 lib/{Doctrine => orm}/Manager.php | 0 lib/{Doctrine => orm}/Manager/Exception.php | 0 lib/{Doctrine => orm}/Migration.php | 0 lib/{Doctrine => orm}/Migration/Builder.php | 0 lib/{Doctrine => orm}/Migration/Exception.php | 0 .../IrreversibleMigrationException.php | 0 lib/{Doctrine => orm}/Migration/Process.php | 0 lib/{Doctrine => orm}/Node.php | 0 lib/{Doctrine => orm}/Node/AdjacencyList.php | 0 .../Node/AdjacencyList/LevelOrderIterator.php | 0 .../Node/AdjacencyList/PostOrderIterator.php | 0 .../Node/AdjacencyList/PreOrderIterator.php | 0 lib/{Doctrine => orm}/Node/Exception.php | 0 lib/{Doctrine => orm}/Node/Interface.php | 0 .../Node/MaterializedPath.php | 0 .../MaterializedPath/LevelOrderIterator.php | 0 .../MaterializedPath/PostOrderIterator.php | 0 .../MaterializedPath/PreOrderIterator.php | 0 lib/{Doctrine => orm}/Node/NestedSet.php | 0 .../Node/NestedSet/LevelOrderIterator.php | 0 .../Node/NestedSet/PostOrderIterator.php | 0 .../Node/NestedSet/PreOrderIterator.php | 0 lib/{Doctrine => orm}/Null.php | 0 lib/{Doctrine => orm}/Overloadable.php | 0 lib/{Doctrine => orm}/Pager.php | 0 lib/{Doctrine => orm}/Pager/Exception.php | 0 lib/{Doctrine => orm}/Pager/Layout.php | 0 lib/{Doctrine => orm}/Pager/Range.php | 0 lib/{Doctrine => orm}/Pager/Range/Jumping.php | 0 lib/{Doctrine => orm}/Pager/Range/Sliding.php | 0 lib/{Doctrine => orm}/Parser.php | 0 lib/{Doctrine => orm}/Parser/Exception.php | 0 lib/{Doctrine => orm}/Parser/Json.php | 0 lib/{Doctrine => orm}/Parser/Serialize.php | 0 lib/{Doctrine => orm}/Parser/Xml.php | 0 lib/{Doctrine => orm}/Parser/Yml.php | 0 lib/{Doctrine => orm}/Parser/spyc.php | 0 lib/{Doctrine => orm}/Query.php | 0 lib/{Doctrine => orm}/Query/Abstract.php | 0 lib/{Doctrine => orm}/Query/Check.php | 0 lib/{Doctrine => orm}/Query/Condition.php | 0 lib/{Doctrine => orm}/Query/Exception.php | 0 lib/{Doctrine => orm}/Query/Filter.php | 0 lib/{Doctrine => orm}/Query/Filter/Chain.php | 0 .../Query/Filter/Interface.php | 0 lib/{Doctrine => orm}/Query/From.php | 0 lib/{Doctrine => orm}/Query/Groupby.php | 0 lib/{Doctrine => orm}/Query/Having.php | 0 lib/{Doctrine => orm}/Query/JoinCondition.php | 0 lib/{Doctrine => orm}/Query/Limit.php | 0 lib/{Doctrine => orm}/Query/Offset.php | 0 lib/{Doctrine => orm}/Query/Orderby.php | 0 lib/{Doctrine => orm}/Query/Parser.php | 0 lib/{Doctrine => orm}/Query/Part.php | 0 lib/{Doctrine => orm}/Query/Registry.php | 0 .../Query/Registry/Exception.php | 0 lib/{Doctrine => orm}/Query/Select.php | 0 lib/{Doctrine => orm}/Query/Set.php | 0 lib/{Doctrine => orm}/Query/Tokenizer.php | 0 .../Query/Tokenizer/Exception.php | 0 lib/{Doctrine => orm}/Query/Where.php | 0 lib/{Doctrine => orm}/RawSql.php | 0 lib/{Doctrine => orm}/RawSql/Exception.php | 0 lib/{Doctrine => orm}/Record.php | 0 lib/{Doctrine => orm}/Record/Abstract.php | 0 lib/{Doctrine => orm}/Record/Exception.php | 0 lib/{Doctrine => orm}/Record/Filter.php | 0 .../Record/Filter/Compound.php | 0 .../Record/Filter/Standard.php | 0 lib/{Doctrine => orm}/Record/Generator.php | 0 lib/{Doctrine => orm}/Record/Iterator.php | 0 lib/{Doctrine => orm}/Record/Listener.php | 0 .../Record/Listener/Chain.php | 0 .../Record/Listener/Interface.php | 0 .../Record/State/Exception.php | 0 lib/{Doctrine => orm}/Relation.php | 0 .../Relation/Association.php | 0 .../Relation/Association/Self.php | 0 lib/{Doctrine => orm}/Relation/Exception.php | 0 lib/{Doctrine => orm}/Relation/ForeignKey.php | 0 lib/{Doctrine => orm}/Relation/LocalKey.php | 0 lib/{Doctrine => orm}/Relation/Nest.php | 0 lib/{Doctrine => orm}/Relation/Parser.php | 0 .../Relation/Parser/Exception.php | 0 lib/{Doctrine => orm}/Search.php | 0 lib/{Doctrine => orm}/Search/Analyzer.php | 0 .../Search/Analyzer/Exception.php | 0 .../Search/Analyzer/Interface.php | 0 .../Search/Analyzer/Standard.php | 0 lib/{Doctrine => orm}/Search/Exception.php | 0 lib/{Doctrine => orm}/Search/File.php | 0 lib/{Doctrine => orm}/Search/Indexer.php | 0 lib/{Doctrine => orm}/Search/Indexer/Dir.php | 0 .../Search/Indexer/Exception.php | 0 lib/{Doctrine => orm}/Search/Listener.php | 0 lib/{Doctrine => orm}/Search/Parser.php | 0 lib/{Doctrine => orm}/Search/Query.php | 0 lib/{Doctrine => orm}/Search/Record.php | 0 lib/{Doctrine => orm}/Search/Scorer.php | 0 lib/{Doctrine => orm}/Sequence.php | 0 lib/{Doctrine => orm}/Sequence/Db2.php | 0 lib/{Doctrine => orm}/Sequence/Exception.php | 0 lib/{Doctrine => orm}/Sequence/Firebird.php | 0 lib/{Doctrine => orm}/Sequence/Informix.php | 0 lib/{Doctrine => orm}/Sequence/Mssql.php | 0 lib/{Doctrine => orm}/Sequence/Mysql.php | 0 lib/{Doctrine => orm}/Sequence/Oracle.php | 0 lib/{Doctrine => orm}/Sequence/Pgsql.php | 0 lib/{Doctrine => orm}/Sequence/Sqlite.php | 0 lib/{Doctrine => orm}/Table.php | 0 lib/{Doctrine => orm}/Table/Exception.php | 0 lib/{Doctrine => orm}/Table/Repository.php | 0 .../Table/Repository/Exception.php | 0 lib/{Doctrine => orm}/Task.php | 0 lib/{Doctrine => orm}/Task/BuildAll.php | 0 lib/{Doctrine => orm}/Task/BuildAllLoad.php | 0 lib/{Doctrine => orm}/Task/BuildAllReload.php | 0 lib/{Doctrine => orm}/Task/Compile.php | 0 lib/{Doctrine => orm}/Task/CreateDb.php | 0 lib/{Doctrine => orm}/Task/CreateTables.php | 0 lib/{Doctrine => orm}/Task/Dql.php | 0 lib/{Doctrine => orm}/Task/DropDb.php | 0 lib/{Doctrine => orm}/Task/DumpData.php | 0 lib/{Doctrine => orm}/Task/Exception.php | 0 .../Task/GenerateMigration.php | 0 .../Task/GenerateMigrationsDb.php | 0 .../Task/GenerateMigrationsModels.php | 0 .../Task/GenerateModelsDb.php | 0 .../Task/GenerateModelsYaml.php | 0 lib/{Doctrine => orm}/Task/GenerateSql.php | 0 lib/{Doctrine => orm}/Task/GenerateYamlDb.php | 0 .../Task/GenerateYamlModels.php | 0 lib/{Doctrine => orm}/Task/LoadData.php | 0 lib/{Doctrine => orm}/Task/LoadDummyData.php | 0 lib/{Doctrine => orm}/Task/Migrate.php | 0 lib/{Doctrine => orm}/Task/RebuildDb.php | 0 lib/{Doctrine => orm}/Template.php | 0 .../Template/Geographical.php | 0 lib/{Doctrine => orm}/Template/I18n.php | 0 .../Template/Listener/Sluggable.php | 0 .../Template/Listener/Timestampable.php | 0 lib/{Doctrine => orm}/Template/NestedSet.php | 0 lib/{Doctrine => orm}/Template/Searchable.php | 0 lib/{Doctrine => orm}/Template/Sluggable.php | 0 lib/{Doctrine => orm}/Template/Taggable.php | 0 .../Template/Timestampable.php | 0 .../Template/Versionable.php | 0 lib/{Doctrine => orm}/Transaction.php | 0 .../Transaction/Exception.php | 0 .../Transaction/Firebird.php | 0 .../Transaction/Informix.php | 0 lib/{Doctrine => orm}/Transaction/Mock.php | 0 lib/{Doctrine => orm}/Transaction/Mssql.php | 0 lib/{Doctrine => orm}/Transaction/Mysql.php | 0 lib/{Doctrine => orm}/Transaction/Oracle.php | 0 lib/{Doctrine => orm}/Transaction/Pgsql.php | 0 lib/{Doctrine => orm}/Transaction/Sqlite.php | 0 lib/{Doctrine => orm}/Tree.php | 0 lib/{Doctrine => orm}/Tree/AdjacencyList.php | 0 lib/{Doctrine => orm}/Tree/Exception.php | 0 lib/{Doctrine => orm}/Tree/Interface.php | 0 .../Tree/MaterializedPath.php | 0 lib/{Doctrine => orm}/Tree/NestedSet.php | 0 lib/{Doctrine => orm}/Util.php | 0 lib/{Doctrine => orm}/Validator.php | 0 lib/{Doctrine => orm}/Validator/Country.php | 0 .../Validator/Creditcard.php | 0 lib/{Doctrine => orm}/Validator/Date.php | 0 lib/{Doctrine => orm}/Validator/Driver.php | 0 lib/{Doctrine => orm}/Validator/Email.php | 0 .../Validator/ErrorStack.php | 0 lib/{Doctrine => orm}/Validator/Exception.php | 0 lib/{Doctrine => orm}/Validator/Future.php | 0 lib/{Doctrine => orm}/Validator/Htmlcolor.php | 0 lib/{Doctrine => orm}/Validator/Ip.php | 0 lib/{Doctrine => orm}/Validator/Minlength.php | 0 lib/{Doctrine => orm}/Validator/Nospace.php | 0 lib/{Doctrine => orm}/Validator/Notblank.php | 0 lib/{Doctrine => orm}/Validator/Notnull.php | 0 lib/{Doctrine => orm}/Validator/Past.php | 0 lib/{Doctrine => orm}/Validator/Protected.php | 0 lib/{Doctrine => orm}/Validator/Range.php | 0 lib/{Doctrine => orm}/Validator/Regexp.php | 0 lib/{Doctrine => orm}/Validator/Unique.php | 0 lib/{Doctrine => orm}/Validator/Unsigned.php | 0 lib/{Doctrine => orm}/Validator/Usstate.php | 0 lib/{Doctrine => orm}/View.php | 0 lib/{Doctrine => orm}/View/Exception.php | 0 353 files changed, 216 insertions(+), 173 deletions(-) rename lib/{Doctrine => orm}/Access.php (100%) rename lib/{Doctrine => orm}/Adapter.php (100%) rename lib/{Doctrine => orm}/Adapter/Db2.php (100%) rename lib/{Doctrine => orm}/Adapter/Db2/Exception.php (100%) rename lib/{Doctrine => orm}/Adapter/Exception.php (100%) rename lib/{Doctrine => orm}/Adapter/Interface.php (100%) rename lib/{Doctrine => orm}/Adapter/Mock.php (100%) rename lib/{Doctrine => orm}/Adapter/Mysqli.php (100%) rename lib/{Doctrine => orm}/Adapter/Oracle.php (100%) rename lib/{Doctrine => orm}/Adapter/Resource.php (100%) rename lib/{Doctrine => orm}/Adapter/Statement.php (100%) rename lib/{Doctrine => orm}/Adapter/Statement/Interface.php (100%) rename lib/{Doctrine => orm}/Adapter/Statement/Mock.php (100%) rename lib/{Doctrine => orm}/AuditLog.php (100%) rename lib/{Doctrine => orm}/AuditLog/Listener.php (100%) rename lib/{Doctrine => orm}/Cache.php (100%) rename lib/{Doctrine => orm}/Cache/Apc.php (100%) rename lib/{Doctrine => orm}/Cache/Array.php (100%) rename lib/{Doctrine => orm}/Cache/Db.php (100%) rename lib/{Doctrine => orm}/Cache/Driver.php (100%) rename lib/{Doctrine => orm}/Cache/Exception.php (100%) rename lib/{Doctrine => orm}/Cache/Interface.php (100%) rename lib/{Doctrine => orm}/Cache/Memcache.php (100%) rename lib/{Doctrine => orm}/Cache/Xcache.php (100%) rename lib/{Doctrine => orm}/Cli.php (100%) rename lib/{Doctrine => orm}/Cli/AnsiColorFormatter.php (100%) rename lib/{Doctrine => orm}/Cli/Exception.php (100%) rename lib/{Doctrine => orm}/Cli/Formatter.php (100%) rename lib/{Doctrine => orm}/Collection.php (100%) rename lib/{Doctrine => orm}/Collection/Exception.php (100%) rename lib/{Doctrine => orm}/Collection/Iterator.php (100%) rename lib/{Doctrine => orm}/Collection/Iterator/Expandable.php (100%) rename lib/{Doctrine => orm}/Collection/Iterator/Normal.php (100%) rename lib/{Doctrine => orm}/Collection/Iterator/Offset.php (100%) rename lib/{Doctrine => orm}/Collection/Offset.php (100%) rename lib/{Doctrine => orm}/Column.php (100%) rename lib/{Doctrine => orm}/Compiler.php (100%) rename lib/{Doctrine => orm}/Compiler/Exception.php (100%) rename lib/{Doctrine => orm}/Configurable.php (100%) rename lib/{Doctrine => orm}/Connection.php (100%) rename lib/{Doctrine => orm}/Connection/Common.php (100%) rename lib/{Doctrine => orm}/Connection/Db2.php (100%) rename lib/{Doctrine => orm}/Connection/Exception.php (100%) rename lib/{Doctrine => orm}/Connection/Firebird.php (100%) rename lib/{Doctrine => orm}/Connection/Firebird/Exception.php (100%) rename lib/{Doctrine => orm}/Connection/Informix.php (100%) rename lib/{Doctrine => orm}/Connection/Informix/Exception.php (100%) rename lib/{Doctrine => orm}/Connection/Mock.php (100%) rename lib/{Doctrine => orm}/Connection/Module.php (100%) rename lib/{Doctrine => orm}/Connection/Mssql.php (100%) rename lib/{Doctrine => orm}/Connection/Mssql/Exception.php (100%) rename lib/{Doctrine => orm}/Connection/Mysql.php (100%) rename lib/{Doctrine => orm}/Connection/Mysql/Exception.php (100%) rename lib/{Doctrine => orm}/Connection/Oracle.php (100%) rename lib/{Doctrine => orm}/Connection/Oracle/Exception.php (100%) rename lib/{Doctrine => orm}/Connection/Pgsql.php (100%) rename lib/{Doctrine => orm}/Connection/Pgsql/Exception.php (100%) rename lib/{Doctrine => orm}/Connection/Profiler.php (100%) rename lib/{Doctrine => orm}/Connection/Profiler/Exception.php (100%) rename lib/{Doctrine => orm}/Connection/Sqlite.php (100%) rename lib/{Doctrine => orm}/Connection/Sqlite/Exception.php (100%) rename lib/{Doctrine => orm}/Connection/Statement.php (100%) rename lib/{Doctrine => orm}/Connection/UnitOfWork.php (100%) rename lib/{Doctrine => orm}/Data.php (100%) rename lib/{Doctrine => orm}/Data/Exception.php (100%) rename lib/{Doctrine => orm}/Data/Export.php (100%) rename lib/{Doctrine => orm}/Data/Import.php (100%) rename lib/{Doctrine => orm}/DataDict.php (100%) rename lib/{Doctrine => orm}/DataDict/Exception.php (100%) rename lib/{Doctrine => orm}/DataDict/Firebird.php (100%) rename lib/{Doctrine => orm}/DataDict/Informix.php (100%) rename lib/{Doctrine => orm}/DataDict/Mssql.php (100%) rename lib/{Doctrine => orm}/DataDict/Mysql.php (100%) rename lib/{Doctrine => orm}/DataDict/Oracle.php (100%) rename lib/{Doctrine => orm}/DataDict/Pgsql.php (100%) rename lib/{Doctrine => orm}/DataDict/Sqlite.php (100%) rename lib/{Doctrine => orm}/DataType.php (100%) rename lib/{Doctrine => orm}/Db.php (100%) rename lib/{Doctrine => orm}/Event.php (100%) rename lib/{Doctrine => orm}/EventListener.php (100%) rename lib/{Doctrine => orm}/EventListener/Chain.php (100%) rename lib/{Doctrine => orm}/EventListener/Exception.php (100%) rename lib/{Doctrine => orm}/EventListener/Interface.php (100%) rename lib/{Doctrine => orm}/Exception.php (100%) rename lib/{Doctrine => orm}/Export.php (100%) rename lib/{Doctrine => orm}/Export/Exception.php (100%) rename lib/{Doctrine => orm}/Export/Firebird.php (100%) rename lib/{Doctrine => orm}/Export/Frontbase.php (100%) rename lib/{Doctrine => orm}/Export/Mssql.php (100%) rename lib/{Doctrine => orm}/Export/Mysql.php (100%) rename lib/{Doctrine => orm}/Export/Oracle.php (100%) rename lib/{Doctrine => orm}/Export/Pgsql.php (100%) rename lib/{Doctrine => orm}/Export/Reporter.php (100%) rename lib/{Doctrine => orm}/Export/Schema.php (100%) rename lib/{Doctrine => orm}/Export/Sqlite.php (100%) rename lib/{Doctrine => orm}/Expression.php (100%) rename lib/{Doctrine => orm}/Expression/Driver.php (100%) rename lib/{Doctrine => orm}/Expression/Exception.php (100%) rename lib/{Doctrine => orm}/Expression/Firebird.php (100%) rename lib/{Doctrine => orm}/Expression/Informix.php (100%) rename lib/{Doctrine => orm}/Expression/Mock.php (100%) rename lib/{Doctrine => orm}/Expression/Mssql.php (100%) rename lib/{Doctrine => orm}/Expression/Mysql.php (100%) rename lib/{Doctrine => orm}/Expression/Oracle.php (100%) rename lib/{Doctrine => orm}/Expression/Pgsql.php (100%) rename lib/{Doctrine => orm}/Expression/Sqlite.php (100%) rename lib/{Doctrine => orm}/File.php (100%) rename lib/{Doctrine => orm}/File/Index.php (100%) rename lib/{Doctrine => orm}/FileFinder.php (100%) rename lib/{Doctrine => orm}/FileFinder/GlobToRegex.php (100%) rename lib/{Doctrine => orm}/FileFinder/NumberCompare.php (100%) rename lib/{Doctrine => orm}/Formatter.php (100%) rename lib/{Doctrine => orm}/Hook.php (100%) rename lib/{Doctrine => orm}/Hook/Equal.php (100%) rename lib/{Doctrine => orm}/Hook/Integer.php (100%) rename lib/{Doctrine => orm}/Hook/Parser.php (100%) rename lib/{Doctrine => orm}/Hook/Parser/Complex.php (100%) rename lib/{Doctrine => orm}/Hook/WordLike.php (100%) rename lib/{Doctrine => orm}/Hydrator.php (100%) rename lib/{Doctrine => orm}/Hydrator/Abstract.php (100%) rename lib/{Doctrine => orm}/Hydrator/ArrayDriver.php (100%) rename lib/{Doctrine => orm}/Hydrator/Exception.php (100%) rename lib/{Doctrine => orm}/Hydrator/RecordDriver.php (100%) rename lib/{Doctrine => orm}/I18n.php (100%) rename lib/{Doctrine => orm}/I18n/Exception.php (100%) rename lib/{Doctrine => orm}/Import.php (100%) rename lib/{Doctrine => orm}/Import/Builder.php (100%) rename lib/{Doctrine => orm}/Import/Builder/BaseClass.php (100%) rename lib/{Doctrine => orm}/Import/Builder/Exception.php (100%) rename lib/{Doctrine => orm}/Import/Exception.php (100%) rename lib/{Doctrine => orm}/Import/Firebird.php (100%) rename lib/{Doctrine => orm}/Import/Informix.php (100%) rename lib/{Doctrine => orm}/Import/Mssql.php (100%) rename lib/{Doctrine => orm}/Import/Mysql.php (100%) rename lib/{Doctrine => orm}/Import/Oracle.php (100%) rename lib/{Doctrine => orm}/Import/Pgsql.php (100%) rename lib/{Doctrine => orm}/Import/Reader.php (100%) rename lib/{Doctrine => orm}/Import/Reader/Db.php (100%) rename lib/{Doctrine => orm}/Import/Reader/Exception.php (100%) rename lib/{Doctrine => orm}/Import/Reader/Propel.php (100%) rename lib/{Doctrine => orm}/Import/Schema.php (100%) rename lib/{Doctrine => orm}/Import/Sqlite.php (100%) rename lib/{Doctrine => orm}/Inflector.php (100%) rename lib/{Doctrine => orm}/IntegrityMapper.php (100%) rename lib/{Doctrine => orm}/Lib.php (100%) rename lib/{Doctrine => orm}/Locator.php (100%) rename lib/{Doctrine => orm}/Locator/Exception.php (100%) rename lib/{Doctrine => orm}/Locator/Injectable.php (100%) rename lib/{Doctrine => orm}/Locking/Exception.php (100%) rename lib/{Doctrine => orm}/Locking/Manager/Pessimistic.php (100%) rename lib/{Doctrine => orm}/Log.php (100%) rename lib/{Doctrine => orm}/Log/Exception.php (100%) rename lib/{Doctrine => orm}/Log/Filter/Interface.php (100%) rename lib/{Doctrine => orm}/Log/Filter/Message.php (100%) rename lib/{Doctrine => orm}/Log/Filter/Priority.php (100%) rename lib/{Doctrine => orm}/Log/Filter/Suppress.php (100%) rename lib/{Doctrine => orm}/Log/Formatter/Interface.php (100%) rename lib/{Doctrine => orm}/Log/Formatter/Simple.php (100%) rename lib/{Doctrine => orm}/Log/Formatter/Xml.php (100%) rename lib/{Doctrine => orm}/Log/Writer/Abstract.php (100%) rename lib/{Doctrine => orm}/Log/Writer/Db.php (100%) rename lib/{Doctrine => orm}/Log/Writer/Mock.php (100%) rename lib/{Doctrine => orm}/Log/Writer/Null.php (100%) rename lib/{Doctrine => orm}/Log/Writer/Stream.php (100%) rename lib/{Doctrine => orm}/Manager.php (100%) rename lib/{Doctrine => orm}/Manager/Exception.php (100%) rename lib/{Doctrine => orm}/Migration.php (100%) rename lib/{Doctrine => orm}/Migration/Builder.php (100%) rename lib/{Doctrine => orm}/Migration/Exception.php (100%) rename lib/{Doctrine => orm}/Migration/IrreversibleMigrationException.php (100%) rename lib/{Doctrine => orm}/Migration/Process.php (100%) rename lib/{Doctrine => orm}/Node.php (100%) rename lib/{Doctrine => orm}/Node/AdjacencyList.php (100%) rename lib/{Doctrine => orm}/Node/AdjacencyList/LevelOrderIterator.php (100%) rename lib/{Doctrine => orm}/Node/AdjacencyList/PostOrderIterator.php (100%) rename lib/{Doctrine => orm}/Node/AdjacencyList/PreOrderIterator.php (100%) rename lib/{Doctrine => orm}/Node/Exception.php (100%) rename lib/{Doctrine => orm}/Node/Interface.php (100%) rename lib/{Doctrine => orm}/Node/MaterializedPath.php (100%) rename lib/{Doctrine => orm}/Node/MaterializedPath/LevelOrderIterator.php (100%) rename lib/{Doctrine => orm}/Node/MaterializedPath/PostOrderIterator.php (100%) rename lib/{Doctrine => orm}/Node/MaterializedPath/PreOrderIterator.php (100%) rename lib/{Doctrine => orm}/Node/NestedSet.php (100%) rename lib/{Doctrine => orm}/Node/NestedSet/LevelOrderIterator.php (100%) rename lib/{Doctrine => orm}/Node/NestedSet/PostOrderIterator.php (100%) rename lib/{Doctrine => orm}/Node/NestedSet/PreOrderIterator.php (100%) rename lib/{Doctrine => orm}/Null.php (100%) rename lib/{Doctrine => orm}/Overloadable.php (100%) rename lib/{Doctrine => orm}/Pager.php (100%) rename lib/{Doctrine => orm}/Pager/Exception.php (100%) rename lib/{Doctrine => orm}/Pager/Layout.php (100%) rename lib/{Doctrine => orm}/Pager/Range.php (100%) rename lib/{Doctrine => orm}/Pager/Range/Jumping.php (100%) rename lib/{Doctrine => orm}/Pager/Range/Sliding.php (100%) rename lib/{Doctrine => orm}/Parser.php (100%) rename lib/{Doctrine => orm}/Parser/Exception.php (100%) rename lib/{Doctrine => orm}/Parser/Json.php (100%) rename lib/{Doctrine => orm}/Parser/Serialize.php (100%) rename lib/{Doctrine => orm}/Parser/Xml.php (100%) rename lib/{Doctrine => orm}/Parser/Yml.php (100%) rename lib/{Doctrine => orm}/Parser/spyc.php (100%) rename lib/{Doctrine => orm}/Query.php (100%) rename lib/{Doctrine => orm}/Query/Abstract.php (100%) rename lib/{Doctrine => orm}/Query/Check.php (100%) rename lib/{Doctrine => orm}/Query/Condition.php (100%) rename lib/{Doctrine => orm}/Query/Exception.php (100%) rename lib/{Doctrine => orm}/Query/Filter.php (100%) rename lib/{Doctrine => orm}/Query/Filter/Chain.php (100%) rename lib/{Doctrine => orm}/Query/Filter/Interface.php (100%) rename lib/{Doctrine => orm}/Query/From.php (100%) rename lib/{Doctrine => orm}/Query/Groupby.php (100%) rename lib/{Doctrine => orm}/Query/Having.php (100%) rename lib/{Doctrine => orm}/Query/JoinCondition.php (100%) rename lib/{Doctrine => orm}/Query/Limit.php (100%) rename lib/{Doctrine => orm}/Query/Offset.php (100%) rename lib/{Doctrine => orm}/Query/Orderby.php (100%) rename lib/{Doctrine => orm}/Query/Parser.php (100%) rename lib/{Doctrine => orm}/Query/Part.php (100%) rename lib/{Doctrine => orm}/Query/Registry.php (100%) rename lib/{Doctrine => orm}/Query/Registry/Exception.php (100%) rename lib/{Doctrine => orm}/Query/Select.php (100%) rename lib/{Doctrine => orm}/Query/Set.php (100%) rename lib/{Doctrine => orm}/Query/Tokenizer.php (100%) rename lib/{Doctrine => orm}/Query/Tokenizer/Exception.php (100%) rename lib/{Doctrine => orm}/Query/Where.php (100%) rename lib/{Doctrine => orm}/RawSql.php (100%) rename lib/{Doctrine => orm}/RawSql/Exception.php (100%) rename lib/{Doctrine => orm}/Record.php (100%) rename lib/{Doctrine => orm}/Record/Abstract.php (100%) rename lib/{Doctrine => orm}/Record/Exception.php (100%) rename lib/{Doctrine => orm}/Record/Filter.php (100%) rename lib/{Doctrine => orm}/Record/Filter/Compound.php (100%) rename lib/{Doctrine => orm}/Record/Filter/Standard.php (100%) rename lib/{Doctrine => orm}/Record/Generator.php (100%) rename lib/{Doctrine => orm}/Record/Iterator.php (100%) rename lib/{Doctrine => orm}/Record/Listener.php (100%) rename lib/{Doctrine => orm}/Record/Listener/Chain.php (100%) rename lib/{Doctrine => orm}/Record/Listener/Interface.php (100%) rename lib/{Doctrine => orm}/Record/State/Exception.php (100%) rename lib/{Doctrine => orm}/Relation.php (100%) rename lib/{Doctrine => orm}/Relation/Association.php (100%) rename lib/{Doctrine => orm}/Relation/Association/Self.php (100%) rename lib/{Doctrine => orm}/Relation/Exception.php (100%) rename lib/{Doctrine => orm}/Relation/ForeignKey.php (100%) rename lib/{Doctrine => orm}/Relation/LocalKey.php (100%) rename lib/{Doctrine => orm}/Relation/Nest.php (100%) rename lib/{Doctrine => orm}/Relation/Parser.php (100%) rename lib/{Doctrine => orm}/Relation/Parser/Exception.php (100%) rename lib/{Doctrine => orm}/Search.php (100%) rename lib/{Doctrine => orm}/Search/Analyzer.php (100%) rename lib/{Doctrine => orm}/Search/Analyzer/Exception.php (100%) rename lib/{Doctrine => orm}/Search/Analyzer/Interface.php (100%) rename lib/{Doctrine => orm}/Search/Analyzer/Standard.php (100%) rename lib/{Doctrine => orm}/Search/Exception.php (100%) rename lib/{Doctrine => orm}/Search/File.php (100%) rename lib/{Doctrine => orm}/Search/Indexer.php (100%) rename lib/{Doctrine => orm}/Search/Indexer/Dir.php (100%) rename lib/{Doctrine => orm}/Search/Indexer/Exception.php (100%) rename lib/{Doctrine => orm}/Search/Listener.php (100%) rename lib/{Doctrine => orm}/Search/Parser.php (100%) rename lib/{Doctrine => orm}/Search/Query.php (100%) rename lib/{Doctrine => orm}/Search/Record.php (100%) rename lib/{Doctrine => orm}/Search/Scorer.php (100%) rename lib/{Doctrine => orm}/Sequence.php (100%) rename lib/{Doctrine => orm}/Sequence/Db2.php (100%) rename lib/{Doctrine => orm}/Sequence/Exception.php (100%) rename lib/{Doctrine => orm}/Sequence/Firebird.php (100%) rename lib/{Doctrine => orm}/Sequence/Informix.php (100%) rename lib/{Doctrine => orm}/Sequence/Mssql.php (100%) rename lib/{Doctrine => orm}/Sequence/Mysql.php (100%) rename lib/{Doctrine => orm}/Sequence/Oracle.php (100%) rename lib/{Doctrine => orm}/Sequence/Pgsql.php (100%) rename lib/{Doctrine => orm}/Sequence/Sqlite.php (100%) rename lib/{Doctrine => orm}/Table.php (100%) rename lib/{Doctrine => orm}/Table/Exception.php (100%) rename lib/{Doctrine => orm}/Table/Repository.php (100%) rename lib/{Doctrine => orm}/Table/Repository/Exception.php (100%) rename lib/{Doctrine => orm}/Task.php (100%) rename lib/{Doctrine => orm}/Task/BuildAll.php (100%) rename lib/{Doctrine => orm}/Task/BuildAllLoad.php (100%) rename lib/{Doctrine => orm}/Task/BuildAllReload.php (100%) rename lib/{Doctrine => orm}/Task/Compile.php (100%) rename lib/{Doctrine => orm}/Task/CreateDb.php (100%) rename lib/{Doctrine => orm}/Task/CreateTables.php (100%) rename lib/{Doctrine => orm}/Task/Dql.php (100%) rename lib/{Doctrine => orm}/Task/DropDb.php (100%) rename lib/{Doctrine => orm}/Task/DumpData.php (100%) rename lib/{Doctrine => orm}/Task/Exception.php (100%) rename lib/{Doctrine => orm}/Task/GenerateMigration.php (100%) rename lib/{Doctrine => orm}/Task/GenerateMigrationsDb.php (100%) rename lib/{Doctrine => orm}/Task/GenerateMigrationsModels.php (100%) rename lib/{Doctrine => orm}/Task/GenerateModelsDb.php (100%) rename lib/{Doctrine => orm}/Task/GenerateModelsYaml.php (100%) rename lib/{Doctrine => orm}/Task/GenerateSql.php (100%) rename lib/{Doctrine => orm}/Task/GenerateYamlDb.php (100%) rename lib/{Doctrine => orm}/Task/GenerateYamlModels.php (100%) rename lib/{Doctrine => orm}/Task/LoadData.php (100%) rename lib/{Doctrine => orm}/Task/LoadDummyData.php (100%) rename lib/{Doctrine => orm}/Task/Migrate.php (100%) rename lib/{Doctrine => orm}/Task/RebuildDb.php (100%) rename lib/{Doctrine => orm}/Template.php (100%) rename lib/{Doctrine => orm}/Template/Geographical.php (100%) rename lib/{Doctrine => orm}/Template/I18n.php (100%) rename lib/{Doctrine => orm}/Template/Listener/Sluggable.php (100%) rename lib/{Doctrine => orm}/Template/Listener/Timestampable.php (100%) rename lib/{Doctrine => orm}/Template/NestedSet.php (100%) rename lib/{Doctrine => orm}/Template/Searchable.php (100%) rename lib/{Doctrine => orm}/Template/Sluggable.php (100%) rename lib/{Doctrine => orm}/Template/Taggable.php (100%) rename lib/{Doctrine => orm}/Template/Timestampable.php (100%) rename lib/{Doctrine => orm}/Template/Versionable.php (100%) rename lib/{Doctrine => orm}/Transaction.php (100%) rename lib/{Doctrine => orm}/Transaction/Exception.php (100%) rename lib/{Doctrine => orm}/Transaction/Firebird.php (100%) rename lib/{Doctrine => orm}/Transaction/Informix.php (100%) rename lib/{Doctrine => orm}/Transaction/Mock.php (100%) rename lib/{Doctrine => orm}/Transaction/Mssql.php (100%) rename lib/{Doctrine => orm}/Transaction/Mysql.php (100%) rename lib/{Doctrine => orm}/Transaction/Oracle.php (100%) rename lib/{Doctrine => orm}/Transaction/Pgsql.php (100%) rename lib/{Doctrine => orm}/Transaction/Sqlite.php (100%) rename lib/{Doctrine => orm}/Tree.php (100%) rename lib/{Doctrine => orm}/Tree/AdjacencyList.php (100%) rename lib/{Doctrine => orm}/Tree/Exception.php (100%) rename lib/{Doctrine => orm}/Tree/Interface.php (100%) rename lib/{Doctrine => orm}/Tree/MaterializedPath.php (100%) rename lib/{Doctrine => orm}/Tree/NestedSet.php (100%) rename lib/{Doctrine => orm}/Util.php (100%) rename lib/{Doctrine => orm}/Validator.php (100%) rename lib/{Doctrine => orm}/Validator/Country.php (100%) rename lib/{Doctrine => orm}/Validator/Creditcard.php (100%) rename lib/{Doctrine => orm}/Validator/Date.php (100%) rename lib/{Doctrine => orm}/Validator/Driver.php (100%) rename lib/{Doctrine => orm}/Validator/Email.php (100%) rename lib/{Doctrine => orm}/Validator/ErrorStack.php (100%) rename lib/{Doctrine => orm}/Validator/Exception.php (100%) rename lib/{Doctrine => orm}/Validator/Future.php (100%) rename lib/{Doctrine => orm}/Validator/Htmlcolor.php (100%) rename lib/{Doctrine => orm}/Validator/Ip.php (100%) rename lib/{Doctrine => orm}/Validator/Minlength.php (100%) rename lib/{Doctrine => orm}/Validator/Nospace.php (100%) rename lib/{Doctrine => orm}/Validator/Notblank.php (100%) rename lib/{Doctrine => orm}/Validator/Notnull.php (100%) rename lib/{Doctrine => orm}/Validator/Past.php (100%) rename lib/{Doctrine => orm}/Validator/Protected.php (100%) rename lib/{Doctrine => orm}/Validator/Range.php (100%) rename lib/{Doctrine => orm}/Validator/Regexp.php (100%) rename lib/{Doctrine => orm}/Validator/Unique.php (100%) rename lib/{Doctrine => orm}/Validator/Unsigned.php (100%) rename lib/{Doctrine => orm}/Validator/Usstate.php (100%) rename lib/{Doctrine => orm}/View.php (100%) rename lib/{Doctrine => orm}/View/Exception.php (100%) diff --git a/lib/Doctrine.php b/lib/Doctrine.php index 03b9fa54c..f390e566a 100644 --- a/lib/Doctrine.php +++ b/lib/Doctrine.php @@ -33,6 +33,25 @@ */ final class Doctrine { + /** + * DEPRECATED ATTRIBUTE CONSTANT NAMES AND VALUES + * + * REMOVE BEFORE 1.0 + * These were deprecated either because they are not used anymore or because they didn't follow the naming pattern required + * by Doctrine attributes + * + * Attribute names must be ATTR_{ATTR_NAME} and the values must be {ATTR_NAME}_NAME_OF_VALUE + */ + const LIMIT_ROWS = 1; + const LIMIT_RECORDS = 2; + const FETCH_IMMEDIATE = 0; + const FETCH_BATCH = 1; + const FETCH_OFFSET = 3; + const FETCH_LAZY_OFFSET = 4; + const FETCH_VHOLDER = 1; + const FETCH_RECORD = 2; + const FETCH_ARRAY = 3; + /** * VERSION */ @@ -81,45 +100,45 @@ final class Doctrine /** * PDO derived constants */ - const CASE_LOWER = 2; - const CASE_NATURAL = 0; - const CASE_UPPER = 1; - const CURSOR_FWDONLY = 0; - const CURSOR_SCROLL = 1; - const ERRMODE_EXCEPTION = 2; - const ERRMODE_SILENT = 0; - const ERRMODE_WARNING = 1; - const FETCH_ASSOC = 2; - const FETCH_BOTH = 4; - const FETCH_BOUND = 6; - const FETCH_CLASS = 8; - const FETCH_CLASSTYPE = 262144; - const FETCH_COLUMN = 7; - const FETCH_FUNC = 10; - const FETCH_GROUP = 65536; - const FETCH_INTO = 9; - const FETCH_LAZY = 1; - const FETCH_NAMED = 11; - const FETCH_NUM = 3; - const FETCH_OBJ = 5; - const FETCH_ORI_ABS = 4; - const FETCH_ORI_FIRST = 2; - const FETCH_ORI_LAST = 3; - const FETCH_ORI_NEXT = 0; - const FETCH_ORI_PRIOR = 1; - const FETCH_ORI_REL = 5; - const FETCH_SERIALIZE = 524288; - const FETCH_UNIQUE = 196608; - const NULL_EMPTY_STRING = 1; - const NULL_NATURAL = 0; - const NULL_TO_STRING = NULL; - const PARAM_BOOL = 5; - const PARAM_INPUT_OUTPUT = -2147483648; - const PARAM_INT = 1; - const PARAM_LOB = 3; - const PARAM_NULL = 0; - const PARAM_STMT = 4; - const PARAM_STR = 2; + const CASE_NATURAL = 0; + const CASE_UPPER = 1; + const CASE_LOWER = 2; + const CURSOR_FWDONLY = 0; + const CURSOR_SCROLL = 1; + const ERRMODE_EXCEPTION = 2; + const ERRMODE_SILENT = 0; + const ERRMODE_WARNING = 1; + const FETCH_ASSOC = 2; + const FETCH_BOTH = 4; + const FETCH_BOUND = 6; + const FETCH_CLASS = 8; + const FETCH_CLASSTYPE = 262144; + const FETCH_COLUMN = 7; + const FETCH_FUNC = 10; + const FETCH_GROUP = 65536; + const FETCH_INTO = 9; + const FETCH_LAZY = 1; + const FETCH_NAMED = 11; + const FETCH_NUM = 3; + const FETCH_OBJ = 5; + const FETCH_ORI_ABS = 4; + const FETCH_ORI_FIRST = 2; + const FETCH_ORI_LAST = 3; + const FETCH_ORI_NEXT = 0; + const FETCH_ORI_PRIOR = 1; + const FETCH_ORI_REL = 5; + const FETCH_SERIALIZE = 524288; + const FETCH_UNIQUE = 196608; + const NULL_EMPTY_STRING = 1; + const NULL_NATURAL = 0; + const NULL_TO_STRING = NULL; + const PARAM_BOOL = 5; + const PARAM_INPUT_OUTPUT = -2147483648; + const PARAM_INT = 1; + const PARAM_LOB = 3; + const PARAM_NULL = 0; + const PARAM_STMT = 4; + const PARAM_STR = 2; /** * ATTRIBUTE CONSTANTS @@ -151,36 +170,33 @@ final class Doctrine /** * Doctrine constants */ - const ATTR_LISTENER = 100; - const ATTR_QUOTE_IDENTIFIER = 101; - const ATTR_FIELD_CASE = 102; - const ATTR_IDXNAME_FORMAT = 103; - const ATTR_SEQNAME_FORMAT = 104; - const ATTR_SEQCOL_NAME = 105; - const ATTR_CMPNAME_FORMAT = 118; - const ATTR_DBNAME_FORMAT = 117; - const ATTR_TBLCLASS_FORMAT = 119; - const ATTR_TBLNAME_FORMAT = 120; - const ATTR_EXPORT = 140; - const ATTR_DECIMAL_PLACES = 141; - - const ATTR_PORTABILITY = 106; - const ATTR_VALIDATE = 107; - const ATTR_COLL_KEY = 108; - const ATTR_QUERY_LIMIT = 109; - const ATTR_DEFAULT_TABLE_TYPE = 112; - const ATTR_DEF_TEXT_LENGTH = 113; - const ATTR_DEF_VARCHAR_LENGTH = 114; - const ATTR_DEF_TABLESPACE = 115; - const ATTR_EMULATE_DATABASE = 116; - const ATTR_USE_NATIVE_ENUM = 117; - const ATTR_DEFAULT_SEQUENCE = 133; - + const ATTR_LISTENER = 100; + const ATTR_QUOTE_IDENTIFIER = 101; + const ATTR_FIELD_CASE = 102; + const ATTR_IDXNAME_FORMAT = 103; + const ATTR_SEQNAME_FORMAT = 104; + const ATTR_SEQCOL_NAME = 105; + const ATTR_CMPNAME_FORMAT = 118; + const ATTR_DBNAME_FORMAT = 117; + const ATTR_TBLCLASS_FORMAT = 119; + const ATTR_TBLNAME_FORMAT = 120; + const ATTR_EXPORT = 140; + const ATTR_DECIMAL_PLACES = 141; + const ATTR_PORTABILITY = 106; + const ATTR_VALIDATE = 107; + const ATTR_COLL_KEY = 108; + const ATTR_QUERY_LIMIT = 109; + const ATTR_DEFAULT_TABLE_TYPE = 112; + const ATTR_DEF_TEXT_LENGTH = 113; + const ATTR_DEF_VARCHAR_LENGTH = 114; + const ATTR_DEF_TABLESPACE = 115; + const ATTR_EMULATE_DATABASE = 116; + const ATTR_USE_NATIVE_ENUM = 117; + const ATTR_DEFAULT_SEQUENCE = 133; const ATTR_FETCHMODE = 118; const ATTR_NAME_PREFIX = 121; const ATTR_CREATE_TABLES = 122; const ATTR_COLL_LIMIT = 123; - const ATTR_CACHE = 150; const ATTR_RESULT_CACHE = 150; const ATTR_CACHE_LIFESPAN = 151; @@ -193,20 +209,28 @@ final class Doctrine const ATTR_QUERY_CACHE_LIFESPAN = 158; const ATTR_AUTOLOAD_TABLE_CLASSES = 160; const ATTR_MODEL_LOADING = 161; + const ATTR_LOCK = 162; + const ATTR_HYDRATE = 163; + const ATTR_IDENTIFIER = 164; /** - * LIMIT CONSTANTS + * QUERY_LIMIT CONSTANTS */ /** + * QUERY_LIMIT_ROWS + * * constant for row limiting + * + * @see self::ATTR_QUERY_LIMIT */ - const LIMIT_ROWS = 1; + const QUERY_LIMIT_ROWS = 1; /** * constant for record limiting + * @see self::ATTR_QUERY_LIMIT */ - const LIMIT_RECORDS = 2; + const QUERY_LIMIT_RECORDS = 2; /** * FETCHMODE CONSTANTS @@ -215,117 +239,163 @@ final class Doctrine /** * IMMEDIATE FETCHING * mode for immediate fetching + * @see self::ATTR_FETCHMODE */ - const FETCH_IMMEDIATE = 0; + const FETCHMODE_IMMEDIATE = 0; /** - * BATCH FETCHING + * FETCHMODE_BATCH + * * mode for batch fetching + * + * @see self::ATTR_FETCHMODE */ - const FETCH_BATCH = 1; + const FETCHMODE_BATCH = 1; /** - * LAZY FETCHING + * FETCHMODE_OFFSET + * * mode for offset fetching + * + * @see self::ATTR_FETCHMODE */ - const FETCH_OFFSET = 3; + const FETCHMODE_OFFSET = 3; /** - * LAZY OFFSET FETCHING + * FETCHMODE_LAZY_OFFSET + * * mode for lazy offset fetching + * + * @see self::ATTR_FETCHMODE */ - const FETCH_LAZY_OFFSET = 4; + const FETCHMODE_LAZY_OFFSET = 4; /** - * FETCH CONSTANTS + * FETCHMODE CONSTANTS */ - /** - * FETCH VALUEHOLDER + * FETCHMODE_VHOLDER + * + * @see self::ATTR_FETCHMODE */ - const FETCH_VHOLDER = 1; + const FETCHMODE_VHOLDER = 1; /** - * FETCH RECORD + * FETCHMODE_RECORD * * Specifies that the fetch method shall return Doctrine_Record * objects as the elements of the result set. * * This is the default fetchmode. + * + * @see self::ATTR_FETCHMODE */ - const FETCH_RECORD = 2; + const FETCHMODE_RECORD = 2; /** - * FETCH ARRAY + * FETCHMODE_ARRAY + * + * @see self::ATTR_FETCHMODE */ - const FETCH_ARRAY = 3; + const FETCHMODE_ARRAY = 3; /** * PORTABILITY CONSTANTS */ /** + * PORTABILITY_NONE + * * Portability: turn off all portability features. + * * @see self::ATTR_PORTABILITY */ const PORTABILITY_NONE = 0; /** + * PORTABILITY_FIX_CASE + * * Portability: convert names of tables and fields to case defined in the * "field_case" option when using the query*(), fetch*() methods. + * * @see self::ATTR_PORTABILITY */ const PORTABILITY_FIX_CASE = 1; /** + * PORTABILITY_RTRIM + * * Portability: right trim the data output by query*() and fetch*(). + * * @see self::ATTR_PORTABILITY */ const PORTABILITY_RTRIM = 2; /** + * PORTABILITY_DELETE_COUNT + * * Portability: force reporting the number of rows deleted. + * * @see self::ATTR_PORTABILITY */ const PORTABILITY_DELETE_COUNT = 4; /** + * PORTABILITY_EMPTY_TO_NULL + * * Portability: convert empty values to null strings in data output by * query*() and fetch*(). + * * @see self::ATTR_PORTABILITY */ const PORTABILITY_EMPTY_TO_NULL = 8; /** + * PORTABILITY_FIX_ASSOC_FIELD_NAMES + * * Portability: removes database/table qualifiers from associative indexes + * * @see self::ATTR_PORTABILITY */ const PORTABILITY_FIX_ASSOC_FIELD_NAMES = 16; /** + * PORTABILITY_EXPR + * * Portability: makes Doctrine_Expression throw exception for unportable RDBMS expressions + * * @see self::ATTR_PORTABILITY */ const PORTABILITY_EXPR = 32; /** + * PORTABILITY_ALL + * * Portability: turn on all portability features. + * * @see self::ATTR_PORTABILITY */ const PORTABILITY_ALL = 63; /** - * LOCKMODE CONSTANTS + * LOCK CONSTANTS */ /** + * LOCK_OPTIMISTIC + * * mode for optimistic locking + * @see self::ATTR_LOCK */ const LOCK_OPTIMISTIC = 0; /** + * LOCK_PESSIMISTIC + * * mode for pessimistic locking + * + * @see self::ATTR_LOCK */ const LOCK_PESSIMISTIC = 1; @@ -335,66 +405,96 @@ final class Doctrine /** * EXPORT_NONE + * + * @see self::ATTR_EXPORT */ const EXPORT_NONE = 0; /** * EXPORT_TABLES + * + * @see self::ATTR_EXPORT */ const EXPORT_TABLES = 1; /** * EXPORT_CONSTRAINTS + * + * @see self::ATTR_EXPORT */ const EXPORT_CONSTRAINTS = 2; /** * EXPORT_PLUGINS + * + * @see self::ATTR_EXPORT */ const EXPORT_PLUGINS = 4; /** * EXPORT_ALL + * + * @see self::ATTR_EXPORT */ const EXPORT_ALL = 7; /** - * HYDRATION CONSTANTS + * HYDRATE CONSTANTS + */ + + /** + * HYDRATE_RECORD + * + * @see self::ATTR_HYDRATE */ const HYDRATE_RECORD = 2; /** * HYDRATE_ARRAY + * + * @see self::ATTR_HYDRATE */ const HYDRATE_ARRAY = 3; /** * HYDRATE_NONE + * + * @see self::ATTR_HYDRATE */ const HYDRATE_NONE = 4; /** - * VALIDATION CONSTANTS + * VALIDATE CONSTANTS + * + * @see self::ATTR_VALIDATE */ const VALIDATE_NONE = 0; /** * VALIDATE_LENGTHS + * + * @see self::ATTR_VALIDATE */ const VALIDATE_LENGTHS = 1; /** * VALIDATE_TYPES + * + * @see self::ATTR_VALIDATE */ const VALIDATE_TYPES = 2; /** * VALIDATE_CONSTRAINTS + * + * @see self::ATTR_VALIDATE */ const VALIDATE_CONSTRAINTS = 4; /** * VALIDATE_ALL + * + * @see self::ATTR_VALIDATE */ const VALIDATE_ALL = 7; @@ -402,6 +502,8 @@ final class Doctrine * IDENTIFIER_AUTOINC * * constant for auto_increment identifier + * + * @see self::ATTR_IDENTIFIER */ const IDENTIFIER_AUTOINC = 1; @@ -409,6 +511,8 @@ final class Doctrine * IDENTIFIER_SEQUENCE * * constant for sequence identifier + * + * @see self::ATTR_IDENTIFIER */ const IDENTIFIER_SEQUENCE = 2; @@ -416,6 +520,8 @@ final class Doctrine * IDENTIFIER_NATURAL * * constant for normal identifier + * + * @see self::ATTR_IDENTIFIER */ const IDENTIFIER_NATURAL = 3; @@ -423,6 +529,7 @@ final class Doctrine * IDENTIFIER_COMPOSITE * * constant for composite identifier + * @see self::ATTR_IDENTIFIER */ const IDENTIFIER_COMPOSITE = 4; @@ -431,6 +538,8 @@ final class Doctrine * * Constant for agressive model loading * Will require_once() all found model files + * + * @see self::ATTR_MODEL_LOADING */ const MODEL_LOADING_AGGRESSIVE = 1; @@ -440,9 +549,11 @@ final class Doctrine * Constant for conservative model loading * Will not require_once() found model files inititally instead it will build an array * and reference it in autoload() when a class is needed it will require_once() it + * + * @see self::ATTR_MODEL_LOADING */ const MODEL_LOADING_CONSERVATIVE= 2; - + /** * Path * @@ -450,15 +561,6 @@ final class Doctrine */ private static $_path; - /** - * Debug - * - * Bool true/false - * - * @var boolean $_debug - */ - private static $_debug = false; - /** * _loadedModelFiles * @@ -468,14 +570,6 @@ final class Doctrine */ private static $_loadedModelFiles = array(); - /** - * _validators - * - * Array of all the loaded validators - * @var array - */ - private static $_validators = array(); - /** * __construct * @@ -486,22 +580,7 @@ final class Doctrine { throw new Doctrine_Exception('Doctrine is static class. No instances can be created.'); } - - /** - * debug - * - * @param string $bool - * @return void - */ - public static function debug($bool = null) - { - if ($bool !== null) { - self::$_debug = (bool) $bool; - } - - return self::$_debug; - } - + /** * getPath * returns the doctrine root @@ -539,7 +618,7 @@ final class Doctrine $e = explode('.', $file->getFileName()); if (end($e) === 'php' && strpos($file->getFileName(), '.inc') === false) { - if ($manager->getAttribute(Doctrine::ATTR_MODEL_LOADING) == Doctrine::MODEL_LOADING_CONSERVATIVE) { + if ($manager->getAttribute(Doctrine::ATTR_MODEL_LOADING) === Doctrine::MODEL_LOADING_CONSERVATIVE) { self::$_loadedModelFiles[$e[0]] = $file->getPathName(); $loadedModels[] = $e[0]; } else { @@ -573,15 +652,12 @@ final class Doctrine * Will filter through an array of classes and return the Doctrine_Records out of them. * If you do not specify $classes it will return all of the currently loaded Doctrine_Records * - * @param classes Array of classes to filter through, otherwise uses get_declared_classes() * @return array $loadedModels */ - public static function getLoadedModels($classes = null) + public static function getLoadedModels() { - if ($classes === null) { - $classes = get_declared_classes(); - $classes = array_merge($classes, array_keys(self::$_loadedModelFiles)); - } + $classes = get_declared_classes(); + $classes = array_merge($classes, array_keys(self::$_loadedModelFiles)); return self::filterInvalidModels($classes); } @@ -691,7 +767,7 @@ final class Doctrine */ public static function generateYamlFromDb($yamlPath) { - $directory = '/tmp/tmp_doctrine_models'; + $directory = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'tmp_doctrine_models'; Doctrine::generateModelsFromDb($directory); @@ -861,7 +937,7 @@ final class Doctrine } try { - $connection->export->dropDatabase($name); + $connection->export->dropDatabase($connection->getDatabaseName()); $results[$name] = true; } catch (Exception $e) { @@ -980,34 +1056,6 @@ final class Doctrine return Doctrine_Manager::table($tableName); } - /** - * fileFinder - * - * @param string $type - * @return void - */ - public static function fileFinder($type) - { - return Doctrine_FileFinder::type($type); - } - - /** - * compile - * - * method for making a single file of most used doctrine runtime components - * including the compiled file instead of multiple files (in worst - * cases dozens of files) can improve performance by an order of magnitude - * - * @param string $target - * @param array $includedDrivers - * @throws Doctrine_Exception - * @return void - */ - public static function compile($target = null, $includedDrivers = array()) - { - return Doctrine_Compiler::compile($target, $includedDrivers); - } - /** * autoload * @@ -1019,7 +1067,7 @@ final class Doctrine */ public static function autoload($className) { - if (class_exists($className, false) || interface_exists($className, false)) { + if ( substr($className, 0, 9) != 'Doctrine_' || class_exists($className, false) || interface_exists($className, false)) { return false; } @@ -1027,8 +1075,16 @@ final class Doctrine self::$_path = dirname(__FILE__); } - $class = self::$_path . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php'; + $findPattern = self::$_path . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, str_replace('Doctrine_', '', $className)) . '.php'; + $matches = glob($findPattern); + + if ( ! isset($matches[0])) { + return false; + } + + $class = $matches[0]; + if (file_exists($class)) { require $class; @@ -1109,17 +1165,4 @@ final class Doctrine { return Doctrine_Inflector::classify($tableName); } - - /** - * isValidClassName - * - * checks for valid class name (uses camel case and underscores) - * - * @param string $classname - * @return boolean - */ - public static function isValidClassname($className) - { - return Doctrine_Lib::isValidClassName($className); - } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Access.php b/lib/orm/Access.php similarity index 100% rename from lib/Doctrine/Access.php rename to lib/orm/Access.php diff --git a/lib/Doctrine/Adapter.php b/lib/orm/Adapter.php similarity index 100% rename from lib/Doctrine/Adapter.php rename to lib/orm/Adapter.php diff --git a/lib/Doctrine/Adapter/Db2.php b/lib/orm/Adapter/Db2.php similarity index 100% rename from lib/Doctrine/Adapter/Db2.php rename to lib/orm/Adapter/Db2.php diff --git a/lib/Doctrine/Adapter/Db2/Exception.php b/lib/orm/Adapter/Db2/Exception.php similarity index 100% rename from lib/Doctrine/Adapter/Db2/Exception.php rename to lib/orm/Adapter/Db2/Exception.php diff --git a/lib/Doctrine/Adapter/Exception.php b/lib/orm/Adapter/Exception.php similarity index 100% rename from lib/Doctrine/Adapter/Exception.php rename to lib/orm/Adapter/Exception.php diff --git a/lib/Doctrine/Adapter/Interface.php b/lib/orm/Adapter/Interface.php similarity index 100% rename from lib/Doctrine/Adapter/Interface.php rename to lib/orm/Adapter/Interface.php diff --git a/lib/Doctrine/Adapter/Mock.php b/lib/orm/Adapter/Mock.php similarity index 100% rename from lib/Doctrine/Adapter/Mock.php rename to lib/orm/Adapter/Mock.php diff --git a/lib/Doctrine/Adapter/Mysqli.php b/lib/orm/Adapter/Mysqli.php similarity index 100% rename from lib/Doctrine/Adapter/Mysqli.php rename to lib/orm/Adapter/Mysqli.php diff --git a/lib/Doctrine/Adapter/Oracle.php b/lib/orm/Adapter/Oracle.php similarity index 100% rename from lib/Doctrine/Adapter/Oracle.php rename to lib/orm/Adapter/Oracle.php diff --git a/lib/Doctrine/Adapter/Resource.php b/lib/orm/Adapter/Resource.php similarity index 100% rename from lib/Doctrine/Adapter/Resource.php rename to lib/orm/Adapter/Resource.php diff --git a/lib/Doctrine/Adapter/Statement.php b/lib/orm/Adapter/Statement.php similarity index 100% rename from lib/Doctrine/Adapter/Statement.php rename to lib/orm/Adapter/Statement.php diff --git a/lib/Doctrine/Adapter/Statement/Interface.php b/lib/orm/Adapter/Statement/Interface.php similarity index 100% rename from lib/Doctrine/Adapter/Statement/Interface.php rename to lib/orm/Adapter/Statement/Interface.php diff --git a/lib/Doctrine/Adapter/Statement/Mock.php b/lib/orm/Adapter/Statement/Mock.php similarity index 100% rename from lib/Doctrine/Adapter/Statement/Mock.php rename to lib/orm/Adapter/Statement/Mock.php diff --git a/lib/Doctrine/AuditLog.php b/lib/orm/AuditLog.php similarity index 100% rename from lib/Doctrine/AuditLog.php rename to lib/orm/AuditLog.php diff --git a/lib/Doctrine/AuditLog/Listener.php b/lib/orm/AuditLog/Listener.php similarity index 100% rename from lib/Doctrine/AuditLog/Listener.php rename to lib/orm/AuditLog/Listener.php diff --git a/lib/Doctrine/Cache.php b/lib/orm/Cache.php similarity index 100% rename from lib/Doctrine/Cache.php rename to lib/orm/Cache.php diff --git a/lib/Doctrine/Cache/Apc.php b/lib/orm/Cache/Apc.php similarity index 100% rename from lib/Doctrine/Cache/Apc.php rename to lib/orm/Cache/Apc.php diff --git a/lib/Doctrine/Cache/Array.php b/lib/orm/Cache/Array.php similarity index 100% rename from lib/Doctrine/Cache/Array.php rename to lib/orm/Cache/Array.php diff --git a/lib/Doctrine/Cache/Db.php b/lib/orm/Cache/Db.php similarity index 100% rename from lib/Doctrine/Cache/Db.php rename to lib/orm/Cache/Db.php diff --git a/lib/Doctrine/Cache/Driver.php b/lib/orm/Cache/Driver.php similarity index 100% rename from lib/Doctrine/Cache/Driver.php rename to lib/orm/Cache/Driver.php diff --git a/lib/Doctrine/Cache/Exception.php b/lib/orm/Cache/Exception.php similarity index 100% rename from lib/Doctrine/Cache/Exception.php rename to lib/orm/Cache/Exception.php diff --git a/lib/Doctrine/Cache/Interface.php b/lib/orm/Cache/Interface.php similarity index 100% rename from lib/Doctrine/Cache/Interface.php rename to lib/orm/Cache/Interface.php diff --git a/lib/Doctrine/Cache/Memcache.php b/lib/orm/Cache/Memcache.php similarity index 100% rename from lib/Doctrine/Cache/Memcache.php rename to lib/orm/Cache/Memcache.php diff --git a/lib/Doctrine/Cache/Xcache.php b/lib/orm/Cache/Xcache.php similarity index 100% rename from lib/Doctrine/Cache/Xcache.php rename to lib/orm/Cache/Xcache.php diff --git a/lib/Doctrine/Cli.php b/lib/orm/Cli.php similarity index 100% rename from lib/Doctrine/Cli.php rename to lib/orm/Cli.php diff --git a/lib/Doctrine/Cli/AnsiColorFormatter.php b/lib/orm/Cli/AnsiColorFormatter.php similarity index 100% rename from lib/Doctrine/Cli/AnsiColorFormatter.php rename to lib/orm/Cli/AnsiColorFormatter.php diff --git a/lib/Doctrine/Cli/Exception.php b/lib/orm/Cli/Exception.php similarity index 100% rename from lib/Doctrine/Cli/Exception.php rename to lib/orm/Cli/Exception.php diff --git a/lib/Doctrine/Cli/Formatter.php b/lib/orm/Cli/Formatter.php similarity index 100% rename from lib/Doctrine/Cli/Formatter.php rename to lib/orm/Cli/Formatter.php diff --git a/lib/Doctrine/Collection.php b/lib/orm/Collection.php similarity index 100% rename from lib/Doctrine/Collection.php rename to lib/orm/Collection.php diff --git a/lib/Doctrine/Collection/Exception.php b/lib/orm/Collection/Exception.php similarity index 100% rename from lib/Doctrine/Collection/Exception.php rename to lib/orm/Collection/Exception.php diff --git a/lib/Doctrine/Collection/Iterator.php b/lib/orm/Collection/Iterator.php similarity index 100% rename from lib/Doctrine/Collection/Iterator.php rename to lib/orm/Collection/Iterator.php diff --git a/lib/Doctrine/Collection/Iterator/Expandable.php b/lib/orm/Collection/Iterator/Expandable.php similarity index 100% rename from lib/Doctrine/Collection/Iterator/Expandable.php rename to lib/orm/Collection/Iterator/Expandable.php diff --git a/lib/Doctrine/Collection/Iterator/Normal.php b/lib/orm/Collection/Iterator/Normal.php similarity index 100% rename from lib/Doctrine/Collection/Iterator/Normal.php rename to lib/orm/Collection/Iterator/Normal.php diff --git a/lib/Doctrine/Collection/Iterator/Offset.php b/lib/orm/Collection/Iterator/Offset.php similarity index 100% rename from lib/Doctrine/Collection/Iterator/Offset.php rename to lib/orm/Collection/Iterator/Offset.php diff --git a/lib/Doctrine/Collection/Offset.php b/lib/orm/Collection/Offset.php similarity index 100% rename from lib/Doctrine/Collection/Offset.php rename to lib/orm/Collection/Offset.php diff --git a/lib/Doctrine/Column.php b/lib/orm/Column.php similarity index 100% rename from lib/Doctrine/Column.php rename to lib/orm/Column.php diff --git a/lib/Doctrine/Compiler.php b/lib/orm/Compiler.php similarity index 100% rename from lib/Doctrine/Compiler.php rename to lib/orm/Compiler.php diff --git a/lib/Doctrine/Compiler/Exception.php b/lib/orm/Compiler/Exception.php similarity index 100% rename from lib/Doctrine/Compiler/Exception.php rename to lib/orm/Compiler/Exception.php diff --git a/lib/Doctrine/Configurable.php b/lib/orm/Configurable.php similarity index 100% rename from lib/Doctrine/Configurable.php rename to lib/orm/Configurable.php diff --git a/lib/Doctrine/Connection.php b/lib/orm/Connection.php similarity index 100% rename from lib/Doctrine/Connection.php rename to lib/orm/Connection.php diff --git a/lib/Doctrine/Connection/Common.php b/lib/orm/Connection/Common.php similarity index 100% rename from lib/Doctrine/Connection/Common.php rename to lib/orm/Connection/Common.php diff --git a/lib/Doctrine/Connection/Db2.php b/lib/orm/Connection/Db2.php similarity index 100% rename from lib/Doctrine/Connection/Db2.php rename to lib/orm/Connection/Db2.php diff --git a/lib/Doctrine/Connection/Exception.php b/lib/orm/Connection/Exception.php similarity index 100% rename from lib/Doctrine/Connection/Exception.php rename to lib/orm/Connection/Exception.php diff --git a/lib/Doctrine/Connection/Firebird.php b/lib/orm/Connection/Firebird.php similarity index 100% rename from lib/Doctrine/Connection/Firebird.php rename to lib/orm/Connection/Firebird.php diff --git a/lib/Doctrine/Connection/Firebird/Exception.php b/lib/orm/Connection/Firebird/Exception.php similarity index 100% rename from lib/Doctrine/Connection/Firebird/Exception.php rename to lib/orm/Connection/Firebird/Exception.php diff --git a/lib/Doctrine/Connection/Informix.php b/lib/orm/Connection/Informix.php similarity index 100% rename from lib/Doctrine/Connection/Informix.php rename to lib/orm/Connection/Informix.php diff --git a/lib/Doctrine/Connection/Informix/Exception.php b/lib/orm/Connection/Informix/Exception.php similarity index 100% rename from lib/Doctrine/Connection/Informix/Exception.php rename to lib/orm/Connection/Informix/Exception.php diff --git a/lib/Doctrine/Connection/Mock.php b/lib/orm/Connection/Mock.php similarity index 100% rename from lib/Doctrine/Connection/Mock.php rename to lib/orm/Connection/Mock.php diff --git a/lib/Doctrine/Connection/Module.php b/lib/orm/Connection/Module.php similarity index 100% rename from lib/Doctrine/Connection/Module.php rename to lib/orm/Connection/Module.php diff --git a/lib/Doctrine/Connection/Mssql.php b/lib/orm/Connection/Mssql.php similarity index 100% rename from lib/Doctrine/Connection/Mssql.php rename to lib/orm/Connection/Mssql.php diff --git a/lib/Doctrine/Connection/Mssql/Exception.php b/lib/orm/Connection/Mssql/Exception.php similarity index 100% rename from lib/Doctrine/Connection/Mssql/Exception.php rename to lib/orm/Connection/Mssql/Exception.php diff --git a/lib/Doctrine/Connection/Mysql.php b/lib/orm/Connection/Mysql.php similarity index 100% rename from lib/Doctrine/Connection/Mysql.php rename to lib/orm/Connection/Mysql.php diff --git a/lib/Doctrine/Connection/Mysql/Exception.php b/lib/orm/Connection/Mysql/Exception.php similarity index 100% rename from lib/Doctrine/Connection/Mysql/Exception.php rename to lib/orm/Connection/Mysql/Exception.php diff --git a/lib/Doctrine/Connection/Oracle.php b/lib/orm/Connection/Oracle.php similarity index 100% rename from lib/Doctrine/Connection/Oracle.php rename to lib/orm/Connection/Oracle.php diff --git a/lib/Doctrine/Connection/Oracle/Exception.php b/lib/orm/Connection/Oracle/Exception.php similarity index 100% rename from lib/Doctrine/Connection/Oracle/Exception.php rename to lib/orm/Connection/Oracle/Exception.php diff --git a/lib/Doctrine/Connection/Pgsql.php b/lib/orm/Connection/Pgsql.php similarity index 100% rename from lib/Doctrine/Connection/Pgsql.php rename to lib/orm/Connection/Pgsql.php diff --git a/lib/Doctrine/Connection/Pgsql/Exception.php b/lib/orm/Connection/Pgsql/Exception.php similarity index 100% rename from lib/Doctrine/Connection/Pgsql/Exception.php rename to lib/orm/Connection/Pgsql/Exception.php diff --git a/lib/Doctrine/Connection/Profiler.php b/lib/orm/Connection/Profiler.php similarity index 100% rename from lib/Doctrine/Connection/Profiler.php rename to lib/orm/Connection/Profiler.php diff --git a/lib/Doctrine/Connection/Profiler/Exception.php b/lib/orm/Connection/Profiler/Exception.php similarity index 100% rename from lib/Doctrine/Connection/Profiler/Exception.php rename to lib/orm/Connection/Profiler/Exception.php diff --git a/lib/Doctrine/Connection/Sqlite.php b/lib/orm/Connection/Sqlite.php similarity index 100% rename from lib/Doctrine/Connection/Sqlite.php rename to lib/orm/Connection/Sqlite.php diff --git a/lib/Doctrine/Connection/Sqlite/Exception.php b/lib/orm/Connection/Sqlite/Exception.php similarity index 100% rename from lib/Doctrine/Connection/Sqlite/Exception.php rename to lib/orm/Connection/Sqlite/Exception.php diff --git a/lib/Doctrine/Connection/Statement.php b/lib/orm/Connection/Statement.php similarity index 100% rename from lib/Doctrine/Connection/Statement.php rename to lib/orm/Connection/Statement.php diff --git a/lib/Doctrine/Connection/UnitOfWork.php b/lib/orm/Connection/UnitOfWork.php similarity index 100% rename from lib/Doctrine/Connection/UnitOfWork.php rename to lib/orm/Connection/UnitOfWork.php diff --git a/lib/Doctrine/Data.php b/lib/orm/Data.php similarity index 100% rename from lib/Doctrine/Data.php rename to lib/orm/Data.php diff --git a/lib/Doctrine/Data/Exception.php b/lib/orm/Data/Exception.php similarity index 100% rename from lib/Doctrine/Data/Exception.php rename to lib/orm/Data/Exception.php diff --git a/lib/Doctrine/Data/Export.php b/lib/orm/Data/Export.php similarity index 100% rename from lib/Doctrine/Data/Export.php rename to lib/orm/Data/Export.php diff --git a/lib/Doctrine/Data/Import.php b/lib/orm/Data/Import.php similarity index 100% rename from lib/Doctrine/Data/Import.php rename to lib/orm/Data/Import.php diff --git a/lib/Doctrine/DataDict.php b/lib/orm/DataDict.php similarity index 100% rename from lib/Doctrine/DataDict.php rename to lib/orm/DataDict.php diff --git a/lib/Doctrine/DataDict/Exception.php b/lib/orm/DataDict/Exception.php similarity index 100% rename from lib/Doctrine/DataDict/Exception.php rename to lib/orm/DataDict/Exception.php diff --git a/lib/Doctrine/DataDict/Firebird.php b/lib/orm/DataDict/Firebird.php similarity index 100% rename from lib/Doctrine/DataDict/Firebird.php rename to lib/orm/DataDict/Firebird.php diff --git a/lib/Doctrine/DataDict/Informix.php b/lib/orm/DataDict/Informix.php similarity index 100% rename from lib/Doctrine/DataDict/Informix.php rename to lib/orm/DataDict/Informix.php diff --git a/lib/Doctrine/DataDict/Mssql.php b/lib/orm/DataDict/Mssql.php similarity index 100% rename from lib/Doctrine/DataDict/Mssql.php rename to lib/orm/DataDict/Mssql.php diff --git a/lib/Doctrine/DataDict/Mysql.php b/lib/orm/DataDict/Mysql.php similarity index 100% rename from lib/Doctrine/DataDict/Mysql.php rename to lib/orm/DataDict/Mysql.php diff --git a/lib/Doctrine/DataDict/Oracle.php b/lib/orm/DataDict/Oracle.php similarity index 100% rename from lib/Doctrine/DataDict/Oracle.php rename to lib/orm/DataDict/Oracle.php diff --git a/lib/Doctrine/DataDict/Pgsql.php b/lib/orm/DataDict/Pgsql.php similarity index 100% rename from lib/Doctrine/DataDict/Pgsql.php rename to lib/orm/DataDict/Pgsql.php diff --git a/lib/Doctrine/DataDict/Sqlite.php b/lib/orm/DataDict/Sqlite.php similarity index 100% rename from lib/Doctrine/DataDict/Sqlite.php rename to lib/orm/DataDict/Sqlite.php diff --git a/lib/Doctrine/DataType.php b/lib/orm/DataType.php similarity index 100% rename from lib/Doctrine/DataType.php rename to lib/orm/DataType.php diff --git a/lib/Doctrine/Db.php b/lib/orm/Db.php similarity index 100% rename from lib/Doctrine/Db.php rename to lib/orm/Db.php diff --git a/lib/Doctrine/Event.php b/lib/orm/Event.php similarity index 100% rename from lib/Doctrine/Event.php rename to lib/orm/Event.php diff --git a/lib/Doctrine/EventListener.php b/lib/orm/EventListener.php similarity index 100% rename from lib/Doctrine/EventListener.php rename to lib/orm/EventListener.php diff --git a/lib/Doctrine/EventListener/Chain.php b/lib/orm/EventListener/Chain.php similarity index 100% rename from lib/Doctrine/EventListener/Chain.php rename to lib/orm/EventListener/Chain.php diff --git a/lib/Doctrine/EventListener/Exception.php b/lib/orm/EventListener/Exception.php similarity index 100% rename from lib/Doctrine/EventListener/Exception.php rename to lib/orm/EventListener/Exception.php diff --git a/lib/Doctrine/EventListener/Interface.php b/lib/orm/EventListener/Interface.php similarity index 100% rename from lib/Doctrine/EventListener/Interface.php rename to lib/orm/EventListener/Interface.php diff --git a/lib/Doctrine/Exception.php b/lib/orm/Exception.php similarity index 100% rename from lib/Doctrine/Exception.php rename to lib/orm/Exception.php diff --git a/lib/Doctrine/Export.php b/lib/orm/Export.php similarity index 100% rename from lib/Doctrine/Export.php rename to lib/orm/Export.php diff --git a/lib/Doctrine/Export/Exception.php b/lib/orm/Export/Exception.php similarity index 100% rename from lib/Doctrine/Export/Exception.php rename to lib/orm/Export/Exception.php diff --git a/lib/Doctrine/Export/Firebird.php b/lib/orm/Export/Firebird.php similarity index 100% rename from lib/Doctrine/Export/Firebird.php rename to lib/orm/Export/Firebird.php diff --git a/lib/Doctrine/Export/Frontbase.php b/lib/orm/Export/Frontbase.php similarity index 100% rename from lib/Doctrine/Export/Frontbase.php rename to lib/orm/Export/Frontbase.php diff --git a/lib/Doctrine/Export/Mssql.php b/lib/orm/Export/Mssql.php similarity index 100% rename from lib/Doctrine/Export/Mssql.php rename to lib/orm/Export/Mssql.php diff --git a/lib/Doctrine/Export/Mysql.php b/lib/orm/Export/Mysql.php similarity index 100% rename from lib/Doctrine/Export/Mysql.php rename to lib/orm/Export/Mysql.php diff --git a/lib/Doctrine/Export/Oracle.php b/lib/orm/Export/Oracle.php similarity index 100% rename from lib/Doctrine/Export/Oracle.php rename to lib/orm/Export/Oracle.php diff --git a/lib/Doctrine/Export/Pgsql.php b/lib/orm/Export/Pgsql.php similarity index 100% rename from lib/Doctrine/Export/Pgsql.php rename to lib/orm/Export/Pgsql.php diff --git a/lib/Doctrine/Export/Reporter.php b/lib/orm/Export/Reporter.php similarity index 100% rename from lib/Doctrine/Export/Reporter.php rename to lib/orm/Export/Reporter.php diff --git a/lib/Doctrine/Export/Schema.php b/lib/orm/Export/Schema.php similarity index 100% rename from lib/Doctrine/Export/Schema.php rename to lib/orm/Export/Schema.php diff --git a/lib/Doctrine/Export/Sqlite.php b/lib/orm/Export/Sqlite.php similarity index 100% rename from lib/Doctrine/Export/Sqlite.php rename to lib/orm/Export/Sqlite.php diff --git a/lib/Doctrine/Expression.php b/lib/orm/Expression.php similarity index 100% rename from lib/Doctrine/Expression.php rename to lib/orm/Expression.php diff --git a/lib/Doctrine/Expression/Driver.php b/lib/orm/Expression/Driver.php similarity index 100% rename from lib/Doctrine/Expression/Driver.php rename to lib/orm/Expression/Driver.php diff --git a/lib/Doctrine/Expression/Exception.php b/lib/orm/Expression/Exception.php similarity index 100% rename from lib/Doctrine/Expression/Exception.php rename to lib/orm/Expression/Exception.php diff --git a/lib/Doctrine/Expression/Firebird.php b/lib/orm/Expression/Firebird.php similarity index 100% rename from lib/Doctrine/Expression/Firebird.php rename to lib/orm/Expression/Firebird.php diff --git a/lib/Doctrine/Expression/Informix.php b/lib/orm/Expression/Informix.php similarity index 100% rename from lib/Doctrine/Expression/Informix.php rename to lib/orm/Expression/Informix.php diff --git a/lib/Doctrine/Expression/Mock.php b/lib/orm/Expression/Mock.php similarity index 100% rename from lib/Doctrine/Expression/Mock.php rename to lib/orm/Expression/Mock.php diff --git a/lib/Doctrine/Expression/Mssql.php b/lib/orm/Expression/Mssql.php similarity index 100% rename from lib/Doctrine/Expression/Mssql.php rename to lib/orm/Expression/Mssql.php diff --git a/lib/Doctrine/Expression/Mysql.php b/lib/orm/Expression/Mysql.php similarity index 100% rename from lib/Doctrine/Expression/Mysql.php rename to lib/orm/Expression/Mysql.php diff --git a/lib/Doctrine/Expression/Oracle.php b/lib/orm/Expression/Oracle.php similarity index 100% rename from lib/Doctrine/Expression/Oracle.php rename to lib/orm/Expression/Oracle.php diff --git a/lib/Doctrine/Expression/Pgsql.php b/lib/orm/Expression/Pgsql.php similarity index 100% rename from lib/Doctrine/Expression/Pgsql.php rename to lib/orm/Expression/Pgsql.php diff --git a/lib/Doctrine/Expression/Sqlite.php b/lib/orm/Expression/Sqlite.php similarity index 100% rename from lib/Doctrine/Expression/Sqlite.php rename to lib/orm/Expression/Sqlite.php diff --git a/lib/Doctrine/File.php b/lib/orm/File.php similarity index 100% rename from lib/Doctrine/File.php rename to lib/orm/File.php diff --git a/lib/Doctrine/File/Index.php b/lib/orm/File/Index.php similarity index 100% rename from lib/Doctrine/File/Index.php rename to lib/orm/File/Index.php diff --git a/lib/Doctrine/FileFinder.php b/lib/orm/FileFinder.php similarity index 100% rename from lib/Doctrine/FileFinder.php rename to lib/orm/FileFinder.php diff --git a/lib/Doctrine/FileFinder/GlobToRegex.php b/lib/orm/FileFinder/GlobToRegex.php similarity index 100% rename from lib/Doctrine/FileFinder/GlobToRegex.php rename to lib/orm/FileFinder/GlobToRegex.php diff --git a/lib/Doctrine/FileFinder/NumberCompare.php b/lib/orm/FileFinder/NumberCompare.php similarity index 100% rename from lib/Doctrine/FileFinder/NumberCompare.php rename to lib/orm/FileFinder/NumberCompare.php diff --git a/lib/Doctrine/Formatter.php b/lib/orm/Formatter.php similarity index 100% rename from lib/Doctrine/Formatter.php rename to lib/orm/Formatter.php diff --git a/lib/Doctrine/Hook.php b/lib/orm/Hook.php similarity index 100% rename from lib/Doctrine/Hook.php rename to lib/orm/Hook.php diff --git a/lib/Doctrine/Hook/Equal.php b/lib/orm/Hook/Equal.php similarity index 100% rename from lib/Doctrine/Hook/Equal.php rename to lib/orm/Hook/Equal.php diff --git a/lib/Doctrine/Hook/Integer.php b/lib/orm/Hook/Integer.php similarity index 100% rename from lib/Doctrine/Hook/Integer.php rename to lib/orm/Hook/Integer.php diff --git a/lib/Doctrine/Hook/Parser.php b/lib/orm/Hook/Parser.php similarity index 100% rename from lib/Doctrine/Hook/Parser.php rename to lib/orm/Hook/Parser.php diff --git a/lib/Doctrine/Hook/Parser/Complex.php b/lib/orm/Hook/Parser/Complex.php similarity index 100% rename from lib/Doctrine/Hook/Parser/Complex.php rename to lib/orm/Hook/Parser/Complex.php diff --git a/lib/Doctrine/Hook/WordLike.php b/lib/orm/Hook/WordLike.php similarity index 100% rename from lib/Doctrine/Hook/WordLike.php rename to lib/orm/Hook/WordLike.php diff --git a/lib/Doctrine/Hydrator.php b/lib/orm/Hydrator.php similarity index 100% rename from lib/Doctrine/Hydrator.php rename to lib/orm/Hydrator.php diff --git a/lib/Doctrine/Hydrator/Abstract.php b/lib/orm/Hydrator/Abstract.php similarity index 100% rename from lib/Doctrine/Hydrator/Abstract.php rename to lib/orm/Hydrator/Abstract.php diff --git a/lib/Doctrine/Hydrator/ArrayDriver.php b/lib/orm/Hydrator/ArrayDriver.php similarity index 100% rename from lib/Doctrine/Hydrator/ArrayDriver.php rename to lib/orm/Hydrator/ArrayDriver.php diff --git a/lib/Doctrine/Hydrator/Exception.php b/lib/orm/Hydrator/Exception.php similarity index 100% rename from lib/Doctrine/Hydrator/Exception.php rename to lib/orm/Hydrator/Exception.php diff --git a/lib/Doctrine/Hydrator/RecordDriver.php b/lib/orm/Hydrator/RecordDriver.php similarity index 100% rename from lib/Doctrine/Hydrator/RecordDriver.php rename to lib/orm/Hydrator/RecordDriver.php diff --git a/lib/Doctrine/I18n.php b/lib/orm/I18n.php similarity index 100% rename from lib/Doctrine/I18n.php rename to lib/orm/I18n.php diff --git a/lib/Doctrine/I18n/Exception.php b/lib/orm/I18n/Exception.php similarity index 100% rename from lib/Doctrine/I18n/Exception.php rename to lib/orm/I18n/Exception.php diff --git a/lib/Doctrine/Import.php b/lib/orm/Import.php similarity index 100% rename from lib/Doctrine/Import.php rename to lib/orm/Import.php diff --git a/lib/Doctrine/Import/Builder.php b/lib/orm/Import/Builder.php similarity index 100% rename from lib/Doctrine/Import/Builder.php rename to lib/orm/Import/Builder.php diff --git a/lib/Doctrine/Import/Builder/BaseClass.php b/lib/orm/Import/Builder/BaseClass.php similarity index 100% rename from lib/Doctrine/Import/Builder/BaseClass.php rename to lib/orm/Import/Builder/BaseClass.php diff --git a/lib/Doctrine/Import/Builder/Exception.php b/lib/orm/Import/Builder/Exception.php similarity index 100% rename from lib/Doctrine/Import/Builder/Exception.php rename to lib/orm/Import/Builder/Exception.php diff --git a/lib/Doctrine/Import/Exception.php b/lib/orm/Import/Exception.php similarity index 100% rename from lib/Doctrine/Import/Exception.php rename to lib/orm/Import/Exception.php diff --git a/lib/Doctrine/Import/Firebird.php b/lib/orm/Import/Firebird.php similarity index 100% rename from lib/Doctrine/Import/Firebird.php rename to lib/orm/Import/Firebird.php diff --git a/lib/Doctrine/Import/Informix.php b/lib/orm/Import/Informix.php similarity index 100% rename from lib/Doctrine/Import/Informix.php rename to lib/orm/Import/Informix.php diff --git a/lib/Doctrine/Import/Mssql.php b/lib/orm/Import/Mssql.php similarity index 100% rename from lib/Doctrine/Import/Mssql.php rename to lib/orm/Import/Mssql.php diff --git a/lib/Doctrine/Import/Mysql.php b/lib/orm/Import/Mysql.php similarity index 100% rename from lib/Doctrine/Import/Mysql.php rename to lib/orm/Import/Mysql.php diff --git a/lib/Doctrine/Import/Oracle.php b/lib/orm/Import/Oracle.php similarity index 100% rename from lib/Doctrine/Import/Oracle.php rename to lib/orm/Import/Oracle.php diff --git a/lib/Doctrine/Import/Pgsql.php b/lib/orm/Import/Pgsql.php similarity index 100% rename from lib/Doctrine/Import/Pgsql.php rename to lib/orm/Import/Pgsql.php diff --git a/lib/Doctrine/Import/Reader.php b/lib/orm/Import/Reader.php similarity index 100% rename from lib/Doctrine/Import/Reader.php rename to lib/orm/Import/Reader.php diff --git a/lib/Doctrine/Import/Reader/Db.php b/lib/orm/Import/Reader/Db.php similarity index 100% rename from lib/Doctrine/Import/Reader/Db.php rename to lib/orm/Import/Reader/Db.php diff --git a/lib/Doctrine/Import/Reader/Exception.php b/lib/orm/Import/Reader/Exception.php similarity index 100% rename from lib/Doctrine/Import/Reader/Exception.php rename to lib/orm/Import/Reader/Exception.php diff --git a/lib/Doctrine/Import/Reader/Propel.php b/lib/orm/Import/Reader/Propel.php similarity index 100% rename from lib/Doctrine/Import/Reader/Propel.php rename to lib/orm/Import/Reader/Propel.php diff --git a/lib/Doctrine/Import/Schema.php b/lib/orm/Import/Schema.php similarity index 100% rename from lib/Doctrine/Import/Schema.php rename to lib/orm/Import/Schema.php diff --git a/lib/Doctrine/Import/Sqlite.php b/lib/orm/Import/Sqlite.php similarity index 100% rename from lib/Doctrine/Import/Sqlite.php rename to lib/orm/Import/Sqlite.php diff --git a/lib/Doctrine/Inflector.php b/lib/orm/Inflector.php similarity index 100% rename from lib/Doctrine/Inflector.php rename to lib/orm/Inflector.php diff --git a/lib/Doctrine/IntegrityMapper.php b/lib/orm/IntegrityMapper.php similarity index 100% rename from lib/Doctrine/IntegrityMapper.php rename to lib/orm/IntegrityMapper.php diff --git a/lib/Doctrine/Lib.php b/lib/orm/Lib.php similarity index 100% rename from lib/Doctrine/Lib.php rename to lib/orm/Lib.php diff --git a/lib/Doctrine/Locator.php b/lib/orm/Locator.php similarity index 100% rename from lib/Doctrine/Locator.php rename to lib/orm/Locator.php diff --git a/lib/Doctrine/Locator/Exception.php b/lib/orm/Locator/Exception.php similarity index 100% rename from lib/Doctrine/Locator/Exception.php rename to lib/orm/Locator/Exception.php diff --git a/lib/Doctrine/Locator/Injectable.php b/lib/orm/Locator/Injectable.php similarity index 100% rename from lib/Doctrine/Locator/Injectable.php rename to lib/orm/Locator/Injectable.php diff --git a/lib/Doctrine/Locking/Exception.php b/lib/orm/Locking/Exception.php similarity index 100% rename from lib/Doctrine/Locking/Exception.php rename to lib/orm/Locking/Exception.php diff --git a/lib/Doctrine/Locking/Manager/Pessimistic.php b/lib/orm/Locking/Manager/Pessimistic.php similarity index 100% rename from lib/Doctrine/Locking/Manager/Pessimistic.php rename to lib/orm/Locking/Manager/Pessimistic.php diff --git a/lib/Doctrine/Log.php b/lib/orm/Log.php similarity index 100% rename from lib/Doctrine/Log.php rename to lib/orm/Log.php diff --git a/lib/Doctrine/Log/Exception.php b/lib/orm/Log/Exception.php similarity index 100% rename from lib/Doctrine/Log/Exception.php rename to lib/orm/Log/Exception.php diff --git a/lib/Doctrine/Log/Filter/Interface.php b/lib/orm/Log/Filter/Interface.php similarity index 100% rename from lib/Doctrine/Log/Filter/Interface.php rename to lib/orm/Log/Filter/Interface.php diff --git a/lib/Doctrine/Log/Filter/Message.php b/lib/orm/Log/Filter/Message.php similarity index 100% rename from lib/Doctrine/Log/Filter/Message.php rename to lib/orm/Log/Filter/Message.php diff --git a/lib/Doctrine/Log/Filter/Priority.php b/lib/orm/Log/Filter/Priority.php similarity index 100% rename from lib/Doctrine/Log/Filter/Priority.php rename to lib/orm/Log/Filter/Priority.php diff --git a/lib/Doctrine/Log/Filter/Suppress.php b/lib/orm/Log/Filter/Suppress.php similarity index 100% rename from lib/Doctrine/Log/Filter/Suppress.php rename to lib/orm/Log/Filter/Suppress.php diff --git a/lib/Doctrine/Log/Formatter/Interface.php b/lib/orm/Log/Formatter/Interface.php similarity index 100% rename from lib/Doctrine/Log/Formatter/Interface.php rename to lib/orm/Log/Formatter/Interface.php diff --git a/lib/Doctrine/Log/Formatter/Simple.php b/lib/orm/Log/Formatter/Simple.php similarity index 100% rename from lib/Doctrine/Log/Formatter/Simple.php rename to lib/orm/Log/Formatter/Simple.php diff --git a/lib/Doctrine/Log/Formatter/Xml.php b/lib/orm/Log/Formatter/Xml.php similarity index 100% rename from lib/Doctrine/Log/Formatter/Xml.php rename to lib/orm/Log/Formatter/Xml.php diff --git a/lib/Doctrine/Log/Writer/Abstract.php b/lib/orm/Log/Writer/Abstract.php similarity index 100% rename from lib/Doctrine/Log/Writer/Abstract.php rename to lib/orm/Log/Writer/Abstract.php diff --git a/lib/Doctrine/Log/Writer/Db.php b/lib/orm/Log/Writer/Db.php similarity index 100% rename from lib/Doctrine/Log/Writer/Db.php rename to lib/orm/Log/Writer/Db.php diff --git a/lib/Doctrine/Log/Writer/Mock.php b/lib/orm/Log/Writer/Mock.php similarity index 100% rename from lib/Doctrine/Log/Writer/Mock.php rename to lib/orm/Log/Writer/Mock.php diff --git a/lib/Doctrine/Log/Writer/Null.php b/lib/orm/Log/Writer/Null.php similarity index 100% rename from lib/Doctrine/Log/Writer/Null.php rename to lib/orm/Log/Writer/Null.php diff --git a/lib/Doctrine/Log/Writer/Stream.php b/lib/orm/Log/Writer/Stream.php similarity index 100% rename from lib/Doctrine/Log/Writer/Stream.php rename to lib/orm/Log/Writer/Stream.php diff --git a/lib/Doctrine/Manager.php b/lib/orm/Manager.php similarity index 100% rename from lib/Doctrine/Manager.php rename to lib/orm/Manager.php diff --git a/lib/Doctrine/Manager/Exception.php b/lib/orm/Manager/Exception.php similarity index 100% rename from lib/Doctrine/Manager/Exception.php rename to lib/orm/Manager/Exception.php diff --git a/lib/Doctrine/Migration.php b/lib/orm/Migration.php similarity index 100% rename from lib/Doctrine/Migration.php rename to lib/orm/Migration.php diff --git a/lib/Doctrine/Migration/Builder.php b/lib/orm/Migration/Builder.php similarity index 100% rename from lib/Doctrine/Migration/Builder.php rename to lib/orm/Migration/Builder.php diff --git a/lib/Doctrine/Migration/Exception.php b/lib/orm/Migration/Exception.php similarity index 100% rename from lib/Doctrine/Migration/Exception.php rename to lib/orm/Migration/Exception.php diff --git a/lib/Doctrine/Migration/IrreversibleMigrationException.php b/lib/orm/Migration/IrreversibleMigrationException.php similarity index 100% rename from lib/Doctrine/Migration/IrreversibleMigrationException.php rename to lib/orm/Migration/IrreversibleMigrationException.php diff --git a/lib/Doctrine/Migration/Process.php b/lib/orm/Migration/Process.php similarity index 100% rename from lib/Doctrine/Migration/Process.php rename to lib/orm/Migration/Process.php diff --git a/lib/Doctrine/Node.php b/lib/orm/Node.php similarity index 100% rename from lib/Doctrine/Node.php rename to lib/orm/Node.php diff --git a/lib/Doctrine/Node/AdjacencyList.php b/lib/orm/Node/AdjacencyList.php similarity index 100% rename from lib/Doctrine/Node/AdjacencyList.php rename to lib/orm/Node/AdjacencyList.php diff --git a/lib/Doctrine/Node/AdjacencyList/LevelOrderIterator.php b/lib/orm/Node/AdjacencyList/LevelOrderIterator.php similarity index 100% rename from lib/Doctrine/Node/AdjacencyList/LevelOrderIterator.php rename to lib/orm/Node/AdjacencyList/LevelOrderIterator.php diff --git a/lib/Doctrine/Node/AdjacencyList/PostOrderIterator.php b/lib/orm/Node/AdjacencyList/PostOrderIterator.php similarity index 100% rename from lib/Doctrine/Node/AdjacencyList/PostOrderIterator.php rename to lib/orm/Node/AdjacencyList/PostOrderIterator.php diff --git a/lib/Doctrine/Node/AdjacencyList/PreOrderIterator.php b/lib/orm/Node/AdjacencyList/PreOrderIterator.php similarity index 100% rename from lib/Doctrine/Node/AdjacencyList/PreOrderIterator.php rename to lib/orm/Node/AdjacencyList/PreOrderIterator.php diff --git a/lib/Doctrine/Node/Exception.php b/lib/orm/Node/Exception.php similarity index 100% rename from lib/Doctrine/Node/Exception.php rename to lib/orm/Node/Exception.php diff --git a/lib/Doctrine/Node/Interface.php b/lib/orm/Node/Interface.php similarity index 100% rename from lib/Doctrine/Node/Interface.php rename to lib/orm/Node/Interface.php diff --git a/lib/Doctrine/Node/MaterializedPath.php b/lib/orm/Node/MaterializedPath.php similarity index 100% rename from lib/Doctrine/Node/MaterializedPath.php rename to lib/orm/Node/MaterializedPath.php diff --git a/lib/Doctrine/Node/MaterializedPath/LevelOrderIterator.php b/lib/orm/Node/MaterializedPath/LevelOrderIterator.php similarity index 100% rename from lib/Doctrine/Node/MaterializedPath/LevelOrderIterator.php rename to lib/orm/Node/MaterializedPath/LevelOrderIterator.php diff --git a/lib/Doctrine/Node/MaterializedPath/PostOrderIterator.php b/lib/orm/Node/MaterializedPath/PostOrderIterator.php similarity index 100% rename from lib/Doctrine/Node/MaterializedPath/PostOrderIterator.php rename to lib/orm/Node/MaterializedPath/PostOrderIterator.php diff --git a/lib/Doctrine/Node/MaterializedPath/PreOrderIterator.php b/lib/orm/Node/MaterializedPath/PreOrderIterator.php similarity index 100% rename from lib/Doctrine/Node/MaterializedPath/PreOrderIterator.php rename to lib/orm/Node/MaterializedPath/PreOrderIterator.php diff --git a/lib/Doctrine/Node/NestedSet.php b/lib/orm/Node/NestedSet.php similarity index 100% rename from lib/Doctrine/Node/NestedSet.php rename to lib/orm/Node/NestedSet.php diff --git a/lib/Doctrine/Node/NestedSet/LevelOrderIterator.php b/lib/orm/Node/NestedSet/LevelOrderIterator.php similarity index 100% rename from lib/Doctrine/Node/NestedSet/LevelOrderIterator.php rename to lib/orm/Node/NestedSet/LevelOrderIterator.php diff --git a/lib/Doctrine/Node/NestedSet/PostOrderIterator.php b/lib/orm/Node/NestedSet/PostOrderIterator.php similarity index 100% rename from lib/Doctrine/Node/NestedSet/PostOrderIterator.php rename to lib/orm/Node/NestedSet/PostOrderIterator.php diff --git a/lib/Doctrine/Node/NestedSet/PreOrderIterator.php b/lib/orm/Node/NestedSet/PreOrderIterator.php similarity index 100% rename from lib/Doctrine/Node/NestedSet/PreOrderIterator.php rename to lib/orm/Node/NestedSet/PreOrderIterator.php diff --git a/lib/Doctrine/Null.php b/lib/orm/Null.php similarity index 100% rename from lib/Doctrine/Null.php rename to lib/orm/Null.php diff --git a/lib/Doctrine/Overloadable.php b/lib/orm/Overloadable.php similarity index 100% rename from lib/Doctrine/Overloadable.php rename to lib/orm/Overloadable.php diff --git a/lib/Doctrine/Pager.php b/lib/orm/Pager.php similarity index 100% rename from lib/Doctrine/Pager.php rename to lib/orm/Pager.php diff --git a/lib/Doctrine/Pager/Exception.php b/lib/orm/Pager/Exception.php similarity index 100% rename from lib/Doctrine/Pager/Exception.php rename to lib/orm/Pager/Exception.php diff --git a/lib/Doctrine/Pager/Layout.php b/lib/orm/Pager/Layout.php similarity index 100% rename from lib/Doctrine/Pager/Layout.php rename to lib/orm/Pager/Layout.php diff --git a/lib/Doctrine/Pager/Range.php b/lib/orm/Pager/Range.php similarity index 100% rename from lib/Doctrine/Pager/Range.php rename to lib/orm/Pager/Range.php diff --git a/lib/Doctrine/Pager/Range/Jumping.php b/lib/orm/Pager/Range/Jumping.php similarity index 100% rename from lib/Doctrine/Pager/Range/Jumping.php rename to lib/orm/Pager/Range/Jumping.php diff --git a/lib/Doctrine/Pager/Range/Sliding.php b/lib/orm/Pager/Range/Sliding.php similarity index 100% rename from lib/Doctrine/Pager/Range/Sliding.php rename to lib/orm/Pager/Range/Sliding.php diff --git a/lib/Doctrine/Parser.php b/lib/orm/Parser.php similarity index 100% rename from lib/Doctrine/Parser.php rename to lib/orm/Parser.php diff --git a/lib/Doctrine/Parser/Exception.php b/lib/orm/Parser/Exception.php similarity index 100% rename from lib/Doctrine/Parser/Exception.php rename to lib/orm/Parser/Exception.php diff --git a/lib/Doctrine/Parser/Json.php b/lib/orm/Parser/Json.php similarity index 100% rename from lib/Doctrine/Parser/Json.php rename to lib/orm/Parser/Json.php diff --git a/lib/Doctrine/Parser/Serialize.php b/lib/orm/Parser/Serialize.php similarity index 100% rename from lib/Doctrine/Parser/Serialize.php rename to lib/orm/Parser/Serialize.php diff --git a/lib/Doctrine/Parser/Xml.php b/lib/orm/Parser/Xml.php similarity index 100% rename from lib/Doctrine/Parser/Xml.php rename to lib/orm/Parser/Xml.php diff --git a/lib/Doctrine/Parser/Yml.php b/lib/orm/Parser/Yml.php similarity index 100% rename from lib/Doctrine/Parser/Yml.php rename to lib/orm/Parser/Yml.php diff --git a/lib/Doctrine/Parser/spyc.php b/lib/orm/Parser/spyc.php similarity index 100% rename from lib/Doctrine/Parser/spyc.php rename to lib/orm/Parser/spyc.php diff --git a/lib/Doctrine/Query.php b/lib/orm/Query.php similarity index 100% rename from lib/Doctrine/Query.php rename to lib/orm/Query.php diff --git a/lib/Doctrine/Query/Abstract.php b/lib/orm/Query/Abstract.php similarity index 100% rename from lib/Doctrine/Query/Abstract.php rename to lib/orm/Query/Abstract.php diff --git a/lib/Doctrine/Query/Check.php b/lib/orm/Query/Check.php similarity index 100% rename from lib/Doctrine/Query/Check.php rename to lib/orm/Query/Check.php diff --git a/lib/Doctrine/Query/Condition.php b/lib/orm/Query/Condition.php similarity index 100% rename from lib/Doctrine/Query/Condition.php rename to lib/orm/Query/Condition.php diff --git a/lib/Doctrine/Query/Exception.php b/lib/orm/Query/Exception.php similarity index 100% rename from lib/Doctrine/Query/Exception.php rename to lib/orm/Query/Exception.php diff --git a/lib/Doctrine/Query/Filter.php b/lib/orm/Query/Filter.php similarity index 100% rename from lib/Doctrine/Query/Filter.php rename to lib/orm/Query/Filter.php diff --git a/lib/Doctrine/Query/Filter/Chain.php b/lib/orm/Query/Filter/Chain.php similarity index 100% rename from lib/Doctrine/Query/Filter/Chain.php rename to lib/orm/Query/Filter/Chain.php diff --git a/lib/Doctrine/Query/Filter/Interface.php b/lib/orm/Query/Filter/Interface.php similarity index 100% rename from lib/Doctrine/Query/Filter/Interface.php rename to lib/orm/Query/Filter/Interface.php diff --git a/lib/Doctrine/Query/From.php b/lib/orm/Query/From.php similarity index 100% rename from lib/Doctrine/Query/From.php rename to lib/orm/Query/From.php diff --git a/lib/Doctrine/Query/Groupby.php b/lib/orm/Query/Groupby.php similarity index 100% rename from lib/Doctrine/Query/Groupby.php rename to lib/orm/Query/Groupby.php diff --git a/lib/Doctrine/Query/Having.php b/lib/orm/Query/Having.php similarity index 100% rename from lib/Doctrine/Query/Having.php rename to lib/orm/Query/Having.php diff --git a/lib/Doctrine/Query/JoinCondition.php b/lib/orm/Query/JoinCondition.php similarity index 100% rename from lib/Doctrine/Query/JoinCondition.php rename to lib/orm/Query/JoinCondition.php diff --git a/lib/Doctrine/Query/Limit.php b/lib/orm/Query/Limit.php similarity index 100% rename from lib/Doctrine/Query/Limit.php rename to lib/orm/Query/Limit.php diff --git a/lib/Doctrine/Query/Offset.php b/lib/orm/Query/Offset.php similarity index 100% rename from lib/Doctrine/Query/Offset.php rename to lib/orm/Query/Offset.php diff --git a/lib/Doctrine/Query/Orderby.php b/lib/orm/Query/Orderby.php similarity index 100% rename from lib/Doctrine/Query/Orderby.php rename to lib/orm/Query/Orderby.php diff --git a/lib/Doctrine/Query/Parser.php b/lib/orm/Query/Parser.php similarity index 100% rename from lib/Doctrine/Query/Parser.php rename to lib/orm/Query/Parser.php diff --git a/lib/Doctrine/Query/Part.php b/lib/orm/Query/Part.php similarity index 100% rename from lib/Doctrine/Query/Part.php rename to lib/orm/Query/Part.php diff --git a/lib/Doctrine/Query/Registry.php b/lib/orm/Query/Registry.php similarity index 100% rename from lib/Doctrine/Query/Registry.php rename to lib/orm/Query/Registry.php diff --git a/lib/Doctrine/Query/Registry/Exception.php b/lib/orm/Query/Registry/Exception.php similarity index 100% rename from lib/Doctrine/Query/Registry/Exception.php rename to lib/orm/Query/Registry/Exception.php diff --git a/lib/Doctrine/Query/Select.php b/lib/orm/Query/Select.php similarity index 100% rename from lib/Doctrine/Query/Select.php rename to lib/orm/Query/Select.php diff --git a/lib/Doctrine/Query/Set.php b/lib/orm/Query/Set.php similarity index 100% rename from lib/Doctrine/Query/Set.php rename to lib/orm/Query/Set.php diff --git a/lib/Doctrine/Query/Tokenizer.php b/lib/orm/Query/Tokenizer.php similarity index 100% rename from lib/Doctrine/Query/Tokenizer.php rename to lib/orm/Query/Tokenizer.php diff --git a/lib/Doctrine/Query/Tokenizer/Exception.php b/lib/orm/Query/Tokenizer/Exception.php similarity index 100% rename from lib/Doctrine/Query/Tokenizer/Exception.php rename to lib/orm/Query/Tokenizer/Exception.php diff --git a/lib/Doctrine/Query/Where.php b/lib/orm/Query/Where.php similarity index 100% rename from lib/Doctrine/Query/Where.php rename to lib/orm/Query/Where.php diff --git a/lib/Doctrine/RawSql.php b/lib/orm/RawSql.php similarity index 100% rename from lib/Doctrine/RawSql.php rename to lib/orm/RawSql.php diff --git a/lib/Doctrine/RawSql/Exception.php b/lib/orm/RawSql/Exception.php similarity index 100% rename from lib/Doctrine/RawSql/Exception.php rename to lib/orm/RawSql/Exception.php diff --git a/lib/Doctrine/Record.php b/lib/orm/Record.php similarity index 100% rename from lib/Doctrine/Record.php rename to lib/orm/Record.php diff --git a/lib/Doctrine/Record/Abstract.php b/lib/orm/Record/Abstract.php similarity index 100% rename from lib/Doctrine/Record/Abstract.php rename to lib/orm/Record/Abstract.php diff --git a/lib/Doctrine/Record/Exception.php b/lib/orm/Record/Exception.php similarity index 100% rename from lib/Doctrine/Record/Exception.php rename to lib/orm/Record/Exception.php diff --git a/lib/Doctrine/Record/Filter.php b/lib/orm/Record/Filter.php similarity index 100% rename from lib/Doctrine/Record/Filter.php rename to lib/orm/Record/Filter.php diff --git a/lib/Doctrine/Record/Filter/Compound.php b/lib/orm/Record/Filter/Compound.php similarity index 100% rename from lib/Doctrine/Record/Filter/Compound.php rename to lib/orm/Record/Filter/Compound.php diff --git a/lib/Doctrine/Record/Filter/Standard.php b/lib/orm/Record/Filter/Standard.php similarity index 100% rename from lib/Doctrine/Record/Filter/Standard.php rename to lib/orm/Record/Filter/Standard.php diff --git a/lib/Doctrine/Record/Generator.php b/lib/orm/Record/Generator.php similarity index 100% rename from lib/Doctrine/Record/Generator.php rename to lib/orm/Record/Generator.php diff --git a/lib/Doctrine/Record/Iterator.php b/lib/orm/Record/Iterator.php similarity index 100% rename from lib/Doctrine/Record/Iterator.php rename to lib/orm/Record/Iterator.php diff --git a/lib/Doctrine/Record/Listener.php b/lib/orm/Record/Listener.php similarity index 100% rename from lib/Doctrine/Record/Listener.php rename to lib/orm/Record/Listener.php diff --git a/lib/Doctrine/Record/Listener/Chain.php b/lib/orm/Record/Listener/Chain.php similarity index 100% rename from lib/Doctrine/Record/Listener/Chain.php rename to lib/orm/Record/Listener/Chain.php diff --git a/lib/Doctrine/Record/Listener/Interface.php b/lib/orm/Record/Listener/Interface.php similarity index 100% rename from lib/Doctrine/Record/Listener/Interface.php rename to lib/orm/Record/Listener/Interface.php diff --git a/lib/Doctrine/Record/State/Exception.php b/lib/orm/Record/State/Exception.php similarity index 100% rename from lib/Doctrine/Record/State/Exception.php rename to lib/orm/Record/State/Exception.php diff --git a/lib/Doctrine/Relation.php b/lib/orm/Relation.php similarity index 100% rename from lib/Doctrine/Relation.php rename to lib/orm/Relation.php diff --git a/lib/Doctrine/Relation/Association.php b/lib/orm/Relation/Association.php similarity index 100% rename from lib/Doctrine/Relation/Association.php rename to lib/orm/Relation/Association.php diff --git a/lib/Doctrine/Relation/Association/Self.php b/lib/orm/Relation/Association/Self.php similarity index 100% rename from lib/Doctrine/Relation/Association/Self.php rename to lib/orm/Relation/Association/Self.php diff --git a/lib/Doctrine/Relation/Exception.php b/lib/orm/Relation/Exception.php similarity index 100% rename from lib/Doctrine/Relation/Exception.php rename to lib/orm/Relation/Exception.php diff --git a/lib/Doctrine/Relation/ForeignKey.php b/lib/orm/Relation/ForeignKey.php similarity index 100% rename from lib/Doctrine/Relation/ForeignKey.php rename to lib/orm/Relation/ForeignKey.php diff --git a/lib/Doctrine/Relation/LocalKey.php b/lib/orm/Relation/LocalKey.php similarity index 100% rename from lib/Doctrine/Relation/LocalKey.php rename to lib/orm/Relation/LocalKey.php diff --git a/lib/Doctrine/Relation/Nest.php b/lib/orm/Relation/Nest.php similarity index 100% rename from lib/Doctrine/Relation/Nest.php rename to lib/orm/Relation/Nest.php diff --git a/lib/Doctrine/Relation/Parser.php b/lib/orm/Relation/Parser.php similarity index 100% rename from lib/Doctrine/Relation/Parser.php rename to lib/orm/Relation/Parser.php diff --git a/lib/Doctrine/Relation/Parser/Exception.php b/lib/orm/Relation/Parser/Exception.php similarity index 100% rename from lib/Doctrine/Relation/Parser/Exception.php rename to lib/orm/Relation/Parser/Exception.php diff --git a/lib/Doctrine/Search.php b/lib/orm/Search.php similarity index 100% rename from lib/Doctrine/Search.php rename to lib/orm/Search.php diff --git a/lib/Doctrine/Search/Analyzer.php b/lib/orm/Search/Analyzer.php similarity index 100% rename from lib/Doctrine/Search/Analyzer.php rename to lib/orm/Search/Analyzer.php diff --git a/lib/Doctrine/Search/Analyzer/Exception.php b/lib/orm/Search/Analyzer/Exception.php similarity index 100% rename from lib/Doctrine/Search/Analyzer/Exception.php rename to lib/orm/Search/Analyzer/Exception.php diff --git a/lib/Doctrine/Search/Analyzer/Interface.php b/lib/orm/Search/Analyzer/Interface.php similarity index 100% rename from lib/Doctrine/Search/Analyzer/Interface.php rename to lib/orm/Search/Analyzer/Interface.php diff --git a/lib/Doctrine/Search/Analyzer/Standard.php b/lib/orm/Search/Analyzer/Standard.php similarity index 100% rename from lib/Doctrine/Search/Analyzer/Standard.php rename to lib/orm/Search/Analyzer/Standard.php diff --git a/lib/Doctrine/Search/Exception.php b/lib/orm/Search/Exception.php similarity index 100% rename from lib/Doctrine/Search/Exception.php rename to lib/orm/Search/Exception.php diff --git a/lib/Doctrine/Search/File.php b/lib/orm/Search/File.php similarity index 100% rename from lib/Doctrine/Search/File.php rename to lib/orm/Search/File.php diff --git a/lib/Doctrine/Search/Indexer.php b/lib/orm/Search/Indexer.php similarity index 100% rename from lib/Doctrine/Search/Indexer.php rename to lib/orm/Search/Indexer.php diff --git a/lib/Doctrine/Search/Indexer/Dir.php b/lib/orm/Search/Indexer/Dir.php similarity index 100% rename from lib/Doctrine/Search/Indexer/Dir.php rename to lib/orm/Search/Indexer/Dir.php diff --git a/lib/Doctrine/Search/Indexer/Exception.php b/lib/orm/Search/Indexer/Exception.php similarity index 100% rename from lib/Doctrine/Search/Indexer/Exception.php rename to lib/orm/Search/Indexer/Exception.php diff --git a/lib/Doctrine/Search/Listener.php b/lib/orm/Search/Listener.php similarity index 100% rename from lib/Doctrine/Search/Listener.php rename to lib/orm/Search/Listener.php diff --git a/lib/Doctrine/Search/Parser.php b/lib/orm/Search/Parser.php similarity index 100% rename from lib/Doctrine/Search/Parser.php rename to lib/orm/Search/Parser.php diff --git a/lib/Doctrine/Search/Query.php b/lib/orm/Search/Query.php similarity index 100% rename from lib/Doctrine/Search/Query.php rename to lib/orm/Search/Query.php diff --git a/lib/Doctrine/Search/Record.php b/lib/orm/Search/Record.php similarity index 100% rename from lib/Doctrine/Search/Record.php rename to lib/orm/Search/Record.php diff --git a/lib/Doctrine/Search/Scorer.php b/lib/orm/Search/Scorer.php similarity index 100% rename from lib/Doctrine/Search/Scorer.php rename to lib/orm/Search/Scorer.php diff --git a/lib/Doctrine/Sequence.php b/lib/orm/Sequence.php similarity index 100% rename from lib/Doctrine/Sequence.php rename to lib/orm/Sequence.php diff --git a/lib/Doctrine/Sequence/Db2.php b/lib/orm/Sequence/Db2.php similarity index 100% rename from lib/Doctrine/Sequence/Db2.php rename to lib/orm/Sequence/Db2.php diff --git a/lib/Doctrine/Sequence/Exception.php b/lib/orm/Sequence/Exception.php similarity index 100% rename from lib/Doctrine/Sequence/Exception.php rename to lib/orm/Sequence/Exception.php diff --git a/lib/Doctrine/Sequence/Firebird.php b/lib/orm/Sequence/Firebird.php similarity index 100% rename from lib/Doctrine/Sequence/Firebird.php rename to lib/orm/Sequence/Firebird.php diff --git a/lib/Doctrine/Sequence/Informix.php b/lib/orm/Sequence/Informix.php similarity index 100% rename from lib/Doctrine/Sequence/Informix.php rename to lib/orm/Sequence/Informix.php diff --git a/lib/Doctrine/Sequence/Mssql.php b/lib/orm/Sequence/Mssql.php similarity index 100% rename from lib/Doctrine/Sequence/Mssql.php rename to lib/orm/Sequence/Mssql.php diff --git a/lib/Doctrine/Sequence/Mysql.php b/lib/orm/Sequence/Mysql.php similarity index 100% rename from lib/Doctrine/Sequence/Mysql.php rename to lib/orm/Sequence/Mysql.php diff --git a/lib/Doctrine/Sequence/Oracle.php b/lib/orm/Sequence/Oracle.php similarity index 100% rename from lib/Doctrine/Sequence/Oracle.php rename to lib/orm/Sequence/Oracle.php diff --git a/lib/Doctrine/Sequence/Pgsql.php b/lib/orm/Sequence/Pgsql.php similarity index 100% rename from lib/Doctrine/Sequence/Pgsql.php rename to lib/orm/Sequence/Pgsql.php diff --git a/lib/Doctrine/Sequence/Sqlite.php b/lib/orm/Sequence/Sqlite.php similarity index 100% rename from lib/Doctrine/Sequence/Sqlite.php rename to lib/orm/Sequence/Sqlite.php diff --git a/lib/Doctrine/Table.php b/lib/orm/Table.php similarity index 100% rename from lib/Doctrine/Table.php rename to lib/orm/Table.php diff --git a/lib/Doctrine/Table/Exception.php b/lib/orm/Table/Exception.php similarity index 100% rename from lib/Doctrine/Table/Exception.php rename to lib/orm/Table/Exception.php diff --git a/lib/Doctrine/Table/Repository.php b/lib/orm/Table/Repository.php similarity index 100% rename from lib/Doctrine/Table/Repository.php rename to lib/orm/Table/Repository.php diff --git a/lib/Doctrine/Table/Repository/Exception.php b/lib/orm/Table/Repository/Exception.php similarity index 100% rename from lib/Doctrine/Table/Repository/Exception.php rename to lib/orm/Table/Repository/Exception.php diff --git a/lib/Doctrine/Task.php b/lib/orm/Task.php similarity index 100% rename from lib/Doctrine/Task.php rename to lib/orm/Task.php diff --git a/lib/Doctrine/Task/BuildAll.php b/lib/orm/Task/BuildAll.php similarity index 100% rename from lib/Doctrine/Task/BuildAll.php rename to lib/orm/Task/BuildAll.php diff --git a/lib/Doctrine/Task/BuildAllLoad.php b/lib/orm/Task/BuildAllLoad.php similarity index 100% rename from lib/Doctrine/Task/BuildAllLoad.php rename to lib/orm/Task/BuildAllLoad.php diff --git a/lib/Doctrine/Task/BuildAllReload.php b/lib/orm/Task/BuildAllReload.php similarity index 100% rename from lib/Doctrine/Task/BuildAllReload.php rename to lib/orm/Task/BuildAllReload.php diff --git a/lib/Doctrine/Task/Compile.php b/lib/orm/Task/Compile.php similarity index 100% rename from lib/Doctrine/Task/Compile.php rename to lib/orm/Task/Compile.php diff --git a/lib/Doctrine/Task/CreateDb.php b/lib/orm/Task/CreateDb.php similarity index 100% rename from lib/Doctrine/Task/CreateDb.php rename to lib/orm/Task/CreateDb.php diff --git a/lib/Doctrine/Task/CreateTables.php b/lib/orm/Task/CreateTables.php similarity index 100% rename from lib/Doctrine/Task/CreateTables.php rename to lib/orm/Task/CreateTables.php diff --git a/lib/Doctrine/Task/Dql.php b/lib/orm/Task/Dql.php similarity index 100% rename from lib/Doctrine/Task/Dql.php rename to lib/orm/Task/Dql.php diff --git a/lib/Doctrine/Task/DropDb.php b/lib/orm/Task/DropDb.php similarity index 100% rename from lib/Doctrine/Task/DropDb.php rename to lib/orm/Task/DropDb.php diff --git a/lib/Doctrine/Task/DumpData.php b/lib/orm/Task/DumpData.php similarity index 100% rename from lib/Doctrine/Task/DumpData.php rename to lib/orm/Task/DumpData.php diff --git a/lib/Doctrine/Task/Exception.php b/lib/orm/Task/Exception.php similarity index 100% rename from lib/Doctrine/Task/Exception.php rename to lib/orm/Task/Exception.php diff --git a/lib/Doctrine/Task/GenerateMigration.php b/lib/orm/Task/GenerateMigration.php similarity index 100% rename from lib/Doctrine/Task/GenerateMigration.php rename to lib/orm/Task/GenerateMigration.php diff --git a/lib/Doctrine/Task/GenerateMigrationsDb.php b/lib/orm/Task/GenerateMigrationsDb.php similarity index 100% rename from lib/Doctrine/Task/GenerateMigrationsDb.php rename to lib/orm/Task/GenerateMigrationsDb.php diff --git a/lib/Doctrine/Task/GenerateMigrationsModels.php b/lib/orm/Task/GenerateMigrationsModels.php similarity index 100% rename from lib/Doctrine/Task/GenerateMigrationsModels.php rename to lib/orm/Task/GenerateMigrationsModels.php diff --git a/lib/Doctrine/Task/GenerateModelsDb.php b/lib/orm/Task/GenerateModelsDb.php similarity index 100% rename from lib/Doctrine/Task/GenerateModelsDb.php rename to lib/orm/Task/GenerateModelsDb.php diff --git a/lib/Doctrine/Task/GenerateModelsYaml.php b/lib/orm/Task/GenerateModelsYaml.php similarity index 100% rename from lib/Doctrine/Task/GenerateModelsYaml.php rename to lib/orm/Task/GenerateModelsYaml.php diff --git a/lib/Doctrine/Task/GenerateSql.php b/lib/orm/Task/GenerateSql.php similarity index 100% rename from lib/Doctrine/Task/GenerateSql.php rename to lib/orm/Task/GenerateSql.php diff --git a/lib/Doctrine/Task/GenerateYamlDb.php b/lib/orm/Task/GenerateYamlDb.php similarity index 100% rename from lib/Doctrine/Task/GenerateYamlDb.php rename to lib/orm/Task/GenerateYamlDb.php diff --git a/lib/Doctrine/Task/GenerateYamlModels.php b/lib/orm/Task/GenerateYamlModels.php similarity index 100% rename from lib/Doctrine/Task/GenerateYamlModels.php rename to lib/orm/Task/GenerateYamlModels.php diff --git a/lib/Doctrine/Task/LoadData.php b/lib/orm/Task/LoadData.php similarity index 100% rename from lib/Doctrine/Task/LoadData.php rename to lib/orm/Task/LoadData.php diff --git a/lib/Doctrine/Task/LoadDummyData.php b/lib/orm/Task/LoadDummyData.php similarity index 100% rename from lib/Doctrine/Task/LoadDummyData.php rename to lib/orm/Task/LoadDummyData.php diff --git a/lib/Doctrine/Task/Migrate.php b/lib/orm/Task/Migrate.php similarity index 100% rename from lib/Doctrine/Task/Migrate.php rename to lib/orm/Task/Migrate.php diff --git a/lib/Doctrine/Task/RebuildDb.php b/lib/orm/Task/RebuildDb.php similarity index 100% rename from lib/Doctrine/Task/RebuildDb.php rename to lib/orm/Task/RebuildDb.php diff --git a/lib/Doctrine/Template.php b/lib/orm/Template.php similarity index 100% rename from lib/Doctrine/Template.php rename to lib/orm/Template.php diff --git a/lib/Doctrine/Template/Geographical.php b/lib/orm/Template/Geographical.php similarity index 100% rename from lib/Doctrine/Template/Geographical.php rename to lib/orm/Template/Geographical.php diff --git a/lib/Doctrine/Template/I18n.php b/lib/orm/Template/I18n.php similarity index 100% rename from lib/Doctrine/Template/I18n.php rename to lib/orm/Template/I18n.php diff --git a/lib/Doctrine/Template/Listener/Sluggable.php b/lib/orm/Template/Listener/Sluggable.php similarity index 100% rename from lib/Doctrine/Template/Listener/Sluggable.php rename to lib/orm/Template/Listener/Sluggable.php diff --git a/lib/Doctrine/Template/Listener/Timestampable.php b/lib/orm/Template/Listener/Timestampable.php similarity index 100% rename from lib/Doctrine/Template/Listener/Timestampable.php rename to lib/orm/Template/Listener/Timestampable.php diff --git a/lib/Doctrine/Template/NestedSet.php b/lib/orm/Template/NestedSet.php similarity index 100% rename from lib/Doctrine/Template/NestedSet.php rename to lib/orm/Template/NestedSet.php diff --git a/lib/Doctrine/Template/Searchable.php b/lib/orm/Template/Searchable.php similarity index 100% rename from lib/Doctrine/Template/Searchable.php rename to lib/orm/Template/Searchable.php diff --git a/lib/Doctrine/Template/Sluggable.php b/lib/orm/Template/Sluggable.php similarity index 100% rename from lib/Doctrine/Template/Sluggable.php rename to lib/orm/Template/Sluggable.php diff --git a/lib/Doctrine/Template/Taggable.php b/lib/orm/Template/Taggable.php similarity index 100% rename from lib/Doctrine/Template/Taggable.php rename to lib/orm/Template/Taggable.php diff --git a/lib/Doctrine/Template/Timestampable.php b/lib/orm/Template/Timestampable.php similarity index 100% rename from lib/Doctrine/Template/Timestampable.php rename to lib/orm/Template/Timestampable.php diff --git a/lib/Doctrine/Template/Versionable.php b/lib/orm/Template/Versionable.php similarity index 100% rename from lib/Doctrine/Template/Versionable.php rename to lib/orm/Template/Versionable.php diff --git a/lib/Doctrine/Transaction.php b/lib/orm/Transaction.php similarity index 100% rename from lib/Doctrine/Transaction.php rename to lib/orm/Transaction.php diff --git a/lib/Doctrine/Transaction/Exception.php b/lib/orm/Transaction/Exception.php similarity index 100% rename from lib/Doctrine/Transaction/Exception.php rename to lib/orm/Transaction/Exception.php diff --git a/lib/Doctrine/Transaction/Firebird.php b/lib/orm/Transaction/Firebird.php similarity index 100% rename from lib/Doctrine/Transaction/Firebird.php rename to lib/orm/Transaction/Firebird.php diff --git a/lib/Doctrine/Transaction/Informix.php b/lib/orm/Transaction/Informix.php similarity index 100% rename from lib/Doctrine/Transaction/Informix.php rename to lib/orm/Transaction/Informix.php diff --git a/lib/Doctrine/Transaction/Mock.php b/lib/orm/Transaction/Mock.php similarity index 100% rename from lib/Doctrine/Transaction/Mock.php rename to lib/orm/Transaction/Mock.php diff --git a/lib/Doctrine/Transaction/Mssql.php b/lib/orm/Transaction/Mssql.php similarity index 100% rename from lib/Doctrine/Transaction/Mssql.php rename to lib/orm/Transaction/Mssql.php diff --git a/lib/Doctrine/Transaction/Mysql.php b/lib/orm/Transaction/Mysql.php similarity index 100% rename from lib/Doctrine/Transaction/Mysql.php rename to lib/orm/Transaction/Mysql.php diff --git a/lib/Doctrine/Transaction/Oracle.php b/lib/orm/Transaction/Oracle.php similarity index 100% rename from lib/Doctrine/Transaction/Oracle.php rename to lib/orm/Transaction/Oracle.php diff --git a/lib/Doctrine/Transaction/Pgsql.php b/lib/orm/Transaction/Pgsql.php similarity index 100% rename from lib/Doctrine/Transaction/Pgsql.php rename to lib/orm/Transaction/Pgsql.php diff --git a/lib/Doctrine/Transaction/Sqlite.php b/lib/orm/Transaction/Sqlite.php similarity index 100% rename from lib/Doctrine/Transaction/Sqlite.php rename to lib/orm/Transaction/Sqlite.php diff --git a/lib/Doctrine/Tree.php b/lib/orm/Tree.php similarity index 100% rename from lib/Doctrine/Tree.php rename to lib/orm/Tree.php diff --git a/lib/Doctrine/Tree/AdjacencyList.php b/lib/orm/Tree/AdjacencyList.php similarity index 100% rename from lib/Doctrine/Tree/AdjacencyList.php rename to lib/orm/Tree/AdjacencyList.php diff --git a/lib/Doctrine/Tree/Exception.php b/lib/orm/Tree/Exception.php similarity index 100% rename from lib/Doctrine/Tree/Exception.php rename to lib/orm/Tree/Exception.php diff --git a/lib/Doctrine/Tree/Interface.php b/lib/orm/Tree/Interface.php similarity index 100% rename from lib/Doctrine/Tree/Interface.php rename to lib/orm/Tree/Interface.php diff --git a/lib/Doctrine/Tree/MaterializedPath.php b/lib/orm/Tree/MaterializedPath.php similarity index 100% rename from lib/Doctrine/Tree/MaterializedPath.php rename to lib/orm/Tree/MaterializedPath.php diff --git a/lib/Doctrine/Tree/NestedSet.php b/lib/orm/Tree/NestedSet.php similarity index 100% rename from lib/Doctrine/Tree/NestedSet.php rename to lib/orm/Tree/NestedSet.php diff --git a/lib/Doctrine/Util.php b/lib/orm/Util.php similarity index 100% rename from lib/Doctrine/Util.php rename to lib/orm/Util.php diff --git a/lib/Doctrine/Validator.php b/lib/orm/Validator.php similarity index 100% rename from lib/Doctrine/Validator.php rename to lib/orm/Validator.php diff --git a/lib/Doctrine/Validator/Country.php b/lib/orm/Validator/Country.php similarity index 100% rename from lib/Doctrine/Validator/Country.php rename to lib/orm/Validator/Country.php diff --git a/lib/Doctrine/Validator/Creditcard.php b/lib/orm/Validator/Creditcard.php similarity index 100% rename from lib/Doctrine/Validator/Creditcard.php rename to lib/orm/Validator/Creditcard.php diff --git a/lib/Doctrine/Validator/Date.php b/lib/orm/Validator/Date.php similarity index 100% rename from lib/Doctrine/Validator/Date.php rename to lib/orm/Validator/Date.php diff --git a/lib/Doctrine/Validator/Driver.php b/lib/orm/Validator/Driver.php similarity index 100% rename from lib/Doctrine/Validator/Driver.php rename to lib/orm/Validator/Driver.php diff --git a/lib/Doctrine/Validator/Email.php b/lib/orm/Validator/Email.php similarity index 100% rename from lib/Doctrine/Validator/Email.php rename to lib/orm/Validator/Email.php diff --git a/lib/Doctrine/Validator/ErrorStack.php b/lib/orm/Validator/ErrorStack.php similarity index 100% rename from lib/Doctrine/Validator/ErrorStack.php rename to lib/orm/Validator/ErrorStack.php diff --git a/lib/Doctrine/Validator/Exception.php b/lib/orm/Validator/Exception.php similarity index 100% rename from lib/Doctrine/Validator/Exception.php rename to lib/orm/Validator/Exception.php diff --git a/lib/Doctrine/Validator/Future.php b/lib/orm/Validator/Future.php similarity index 100% rename from lib/Doctrine/Validator/Future.php rename to lib/orm/Validator/Future.php diff --git a/lib/Doctrine/Validator/Htmlcolor.php b/lib/orm/Validator/Htmlcolor.php similarity index 100% rename from lib/Doctrine/Validator/Htmlcolor.php rename to lib/orm/Validator/Htmlcolor.php diff --git a/lib/Doctrine/Validator/Ip.php b/lib/orm/Validator/Ip.php similarity index 100% rename from lib/Doctrine/Validator/Ip.php rename to lib/orm/Validator/Ip.php diff --git a/lib/Doctrine/Validator/Minlength.php b/lib/orm/Validator/Minlength.php similarity index 100% rename from lib/Doctrine/Validator/Minlength.php rename to lib/orm/Validator/Minlength.php diff --git a/lib/Doctrine/Validator/Nospace.php b/lib/orm/Validator/Nospace.php similarity index 100% rename from lib/Doctrine/Validator/Nospace.php rename to lib/orm/Validator/Nospace.php diff --git a/lib/Doctrine/Validator/Notblank.php b/lib/orm/Validator/Notblank.php similarity index 100% rename from lib/Doctrine/Validator/Notblank.php rename to lib/orm/Validator/Notblank.php diff --git a/lib/Doctrine/Validator/Notnull.php b/lib/orm/Validator/Notnull.php similarity index 100% rename from lib/Doctrine/Validator/Notnull.php rename to lib/orm/Validator/Notnull.php diff --git a/lib/Doctrine/Validator/Past.php b/lib/orm/Validator/Past.php similarity index 100% rename from lib/Doctrine/Validator/Past.php rename to lib/orm/Validator/Past.php diff --git a/lib/Doctrine/Validator/Protected.php b/lib/orm/Validator/Protected.php similarity index 100% rename from lib/Doctrine/Validator/Protected.php rename to lib/orm/Validator/Protected.php diff --git a/lib/Doctrine/Validator/Range.php b/lib/orm/Validator/Range.php similarity index 100% rename from lib/Doctrine/Validator/Range.php rename to lib/orm/Validator/Range.php diff --git a/lib/Doctrine/Validator/Regexp.php b/lib/orm/Validator/Regexp.php similarity index 100% rename from lib/Doctrine/Validator/Regexp.php rename to lib/orm/Validator/Regexp.php diff --git a/lib/Doctrine/Validator/Unique.php b/lib/orm/Validator/Unique.php similarity index 100% rename from lib/Doctrine/Validator/Unique.php rename to lib/orm/Validator/Unique.php diff --git a/lib/Doctrine/Validator/Unsigned.php b/lib/orm/Validator/Unsigned.php similarity index 100% rename from lib/Doctrine/Validator/Unsigned.php rename to lib/orm/Validator/Unsigned.php diff --git a/lib/Doctrine/Validator/Usstate.php b/lib/orm/Validator/Usstate.php similarity index 100% rename from lib/Doctrine/Validator/Usstate.php rename to lib/orm/Validator/Usstate.php diff --git a/lib/Doctrine/View.php b/lib/orm/View.php similarity index 100% rename from lib/Doctrine/View.php rename to lib/orm/View.php diff --git a/lib/Doctrine/View/Exception.php b/lib/orm/View/Exception.php similarity index 100% rename from lib/Doctrine/View/Exception.php rename to lib/orm/View/Exception.php