From 3d34f266c631040ed48eb566669e8ac1e6d12239 Mon Sep 17 00:00:00 2001 From: guilhermeblanco Date: Tue, 9 Mar 2010 01:47:45 +0000 Subject: [PATCH] [2.0][DDC-395] Applied the provided patch of Jordi Boggiano removing some trailing whitespaces and fixing missing public keywords --- lib/Doctrine/DBAL/Schema/TableDiff.php | 16 ++++++++-------- lib/Doctrine/ORM/Query/TreeWalker.php | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/Doctrine/DBAL/Schema/TableDiff.php b/lib/Doctrine/DBAL/Schema/TableDiff.php index 83e2cab9e..3351a2393 100644 --- a/lib/Doctrine/DBAL/Schema/TableDiff.php +++ b/lib/Doctrine/DBAL/Schema/TableDiff.php @@ -95,7 +95,7 @@ class TableDiff /** * All added foreign key definitions - * + * * @var array */ public $addedForeignKeys = array(); @@ -119,14 +119,14 @@ class TableDiff * * @param array(string=>Column) $addedColumns * @param array(string=>Column) $changedColumns - * @param array(string=>bool) $removedColumns - * @param array(string=>Index) $addedIndexes - * @param array(string=>Index) $changedIndexes - * @param array(string=>bool) $removedIndexes + * @param array(string=>bool) $removedColumns + * @param array(string=>Index) $addedIndexes + * @param array(string=>Index) $changedIndexes + * @param array(string=>bool) $removedIndexes */ - function __construct( $tableName, $addedColumns = array(), $changedColumns = array(), - $removedColumns = array(), $addedIndexes = array(), $changedIndexes = - array(), $removedIndexes = array() ) + public function __construct($tableName, $addedColumns = array(), + $changedColumns = array(), $removedColumns = array(), $addedIndexes = array(), + $changedIndexes = array(), $removedIndexes = array()) { $this->name = $tableName; $this->addedColumns = $addedColumns; diff --git a/lib/Doctrine/ORM/Query/TreeWalker.php b/lib/Doctrine/ORM/Query/TreeWalker.php index 51c32e50f..b76b77258 100644 --- a/lib/Doctrine/ORM/Query/TreeWalker.php +++ b/lib/Doctrine/ORM/Query/TreeWalker.php @@ -23,7 +23,7 @@ namespace Doctrine\ORM\Query; /** * Interface for walkers of DQL ASTs (abstract syntax trees). - * + * * @author Roman Borschel * @since 2.0 */ @@ -36,8 +36,8 @@ interface TreeWalker * @param ParserResult $parserResult The result of the parsing process. * @param array $queryComponents Query components (symbol table) */ - function __construct($query, $parserResult, array $queryComponents); - + public function __construct($query, $parserResult, array $queryComponents); + /** * Walks down a SelectStatement AST node, thereby generating the appropriate SQL. * @@ -241,7 +241,7 @@ interface TreeWalker * @return string The SQL. */ function walkExistsExpression($existsExpr); - + /** * Walks down a CollectionMemberExpression AST node, thereby generating the appropriate SQL. * @@ -249,7 +249,7 @@ interface TreeWalker * @return string The SQL. */ function walkCollectionMemberExpression($collMemberExpr); - + /** * Walks down an EmptyCollectionComparisonExpression AST node, thereby generating the appropriate SQL. * @@ -369,10 +369,10 @@ interface TreeWalker * @return string The SQL. */ function walkPathExpression($pathExpr); - + /** * Gets an executor that can be used to execute the result of this walker. - * + * * @return AbstractExecutor */ function getExecutor($AST);