From 5eeeeeb96db991f0500881190e321aba8efc8891 Mon Sep 17 00:00:00 2001 From: "ctrlaltca@gmail.com" <> Date: Sat, 21 May 2011 19:29:39 +0000 Subject: remove spurious parent::__construct() added in r2880 --- framework/Data/ActiveRecord/TActiveRecord.php | 1 - framework/Data/ActiveRecord/TActiveRecordGateway.php | 1 - framework/Data/Common/Oracle/TOracleTableInfo.php | 1 - framework/Data/Common/TDbCommandBuilder.php | 1 - framework/Data/Common/TDbMetaData.php | 1 - framework/Data/Common/TDbTableColumn.php | 1 - framework/Data/Common/TDbTableInfo.php | 1 - framework/Data/DataGateway/TDataGatewayCommand.php | 2 -- framework/Data/DataGateway/TSqlCriteria.php | 1 - framework/Data/SqlMap/Configuration/TParameterMap.php | 1 - framework/Data/SqlMap/Configuration/TResultMap.php | 1 - framework/Data/SqlMap/Configuration/TResultProperty.php | 1 - framework/Data/SqlMap/Statements/TMappedStatement.php | 1 - framework/Data/SqlMap/Statements/TPreparedStatement.php | 1 - framework/Data/SqlMap/Statements/TSimpleDynamicSql.php | 1 - framework/Data/SqlMap/TSqlMapGateway.php | 1 - framework/Data/SqlMap/TSqlMapManager.php | 1 - framework/Data/TDbCommand.php | 1 - framework/Data/TDbConnection.php | 1 - framework/Data/TDbDataReader.php | 1 - framework/Data/TDbTransaction.php | 1 - 21 files changed, 22 deletions(-) (limited to 'framework') diff --git a/framework/Data/ActiveRecord/TActiveRecord.php b/framework/Data/ActiveRecord/TActiveRecord.php index 34de431b..8b52f4b0 100644 --- a/framework/Data/ActiveRecord/TActiveRecord.php +++ b/framework/Data/ActiveRecord/TActiveRecord.php @@ -225,7 +225,6 @@ abstract class TActiveRecord extends TComponent */ public function __construct($data=array(), $connection=null) { - parent::__construct(); if($connection!==null) $this->setDbConnection($connection); $this->setupColumnMapping(); diff --git a/framework/Data/ActiveRecord/TActiveRecordGateway.php b/framework/Data/ActiveRecord/TActiveRecordGateway.php index 534bd253..087faab9 100644 --- a/framework/Data/ActiveRecord/TActiveRecordGateway.php +++ b/framework/Data/ActiveRecord/TActiveRecordGateway.php @@ -42,7 +42,6 @@ class TActiveRecordGateway extends TComponent */ public function __construct(TActiveRecordManager $manager) { - parent::__construct(); $this->_manager=$manager; } diff --git a/framework/Data/Common/Oracle/TOracleTableInfo.php b/framework/Data/Common/Oracle/TOracleTableInfo.php index 0a6238e0..c3fd85eb 100644 --- a/framework/Data/Common/Oracle/TOracleTableInfo.php +++ b/framework/Data/Common/Oracle/TOracleTableInfo.php @@ -36,7 +36,6 @@ class TOracleTableInfo extends TComponent */ public function __construct($tableInfo=array(),$primary=array(),$foreign=array()) { - parent::__construct(); $this->_info=$tableInfo; $this->_primaryKeys=$primary; $this->_foreignKeys=$foreign; diff --git a/framework/Data/Common/TDbCommandBuilder.php b/framework/Data/Common/TDbCommandBuilder.php index 2e772e73..67625dba 100644 --- a/framework/Data/Common/TDbCommandBuilder.php +++ b/framework/Data/Common/TDbCommandBuilder.php @@ -30,7 +30,6 @@ class TDbCommandBuilder extends TComponent */ public function __construct($connection=null, $tableInfo=null) { - parent::__construct(); $this->setDbConnection($connection); $this->setTableInfo($tableInfo); } diff --git a/framework/Data/Common/TDbMetaData.php b/framework/Data/Common/TDbMetaData.php index 1a194056..f2eb67ff 100644 --- a/framework/Data/Common/TDbMetaData.php +++ b/framework/Data/Common/TDbMetaData.php @@ -31,7 +31,6 @@ abstract class TDbMetaData extends TComponent */ public function __construct($conn) { - parent::__construct(); $this->_connection=$conn; } diff --git a/framework/Data/Common/TDbTableColumn.php b/framework/Data/Common/TDbTableColumn.php index 84fa6c55..ec6d98a6 100644 --- a/framework/Data/Common/TDbTableColumn.php +++ b/framework/Data/Common/TDbTableColumn.php @@ -30,7 +30,6 @@ class TDbTableColumn extends TComponent */ public function __construct($columnInfo) { - parent::__construct(); $this->_info=$columnInfo; } diff --git a/framework/Data/Common/TDbTableInfo.php b/framework/Data/Common/TDbTableInfo.php index 6cab9230..14b1f36a 100644 --- a/framework/Data/Common/TDbTableInfo.php +++ b/framework/Data/Common/TDbTableInfo.php @@ -41,7 +41,6 @@ class TDbTableInfo extends TComponent */ public function __construct($tableInfo=array(),$primary=array(),$foreign=array()) { - parent::__construct(); $this->_info=$tableInfo; $this->_primaryKeys=$primary; $this->_foreignKeys=$foreign; diff --git a/framework/Data/DataGateway/TDataGatewayCommand.php b/framework/Data/DataGateway/TDataGatewayCommand.php index 034ea36e..ffd219ef 100644 --- a/framework/Data/DataGateway/TDataGatewayCommand.php +++ b/framework/Data/DataGateway/TDataGatewayCommand.php @@ -43,7 +43,6 @@ class TDataGatewayCommand extends TComponent */ public function __construct($builder) { - parent::__construct(); $this->_builder = $builder; } @@ -470,7 +469,6 @@ class TDataGatewayEventParameter extends TEventParameter public function __construct($command,$criteria) { - parent::__construct(); $this->_command=$command; $this->_criteria=$criteria; } diff --git a/framework/Data/DataGateway/TSqlCriteria.php b/framework/Data/DataGateway/TSqlCriteria.php index 1b85c7d3..c1c37810 100644 --- a/framework/Data/DataGateway/TSqlCriteria.php +++ b/framework/Data/DataGateway/TSqlCriteria.php @@ -49,7 +49,6 @@ class TSqlCriteria extends TComponent */ public function __construct($condition=null, $parameters=array()) { - parent::__construct(); if(!is_array($parameters) && func_num_args() > 1) $parameters = array_slice(func_get_args(),1); $this->_parameters=new TAttributeCollection; diff --git a/framework/Data/SqlMap/Configuration/TParameterMap.php b/framework/Data/SqlMap/Configuration/TParameterMap.php index 60b05662..a04d5de4 100644 --- a/framework/Data/SqlMap/Configuration/TParameterMap.php +++ b/framework/Data/SqlMap/Configuration/TParameterMap.php @@ -43,7 +43,6 @@ class TParameterMap extends TComponent */ public function __construct() { - parent::__construct(); $this->_properties = new TList; $this->_propertyMap = new TMap; } diff --git a/framework/Data/SqlMap/Configuration/TResultMap.php b/framework/Data/SqlMap/Configuration/TResultMap.php index b20a81f6..341be489 100644 --- a/framework/Data/SqlMap/Configuration/TResultMap.php +++ b/framework/Data/SqlMap/Configuration/TResultMap.php @@ -51,7 +51,6 @@ class TResultMap extends TComponent */ public function __construct() { - parent::__construct(); $this->_columns=new TMap; } diff --git a/framework/Data/SqlMap/Configuration/TResultProperty.php b/framework/Data/SqlMap/Configuration/TResultProperty.php index 24401812..abeeceb9 100644 --- a/framework/Data/SqlMap/Configuration/TResultProperty.php +++ b/framework/Data/SqlMap/Configuration/TResultProperty.php @@ -57,7 +57,6 @@ class TResultProperty extends TComponent */ public function __construct($resultMap=null) { - parent::__construct(); if($resultMap instanceof TResultMap) $this->_hostResultMapID = $resultMap->getID(); } diff --git a/framework/Data/SqlMap/Statements/TMappedStatement.php b/framework/Data/SqlMap/Statements/TMappedStatement.php index 7aab3510..c41e6464 100644 --- a/framework/Data/SqlMap/Statements/TMappedStatement.php +++ b/framework/Data/SqlMap/Statements/TMappedStatement.php @@ -116,7 +116,6 @@ class TMappedStatement extends TComponent implements IMappedStatement */ public function __construct(TSqlMapManager $sqlMap, TSqlMapStatement $statement) { - parent::__construct(); $this->_manager = $sqlMap; $this->_statement = $statement; $this->_command = new TPreparedCommand(); diff --git a/framework/Data/SqlMap/Statements/TPreparedStatement.php b/framework/Data/SqlMap/Statements/TPreparedStatement.php index c9faf4ee..4f91ddba 100644 --- a/framework/Data/SqlMap/Statements/TPreparedStatement.php +++ b/framework/Data/SqlMap/Statements/TPreparedStatement.php @@ -26,7 +26,6 @@ class TPreparedStatement extends TComponent public function __construct() { - parent::__construct(); $this->_parameterNames=new TList; $this->_parameterValues=new TMap; } diff --git a/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php b/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php index 5335c41c..3a35b5b7 100644 --- a/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php +++ b/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php @@ -24,7 +24,6 @@ class TSimpleDynamicSql extends TStaticSql public function __construct($mappings) { - parent::__construct(); $this->_mappings = $mappings; } diff --git a/framework/Data/SqlMap/TSqlMapGateway.php b/framework/Data/SqlMap/TSqlMapGateway.php index 3a19d155..7f99e5f3 100644 --- a/framework/Data/SqlMap/TSqlMapGateway.php +++ b/framework/Data/SqlMap/TSqlMapGateway.php @@ -36,7 +36,6 @@ class TSqlMapGateway extends TComponent public function __construct($manager) { - parent::__construct(); $this->_manager=$manager; } diff --git a/framework/Data/SqlMap/TSqlMapManager.php b/framework/Data/SqlMap/TSqlMapManager.php index 0af90a3d..fb534469 100644 --- a/framework/Data/SqlMap/TSqlMapManager.php +++ b/framework/Data/SqlMap/TSqlMapManager.php @@ -60,7 +60,6 @@ class TSqlMapManager extends TComponent */ public function __construct($connection=null) { - parent::__construct(); $this->_connection=$connection; $this->_mappedStatements=new TMap; diff --git a/framework/Data/TDbCommand.php b/framework/Data/TDbCommand.php index 749d3ec3..3f893b6b 100644 --- a/framework/Data/TDbCommand.php +++ b/framework/Data/TDbCommand.php @@ -49,7 +49,6 @@ class TDbCommand extends TComponent */ public function __construct(TDbConnection $connection,$text) { - parent::__construct(); $this->_connection=$connection; $this->setText($text); } diff --git a/framework/Data/TDbConnection.php b/framework/Data/TDbConnection.php index 603cfbd3..5dc6c538 100644 --- a/framework/Data/TDbConnection.php +++ b/framework/Data/TDbConnection.php @@ -119,7 +119,6 @@ class TDbConnection extends TComponent */ public function __construct($dsn='',$username='',$password='', $charset='') { - parent::__construct(); $this->_dsn=$dsn; $this->_username=$username; $this->_password=$password; diff --git a/framework/Data/TDbDataReader.php b/framework/Data/TDbDataReader.php index 4a323024..4feb2591 100644 --- a/framework/Data/TDbDataReader.php +++ b/framework/Data/TDbDataReader.php @@ -47,7 +47,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/Data/TDbTransaction.php b/framework/Data/TDbTransaction.php index 7c646833..60eff1bd 100644 --- a/framework/Data/TDbTransaction.php +++ b/framework/Data/TDbTransaction.php @@ -51,7 +51,6 @@ class TDbTransaction extends TComponent */ public function __construct(TDbConnection $connection) { - parent::__construct(); $this->_connection=$connection; $this->setActive(true); } -- cgit v1.2.3