From f4d160e0d88a3d616f2cb4aedbc6b7b5171387da Mon Sep 17 00:00:00 2001 From: zYne Date: Fri, 20 Apr 2007 23:58:28 +0000 Subject: [PATCH] --- lib/Doctrine/Query.php | 2 ++ lib/Doctrine/Table.php | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/Doctrine/Query.php b/lib/Doctrine/Query.php index dddabfdd9..3818de01c 100644 --- a/lib/Doctrine/Query.php +++ b/lib/Doctrine/Query.php @@ -543,6 +543,8 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable { } else { $this->params[] = $params; } + + return $this; } /** * addSelect diff --git a/lib/Doctrine/Table.php b/lib/Doctrine/Table.php index ccd93b1d6..fc9de5141 100644 --- a/lib/Doctrine/Table.php +++ b/lib/Doctrine/Table.php @@ -616,14 +616,14 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable /** * @return mixed */ - final public function getIdentifier() + public function getIdentifier() { return $this->identifier; } /** * @return integer */ - final public function getIdentifierType() + public function getIdentifierType() { return $this->identifierType; } @@ -631,7 +631,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable * hasColumn * @return boolean */ - final public function hasColumn($name) + public function hasColumn($name) { return isset($this->columns[$name]); } @@ -639,7 +639,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable * @param mixed $key * @return void */ - final public function setPrimaryKey($key) + public function setPrimaryKey($key) { switch (gettype($key)) { case "array": @@ -654,14 +654,14 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable * returns all primary keys * @return array */ - final public function getPrimaryKeys() + public function getPrimaryKeys() { return $this->primaryKeys; } /** * @return boolean */ - final public function hasPrimaryKey($key) + public function hasPrimaryKey($key) { return in_array($key,$this->primaryKeys); } @@ -818,7 +818,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable * hasRelatedComponent * @return boolean */ - final public function hasRelatedComponent($name, $component) + public function hasRelatedComponent($name, $component) { return (strpos($this->bound[$name]['field'], $component . '.') !== false); }