Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[2.0] Another step towards finishing namespace refactoring

  • Loading branch information...
commit d458197e3a78aba49e7aa759e8d5c1ad86fb0a59 1 parent 43b6791
jwage authored
Showing with 460 additions and 1,009 deletions.
  1. +0 −39 lib/Doctrine/Common/Configurable.php
  2. +6 −6 lib/Doctrine/DBAL/Connection.php
  3. +3 −4 lib/Doctrine/DBAL/Driver.php
  4. +1 −1  lib/Doctrine/DBAL/Driver/PDOConnection.php
  5. +4 −5 lib/Doctrine/DBAL/Driver/PDOMsSql/Connection.php
  6. +12 −14 lib/Doctrine/DBAL/Driver/PDOMsSql/Driver.php
  7. +9 −10 lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php
  8. +11 −11 lib/Doctrine/DBAL/Driver/PDOOracle/Driver.php
  9. +17 −18 lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php
  10. +9 −13 lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php
  11. +1 −1  lib/Doctrine/DBAL/Driver/PDOStatement.php
  12. +10 −10 lib/Doctrine/DBAL/Driver/Statement.php
  13. +3 −4 lib/Doctrine/DBAL/DriverManager.php
  14. +1 −3 lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
  15. +1 −4 lib/Doctrine/DBAL/Platforms/Db2Platform.php
  16. +1 −5 lib/Doctrine/DBAL/Platforms/FirebirdPlatform.php
  17. +1 −5 lib/Doctrine/DBAL/Platforms/InformixPlatform.php
  18. +1 −2  lib/Doctrine/DBAL/Platforms/MockPlatform.php
  19. +1 −3 lib/Doctrine/DBAL/Platforms/MsSqlPlatform.php
  20. +1 −3 lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
  21. +1 −3 lib/Doctrine/DBAL/Platforms/OraclePlatform.php
  22. +2 −4 lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
  23. +1 −3 lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
  24. +3 −5 lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php
  25. +3 −6 lib/Doctrine/DBAL/Schema/FirebirdSchemaManager.php
  26. +20 −25 lib/Doctrine/DBAL/Schema/InformixSchemaManager.php
  27. +1 −4 lib/Doctrine/DBAL/Schema/MsSqlSchemaManager.php
  28. +3 −6 lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php
  29. +1 −4 lib/Doctrine/DBAL/Schema/OracleSchemaManager.php
  30. +2 −4 lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
  31. +3 −4 lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php
  32. +10 −10 lib/Doctrine/DBAL/Statement.php
  33. +1 −4 lib/Doctrine/DBAL/Types/ArrayType.php
  34. +1 −2  lib/Doctrine/DBAL/Types/BigIntType.php
  35. +1 −2  lib/Doctrine/DBAL/Types/BooleanType.php
  36. +1 −2  lib/Doctrine/DBAL/Types/CharType.php
  37. +1 −3 lib/Doctrine/DBAL/Types/DateTimeType.php
  38. +1 −2  lib/Doctrine/DBAL/Types/DecimalType.php
  39. +0 −1  lib/Doctrine/DBAL/Types/IntegerType.php
  40. +1 −2  lib/Doctrine/DBAL/Types/MediumIntType.php
  41. +1 −2  lib/Doctrine/DBAL/Types/SmallIntType.php
  42. +1 −3 lib/Doctrine/DBAL/Types/TextType.php
  43. +1 −2  lib/Doctrine/DBAL/Types/TinyIntType.php
  44. +2 −3 lib/Doctrine/DBAL/Types/Type.php
  45. +5 −3 lib/Doctrine/DBAL/Types/VarcharType.php
  46. +0 −57 lib/Doctrine/Exception.php
  47. +1 −1  lib/Doctrine/ORM/Cache/ApcCache.php
  48. +1 −1  lib/Doctrine/ORM/Cache/ArrayCache.php
  49. +1 −1  lib/Doctrine/ORM/Cache/Cache.php
  50. +1 −1  lib/Doctrine/ORM/Cache/DbCache.php
  51. +1 −1  lib/Doctrine/ORM/Cache/MemcacheCache.php
  52. +1 −3 lib/Doctrine/ORM/Events.php
  53. +3 −3 lib/Doctrine/ORM/Id/AbstractIdGenerator.php
  54. +1 −2  lib/Doctrine/ORM/Id/Assigned.php
  55. +3 −3 lib/Doctrine/ORM/Id/IdentityGenerator.php
  56. +1 −2  lib/Doctrine/ORM/Id/SequenceGenerator.php
  57. +1 −3 lib/Doctrine/ORM/Id/SequenceIdentityGenerator.php
  58. +1 −4 lib/Doctrine/ORM/Id/TableGenerator.php
  59. +0 −34 lib/Doctrine/ORM/Import/Exception.php
  60. +4 −16 lib/Doctrine/ORM/Import/{Reader.php → Reader/AbstractReader.php}
  61. +3 −7 lib/Doctrine/ORM/Import/Reader/Db.php
  62. +0 −42 lib/Doctrine/ORM/Import/Reader/Exception.php
  63. +4 −9 lib/Doctrine/ORM/Import/Reader/Propel.php
  64. +1 −3 lib/Doctrine/ORM/Internal/CommitOrderCalculator.php
  65. +1 −2  lib/Doctrine/ORM/Internal/CommitOrderNode.php
  66. +1 −1  lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
  67. +1 −2  lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
  68. +0 −49 lib/Doctrine/ORM/Internal/Hydration/Exception.php
  69. +1 −4 lib/Doctrine/ORM/Internal/Hydration/HydrationException.php
  70. +1 −2  lib/Doctrine/ORM/Internal/Hydration/IterableResult.php
  71. +1 −2  lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
  72. +1 −2  lib/Doctrine/ORM/Internal/Hydration/ScalarHydrator.php
  73. +1 −2  lib/Doctrine/ORM/Internal/Hydration/SingleScalarHydrator.php
  74. +1 −2  lib/Doctrine/ORM/Mapping/AssociationMapping.php
  75. +1 −2  lib/Doctrine/ORM/Mapping/ClassMetadata.php
  76. +1 −4 lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
  77. +1 −1  lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
  78. +1 −1  lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
  79. +1 −2  lib/Doctrine/ORM/Mapping/ManyToManyMapping.php
  80. +1 −3 lib/Doctrine/ORM/Mapping/MappingException.php
  81. +1 −3 lib/Doctrine/ORM/Mapping/OneToManyMapping.php
  82. +1 −3 lib/Doctrine/ORM/Mapping/OneToOneMapping.php
  83. +1 −1  lib/Doctrine/ORM/PersistentCollection.php
  84. +1 −2  lib/Doctrine/ORM/Persisters/AbstractCollectionPersister.php
  85. +1 −1  lib/Doctrine/ORM/Persisters/AbstractEntityPersister.php
  86. +1 −2  lib/Doctrine/ORM/Persisters/ElementCollectionPersister.php
  87. +0 −38 lib/Doctrine/ORM/Persisters/Exception.php
  88. +1 −2  lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php
  89. +1 −2  lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
  90. +1 −3 lib/Doctrine/ORM/Persisters/OneToManyPersister.php
  91. +6 −1 lib/Doctrine/ORM/Persisters/SingleTablePersister.php
  92. +6 −1 lib/Doctrine/ORM/Persisters/UnionSubclassPersister.php
  93. +1 −1  lib/Doctrine/ORM/Query.php
  94. +1 −2  lib/Doctrine/ORM/Query/AST/AggregateExpression.php
  95. +9 −6 lib/Doctrine/ORM/Query/AST/ArithmeticExpression.php
  96. +1 −2  lib/Doctrine/ORM/Query/AST/ArithmeticFactor.php
  97. +1 −2  lib/Doctrine/ORM/Query/AST/ArithmeticTerm.php
  98. +1 −2  lib/Doctrine/ORM/Query/AST/ComparisonExpression.php
  99. +1 −2  lib/Doctrine/ORM/Query/AST/ComparisonOperator.php
  100. +1 −2  lib/Doctrine/ORM/Query/AST/ConditionalExpression.php
  101. +1 −2  lib/Doctrine/ORM/Query/AST/ConditionalFactor.php
  102. +3 −4 lib/Doctrine/ORM/Query/AST/ConditionalPrimary.php
  103. +1 −2  lib/Doctrine/ORM/Query/AST/ConditionalTerm.php
  104. +1 −7 lib/Doctrine/ORM/Query/AST/DeleteStatement.php
  105. +1 −5 lib/Doctrine/ORM/Query/AST/FromClause.php
  106. +1 −4 lib/Doctrine/ORM/Query/AST/Function.php
  107. +1 −2  lib/Doctrine/ORM/Query/AST/GroupByClause.php
  108. +0 −1  lib/Doctrine/ORM/Query/AST/IdentificationVariableDeclaration.php
  109. +1 −2  lib/Doctrine/ORM/Query/AST/InputParameter.php
  110. +1 −13 lib/Doctrine/ORM/Query/AST/Join.php
  111. +1 −2  lib/Doctrine/ORM/Query/AST/JoinPathExpression.php
  112. +0 −4 lib/Doctrine/ORM/Query/AST/JoinVariableDeclaration.php
  113. +1 −2  lib/Doctrine/ORM/Query/AST/LikeExpression.php
  114. +1 −2  lib/Doctrine/ORM/Query/AST/PathExpression.php
  115. +0 −2  lib/Doctrine/ORM/Query/AST/RangeVariableDeclaration.php
  116. +1 −6 lib/Doctrine/ORM/Query/AST/SelectClause.php
  117. +0 −1  lib/Doctrine/ORM/Query/AST/SelectExpression.php
  118. +0 −6 lib/Doctrine/ORM/Query/AST/SelectStatement.php
  119. +1 −2  lib/Doctrine/ORM/Query/AST/SimpleArithmeticExpression.php
  120. +0 −2  lib/Doctrine/ORM/Query/AST/SimpleStateFieldPathExpression.php
  121. +0 −7 lib/Doctrine/ORM/Query/AST/UpdateStatetement.php
  122. +1 −2  lib/Doctrine/ORM/Query/AST/WhereClause.php
  123. +0 −16 lib/Doctrine/ORM/Query/AbstractResult.php
  124. +6 −11 lib/Doctrine/ORM/Query/CacheHandler.php
  125. +0 −37 lib/Doctrine/ORM/Query/Exception.php
  126. +0 −2  lib/Doctrine/ORM/Query/Exec/AbstractExecutor.php
  127. +5 −3 lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php
  128. +5 −3 lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php
  129. +1 −1  lib/Doctrine/ORM/Query/Lexer.php
  130. +1 −3 lib/Doctrine/ORM/Query/Parser.php
  131. +7 −8 lib/Doctrine/ORM/Query/Parser/AbstractSchemaName.php
  132. +4 −3 lib/Doctrine/ORM/Query/Parser/AliasIdentificationVariable.php
  133. +5 −2 lib/Doctrine/ORM/Query/Parser/CollectionValuedAssociationField.php
  134. +4 −2 lib/Doctrine/ORM/Query/Parser/DeleteStatement.php
  135. +5 −2 lib/Doctrine/ORM/Query/Parser/EmbeddedClassStateField.php
  136. +0 −35 lib/Doctrine/ORM/Query/Parser/Exception.php
  137. +4 −2 lib/Doctrine/ORM/Query/Parser/FieldAliasIdentificationVariable.php
  138. +4 −2 lib/Doctrine/ORM/Query/Parser/FieldIdentificationVariable.php
  139. +4 −3 lib/Doctrine/ORM/Query/Parser/FromClause.php
  140. +4 −4 lib/Doctrine/ORM/Query/Parser/IdentificationVariable.php
  141. +7 −5 lib/Doctrine/ORM/Query/Parser/IdentificationVariableDeclaration.php
  142. +5 −5 lib/Doctrine/ORM/Query/Parser/IndexBy.php
  143. +17 −16 lib/Doctrine/ORM/Query/Parser/Join.php
  144. +5 −4 lib/Doctrine/ORM/Query/Parser/JoinAssociationPathExpression.php
  145. +5 −5 lib/Doctrine/ORM/Query/Parser/JoinCollectionValuedPathExpression.php
  146. +4 −4 lib/Doctrine/ORM/Query/Parser/JoinSingleValuedAssociationPathExpression.php
  147. +4 −4 lib/Doctrine/ORM/Query/Parser/JoinVariableDeclaration.php
  148. +6 −4 lib/Doctrine/ORM/Query/Parser/QueryLanguage.php
  149. +5 −5 lib/Doctrine/ORM/Query/Parser/RangeVariableDeclaration.php
  150. +6 −9 lib/Doctrine/ORM/Query/Parser/SelectClause.php
  151. +7 −10 lib/Doctrine/ORM/Query/Parser/SelectExpression.php
  152. +7 −8 lib/Doctrine/ORM/Query/Parser/SelectStatement.php
  153. +5 −2 lib/Doctrine/ORM/Query/Parser/SimpleStateField.php
  154. +5 −5 lib/Doctrine/ORM/Query/Parser/SimpleStateFieldPathExpression.php
  155. +5 −2 lib/Doctrine/ORM/Query/Parser/SingleValuedAssociationField.php
  156. +6 −5 lib/Doctrine/ORM/Query/Parser/StateField.php
  157. +5 −3 lib/Doctrine/ORM/Query/Parser/UpdateStatement.php
  158. +1 −9 lib/Doctrine/ORM/Query/ParserDataHolder.php
  159. +1 −10 lib/Doctrine/ORM/Query/ParserResult.php
  160. +1 −5 lib/Doctrine/ORM/Query/ParserResultDummy.php
  161. +2 −12 lib/Doctrine/ORM/Query/ParserRule.php
  162. +4 −2 lib/Doctrine/ORM/Query/Printer.php
  163. +13 −12 lib/Doctrine/ORM/Query/Production/AggregateExpression.php
  164. +4 −5 lib/Doctrine/ORM/Query/Production/Factor.php
  165. +7 −4 lib/Doctrine/ORM/Query/QueryException.php
  166. +4 −3 lib/Doctrine/ORM/Query/QueryResult.php
  167. +1 −2  lib/Doctrine/ORM/Query/SqlWalker.php
  168. +1 −6 lib/Doctrine/ORM/Query/Token.php
  169. +1 −2  lib/Doctrine/ORM/VirtualProxy.php
39 lib/Doctrine/Common/Configurable.php
View
@@ -1,39 +0,0 @@
-<?php
-/*
- * $Id: Configurable.php 4523 2008-06-15 15:56:28Z romanb $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.org>.
- */
-
-#namespace Doctrine::Common;
-
-/**
- * Doctrine_Configurable
- *
- * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @link www.phpdoctrine.org
- * @since 2.0
- * @version $Revision: 4523 $
- * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @author Roman Borschel <roman@code-factory.org>
- */
-interface Doctrine_Common_Configurable
-{
- public function getAttribute($name);
- public function setAttribute($name, $value);
- public function hasAttribute($name);
-}
12 lib/Doctrine/DBAL/Connection.php
View
@@ -284,7 +284,7 @@ public function delete($tableName, array $identifier)
/**
* Updates table row(s) with specified data
*
- * @throws Doctrine_Connection_Exception if something went wrong at the database level
+ * @throws Doctrine\DBAL\ConnectionException if something went wrong at the database level
* @param string $table The table to insert data into
* @param array $values An associateve array containing column-value pairs.
* @return mixed boolean false if empty value array was given,
@@ -509,7 +509,7 @@ public function select($query, $limit = 0, $offset = 0)
* @param string $query sql query
* @param array $params query parameters
*
- * @return PDOStatement|Doctrine_Adapter_Statement
+ * @return PDOStatement
*/
public function execute($query, array $params = array())
{
@@ -536,7 +536,7 @@ public function execute($query, array $params = array())
* @param string $query sql query
* @param array $params query parameters
*
- * @return PDOStatement|Doctrine_Adapter_Statement
+ * @return PDOStatement
* @todo Rename to executeUpdate().
*/
public function exec($query, array $params = array()) {
@@ -562,7 +562,7 @@ public function exec($query, array $params = array()) {
/**
* Wraps the given exception into a driver-specific exception and rethrows it.
*
- * @throws Doctrine_Connection_Exception
+ * @throws Doctrine\DBAL\ConnectionException
*/
public function rethrowException(Exception $e, $invoker)
{
@@ -711,7 +711,7 @@ public function commit()
* eventlistener methods
*
* @param string $savepoint Name of a savepoint to rollback to.
- * @throws Doctrine_Transaction_Exception If the rollback operation fails at database level.
+ * @throws Doctrine\DBAL\ConnectionException If the rollback operation fails at database level.
* @return boolean FALSE if rollback couldn't be performed, TRUE otherwise.
*/
public function rollback()
@@ -772,4 +772,4 @@ public function getSchemaManager()
}
return $this->_schemaManager;
}
-}
+}
7 lib/Doctrine/DBAL/Driver.php
View
@@ -20,7 +20,7 @@
* @return Doctrine::DBAL::Connection The database connection.
*/
public function connect(array $params, $username = null, $password = null, array $driverOptions = array());
-
+
/**
* Gets the DatabasePlatform instance that provides all the metadata about
* the platform this driver connects to.
@@ -28,7 +28,7 @@ public function connect(array $params, $username = null, $password = null, array
* @return Doctrine::DBAL::DatabasePlatform The database platform.
*/
public function getDatabasePlatform();
-
+
/**
* Gets the SchemaManager that can be used to inspect and change the underlying
* database schema of the platform this driver connects to.
@@ -36,5 +36,4 @@ public function getDatabasePlatform();
* @return Doctrine\DBAL\SchemaManager
*/
public function getSchemaManager(Connection $conn);
-}
-
+}
2  lib/Doctrine/DBAL/Driver/PDOConnection.php
View
@@ -19,4 +19,4 @@ public function __construct($dsn, $user = null, $password = null, array $options
$this->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$this->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
}
-}
+}
9 lib/Doctrine/DBAL/Driver/PDOMsSql/Connection.php
View
@@ -7,7 +7,7 @@
*
* @since 2.0
*/
-class Connection extends PDO implements \Doctrine\DBAL\Driver\Connection
+class Connection extends PDO implements \Doctrine\DBAL\Driver\PDOConnection
{
/**
* Performs the rollback.
@@ -18,7 +18,7 @@ public function rollback()
{
$this->exec('ROLLBACK TRANSACTION');
}
-
+
/**
* Performs the commit.
*
@@ -28,7 +28,7 @@ public function commit()
{
$this->exec('COMMIT TRANSACTION');
}
-
+
/**
* Begins a database transaction.
*
@@ -38,5 +38,4 @@ public function beginTransaction()
{
$this->exec('BEGIN TRANSACTION');
}
-}
-
+}
26 lib/Doctrine/DBAL/Driver/PDOMsSql/Driver.php
View
@@ -4,16 +4,16 @@
class Driver implements \Doctrine\DBAL\Driver
{
-
public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
{
return new Connection(
- $this->_constructPdoDsn($params),
- $username,
- $password,
- $driverOptions);
+ $this->_constructPdoDsn($params),
+ $username,
+ $password,
+ $driverOptions
+ );
}
-
+
/**
* Constructs the MySql PDO DSN.
*
@@ -25,16 +25,14 @@ private function _constructPdoDsn(array $params)
{
//TODO
}
-
+
public function getDatabasePlatform()
{
- return new Doctrine_DatabasePlatform_MySqlPlatform();
+ return new \Doctrine\DBAL\Platforms\MsSqlPlatform();
}
-
- public function getSchemaManager(Doctrine_Connection $conn)
+
+ public function getSchemaManager(\Doctrine\DBAL\Connection $conn)
{
- return new Doctrine_Schema_MySqlSchemaManager($conn);
+ return new \Doctrine\DBAL\Schema\MsSqlSchemaManager($conn);
}
-
-}
-
+}
19 lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php
View
@@ -40,14 +40,15 @@ class Driver implements \Doctrine\DBAL\Driver
public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
{
$conn = new \Doctrine\DBAL\Driver\PDOConnection(
- $this->_constructPdoDsn($params),
- $username,
- $password,
- $driverOptions);
+ $this->_constructPdoDsn($params),
+ $username,
+ $password,
+ $driverOptions
+ );
$conn->setAttribute(\PDO::ATTR_AUTOCOMMIT, false);
return $conn;
}
-
+
/**
* Constructs the MySql PDO DSN.
*
@@ -73,16 +74,14 @@ private function _constructPdoDsn(array $params)
return $dsn;
}
-
+
public function getDatabasePlatform()
{
return new \Doctrine\DBAL\Platforms\MySqlPlatform();
}
-
+
public function getSchemaManager(\Doctrine\DBAL\Connection $conn)
{
return new \Doctrine\DBAL\Schema\MySqlSchemaManager($conn);
}
-
-}
-
+}
22 lib/Doctrine/DBAL/Driver/PDOOracle/Driver.php
View
@@ -2,18 +2,20 @@
namespace Doctrine\DBAL\Driver\PDOOracle;
+use Doctrine\DBAL\Platforms;
+
class Driver implements \Doctrine\DBAL\Driver
{
-
public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
{
return new \Doctrine\DBAL\Driver\PDOConnection(
- $this->_constructPdoDsn($params),
- $username,
- $password,
- $driverOptions);
+ $this->_constructPdoDsn($params),
+ $username,
+ $password,
+ $driverOptions
+ );
}
-
+
/**
* Constructs the Oracle PDO DSN.
*
@@ -23,16 +25,14 @@ private function _constructPdoDsn(array $params)
{
//TODO
}
-
+
public function getDatabasePlatform()
{
return new \Doctrine\DBAL\Platforms\OraclePlatform();
}
-
+
public function getSchemaManager(\Doctrine\DBAL\Connection $conn)
{
return new \Doctrine\DBAL\Schema\OracleSchemaManager($conn);
}
-
-}
-
+}
35 lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php
View
@@ -1,24 +1,26 @@
<?php
-#namespace Doctrine::DBAL::Driver::PDOPgSql;
+namespace Doctrine\DBAL\Driver\PDOPgSql;
+
+use Doctrine\DBAL\Platforms;
/**
* Driver that connects through pdo_pgsql.
*
* @since 2.0
*/
-class Doctrine_DBAL_Driver_PDOPgSql_Driver implements Doctrine_DBAL_Driver
+class Driver implements \Doctrine\DBAL\Driver
{
-
public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
{
- return new Doctrine_DBAL_Driver_PDOConnection(
- $this->_constructPdoDsn($params),
- $username,
- $password,
- $driverOptions);
+ return new \Doctrine\DBAL\Driver\PDOConnection(
+ $this->_constructPdoDsn($params),
+ $username,
+ $password,
+ $driverOptions
+ );
}
-
+
/**
* Constructs the Postgres PDO DSN.
*
@@ -28,17 +30,14 @@ private function _constructPdoDsn(array $params)
{
//TODO
}
-
+
public function getDatabasePlatform()
{
- return new Doctrine_DBAL_Platforms_PostgreSqlPlatform();
+ return new \Doctrine\DBAL\Platforms\PostgreSqlPlatform();
}
-
- public function getSchemaManager(Doctrine_DBAL_Connection $conn)
+
+ public function getSchemaManager(\Doctrine\DBAL\Connection $conn)
{
- return new Doctrine_DBAL_Schema_PostgreSqlSchemaManager($conn);
+ return new \Doctrine\DBAL\Schema\PostgreSqlSchemaManager($conn);
}
-
-}
-
-?>
+}
22 lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php
View
@@ -2,8 +2,6 @@
namespace Doctrine\DBAL\Driver\PDOSqlite;
-#use Doctrine::DBAL::Driver;
-
/**
* The PDO Sqlite driver.
*
@@ -23,12 +21,13 @@ class Driver implements \Doctrine\DBAL\Driver
public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
{
return new \Doctrine\DBAL\Driver\PDOConnection(
- $this->_constructPdoDsn($params),
- $username,
- $password,
- $driverOptions);
+ $this->_constructPdoDsn($params),
+ $username,
+ $password,
+ $driverOptions
+ );
}
-
+
/**
* Constructs the Sqlite PDO DSN.
*
@@ -46,7 +45,7 @@ protected function _constructPdoDsn(array $params)
return $dsn;
}
-
+
/**
* Gets the database platform that is relevant for this driver.
*/
@@ -54,7 +53,7 @@ public function getDatabasePlatform()
{
return new \Doctrine\DBAL\Platforms\SqlitePlatform();
}
-
+
/**
* Gets the schema manager that is relevant for this driver.
*
@@ -65,7 +64,4 @@ public function getSchemaManager(\Doctrine\DBAL\Connection $conn)
{
return new \Doctrine\DBAL\Schema\SqliteSchemaManager($conn);
}
-
-}
-
-?>
+}
2  lib/Doctrine/DBAL/Driver/PDOStatement.php
View
@@ -5,4 +5,4 @@
class PDOStatement extends \PDOStatement implements \Doctrine\DBAL\Driver\Statement
{
private function __construct() {}
-}
+}
20 lib/Doctrine/DBAL/Driver/Statement.php
View
@@ -67,9 +67,9 @@ public function bindValue($param, $value, $type = null);
/**
* bindParam
* Binds a PHP variable to a corresponding named or question mark placeholder in the
- * SQL statement that was use to prepare the statement. Unlike Doctrine_Adapter_Statement_Interface->bindValue(),
+ * SQL statement that was use to prepare the statement. Unlike PDOStatement->bindValue(),
* the variable is bound as a reference and will only be evaluated at the time
- * that Doctrine_Adapter_Statement_Interface->execute() is called.
+ * that PDOStatement->execute() is called.
*
* Most parameters are input parameters, that is, parameters that are
* used in a read-only fashion to build up the query. Some drivers support the invocation
@@ -106,7 +106,7 @@ public function closeCursor();
* Returns the number of columns in the result set
*
* @return integer Returns the number of columns in the result set represented
- * by the Doctrine_Adapter_Statement_Interface object. If there is no result set,
+ * by the PDOStatement object. If there is no result set,
* this method should return 0.
*/
public function columnCount();
@@ -157,18 +157,18 @@ public function execute($params = null);
* this value determines which row will be returned to the caller.
* This value must be one of the Query::HYDRATE_ORI_* constants, defaulting to
* Query::HYDRATE_ORI_NEXT. To request a scrollable cursor for your
- * Doctrine_Adapter_Statement_Interface object,
+ * PDOStatement object,
* you must set the PDO::ATTR_CURSOR attribute to Doctrine::CURSOR_SCROLL when you
* prepare the SQL statement with Doctrine_Adapter_Interface->prepare().
*
- * @param integer $cursorOffset For a Doctrine_Adapter_Statement_Interface object representing a scrollable cursor for which the
+ * @param integer $cursorOffset For a PDOStatement object representing a scrollable cursor for which the
* $cursorOrientation parameter is set to Query::HYDRATE_ORI_ABS, this value specifies
* the absolute number of the row in the result set that shall be fetched.
*
- * For a Doctrine_Adapter_Statement_Interface object representing a scrollable cursor for
+ * For a PDOStatement object representing a scrollable cursor for
* which the $cursorOrientation parameter is set to Query::HYDRATE_ORI_REL, this value
* specifies the row to fetch relative to the cursor position before
- * Doctrine_Adapter_Statement_Interface->fetch() was called.
+ * PDOStatement->fetch() was called.
*
* @return mixed
*/
@@ -197,7 +197,7 @@ public function fetchAll($fetchStyle = Query::HYDRATE_BOTH);
* result set or FALSE if there are no more rows.
*
* @param integer $columnIndex 0-indexed number of the column you wish to retrieve from the row. If no
- * value is supplied, Doctrine_Adapter_Statement_Interface->fetchColumn()
+ * value is supplied, PDOStatement->fetchColumn()
* fetches the first column.
*
* @return string returns a single column in the next row of a result set.
@@ -209,7 +209,7 @@ public function fetchColumn($columnIndex = 0);
* Fetches the next row and returns it as an object.
*
* Fetches the next row and returns it as an object. This function is an alternative to
- * Doctrine_Adapter_Statement_Interface->fetch() with Query::HYDRATE_CLASS or Query::HYDRATE_OBJ style.
+ * PDOStatement->fetch() with Query::HYDRATE_CLASS or Query::HYDRATE_OBJ style.
*
* @param string $className Name of the created class, defaults to stdClass.
* @param array $args Elements of this array are passed to the constructor.
@@ -292,4 +292,4 @@ public function setAttribute($attribute, $value);
* @return boolean Returns 1 on success or FALSE on failure.
*/
public function setFetchMode($mode, $arg1);
-}
+}
7 lib/Doctrine/DBAL/DriverManager.php
View
@@ -48,7 +48,7 @@
/** Private constructor. This class cannot be instantiated. */
private function __construct() {}
-
+
/**
* Creates a connection object based on the specified parameters.
* This method returns a Doctrine\DBAL\Connection which wraps the underlying
@@ -128,7 +128,7 @@ public static function getConnection(array $params,
return new $wrapperClass($params, $driver, $config, $eventManager);
}
-
+
/**
* Checks the list of parameters.
*
@@ -150,5 +150,4 @@ private static function _checkParams(array $params)
throw Exceptions\DBALException::unknownDriver($params['driver']);
}
}
-}
-
+}
4 lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
View
@@ -1953,6 +1953,4 @@ public function getIdentityColumnNullInsertSql()
* @params array $field
*/
abstract public function getVarcharDeclarationSql(array $field);
-}
-
-
+}
5 lib/Doctrine/DBAL/Platforms/Db2Platform.php
View
@@ -4,11 +4,8 @@
class Db2Platform extends AbstractPlatform
{
-
public function getSequenceNextValSql($sequenceName) {
return 'SELECT NEXTVAL FOR ' . $this->quoteIdentifier($sequenceName)
. ' FROM SYSIBM.SYSDUMMY1';
}
-
-}
-
+}
6 lib/Doctrine/DBAL/Platforms/FirebirdPlatform.php
View
@@ -9,7 +9,6 @@
*/
class FirebirdPlatform extends AbstractPlatform
{
-
/**
* Constructor.
*/
@@ -289,7 +288,4 @@ public function getSetTransactionIsolationSql($level)
{
return 'SET TRANSACTION ISOLATION LEVEL ' . $this->_getTransactionIsolationLevelSql($level);
}
-
-}
-
-?>
+}
6 lib/Doctrine/DBAL/Platforms/InformixPlatform.php
View
@@ -9,7 +9,6 @@
*/
class InformixPlatform extends AbstractPlatform
{
-
public function __construct()
{
parent::__construct();
@@ -92,7 +91,4 @@ public function getNativeDeclaration($field)
}
throw \Doctrine\Common\DoctrineException::updateMe('Unknown field type \'' . $field['type'] . '\'.');
}
-
-}
-
-?>
+}
3  lib/Doctrine/DBAL/Platforms/MockPlatform.php
View
@@ -5,5 +5,4 @@ class MockPlatform extends AbstractPlatform
{
public function getNativeDeclaration(array $field) {}
public function getPortableDeclaration(array $field) {}
-}
-
+}
4 lib/Doctrine/DBAL/Platforms/MsSqlPlatform.php
View
@@ -322,6 +322,4 @@ public function getSetTransactionIsolationSql($level)
return 'SET TRANSACTION ISOLATION LEVEL ' . $this->_getTransactionIsolationLevelSql($level);
}
-}
-
-?>
+}
4 lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
View
@@ -1259,6 +1259,4 @@ public function getSetTransactionIsolationSql($level)
{
return 'SET SESSION TRANSACTION ISOLATION LEVEL ' . $this->_getTransactionIsolationLevelSql($level);
}
-}
-
-?>
+}
4 lib/Doctrine/DBAL/Platforms/OraclePlatform.php
View
@@ -375,6 +375,4 @@ protected function _getTransactionIsolationLevelSql($level)
return parent::_getTransactionIsolationLevelSql($level);
}
}
-}
-
-?>
+}
6 lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
View
@@ -833,7 +833,7 @@ public function getAlterTableSql($name, array $changes, $check = false)
/**
* return RDBMS specific create sequence statement
*
- * @throws Doctrine_Connection_Exception if something fails at database level
+ * @throws Doctrine\DBAL\ConnectionException if something fails at database level
* @param string $seqName name of the sequence to be created
* @param string $start start value of the sequence; default is 1
* @param array $options An associative array of table options:
@@ -1001,6 +1001,4 @@ public function getSetTransactionIsolationSql($level)
return 'SET SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL '
. $this->_getTransactionIsolationLevelSql($level);
}
-}
-
-?>
+}
4 lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
View
@@ -29,7 +29,6 @@
*/
class SqlitePlatform extends AbstractPlatform
{
-
/**
* the constructor
*/
@@ -564,5 +563,4 @@ public function supportsForeignKeyConstraints()
{
return false;
}
-}
-
+}
8 lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php
View
@@ -228,7 +228,7 @@ public function dropForeignKey($table, $name)
* drop existing sequence
* (this method is implemented by the drivers)
*
- * @throws Doctrine_Connection_Exception if something fails at database level
+ * @throws Doctrine\DBAL\ConnectionException if something fails at database level
* @param string $sequenceName name of the sequence to be dropped
* @return void
*/
@@ -285,7 +285,7 @@ public function createTable($name, array $columns, array $options = array())
/**
* create sequence
*
- * @throws Doctrine_Connection_Exception if something fails at database level
+ * @throws Doctrine\DBAL\ConnectionException if something fails at database level
* @param string $seqName name of the sequence to be created
* @param string $start start value of the sequence; default is 1
* @param array $options An associative array of table options:
@@ -476,6 +476,4 @@ public function alterTable($name, array $changes, $check = false)
$this->_conn->execute($sql);
}
}
-}
-
-?>
+}
9 lib/Doctrine/DBAL/Schema/FirebirdSchemaManager.php
View
@@ -614,10 +614,10 @@ public function createSequence($seqName, $start = 1, array $options = array())
$this->_conn->exec('SET GENERATOR ' . $sequenceName . ' TO ' . ($start-1));
return true;
- } catch (Doctrine_Connection_Exception $e) {
+ } catch (Doctrine\DBAL\ConnectionException $e) {
try {
$this->dropSequence($seqName);
- } catch(Doctrine_Connection_Exception $e) {
+ } catch(Doctrine\DBAL\ConnectionException $e) {
throw \Doctrine\Common\DoctrineException::updateMe('Could not drop inconsistent sequence table');
}
}
@@ -638,7 +638,4 @@ public function dropSequenceSql($seqName)
return $query;
}
-
-}
-
-?>
+}
45 lib/Doctrine/DBAL/Schema/InformixSchemaManager.php
View
@@ -34,28 +34,23 @@
class InformixSchemaManager extends AbstractSchemaManager
{
protected $sql = array(
- 'listTables' => "SELECT tabname,tabtype FROM systables WHERE tabtype IN ('T','V') AND owner != 'informix'",
- 'listColumns' => "SELECT c.colname, c.coltype, c.collength, d.default, c.colno
- FROM syscolumns c, systables t,outer sysdefaults d
- WHERE c.tabid = t.tabid AND d.tabid = t.tabid AND d.colno = c.colno
- AND tabname='%s' ORDER BY c.colno",
- 'listPk' => "SELECT part1, part2, part3, part4, part5, part6, part7, part8 FROM
- systables t, sysconstraints s, sysindexes i WHERE t.tabname='%s'
- AND s.tabid=t.tabid AND s.constrtype='P'
- AND i.idxname=s.idxname",
- 'listForeignKeys' => "SELECT tr.tabname,updrule,delrule,
- i.part1 o1,i2.part1 d1,i.part2 o2,i2.part2 d2,i.part3 o3,i2.part3 d3,i.part4 o4,i2.part4 d4,
- i.part5 o5,i2.part5 d5,i.part6 o6,i2.part6 d6,i.part7 o7,i2.part7 d7,i.part8 o8,i2.part8 d8
- from systables t,sysconstraints s,sysindexes i,
- sysreferences r,systables tr,sysconstraints s2,sysindexes i2
- where t.tabname='%s'
- and s.tabid=t.tabid and s.constrtype='R' and r.constrid=s.constrid
- and i.idxname=s.idxname and tr.tabid=r.ptabid
- and s2.constrid=r.primary and i2.idxname=s2.idxname",
- );
-
-
-
-
-}
-
+ 'listTables' => "SELECT tabname,tabtype FROM systables WHERE tabtype IN ('T','V') AND owner != 'informix'",
+ 'listColumns' => "SELECT c.colname, c.coltype, c.collength, d.default, c.colno
+ FROM syscolumns c, systables t,outer sysdefaults d
+ WHERE c.tabid = t.tabid AND d.tabid = t.tabid AND d.colno = c.colno
+ AND tabname='%s' ORDER BY c.colno",
+ 'listPk' => "SELECT part1, part2, part3, part4, part5, part6, part7, part8 FROM
+ systables t, sysconstraints s, sysindexes i WHERE t.tabname='%s'
+ AND s.tabid=t.tabid AND s.constrtype='P'
+ AND i.idxname=s.idxname",
+ 'listForeignKeys' => "SELECT tr.tabname,updrule,delrule,
+ i.part1 o1,i2.part1 d1,i.part2 o2,i2.part2 d2,i.part3 o3,i2.part3 d3,i.part4 o4,i2.part4 d4,
+ i.part5 o5,i2.part5 d5,i.part6 o6,i2.part6 d6,i.part7 o7,i2.part7 d7,i.part8 o8,i2.part8 d8
+ from systables t,sysconstraints s,sysindexes i,
+ sysreferences r,systables tr,sysconstraints s2,sysindexes i2
+ where t.tabname='%s'
+ and s.tabid=t.tabid and s.constrtype='R' and r.constrid=s.constrid
+ and i.idxname=s.idxname and tr.tabid=r.ptabid
+ and s2.constrid=r.primary and i2.idxname=s2.idxname",
+ );
+}
5 lib/Doctrine/DBAL/Schema/MsSqlSchemaManager.php
View
@@ -417,7 +417,4 @@ public function listViews($database = null)
return $this->conn->fetchColumn($query);
}
-
-}
-
-?>
+}
9 lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php
View
@@ -279,7 +279,7 @@ public function createSequence($sequenceName, $start = 1, array $options = array
}
$res = $this->_conn->exec($query);
- } catch(Doctrine_Connection_Exception $e) {
+ } catch(Doctrine\DBAL\ConnectionException $e) {
throw \Doctrine\Common\DoctrineException::updateMe('could not create sequence table');
}
@@ -295,7 +295,7 @@ public function createSequence($sequenceName, $start = 1, array $options = array
// Handle error
try {
$res = $this->_conn->exec('DROP TABLE ' . $sequenceName);
- } catch(Doctrine_Connection_Exception $e) {
+ } catch(Doctrine\DBAL\ConnectionException $e) {
throw \Doctrine\Common\DoctrineException::updateMe('could not drop inconsistent sequence table');
}
@@ -316,7 +316,4 @@ public function dropForeignKey($table, $name)
$name = $this->_conn->quoteIdentifier($name);
return $this->_conn->exec('ALTER TABLE ' . $table . ' DROP FOREIGN KEY ' . $name);
}
-
-}
-
-?>
+}
5 lib/Doctrine/DBAL/Schema/OracleSchemaManager.php
View
@@ -704,7 +704,4 @@ public function listViews($database = null)
$query = 'SELECT view_name FROM sys.user_views';
return $this->_conn->fetchColumn($query);
}
-
-}
-
-?>
+}
6 lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
View
@@ -118,7 +118,7 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
* @param boolean $check indicates whether the function should just check if the DBMS driver
* can perform the requested table alterations if the value is true or
* actually perform them otherwise.
- * @throws Doctrine_Connection_Exception
+ * @throws Doctrine\DBAL\ConnectionException
* @return boolean
*/
public function alterTable($name, array $changes, $check = false)
@@ -260,6 +260,4 @@ public function listTableViews($table)
{
return $this->_conn->fetchColumn($query);
}
-}
-
-?>
+}
7 lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php
View
@@ -428,12 +428,12 @@ public function createSequence($seqName, $start = 1, array $options = array())
try {
$this->_conn->exec('INSERT INTO ' . $sequenceName . ' (' . $seqcolName . ') VALUES (' . ($start-1) . ')');
return true;
- } catch(Doctrine_Connection_Exception $e) {
+ } catch(Doctrine\DBAL\ConnectionException $e) {
// Handle error
try {
$result = $db->exec('DROP TABLE ' . $sequenceName);
- } catch(Doctrine_Connection_Exception $e) {
+ } catch(Doctrine\DBAL\ConnectionException $e) {
throw \Doctrine\Common\DoctrineException::updateMe('could not drop inconsistent sequence table');
}
}
@@ -587,5 +587,4 @@ public function getIntegerDeclaration($name, array $field)
$name = $this->_conn->quoteIdentifier($name, true);
return $name . ' ' . $type . $unsigned . $default . $notnull . $autoinc;
}
-}
-
+}
20 lib/Doctrine/DBAL/Statement.php
View
@@ -125,9 +125,9 @@ public function bindValue($param, $value, $type = null)
/**
* Binds a PHP variable to a corresponding named or question mark placeholder in the
- * SQL statement that was use to prepare the statement. Unlike Doctrine_Adapter_Statement_Interface->bindValue(),
+ * SQL statement that was use to prepare the statement. Unlike PDOStatement->bindValue(),
* the variable is bound as a reference and will only be evaluated at the time
- * that Doctrine_Adapter_Statement_Interface->execute() is called.
+ * that PDOStatement->execute() is called.
*
* Most parameters are input parameters, that is, parameters that are
* used in a read-only fashion to build up the query. Some drivers support the invocation
@@ -172,7 +172,7 @@ public function closeCursor()
* Returns the number of columns in the result set
*
* @return integer Returns the number of columns in the result set represented
- * by the Doctrine_Adapter_Statement_Interface object. If there is no result set,
+ * by the PDOStatement object. If there is no result set,
* this method should return 0.
*/
public function columnCount()
@@ -250,18 +250,18 @@ public function execute($params = null)
* this value determines which row will be returned to the caller.
* This value must be one of the Query::HYDRATE_ORI_* constants, defaulting to
* Query::HYDRATE_ORI_NEXT. To request a scrollable cursor for your
- * Doctrine_Adapter_Statement_Interface object,
+ * PDOStatement object,
* you must set the PDO::ATTR_CURSOR attribute to Doctrine::CURSOR_SCROLL when you
* prepare the SQL statement with Doctrine_Adapter_Interface->prepare().
*
- * @param integer $cursorOffset For a Doctrine_Adapter_Statement_Interface object representing a scrollable cursor for which the
+ * @param integer $cursorOffset For a PDOStatement object representing a scrollable cursor for which the
* $cursorOrientation parameter is set to Query::HYDRATE_ORI_ABS, this value specifies
* the absolute number of the row in the result set that shall be fetched.
*
- * For a Doctrine_Adapter_Statement_Interface object representing a scrollable cursor for
+ * For a PDOStatement object representing a scrollable cursor for
* which the $cursorOrientation parameter is set to Query::HYDRATE_ORI_REL, this value
* specifies the row to fetch relative to the cursor position before
- * Doctrine_Adapter_Statement_Interface->fetch() was called.
+ * PDOStatement->fetch() was called.
*
* @return mixed
*/
@@ -323,7 +323,7 @@ public function fetchAll($fetchMode = Query::HYDRATE_BOTH, $columnIndex = null)
* result set or FALSE if there are no more rows.
*
* @param integer $columnIndex 0-indexed number of the column you wish to retrieve from the row. If no
- * value is supplied, Doctrine_Adapter_Statement_Interface->fetchColumn()
+ * value is supplied, PDOStatement->fetchColumn()
* fetches the first column.
*
* @return string returns a single column in the next row of a result set.
@@ -337,7 +337,7 @@ public function fetchColumn($columnIndex = 0)
* Fetches the next row and returns it as an object.
*
* Fetches the next row and returns it as an object. This function is an alternative to
- * Doctrine_Adapter_Statement_Interface->fetch() with Query::HYDRATE_CLASS or Query::HYDRATE_OBJ style.
+ * PDOStatement->fetch() with Query::HYDRATE_CLASS or Query::HYDRATE_OBJ style.
*
* @param string $className Name of the created class, defaults to stdClass.
* @param array $args Elements of this array are passed to the constructor.
@@ -435,4 +435,4 @@ public function setFetchMode($mode, $arg1 = null, $arg2 = null)
{
return $this->_stmt->setFetchMode($mode, $arg1, $arg2);
}
-}
+}
5 lib/Doctrine/DBAL/Types/ArrayType.php
View
@@ -9,11 +9,8 @@
*/
class ArrayType extends Type
{
-
-
public function getName()
{
return 'Array';
}
-}
-
+}
3  lib/Doctrine/DBAL/Types/BigIntType.php
View
@@ -10,5 +10,4 @@
class BigIntType extends Type
{
//put your code here
-}
-
+}
3  lib/Doctrine/DBAL/Types/BooleanType.php
View
@@ -30,5 +30,4 @@ public function convertToObjectValue($value)
{
return (bool)$value;
}
-}
-
+}
3  lib/Doctrine/DBAL/Types/CharType.php
View
@@ -10,5 +10,4 @@
class CharType
{
//put your code here
-}
-
+}
4 lib/Doctrine/DBAL/Types/DateTimeType.php
View
@@ -32,6 +32,4 @@ public function convertToObjectValue($value)
{
return new DateTime($value);
}
-}
-
-?>
+}
3  lib/Doctrine/DBAL/Types/DecimalType.php
View
@@ -9,5 +9,4 @@
class DecimalType extends Type
{
-}
-
+}
1  lib/Doctrine/DBAL/Types/IntegerType.php
View
@@ -8,7 +8,6 @@
*/
class IntegerType extends Type
{
-
public function getName()
{
return "Integer";
3  lib/Doctrine/DBAL/Types/MediumIntType.php
View
@@ -10,5 +10,4 @@
class MediumIntType
{
//put your code here
-}
-
+}
3  lib/Doctrine/DBAL/Types/SmallIntType.php
View
@@ -10,5 +10,4 @@
class SmallIntType
{
//put your code here
-}
-
+}
4 lib/Doctrine/DBAL/Types/TextType.php
View
@@ -14,6 +14,4 @@ public function getSqlDeclaration(array $fieldDeclaration, Doctrine_DatabasePlat
{
return $platform->getClobDeclarationSql($fieldDeclaration);
}
-
-}
-
+}
3  lib/Doctrine/DBAL/Types/TinyIntType.php
View
@@ -10,5 +10,4 @@
class TinyIntType
{
//put your code here
-}
-
+}
5 lib/Doctrine/DBAL/Types/Type.php
View
@@ -2,7 +2,7 @@
namespace Doctrine\DBAL\Types;
-#use Doctrine\DBAL\Platforms\AbstractDatabasePlatform;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
abstract class Type
{
@@ -90,5 +90,4 @@ public static function overrideType($name, $className)
}
self::$_typesMap[$name] = $className;
}
-}
-
+}
8 lib/Doctrine/DBAL/Types/VarcharType.php
View
@@ -22,6 +22,8 @@ public function getDefaultLength(\Doctrine\DBAL\Platforms\AbstractPlatform $plat
}
/** @override */
- public function getName() { return 'Varchar'; }
-}
-
+ public function getName()
+ {
+ return 'Varchar';
+ }
+}
57 lib/Doctrine/Exception.php
View
@@ -1,57 +0,0 @@
-<?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
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.org>.
- */
-
-#namespace Doctrine::ORM::Exceptions;
-
-/**
- * Doctrine_Exception
- *
- * @package Doctrine
- * @subpackage Exception
- * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @link www.phpdoctrine.org
- * @since 1.0
- * @version $Revision$
- * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @author Roman Borschel <roman@code-factory.org>
- * @todo Rename to DoctrineException
- */
-class Doctrine_Exception extends Exception
-{
- private $_innerException;
-
- public function __construct($message = "", Doctrine_Exception $innerException = null)
- {
- parent::__construct($message);
- $this->_innerException = $innerException;
- }
-
- public function getInnerException()
- {
- return $this->_innerException;
- }
-
- public static function notYetImplemented($method, $class)
- {
- return new self("The method '$method' is not implemented in the class '$class'.");
- }
-
-}
2  lib/Doctrine/ORM/Cache/ApcCache.php
View
@@ -74,4 +74,4 @@ public function delete($id)
{
return apc_delete($id);
}
-}
+}
2  lib/Doctrine/ORM/Cache/ArrayCache.php
View
@@ -89,4 +89,4 @@ public function count()
{
return count($this->data);
}
-}
+}
2  lib/Doctrine/ORM/Cache/Cache.php
View
@@ -68,4 +68,4 @@ public function save($id, $data, $lifeTime = false);
* @return boolean true if no problem
*/
public function delete($id);
-}
+}
2  lib/Doctrine/ORM/Cache/DbCache.php
View
@@ -178,4 +178,4 @@ public function createTable()
$this->getConnection()->export->createTable($name, $fields, $options);
}
-}
+}
2  lib/Doctrine/ORM/Cache/MemcacheCache.php
View
@@ -98,4 +98,4 @@ public function delete($id)
{
return $this->_memcache->delete($id);
}
-}
+}
4 lib/Doctrine/ORM/Events.php
View
@@ -37,6 +37,4 @@ private function __construct() {}
const postDelete = 'postDelete';
const preSave = 'preSave';
const postSave = 'postSave';
-
-}
-
+}
6 lib/Doctrine/ORM/Id/AbstractIdGenerator.php
View
@@ -31,8 +31,8 @@ public function __construct(\Doctrine\ORM\EntityManager $em)
*
* @return boolean
*/
- public function isPostInsertGenerator() {
+ public function isPostInsertGenerator()
+ {
return false;
}
-}
-
+}
3  lib/Doctrine/ORM/Id/Assigned.php
View
@@ -66,5 +66,4 @@ public function generate($entity)
return $identifier;
}
-}
-
+}
6 lib/Doctrine/ORM/Id/IdentityGenerator.php
View
@@ -20,8 +20,8 @@ public function generate($entity)
* @return boolean
* @override
*/
- public function isPostInsertGenerator() {
+ public function isPostInsertGenerator()
+ {
return true;
}
-}
-
+}
3  lib/Doctrine/ORM/Id/SequenceGenerator.php
View
@@ -23,5 +23,4 @@ public function generate($entity)
$sql = $conn->getDatabasePlatform()->getSequenceNextValSql($this->_sequenceName);
return $conn->fetchOne($sql);
}
-}
-
+}
4 lib/Doctrine/ORM/Id/SequenceIdentityGenerator.php
View
@@ -21,6 +21,4 @@ public function getPostInsertId()
{
return $this->_em->getConnection()->lastInsertId($this->_sequenceName);
}
-
-}
-
+}
5 lib/Doctrine/ORM/Id/TableGenerator.php
View
@@ -9,11 +9,8 @@
*/
class TableGenerator extends AbstractIdGenerator
{
-
public function generate($entity)
{
throw \Doctrine\Common\DoctrineException::updateMe("Not implemented");
}
-
-}
-
+}
34 lib/Doctrine/ORM/Import/Exception.php
View
@@ -1,34 +0,0 @@
-<?php
-/*
- * $Id: Exception.php 3882 2008-02-22 18:11:35Z jwage $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.org>.
- */
-
-/**
- * class Doctrine_Import_Exception
- *
- * @package Doctrine
- * @subpackage Import
- * @link www.phpdoctrine.org
- * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @since 1.0
- * @version $Revision: 3882 $
- * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
- */
-class Doctrine_Import_Exception extends Doctrine_Exception
-{ }
20 lib/Doctrine/ORM/Import/Reader.php → lib/Doctrine/ORM/Import/Reader/AbstractReader.php
View
@@ -19,6 +19,8 @@
* <http://www.phpdoctrine.org>.
*/
+namespace Doctrine\ORM\Import\Reader;
+
/**
* class Doctrine_Import_Reader
* Is responsible of reading a database definitions from a source and costructing a
@@ -32,21 +34,7 @@
* @version $Revision: 3882 $
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
*/
-abstract class Doctrine_Import_Reader
+abstract class AbstractRader
{
-
- /** Aggregations: */
-
- /** Compositions: */
-
- /*** Attributes: ***/
-
- /**
- *
- * @return Doctrine_Schema
- * @abstract
- * @access public
- */
- abstract public function read( );
-
+ abstract public function read();
}
10 lib/Doctrine/ORM/Import/Reader/Db.php
View
@@ -19,6 +19,8 @@
* <http://www.phpdoctrine.org>.
*/
+namespace Doctrine\ORM\Import\Reader;
+
/**
* class Doctrine_Import_Reader_Db
* Reads a database using the given PDO connection and constructs a database
@@ -32,14 +34,8 @@
* @version $Revision: 3882 $
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
*/
-class Doctrine_Import_Reader_Db extends Doctrine_Import_Reader
+class Db extends AbstractReader
{
- /** Aggregations: */
-
- /** Compositions: */
-
- /*** Attributes: ***/
-
/**
* @access private
*/
42 lib/Doctrine/ORM/Import/Reader/Exception.php
View
@@ -1,42 +0,0 @@
-<?php
-/*
- * $Id: Exception.php 3882 2008-02-22 18:11:35Z jwage $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.org>.
- */
-
-/**
- * class Doctrine_Import_Reader_Exception
- *
- * @package Doctrine
- * @subpackage Import
- * @link www.phpdoctrine.org
- * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @since 1.0
- * @version $Revision: 3882 $
- * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
- */
-class Doctrine_Import_Reader_Exception
-{
-
- /** Aggregations: */
-
- /** Compositions: */
-
- /*** Attributes: ***/
-
-}
13 lib/Doctrine/ORM/Import/Reader/Propel.php
View
@@ -18,7 +18,9 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.org>.
*/
-Doctrine::autoload('Doctrine_Import_Reader');
+
+namespace Doctrine\ORM\Import\Reader;
+
/**
* class Doctrine_Import_Reader_Xml_Propel
*
@@ -30,15 +32,8 @@
* @version $Revision: 3882 $
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
*/
-class Doctrine_Import_Reader_Xml_Propel extends Doctrine_Import_Reader
+class Propel extends AbstractReader
{
-
- /** Aggregations: */
-
- /** Compositions: */
-
- /*** Attributes: ***/
-
/**
* @access private
*/
4 lib/Doctrine/ORM/Internal/CommitOrderCalculator.php
View
@@ -145,6 +145,4 @@ public function prependNode($node)
{
array_unshift($this->_sorted, $node->getClass());
}
-}
-
-?>
+}
3  lib/Doctrine/ORM/Internal/CommitOrderNode.php
View
@@ -161,5 +161,4 @@ public function before(CommitOrderNode $node)
{
$this->_relatedNodes[] = $node;
}
-}
-
+}
2  lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
View
@@ -362,4 +362,4 @@ public function setResultMixed($bool)
{
$this->_isResultMixed = $bool;
}
-}
+}
3  lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
View
@@ -208,5 +208,4 @@ protected function _getRowContainer()
{
return array();
}
-}
-
+}
49 lib/Doctrine/ORM/Internal/Hydration/Exception.php
View
@@ -1,49 +0,0 @@
-<?php
-/*
- * $Id: Exception.php 1080 2007-02-10 18:17:08Z romanb $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.org>.
- */
-
-/**
- * Doctrine_Hydrator_Exception
- *
- * @package Doctrine
- * @subpackage Hydrate
- * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @link www.phpdoctrine.org
- * @since 1.0
- * @version $Revision: 1080 $
- * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
- */
-class Doctrine_Hydrator_Exception extends Doctrine_Exception
-{
- public static function nonUniqueKeyMapping()
- {
- return new self("Hydration failed. Found non-unique key mapping.");
- }
-
- public static function nonExistantFieldUsedAsIndex($field)
- {
- return new self("Hydration failed. Found a non-existent field '$field'.");
- }
-
- public static function nonUniqueResult()
- {
- return new self("Hydration failed. Non-unique result returned.");
- }
-}
5 lib/Doctrine/ORM/Internal/Hydration/HydrationException.php
View
@@ -4,11 +4,8 @@
class HydrationException extends \Doctrine\Common\DoctrineException
{
-
public static function nonUniqueResult()
{
return new self("The result returned by the query was not unique.");
}
-
-}
-
+}
3  lib/Doctrine/ORM/Internal/Hydration/IterableResult.php
View
@@ -46,5 +46,4 @@ public function next()
{
return $this->_hydrator->hydrateRow();
}
-}
-
+}
3  lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
View
@@ -395,5 +395,4 @@ protected function _getRowContainer()
{
return new \Doctrine\Common\Collections\Collection;
}
-}
-
+}
3  lib/Doctrine/ORM/Internal/Hydration/ScalarHydrator.php
View
@@ -36,5 +36,4 @@ protected function _getRowContainer()
{
return array();
}
-}
-
+}
3  lib/Doctrine/ORM/Internal/Hydration/SingleScalarHydrator.php
View
@@ -33,5 +33,4 @@ protected function _getRowContainer()
{
return array();
}
-}
-
+}
3  lib/Doctrine/ORM/Mapping/AssociationMapping.php
View
@@ -339,5 +339,4 @@ public function usesJoinTable()
}
abstract public function lazyLoadFor($entity, $entityManager);
-}
-
+}
3  lib/Doctrine/ORM/Mapping/ClassMetadata.php
View
@@ -1476,5 +1476,4 @@ public function __toString()
{
return __CLASS__ . '@' . spl_object_hash($this);
}
-}
-
+}
5 lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
View
@@ -205,7 +205,4 @@ private function _completeIdGeneratorMapping(ClassMetadata $class)
}
}
}
-}
-
-
-
+}
2  lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
View
@@ -173,4 +173,4 @@ public function isTransient($className)
return strpos($docComment, '@DoctrineEntity') === false &&
strpos($docComment, '@DoctrineMappedSuperclass') === false;
}
-}
+}
2  lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
View
@@ -83,4 +83,4 @@
public $schema;
public $joinColumns;
public $inverseJoinColumns;
-}
+}
3  lib/Doctrine/ORM/Mapping/ManyToManyMapping.php
View
@@ -141,5 +141,4 @@ public function isManyToMany()
{
return true;
}
-}
-
+}
4 lib/Doctrine/ORM/Mapping/MappingException.php
View
@@ -83,6 +83,4 @@ public static function invalidMapping($fieldName)
{
return new self("The mapping of field '$fieldName' is invalid.");
}
-}
-
-?>
+}
4 lib/Doctrine/ORM/Mapping/OneToManyMapping.php
View
@@ -112,6 +112,4 @@ public function lazyLoadFor($entity, $entityManager)
{
}
-
-}
-
+}
4 lib/Doctrine/ORM/Mapping/OneToOneMapping.php
View
@@ -163,6 +163,4 @@ public function lazyLoadFor($entity, $entityManager)
}
$sourceClass->getReflectionProperty($this->_sourceFieldName)->setValue($entity, $otherEntity);
}
-
-}
-
+}
2  lib/Doctrine/ORM/PersistentCollection.php
View
@@ -395,4 +395,4 @@ public function setDirty($dirty)
{
$this->_isDirty = $dirty;
}
-}
+}
3  lib/Doctrine/ORM/Persisters/AbstractCollectionPersister.php
View
@@ -160,5 +160,4 @@ public function insertRows(PersistentCollection $coll)
* @param mixed $element
*/
abstract protected function _getInsertRowSqlParameters(PersistentCollection $coll, $element);
-}
-
+}
2  lib/Doctrine/ORM/Persisters/AbstractEntityPersister.php
View
@@ -237,4 +237,4 @@ protected function _prepareData($entity, array &$result, $isInsert = false)
$result[$discColumn['name']] = array_search($this->_entityName, $discMap);
}
}
-}
+}
3  lib/Doctrine/ORM/Persisters/ElementCollectionPersister.php
View
@@ -29,5 +29,4 @@
class ElementCollectionPersister extends AbstractCollectionPersister
{
//put your code here
-}
-
+}
38 lib/Doctrine/ORM/Persisters/Exception.php
View
@@ -1,38 +0,0 @@
-<?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
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.org>.
- */
-
-#namespace Doctrine::ORM;
-
-/**
- * Doctrine_EntityPersister_Exception
- *
- * @package Doctrine
- * @subpackage Entity
- * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @author Roman Borschel <roman@code-factory.org>
- * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @link www.phpdoctrine.org
- * @since 2.0
- * @version $Revision$
- */
-class Doctrine_EntityPersister_Exception extends Doctrine_Exception
-{
-}
3  lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php
View
@@ -277,5 +277,4 @@ protected function _groupFieldsByDefiningClass(Doctrine_ClassMetadata $class, ar
return $dataSet;
}
-}
-
+}
3  lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
View
@@ -126,5 +126,4 @@ protected function _getDeleteSqlParameters(PersistentCollection $coll)
// rely on a specific ordering of the columns.
return $this->_uow->getEntityIdentifier($coll->getOwner());
}
-}
-
+}
4 lib/Doctrine/ORM/Persisters/OneToManyPersister.php
View
@@ -73,6 +73,4 @@ protected function _getUpdateRowSql()
{
return;
}
-
-}
-
+}
7 lib/Doctrine/ORM/Persisters/SingleTablePersister.php
View
@@ -1,3 +1,8 @@
<?php
-?>
+namespace Doctrine\ORM\Persisters;
+
+class SingleTablePersister extends AbstractEntityPersister
+{
+
+}
7 lib/Doctrine/ORM/Persisters/UnionSubclassPersister.php
View
@@ -1,3 +1,8 @@
<?php
-?>
+namespace Doctrine\ORM\Persisters;
+
+class UnionSubclassPersister extends AbstractEntityPersister
+{
+
+}
2  lib/Doctrine/ORM/Query.php
View
@@ -587,4 +587,4 @@ public function iterate(array $params = array(), $hydrationMode = self::HYDRATE_
$this->_execute($params, $hydrationMode), $this->_parserResult
);
}