summaryrefslogtreecommitdiff
path: root/framework/Testing
diff options
context:
space:
mode:
authorjavalizard <>2010-04-18 04:37:36 +0000
committerjavalizard <>2010-04-18 04:37:36 +0000
commit4d02feae9d948b28ec24df42ebf498ec24beaae5 (patch)
tree4c492cb4ef2b13f1dc34fc376fc468614b51f0e2 /framework/Testing
parent2157ae5323261476ffc67c41e58455feaf6bbecc (diff)
Ensured parent::__construct calls within Testing
Diffstat (limited to 'framework/Testing')
-rw-r--r--framework/Testing/Data/ActiveRecord/TActiveFinder.php1
-rw-r--r--framework/Testing/Data/ActiveRecord/TActiveRecord.php3
-rw-r--r--framework/Testing/Data/ActiveRecord/TActiveRecordCriteria.php1
-rwxr-xr-xframework/Testing/Data/Schema/TDbCommandBuilder.php1
-rwxr-xr-xframework/Testing/Data/Schema/TDbExpression.php1
-rwxr-xr-xframework/Testing/Data/Schema/TDbSchema.php1
-rwxr-xr-xframework/Testing/Data/TDbCommand.php1
-rwxr-xr-xframework/Testing/Data/TDbConnection.php1
-rwxr-xr-xframework/Testing/Data/TDbDataReader.php1
-rwxr-xr-xframework/Testing/Data/TDbTransaction.php1
10 files changed, 11 insertions, 1 deletions
diff --git a/framework/Testing/Data/ActiveRecord/TActiveFinder.php b/framework/Testing/Data/ActiveRecord/TActiveFinder.php
index d1c35bdf..75787e77 100644
--- a/framework/Testing/Data/ActiveRecord/TActiveFinder.php
+++ b/framework/Testing/Data/ActiveRecord/TActiveFinder.php
@@ -47,6 +47,7 @@ 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 8d6c5e10..e1484f03 100644
--- a/framework/Testing/Data/ActiveRecord/TActiveRecord.php
+++ b/framework/Testing/Data/ActiveRecord/TActiveRecord.php
@@ -68,7 +68,8 @@ 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 46eddaf9..2a00cbda 100644
--- a/framework/Testing/Data/ActiveRecord/TActiveRecordCriteria.php
+++ b/framework/Testing/Data/ActiveRecord/TActiveRecordCriteria.php
@@ -16,6 +16,7 @@ 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 7a196439..3bfb6b54 100755
--- a/framework/Testing/Data/Schema/TDbCommandBuilder.php
+++ b/framework/Testing/Data/Schema/TDbCommandBuilder.php
@@ -31,6 +31,7 @@ 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 a1819000..fdfeb8bb 100755
--- a/framework/Testing/Data/Schema/TDbExpression.php
+++ b/framework/Testing/Data/Schema/TDbExpression.php
@@ -35,6 +35,7 @@ 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 2c568e7e..a4e633a9 100755
--- a/framework/Testing/Data/Schema/TDbSchema.php
+++ b/framework/Testing/Data/Schema/TDbSchema.php
@@ -38,6 +38,7 @@ 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 dd3a9fe6..9a1bb5b7 100755
--- a/framework/Testing/Data/TDbCommand.php
+++ b/framework/Testing/Data/TDbCommand.php
@@ -47,6 +47,7 @@ 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 b1dd739a..99484454 100755
--- a/framework/Testing/Data/TDbConnection.php
+++ b/framework/Testing/Data/TDbConnection.php
@@ -156,6 +156,7 @@ 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 6014ff04..ae14e18a 100755
--- a/framework/Testing/Data/TDbDataReader.php
+++ b/framework/Testing/Data/TDbDataReader.php
@@ -43,6 +43,7 @@ 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 41a2c1f9..60fd7c23 100755
--- a/framework/Testing/Data/TDbTransaction.php
+++ b/framework/Testing/Data/TDbTransaction.php
@@ -49,6 +49,7 @@ class TDbTransaction extends TComponent
*/
public function __construct(TDbConnection $connection)
{
+ parent::__construct();
$this->_connection=$connection;
$this->setActive(true);
}