Permalink
Browse files

Revert "Updated to Doctrine 2.1.5"

This reverts commit 4416767.
  • Loading branch information...
1 parent 1cbdb29 commit 45db27eb34115f1c8d0e1cebf48303662969a73a @rubensarrio committed Jan 13, 2012
Showing with 2,328 additions and 11,560 deletions.
  1. +7 −1 application/third_party/doctrine-orm/Doctrine/Common/Annotations/Annotation.php
  2. +0 −43 application/third_party/doctrine-orm/Doctrine/Common/Annotations/Annotation/IgnoreAnnotation.php
  3. +112 −250 application/third_party/doctrine-orm/Doctrine/Common/Annotations/AnnotationReader.php
  4. +0 −129 application/third_party/doctrine-orm/Doctrine/Common/Annotations/AnnotationRegistry.php
  5. +0 −179 application/third_party/doctrine-orm/Doctrine/Common/Annotations/CachedReader.php
  6. +0 −625 application/third_party/doctrine-orm/Doctrine/Common/Annotations/DocParser.php
  7. +0 −209 application/third_party/doctrine-orm/Doctrine/Common/Annotations/FileCacheReader.php
  8. +0 −94 application/third_party/doctrine-orm/Doctrine/Common/Annotations/IndexedReader.php
  9. +54 −33 application/third_party/doctrine-orm/Doctrine/Common/Annotations/{DocLexer.php → Lexer.php}
  10. +552 −0 application/third_party/doctrine-orm/Doctrine/Common/Annotations/Parser.php
  11. +0 −152 application/third_party/doctrine-orm/Doctrine/Common/Annotations/PhpParser.php
  12. +0 −35 application/third_party/doctrine-orm/Doctrine/Common/Annotations/Reader.php
  13. +23 −13 application/third_party/doctrine-orm/Doctrine/Common/Cache/AbstractCache.php
  14. +0 −76 application/third_party/doctrine-orm/Doctrine/Common/Cache/ZendDataCache.php
  15. +6 −27 application/third_party/doctrine-orm/Doctrine/Common/ClassLoader.php
  16. +5 −8 application/third_party/doctrine-orm/Doctrine/Common/Collections/ArrayCollection.php
  17. +18 −29 application/third_party/doctrine-orm/Doctrine/Common/Lexer.php
  18. +0 −132 application/third_party/doctrine-orm/Doctrine/Common/Persistence/Mapping/ClassMetadata.php
  19. +0 −64 application/third_party/doctrine-orm/Doctrine/Common/Persistence/Mapping/ClassMetadataFactory.php
  20. +0 −125 application/third_party/doctrine-orm/Doctrine/Common/Persistence/ObjectManager.php
  21. +0 −71 application/third_party/doctrine-orm/Doctrine/Common/Persistence/ObjectRepository.php
  22. +3 −3 application/third_party/doctrine-orm/Doctrine/Common/Version.php
  23. +1 −1 application/third_party/doctrine-orm/Doctrine/DBAL/Configuration.php
  24. +7 −73 application/third_party/doctrine-orm/Doctrine/DBAL/Connection.php
  25. +2 −6 application/third_party/doctrine-orm/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php
  26. +1 −1 application/third_party/doctrine-orm/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php
  27. +1 −1 application/third_party/doctrine-orm/Doctrine/DBAL/Driver/PDOMySql/Driver.php
  28. +3 −3 application/third_party/doctrine-orm/Doctrine/DBAL/Driver/PDOPgSql/Driver.php
  29. +2 −1 application/third_party/doctrine-orm/Doctrine/DBAL/Event/Listeners/MysqlSessionInit.php
  30. +1 −1 application/third_party/doctrine-orm/Doctrine/DBAL/Logging/SQLLogger.php
  31. +27 −293 application/third_party/doctrine-orm/Doctrine/DBAL/Platforms/AbstractPlatform.php
  32. +1 −6 application/third_party/doctrine-orm/Doctrine/DBAL/Platforms/DB2Platform.php
  33. +0 −439 application/third_party/doctrine-orm/Doctrine/DBAL/Platforms/Keywords/DB2Keywords.php
  34. +0 −63 application/third_party/doctrine-orm/Doctrine/DBAL/Platforms/Keywords/KeywordList.php
  35. +0 −243 application/third_party/doctrine-orm/Doctrine/DBAL/Platforms/Keywords/MsSQLKeywords.php
  36. +0 −268 application/third_party/doctrine-orm/Doctrine/DBAL/Platforms/Keywords/MySQLKeywords.php
  37. +0 −156 application/third_party/doctrine-orm/Doctrine/DBAL/Platforms/Keywords/OracleKeywords.php
  38. +0 −131 application/third_party/doctrine-orm/Doctrine/DBAL/Platforms/Keywords/PostgreSQLKeywords.php
  39. +0 −116 application/third_party/doctrine-orm/Doctrine/DBAL/Platforms/Keywords/ReservedKeywordsValidator.php
  40. +0 −164 application/third_party/doctrine-orm/Doctrine/DBAL/Platforms/Keywords/SQLiteKeywords.php
  41. +9 −13 application/third_party/doctrine-orm/Doctrine/DBAL/Platforms/MsSqlPlatform.php
  42. +26 −107 application/third_party/doctrine-orm/Doctrine/DBAL/Platforms/MySqlPlatform.php
  43. +14 −73 application/third_party/doctrine-orm/Doctrine/DBAL/Platforms/OraclePlatform.php
  44. +12 −67 application/third_party/doctrine-orm/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
  45. +29 −60 application/third_party/doctrine-orm/Doctrine/DBAL/Platforms/SqlitePlatform.php
  46. +0 −112 application/third_party/doctrine-orm/Doctrine/DBAL/Portability/Connection.php
  47. +0 −174 application/third_party/doctrine-orm/Doctrine/DBAL/Portability/Statement.php
  48. +0 −130 application/third_party/doctrine-orm/Doctrine/DBAL/Query/Expression/CompositeExpression.php
  49. +0 −264 application/third_party/doctrine-orm/Doctrine/DBAL/Query/Expression/ExpressionBuilder.php
  50. +0 −1,091 application/third_party/doctrine-orm/Doctrine/DBAL/Query/QueryBuilder.php
  51. +0 −40 application/third_party/doctrine-orm/Doctrine/DBAL/Query/QueryException.php
  52. +0 −143 application/third_party/doctrine-orm/Doctrine/DBAL/SQLParserUtils.php
  53. +2 −28 application/third_party/doctrine-orm/Doctrine/DBAL/Schema/AbstractSchemaManager.php
  54. +0 −17 application/third_party/doctrine-orm/Doctrine/DBAL/Schema/Column.php
  55. +2 −10 application/third_party/doctrine-orm/Doctrine/DBAL/Schema/Comparator.php
  56. +1 −13 application/third_party/doctrine-orm/Doctrine/DBAL/Schema/Index.php
  57. +8 −12 application/third_party/doctrine-orm/Doctrine/DBAL/Schema/MySqlSchemaManager.php
  58. +0 −4 application/third_party/doctrine-orm/Doctrine/DBAL/Schema/OracleSchemaManager.php
  59. +11 −14 application/third_party/doctrine-orm/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
  60. +2 −1 application/third_party/doctrine-orm/Doctrine/DBAL/Schema/SchemaDiff.php
  61. +0 −10 application/third_party/doctrine-orm/Doctrine/DBAL/Schema/Sequence.php
  62. +14 −30 application/third_party/doctrine-orm/Doctrine/DBAL/Schema/Table.php
  63. +19 −36 application/third_party/doctrine-orm/Doctrine/DBAL/Schema/Visitor/DropSchemaSqlCollector.php
  64. +0 −151 application/third_party/doctrine-orm/Doctrine/DBAL/Schema/Visitor/Graphviz.php
  65. +3 −0 application/third_party/doctrine-orm/Doctrine/DBAL/Tools/Console/Command/ImportCommand.php
  66. +0 −133 application/third_party/doctrine-orm/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php
  67. +3 −0 application/third_party/doctrine-orm/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php
  68. +0 −17 application/third_party/doctrine-orm/Doctrine/DBAL/Types/ConversionException.php
  69. +1 −1 application/third_party/doctrine-orm/Doctrine/DBAL/Types/DateTimeType.php
  70. +1 −1 application/third_party/doctrine-orm/Doctrine/DBAL/Types/DateTimeTzType.php
  71. +1 −1 application/third_party/doctrine-orm/Doctrine/DBAL/Types/DateType.php
  72. +1 −1 application/third_party/doctrine-orm/Doctrine/DBAL/Types/TimeType.php
  73. +2 −40 application/third_party/doctrine-orm/Doctrine/DBAL/Types/Type.php
  74. +1 −1 application/third_party/doctrine-orm/Doctrine/DBAL/Version.php
  75. +26 −94 application/third_party/doctrine-orm/Doctrine/ORM/AbstractQuery.php
  76. +13 −47 application/third_party/doctrine-orm/Doctrine/ORM/Configuration.php
  77. +29 −47 application/third_party/doctrine-orm/Doctrine/ORM/EntityManager.php
  78. +8 −23 application/third_party/doctrine-orm/Doctrine/ORM/EntityRepository.php
  79. +0 −54 application/third_party/doctrine-orm/Doctrine/ORM/Event/OnClearEventArgs.php
  80. +0 −8 application/third_party/doctrine-orm/Doctrine/ORM/Events.php
  81. +1 −1 application/third_party/doctrine-orm/Doctrine/ORM/Id/AbstractIdGenerator.php
  82. +3 −21 application/third_party/doctrine-orm/Doctrine/ORM/Id/AssignedGenerator.php
  83. +1 −1 application/third_party/doctrine-orm/Doctrine/ORM/Id/SequenceGenerator.php
  84. +6 −47 application/third_party/doctrine-orm/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
  85. +0 −16 application/third_party/doctrine-orm/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
  86. +2 −2 application/third_party/doctrine-orm/Doctrine/ORM/Internal/Hydration/IterableResult.php
  87. +30 −75 application/third_party/doctrine-orm/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
  88. +0 −131 application/third_party/doctrine-orm/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php
  89. +43 −13 application/third_party/doctrine-orm/Doctrine/ORM/Mapping/ClassMetadata.php
  90. +40 −84 application/third_party/doctrine-orm/Doctrine/ORM/Mapping/ClassMetadataFactory.php
  91. +41 −419 application/third_party/doctrine-orm/Doctrine/ORM/Mapping/ClassMetadataInfo.php
  92. +17 −72 application/third_party/doctrine-orm/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
  93. +11 −104 application/third_party/doctrine-orm/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
  94. +3 −72 application/third_party/doctrine-orm/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
  95. +4 −9 application/third_party/doctrine-orm/Doctrine/ORM/Mapping/Driver/DriverChain.php
  96. +5 −44 application/third_party/doctrine-orm/Doctrine/ORM/Mapping/Driver/XmlDriver.php
  97. +0 −56 application/third_party/doctrine-orm/Doctrine/ORM/Mapping/Driver/YamlDriver.php
  98. +0 −62 application/third_party/doctrine-orm/Doctrine/ORM/Mapping/MappingException.php
  99. +1 −25 application/third_party/doctrine-orm/Doctrine/ORM/ORMException.php
  100. +0 −1 application/third_party/doctrine-orm/Doctrine/ORM/OptimisticLockException.php
  101. +41 −50 application/third_party/doctrine-orm/Doctrine/ORM/PersistentCollection.php
  102. +3 −34 application/third_party/doctrine-orm/Doctrine/ORM/Persisters/AbstractCollectionPersister.php
  103. +60 −9 application/third_party/doctrine-orm/Doctrine/ORM/Persisters/AbstractEntityInheritancePersister.php
  104. +270 −359 application/third_party/doctrine-orm/Doctrine/ORM/Persisters/BasicEntityPersister.php
  105. +13 −37 application/third_party/doctrine-orm/Doctrine/ORM/Persisters/JoinedSubclassPersister.php
  106. +5 −130 application/third_party/doctrine-orm/Doctrine/ORM/Persisters/ManyToManyPersister.php
  107. +2 −68 application/third_party/doctrine-orm/Doctrine/ORM/Persisters/OneToManyPersister.php
  108. +4 −11 application/third_party/doctrine-orm/Doctrine/ORM/Persisters/SingleTablePersister.php
  109. +5 −15 application/third_party/doctrine-orm/Doctrine/ORM/Proxy/ProxyFactory.php
  110. +56 −108 application/third_party/doctrine-orm/Doctrine/ORM/Query.php
  111. +0 −47 application/third_party/doctrine-orm/Doctrine/ORM/Query/AST/CoalesceExpression.php
  112. +3 −0 application/third_party/doctrine-orm/Doctrine/ORM/Query/AST/FromClause.php
  113. +0 −71 application/third_party/doctrine-orm/Doctrine/ORM/Query/AST/Functions/DateAddFunction.php
  114. +0 −58 application/third_party/doctrine-orm/Doctrine/ORM/Query/AST/Functions/DateDiffFunction.php
  115. +0 −58 application/third_party/doctrine-orm/Doctrine/ORM/Query/AST/Functions/DateSubFunction.php
  116. +4 −4 application/third_party/doctrine-orm/Doctrine/ORM/Query/AST/Functions/SizeFunction.php
  117. +0 −49 application/third_party/doctrine-orm/Doctrine/ORM/Query/AST/NullIfExpression.php
  118. +2 −2 application/third_party/doctrine-orm/Doctrine/ORM/Query/Exec/AbstractSqlExecutor.php
  119. +3 −5 application/third_party/doctrine-orm/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php
  120. +7 −28 application/third_party/doctrine-orm/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php
  121. +0 −22 application/third_party/doctrine-orm/Doctrine/ORM/Query/Expr.php
  122. +2 −2 application/third_party/doctrine-orm/Doctrine/ORM/Query/Expr/Andx.php
  123. +2 −2 application/third_party/doctrine-orm/Doctrine/ORM/Query/Expr/Base.php
  124. +0 −68 application/third_party/doctrine-orm/Doctrine/ORM/Query/Expr/Composite.php
  125. +6 −9 application/third_party/doctrine-orm/Doctrine/ORM/Query/Expr/Join.php
  126. +2 −2 application/third_party/doctrine-orm/Doctrine/ORM/Query/Expr/Orx.php
  127. +1 −1 application/third_party/doctrine-orm/Doctrine/ORM/Query/Lexer.php
  128. +0 −72 application/third_party/doctrine-orm/Doctrine/ORM/Query/ParameterTypeInferer.php
  129. +26 −98 application/third_party/doctrine-orm/Doctrine/ORM/Query/Parser.php
  130. +1 −12 application/third_party/doctrine-orm/Doctrine/ORM/Query/QueryException.php
  131. +8 −16 application/third_party/doctrine-orm/Doctrine/ORM/Query/ResultSetMapping.php
  132. +0 −107 application/third_party/doctrine-orm/Doctrine/ORM/Query/ResultSetMappingBuilder.php
  133. +252 −380 application/third_party/doctrine-orm/Doctrine/ORM/Query/SqlWalker.php
  134. +2 −2 application/third_party/doctrine-orm/Doctrine/ORM/Query/TreeWalkerAdapter.php
  135. +24 −154 application/third_party/doctrine-orm/Doctrine/ORM/QueryBuilder.php
  136. +3 −13 application/third_party/doctrine-orm/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php
  137. +0 −80 application/third_party/doctrine-orm/Doctrine/ORM/Tools/Console/Command/InfoCommand.php
  138. +1 −1 application/third_party/doctrine-orm/Doctrine/ORM/Tools/Console/Command/SchemaTool/CreateCommand.php
  139. +1 −1 application/third_party/doctrine-orm/Doctrine/ORM/Tools/Console/Command/SchemaTool/DropCommand.php
  140. +28 −60 application/third_party/doctrine-orm/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php
  141. +0 −1 application/third_party/doctrine-orm/Doctrine/ORM/Tools/Console/ConsoleRunner.php
  142. +0 −11 application/third_party/doctrine-orm/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php
  143. +17 −53 application/third_party/doctrine-orm/Doctrine/ORM/Tools/EntityGenerator.php
  144. +1 −1 application/third_party/doctrine-orm/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php
  145. +12 −20 application/third_party/doctrine-orm/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php
  146. +11 −11 application/third_party/doctrine-orm/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php
  147. +11 −83 application/third_party/doctrine-orm/Doctrine/ORM/Tools/SchemaTool.php
  148. +1 −1 application/third_party/doctrine-orm/Doctrine/ORM/Tools/SchemaValidator.php
  149. +0 −194 application/third_party/doctrine-orm/Doctrine/ORM/Tools/Setup.php
  150. +135 −323 application/third_party/doctrine-orm/Doctrine/ORM/UnitOfWork.php
  151. +1 −1 application/third_party/doctrine-orm/Doctrine/ORM/Version.php
  152. 0 application/third_party/doctrine-orm/bin/doctrine
  153. +0 −9 application/third_party/doctrine-orm/bin/doctrine.bat
  154. +30 −20 application/third_party/doctrine-orm/bin/doctrine.php
@@ -1,5 +1,7 @@
<?php
/*
+ * $Id$
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -22,6 +24,10 @@
/**
* Annotations class
*
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link www.doctrine-project.org
+ * @since 2.0
+ * @version $Revision$
* @author Benjamin Eberlei <kontakt@beberlei.de>
* @author Guilherme Blanco <guilhermeblanco@hotmail.com>
* @author Jonathan Wage <jonwage@gmail.com>
@@ -59,7 +65,7 @@ public function __get($name)
sprintf("Unknown property '%s' on annotation '%s'.", $name, get_class($this))
);
}
-
+
/**
* Error handler for unknown property mutator in Annotation class.
*
@@ -1,43 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Annotations\Annotation;
-
-/**
- * Annotation that can be used to signal to the parser to ignore specific
- * annotations during the parsing process.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-final class IgnoreAnnotation
-{
- public $names;
-
- public function __construct(array $values)
- {
- if (is_string($values['value'])) {
- $values['value'] = array($values['value']);
- }
- if (!is_array($values['value'])) {
- throw new \RuntimeException(sprintf('@IgnoreAnnotation expects either a string name, or an array of strings, but got %s.', json_encode($values['value'])));
- }
-
- $this->names = $values['value'];
- }
-}
Oops, something went wrong.

0 comments on commit 45db27e

Please sign in to comment.