From 656c339879a071f2f875831281ed833b876e4361 Mon Sep 17 00:00:00 2001 From: "ctrlaltca@gmail.com" <> Date: Mon, 20 Jun 2011 10:48:45 +0000 Subject: removed useless calls to empty contructor; reverted some additional undocumented changes; upported the "cgi workaround" to trunk/; large (fake) changeset are due to mixed cr/crlf used previously --- framework/Testing/Data/ActiveRecord/TActiveFinder.php | 1 - framework/Testing/Data/ActiveRecord/TActiveRecord.php | 3 +-- framework/Testing/Data/ActiveRecord/TActiveRecordCriteria.php | 1 - framework/Testing/Data/Schema/TDbCommandBuilder.php | 1 - framework/Testing/Data/Schema/TDbExpression.php | 1 - framework/Testing/Data/Schema/TDbSchema.php | 1 - framework/Testing/Data/TDbCommand.php | 1 - framework/Testing/Data/TDbConnection.php | 1 - framework/Testing/Data/TDbDataReader.php | 1 - framework/Testing/Data/TDbTransaction.php | 1 - 10 files changed, 1 insertion(+), 11 deletions(-) (limited to 'framework/Testing') diff --git a/framework/Testing/Data/ActiveRecord/TActiveFinder.php b/framework/Testing/Data/ActiveRecord/TActiveFinder.php index 75787e77..d1c35bdf 100644 --- a/framework/Testing/Data/ActiveRecord/TActiveFinder.php +++ b/framework/Testing/Data/ActiveRecord/TActiveFinder.php @@ -47,7 +47,6 @@ class TActiveFinder extends TComponent */ public function __construct($model,$with,$criteria=null) { - parent::__construct(); $this->_criteria=$criteria; $this->_builder=$model->getCommandBuilder(); $this->_joinTree=new TJoinElement($this,$model); diff --git a/framework/Testing/Data/ActiveRecord/TActiveRecord.php b/framework/Testing/Data/ActiveRecord/TActiveRecord.php index e1484f03..8d6c5e10 100644 --- a/framework/Testing/Data/ActiveRecord/TActiveRecord.php +++ b/framework/Testing/Data/ActiveRecord/TActiveRecord.php @@ -68,8 +68,7 @@ abstract class TActiveRecord extends TModel { if($scenario===null) // internally used by populateRecord() and model() return; - - parent::__construct(); + $this->setScenario($scenario); $this->setIsNewRecord(true); $this->_attributes=$this->getMetaData()->attributeDefaults; diff --git a/framework/Testing/Data/ActiveRecord/TActiveRecordCriteria.php b/framework/Testing/Data/ActiveRecord/TActiveRecordCriteria.php index 2a00cbda..46eddaf9 100644 --- a/framework/Testing/Data/ActiveRecord/TActiveRecordCriteria.php +++ b/framework/Testing/Data/ActiveRecord/TActiveRecordCriteria.php @@ -16,7 +16,6 @@ class TSqlCriteria extends TDbCriteria public function __construct($condition=null, $parameters=array()) { - parent::__construct(); if(!is_array($parameters) && func_num_args() > 1) $parameters = array_slice(func_get_args(), 1); diff --git a/framework/Testing/Data/Schema/TDbCommandBuilder.php b/framework/Testing/Data/Schema/TDbCommandBuilder.php index 3bfb6b54..7a196439 100755 --- a/framework/Testing/Data/Schema/TDbCommandBuilder.php +++ b/framework/Testing/Data/Schema/TDbCommandBuilder.php @@ -31,7 +31,6 @@ class TDbCommandBuilder extends TComponent */ public function __construct($schema) { - parent::__construct(); $this->_schema=$schema; $this->_connection=$schema->getDbConnection(); } diff --git a/framework/Testing/Data/Schema/TDbExpression.php b/framework/Testing/Data/Schema/TDbExpression.php index fdfeb8bb..a1819000 100755 --- a/framework/Testing/Data/Schema/TDbExpression.php +++ b/framework/Testing/Data/Schema/TDbExpression.php @@ -35,7 +35,6 @@ class TDbExpression extends TComponent */ public function __construct($expression) { - parent::__construct(); $this->expression=$expression; } diff --git a/framework/Testing/Data/Schema/TDbSchema.php b/framework/Testing/Data/Schema/TDbSchema.php index a4e633a9..2c568e7e 100755 --- a/framework/Testing/Data/Schema/TDbSchema.php +++ b/framework/Testing/Data/Schema/TDbSchema.php @@ -38,7 +38,6 @@ abstract class TDbSchema extends TComponent */ public function __construct($conn) { - parent::__construct(); $conn->setActive(true); $this->_connection=$conn; foreach($conn->schemaCachingExclude as $name) diff --git a/framework/Testing/Data/TDbCommand.php b/framework/Testing/Data/TDbCommand.php index 9a1bb5b7..dd3a9fe6 100755 --- a/framework/Testing/Data/TDbCommand.php +++ b/framework/Testing/Data/TDbCommand.php @@ -47,7 +47,6 @@ class TDbCommand extends TComponent */ public function __construct(TDbConnection $connection,$text) { - parent::__construct(); $this->_connection=$connection; $this->setText($text); } diff --git a/framework/Testing/Data/TDbConnection.php b/framework/Testing/Data/TDbConnection.php index 54061239..d2d268de 100755 --- a/framework/Testing/Data/TDbConnection.php +++ b/framework/Testing/Data/TDbConnection.php @@ -156,7 +156,6 @@ class TDbConnection extends TComponent */ public function __construct($dsn='',$username='',$password='') { - parent::__construct(); $this->connectionString=$dsn; $this->username=$username; $this->password=$password; diff --git a/framework/Testing/Data/TDbDataReader.php b/framework/Testing/Data/TDbDataReader.php index ae14e18a..6014ff04 100755 --- a/framework/Testing/Data/TDbDataReader.php +++ b/framework/Testing/Data/TDbDataReader.php @@ -43,7 +43,6 @@ class TDbDataReader extends TComponent implements Iterator */ public function __construct(TDbCommand $command) { - parent::__construct(); $this->_statement=$command->getPdoStatement(); $this->_statement->setFetchMode(PDO::FETCH_ASSOC); } diff --git a/framework/Testing/Data/TDbTransaction.php b/framework/Testing/Data/TDbTransaction.php index 60fd7c23..41a2c1f9 100755 --- a/framework/Testing/Data/TDbTransaction.php +++ b/framework/Testing/Data/TDbTransaction.php @@ -49,7 +49,6 @@ class TDbTransaction extends TComponent */ public function __construct(TDbConnection $connection) { - parent::__construct(); $this->_connection=$connection; $this->setActive(true); } -- cgit v1.2.3