diff --git a/benchmarks/classes/ezbenchmark.php b/benchmarks/classes/ezbenchmark.php index 69cbb13f42e..354cdab982e 100644 --- a/benchmarks/classes/ezbenchmark.php +++ b/benchmarks/classes/ezbenchmark.php @@ -18,12 +18,9 @@ class eZBenchmark extends eZBenchmarkUnit { - /*! - Initializes the benchmark with the name \a $name. - */ - function eZBenchmark( $name ) + function __construct( $name = false ) { - $this->eZBenchmarkUnit( $name ); + parent::__construct( $name ); } function addMark( &$mark ) diff --git a/benchmarks/classes/ezbenchmarkcase.php b/benchmarks/classes/ezbenchmarkcase.php index eeec84791d5..20bf7b2022e 100644 --- a/benchmarks/classes/ezbenchmarkcase.php +++ b/benchmarks/classes/ezbenchmarkcase.php @@ -37,7 +37,7 @@ class MyTest extends eZBenchmarkCase { function MyTest() { - $this->eZBenchmarkCase( 'My test case' ); + parent::__construct( 'My test case' ); $this->addmark( 'markFunctionA', 'Addition mark' ); $this->addFunctionTest( 'MyFunctionMark', 'Addition mark 2' ); } @@ -64,12 +64,9 @@ function MyFunctionMark( &$tr, $parameter ) class eZBenchmarkCase extends eZBenchmarkUnit { - /*! - Constructor - */ - function eZBenchmarkCase( $name = false ) + function __construct( $name = false ) { - $this->eZBenchmarkUnit( $name ); + parent::__construct( $name ); } function addMark( $method, $name, $parameter = false ) diff --git a/benchmarks/classes/ezbenchmarkclirunner.php b/benchmarks/classes/ezbenchmarkclirunner.php index f9b9efc2c2f..25d40413822 100644 --- a/benchmarks/classes/ezbenchmarkclirunner.php +++ b/benchmarks/classes/ezbenchmarkclirunner.php @@ -24,12 +24,9 @@ class eZBenchmarkCLIRunner extends eZBenchmarkRunner { - /*! - Constructor - */ - function eZBenchmarkCLIRunner() + public function __construct() { - $this->eZBenchmarkRunner(); + parent::__construct(); $this->MaxMap = false; } diff --git a/benchmarks/classes/ezbenchmarkrunner.php b/benchmarks/classes/ezbenchmarkrunner.php index 747aad013c6..95d3f0ff749 100644 --- a/benchmarks/classes/ezbenchmarkrunner.php +++ b/benchmarks/classes/ezbenchmarkrunner.php @@ -16,10 +16,10 @@ class eZBenchmarkrunner { - /*! - Constructor - */ - function eZBenchmarkrunner() + /** + * Constructor + */ + public function __construct() { $this->Results = array(); $this->CurrentResult = false; diff --git a/benchmarks/classes/ezbenchmarkunit.php b/benchmarks/classes/ezbenchmarkunit.php index d2ccae2cf9f..3c1476148a6 100644 --- a/benchmarks/classes/ezbenchmarkunit.php +++ b/benchmarks/classes/ezbenchmarkunit.php @@ -21,10 +21,12 @@ class eZBenchmarkUnit { - /*! - Constructor - */ - function eZBenchmarkUnit( $name = false ) + /** + * Initializes the benchmark + * + * @param bool|string $name + */ + function __construct( $name = false ) { if ( !$name ) $name = get_class( $this ); diff --git a/benchmarks/eztemplate/ezmarktemplatecompiler.php b/benchmarks/eztemplate/ezmarktemplatecompiler.php index 5388d720491..5a90ef09029 100644 --- a/benchmarks/eztemplate/ezmarktemplatecompiler.php +++ b/benchmarks/eztemplate/ezmarktemplatecompiler.php @@ -16,12 +16,9 @@ class eZMarkTemplateCompiler extends eZBenchmarkCase { - /*! - Constructor - */ - function eZMarkTemplateCompiler( $name ) + public function __construct( $name = false ) { - $this->eZBenchmarkCase( $name ); + parent::__construct( $name ); $this->addMark( 'markProcess', 'Processed template mark' ); $this->addMark( 'markCompilation', 'Compiled template mark' ); } diff --git a/benchmarks/hashing/ezmarkhashing.php b/benchmarks/hashing/ezmarkhashing.php index 893845778c2..069a8abf5a8 100644 --- a/benchmarks/hashing/ezmarkhashing.php +++ b/benchmarks/hashing/ezmarkhashing.php @@ -16,12 +16,9 @@ class eZMarkHashing extends eZBenchmarkCase { - /*! - Constructor - */ - function eZMarkHashing( $name ) + public function __construct( $name = false ) { - $this->eZBenchmarkCase( $name ); + parent::__construct( $name ); $this->addMark( 'markMD5', 'MD5 hash', array( 'repeat_count' => 1000 ) ); $this->addMark( 'markCRC32', 'CRC32 hash', array( 'repeat_count' => 1000 ) ); } diff --git a/extension/ezjscore/autoloads/ezjscaccesstemplatefunctions.php b/extension/ezjscore/autoloads/ezjscaccesstemplatefunctions.php index c94b42347d8..98ede4a47c9 100644 --- a/extension/ezjscore/autoloads/ezjscaccesstemplatefunctions.php +++ b/extension/ezjscore/autoloads/ezjscaccesstemplatefunctions.php @@ -38,10 +38,6 @@ class ezjscAccessTemplateFunctions { - function ezjscAccessTemplateFunctions() - { - } - function operatorList() { return array( 'has_access_to_limitation' ); diff --git a/extension/ezjscore/autoloads/ezjscencodingtemplatefunctions.php b/extension/ezjscore/autoloads/ezjscencodingtemplatefunctions.php index bd709090206..2d03191bfda 100644 --- a/extension/ezjscore/autoloads/ezjscencodingtemplatefunctions.php +++ b/extension/ezjscore/autoloads/ezjscencodingtemplatefunctions.php @@ -42,10 +42,6 @@ class ezjscEncodingTemplateFunctions { - function ezjscEncodingTemplateFunctions() - { - } - function operatorList() { return array( 'json_encode', diff --git a/extension/ezjscore/autoloads/ezjscpackertemplatefunctions.php b/extension/ezjscore/autoloads/ezjscpackertemplatefunctions.php index 006b3e05f77..0026d18a20d 100644 --- a/extension/ezjscore/autoloads/ezjscpackertemplatefunctions.php +++ b/extension/ezjscore/autoloads/ezjscpackertemplatefunctions.php @@ -84,10 +84,6 @@ class ezjscPackerTemplateFunctions { - function ezjscPackerTemplateFunctions() - { - } - function operatorList() { return array( 'ezscript', 'ezscript_require', 'ezscript_load', 'ezscriptfiles', 'ezcss', 'ezcss_require', 'ezcss_load', 'ezcssfiles' ); diff --git a/extension/ezjscore/classes/ezjscserverrouter.php b/extension/ezjscore/classes/ezjscserverrouter.php index 0a9dc7a1868..399cc01bc72 100644 --- a/extension/ezjscore/classes/ezjscserverrouter.php +++ b/extension/ezjscore/classes/ezjscserverrouter.php @@ -40,7 +40,7 @@ class ezjscServerRouter protected $functionArguments = array(); protected $isTemplateFunction = false; - protected function ezjscServerRouter( $className, $functionName = 'call', array $functionArguments = array(), $isTemplateFunction = false ) + protected function __construct( $className, $functionName = 'call', array $functionArguments = array(), $isTemplateFunction = false ) { $this->className = $className; $this->functionName = $functionName; diff --git a/extension/ezoe/autoloads/ezoetemplateutils.php b/extension/ezoe/autoloads/ezoetemplateutils.php index a964cb4bfdb..d307fdbffa5 100644 --- a/extension/ezoe/autoloads/ezoetemplateutils.php +++ b/extension/ezoe/autoloads/ezoetemplateutils.php @@ -35,10 +35,6 @@ class eZOETemplateUtils { - function eZOETemplateUtils() - { - } - function operatorList() { return array( 'ezoe_ini_section' ); diff --git a/extension/ezoe/ezxmltext/handlers/input/ezoeinputparser.php b/extension/ezoe/ezxmltext/handlers/input/ezoeinputparser.php index d7957977021..9fad3a36f71 100644 --- a/extension/ezoe/ezxmltext/handlers/input/ezoeinputparser.php +++ b/extension/ezoe/ezxmltext/handlers/input/ezoeinputparser.php @@ -178,12 +178,12 @@ class eZOEInputParser extends eZXMLInputParser * @param bool $parseLineBreaks flag if line breaks should be given meaning or not * @param bool $removeDefaultAttrs signal if attributes of default value should not be saved. */ - function eZOEInputParser( $validateErrorLevel = eZXMLInputParser::ERROR_NONE, + public function __construct( $validateErrorLevel = eZXMLInputParser::ERROR_NONE, $detectErrorLevel = eZXMLInputParser::ERROR_NONE, $parseLineBreaks = false, $removeDefaultAttrs = false ) { - $this->eZXMLInputParser( $validateErrorLevel, + parent::__construct( $validateErrorLevel, $detectErrorLevel, $parseLineBreaks, $removeDefaultAttrs ); diff --git a/extension/ezoe/ezxmltext/handlers/input/ezoexmlinput.php b/extension/ezoe/ezxmltext/handlers/input/ezoexmlinput.php index ede5119d8b8..8915eeeb121 100644 --- a/extension/ezoe/ezxmltext/handlers/input/ezoexmlinput.php +++ b/extension/ezoe/ezxmltext/handlers/input/ezoexmlinput.php @@ -38,17 +38,9 @@ */ class eZOEXMLInput extends eZXMLInputHandler { - /** - * Constructor - * For more info see {@link eZXMLInputHandler::eZXMLInputHandler()} - * - * @param string $xmlData - * @param string $aliasedType - * @param eZContentObjectAttribute $contentObjectAttribute - */ - function eZOEXMLInput( $xmlData, $aliasedType, $contentObjectAttribute ) + public function __construct( $xmlData, $aliasedType, $contentObjectAttribute ) { - $this->eZXMLInputHandler( $xmlData, $aliasedType, $contentObjectAttribute ); + parent::__construct( $xmlData, $aliasedType, $contentObjectAttribute ); $contentIni = eZINI::instance( 'content.ini' ); if ( $contentIni->hasVariable( 'header', 'UseStrictHeaderRule' ) === true ) diff --git a/kernel/class/ezclassfunctioncollection.php b/kernel/class/ezclassfunctioncollection.php index 95bb0e0099e..fb1534ba89a 100644 --- a/kernel/class/ezclassfunctioncollection.php +++ b/kernel/class/ezclassfunctioncollection.php @@ -16,13 +16,6 @@ class eZClassFunctionCollection { - /*! - Constructor - */ - function eZClassFunctionCollection() - { - } - function fetchClassListByGroups( $groupFilter, $groupFilterType = 'include' ) { $notIn = ( $groupFilterType == 'exclude' ); diff --git a/kernel/classes/basketinfohandlers/ezdefaultbasketinfohandler.php b/kernel/classes/basketinfohandlers/ezdefaultbasketinfohandler.php index 00ebb2db832..5d149d99f84 100644 --- a/kernel/classes/basketinfohandlers/ezdefaultbasketinfohandler.php +++ b/kernel/classes/basketinfohandlers/ezdefaultbasketinfohandler.php @@ -10,13 +10,6 @@ class eZDefaultBasketInfoHandler { - /*! - Constructor - */ - function eZDefaultBasketInfoHandler() - { - } - /*! Calculate additional information about vat and prices for items in the basket. */ diff --git a/kernel/classes/binaryhandlers/ezfilepassthrough/ezfilepassthroughhandler.php b/kernel/classes/binaryhandlers/ezfilepassthrough/ezfilepassthroughhandler.php index d2f91355609..3ca3d4709ba 100644 --- a/kernel/classes/binaryhandlers/ezfilepassthrough/ezfilepassthroughhandler.php +++ b/kernel/classes/binaryhandlers/ezfilepassthrough/ezfilepassthroughhandler.php @@ -18,9 +18,9 @@ class eZFilePassthroughHandler extends eZBinaryFileHandler { const HANDLER_ID = 'ezfilepassthrough'; - function eZFilePassthroughHandler() + public function __construct() { - $this->eZBinaryFileHandler( self::HANDLER_ID, "PHP passthrough", eZBinaryFileHandler::HANDLE_DOWNLOAD ); + parent::__construct( self::HANDLER_ID, "PHP passthrough", eZBinaryFileHandler::HANDLE_DOWNLOAD ); } function handleFileDownload( $contentObject, $contentObjectAttribute, $type, diff --git a/kernel/classes/clusterfilehandlers/dbbackends/mysqlbackenderror.php b/kernel/classes/clusterfilehandlers/dbbackends/mysqlbackenderror.php index 1b721b10dcd..b9126c6a013 100644 --- a/kernel/classes/clusterfilehandlers/dbbackends/mysqlbackenderror.php +++ b/kernel/classes/clusterfilehandlers/dbbackends/mysqlbackenderror.php @@ -15,7 +15,7 @@ class eZMySQLBackendError { - function eZMySQLBackendError( $value, $text ) + public function __construct( $value, $text ) { $this->errorValue = $value; $this->errorText = $text; diff --git a/kernel/classes/clusterfilehandlers/ezfsfilehandler.php b/kernel/classes/clusterfilehandlers/ezfsfilehandler.php index 7a4121a9594..51d2ecdb31a 100644 --- a/kernel/classes/clusterfilehandlers/ezfsfilehandler.php +++ b/kernel/classes/clusterfilehandlers/ezfsfilehandler.php @@ -15,9 +15,9 @@ class eZFSFileHandler implements eZClusterFileHandlerInterface /** * Constructor. * - * $filePath File path. If specified, file metadata is fetched in the constructor. + * @param bool $filePath File path. If specified, file metadata is fetched in the constructor. */ - function eZFSFileHandler( $filePath = false ) + public function __construct( $filePath = false ) { eZDebugSetting::writeDebug( 'kernel-clustering', "fs::instance( '$filePath' )", __METHOD__ ); $this->Mutex = null; diff --git a/kernel/classes/collaborationhandlers/ezapprove/ezapprovecollaborationhandler.php b/kernel/classes/collaborationhandlers/ezapprove/ezapprovecollaborationhandler.php index c7844255706..1424d6cba37 100644 --- a/kernel/classes/collaborationhandlers/ezapprove/ezapprovecollaborationhandler.php +++ b/kernel/classes/collaborationhandlers/ezapprove/ezapprovecollaborationhandler.php @@ -38,16 +38,17 @@ class eZApproveCollaborationHandler extends eZCollaborationItemHandler /// The contentobject was deferred and will be a draft again for reediting. const STATUS_DEFERRED = 3; - /*! - Initializes the handler - */ - function eZApproveCollaborationHandler() + public function __construct() { - $this->eZCollaborationItemHandler( 'ezapprove', - ezpI18n::tr( 'kernel/classes', 'Approval' ), - array( 'use-messages' => true, - 'notification-types' => true, - 'notification-collection-handling' => eZCollaborationItemHandler::NOTIFICATION_COLLECTION_PER_PARTICIPATION_ROLE ) ); + parent::__construct( + 'ezapprove', + ezpI18n::tr( 'kernel/classes', 'Approval' ), + array( + 'use-messages' => true, + 'notification-types' => true, + 'notification-collection-handling' => eZCollaborationItemHandler::NOTIFICATION_COLLECTION_PER_PARTICIPATION_ROLE + ) + ); } function title( $collaborationItem ) diff --git a/kernel/classes/confirmorderhandlers/ezdefaultconfirmorderhandler.php b/kernel/classes/confirmorderhandlers/ezdefaultconfirmorderhandler.php index 2af117bbb27..14ef7951c44 100644 --- a/kernel/classes/confirmorderhandlers/ezdefaultconfirmorderhandler.php +++ b/kernel/classes/confirmorderhandlers/ezdefaultconfirmorderhandler.php @@ -16,13 +16,6 @@ class eZDefaultConfirmOrderHandler { - /*! - Constructor - */ - function eZDefaultConfirmOrderHandler() - { - } - function execute( $params = array() ) { $ini = eZINI::instance(); diff --git a/kernel/classes/datatypes/ezauthor/ezauthor.php b/kernel/classes/datatypes/ezauthor/ezauthor.php index f6a7a1d85df..0156bf0addd 100644 --- a/kernel/classes/datatypes/ezauthor/ezauthor.php +++ b/kernel/classes/datatypes/ezauthor/ezauthor.php @@ -27,7 +27,7 @@ class eZAuthor { - function eZAuthor( ) + public function __construct( ) { $this->Authors = array(); $this->AuthorCount = 0; diff --git a/kernel/classes/datatypes/ezauthor/ezauthortype.php b/kernel/classes/datatypes/ezauthor/ezauthortype.php index fae48178359..fd5b91bed2a 100644 --- a/kernel/classes/datatypes/ezauthor/ezauthortype.php +++ b/kernel/classes/datatypes/ezauthor/ezauthortype.php @@ -19,9 +19,9 @@ class eZAuthorType extends eZDataType { const DATA_TYPE_STRING = "ezauthor"; - function eZAuthorType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Authors", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Authors", 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezbinaryfile/ezbinaryfile.php b/kernel/classes/datatypes/ezbinaryfile/ezbinaryfile.php index a3bf6e3aa11..246faf7b9c1 100644 --- a/kernel/classes/datatypes/ezbinaryfile/ezbinaryfile.php +++ b/kernel/classes/datatypes/ezbinaryfile/ezbinaryfile.php @@ -17,11 +17,6 @@ class eZBinaryFile extends eZPersistentObject { - function eZBinaryFile( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { static $definition = array( 'fields' => array( 'contentobject_attribute_id' => array( 'name' => 'ContentObjectAttributeID', diff --git a/kernel/classes/datatypes/ezbinaryfile/ezbinaryfiletype.php b/kernel/classes/datatypes/ezbinaryfile/ezbinaryfiletype.php index 1dfc890c7cc..c1ba06b5e17 100644 --- a/kernel/classes/datatypes/ezbinaryfile/ezbinaryfiletype.php +++ b/kernel/classes/datatypes/ezbinaryfile/ezbinaryfiletype.php @@ -23,9 +23,9 @@ class eZBinaryFileType extends eZDataType const DATA_TYPE_STRING = "ezbinaryfile"; - function eZBinaryFileType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "File", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "File", 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezboolean/ezbooleantype.php b/kernel/classes/datatypes/ezboolean/ezbooleantype.php index e08a38aba69..67f109698e4 100644 --- a/kernel/classes/datatypes/ezboolean/ezbooleantype.php +++ b/kernel/classes/datatypes/ezboolean/ezbooleantype.php @@ -19,9 +19,9 @@ class eZBooleanType extends eZDataType { const DATA_TYPE_STRING = "ezboolean"; - function eZBooleanType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Checkbox", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Checkbox", 'Datatype name' ), array( 'serialize_supported' => true, 'object_serialize_map' => array( 'data_int' => 'value' ) ) ); } diff --git a/kernel/classes/datatypes/ezcountry/ezcountrytype.php b/kernel/classes/datatypes/ezcountry/ezcountrytype.php index 861d7fb9a48..1e75dc53c78 100644 --- a/kernel/classes/datatypes/ezcountry/ezcountrytype.php +++ b/kernel/classes/datatypes/ezcountry/ezcountrytype.php @@ -27,9 +27,9 @@ class eZCountryType extends eZDataType const MULTIPLE_CHOICE_FIELD = 'data_int1'; - function eZCountryType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'Country', 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'Country', 'Datatype name' ), array( 'serialize_supported' => true, 'object_serialize_map' => array( 'data_text' => 'country' ) ) ); } diff --git a/kernel/classes/datatypes/ezdate/ezdatetype.php b/kernel/classes/datatypes/ezdate/ezdatetype.php index b317cb5068c..c256446600e 100644 --- a/kernel/classes/datatypes/ezdate/ezdatetype.php +++ b/kernel/classes/datatypes/ezdate/ezdatetype.php @@ -25,9 +25,9 @@ class eZDateType extends eZDataType const DEFAULT_CURRENT_DATE = 1; - function eZDateType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Date", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Date", 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezdatetime/ezdatetimetype.php b/kernel/classes/datatypes/ezdatetime/ezdatetimetype.php index d46179e4020..bdca7897681 100644 --- a/kernel/classes/datatypes/ezdatetime/ezdatetimetype.php +++ b/kernel/classes/datatypes/ezdatetime/ezdatetimetype.php @@ -31,9 +31,9 @@ class eZDateTimeType extends eZDataType const DEFAULT_ADJUSTMENT = 2; - function eZDateTimeType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Date and time", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Date and time", 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezemail/ezemailtype.php b/kernel/classes/datatypes/ezemail/ezemailtype.php index 866754c4b47..b1574285c11 100644 --- a/kernel/classes/datatypes/ezemail/ezemailtype.php +++ b/kernel/classes/datatypes/ezemail/ezemailtype.php @@ -19,9 +19,9 @@ class eZEmailType extends eZDataType { const DATA_TYPE_STRING = "ezemail"; - function eZEmailType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Email", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Email", 'Datatype name' ), array( 'serialize_supported' => true, 'object_serialize_map' => array( 'data_text' => 'email' ) ) ); } diff --git a/kernel/classes/datatypes/ezenum/ezenum.php b/kernel/classes/datatypes/ezenum/ezenum.php index 92c20949015..3644cf9b81e 100644 --- a/kernel/classes/datatypes/ezenum/ezenum.php +++ b/kernel/classes/datatypes/ezenum/ezenum.php @@ -17,10 +17,13 @@ class eZEnum { - /*! - Constructor - */ - function eZEnum( $id, $version ) + /** + * Constructor + * + * @param int $id + * @param int $version + */ + public function __construct( $id, $version ) { $this->ClassAttributeID = $id; $this->ClassAttributeVersion = $version; diff --git a/kernel/classes/datatypes/ezenum/ezenumobjectvalue.php b/kernel/classes/datatypes/ezenum/ezenumobjectvalue.php index f360c2aa03c..8a2a866caff 100644 --- a/kernel/classes/datatypes/ezenum/ezenumobjectvalue.php +++ b/kernel/classes/datatypes/ezenum/ezenumobjectvalue.php @@ -16,14 +16,6 @@ class eZEnumObjectValue extends eZPersistentObject { - /*! - Constructor - */ - function eZEnumObjectValue( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "contentobject_attribute_id" => array( 'name' => "ContentObjectAttributeID", diff --git a/kernel/classes/datatypes/ezenum/ezenumtype.php b/kernel/classes/datatypes/ezenum/ezenumtype.php index 64e41a1d04e..6e62f6d39e9 100644 --- a/kernel/classes/datatypes/ezenum/ezenumtype.php +++ b/kernel/classes/datatypes/ezenum/ezenumtype.php @@ -22,12 +22,9 @@ class eZEnumType extends eZDataType const IS_OPTION_FIELD = 'data_int2'; const IS_OPTION_VARIABLE = '_ezenum_isoption_value_'; - /*! - Constructor - */ - function eZEnumType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'Enum', 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'Enum', 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezenum/ezenumvalue.php b/kernel/classes/datatypes/ezenum/ezenumvalue.php index 2b54c741458..c2b05de3d3a 100644 --- a/kernel/classes/datatypes/ezenum/ezenumvalue.php +++ b/kernel/classes/datatypes/ezenum/ezenumvalue.php @@ -17,14 +17,6 @@ class eZEnumValue extends eZPersistentObject { - /*! - Constructor - */ - function eZEnumValue( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/datatypes/ezfloat/ezfloattype.php b/kernel/classes/datatypes/ezfloat/ezfloattype.php index 556a4d09aae..39d84dc5964 100644 --- a/kernel/classes/datatypes/ezfloat/ezfloattype.php +++ b/kernel/classes/datatypes/ezfloat/ezfloattype.php @@ -30,9 +30,9 @@ class eZFloatType extends eZDataType const HAS_MAX_VALUE = 2; const HAS_MIN_MAX_VALUE = 3; - function eZFloatType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Float", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Float", 'Datatype name' ), array( 'serialize_supported' => true, 'object_serialize_map' => array( 'data_float' => 'value' ) ) ); $this->FloatValidator = new eZFloatValidator(); diff --git a/kernel/classes/datatypes/ezidentifier/ezidentifiertype.php b/kernel/classes/datatypes/ezidentifier/ezidentifiertype.php index e20b61f7c6f..e896d0c783a 100644 --- a/kernel/classes/datatypes/ezidentifier/ezidentifiertype.php +++ b/kernel/classes/datatypes/ezidentifier/ezidentifiertype.php @@ -34,12 +34,12 @@ class eZIdentifierType extends eZDataType const DATA_TYPE_STRING = "ezidentifier"; - /*! - Constructor - */ - function eZIdentifierType() + /** + * Constructor + */ + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Identifier", 'Datatype name' ), array( 'serialize_supported' => true, 'object_serialize_map' => array( 'data_text' => 'identifier', diff --git a/kernel/classes/datatypes/ezimage/ezimagealiashandler.php b/kernel/classes/datatypes/ezimage/ezimagealiashandler.php index aacf131facc..3cce4df78d7 100644 --- a/kernel/classes/datatypes/ezimage/ezimagealiashandler.php +++ b/kernel/classes/datatypes/ezimage/ezimagealiashandler.php @@ -26,10 +26,12 @@ class eZImageAliasHandler { - /*! - Creates the handler and creates a reference to the contentobject attribute that created it. - */ - function eZImageAliasHandler( $contentObjectAttribute ) + /** + * Creates the handler and creates a reference to the contentobject attribute that created it. + * + * @param eZContentObjectAttribute $contentObjectAttribute + */ + public function __construct( $contentObjectAttribute ) { $this->ContentObjectAttributeData = array(); if ( is_object( $contentObjectAttribute ) ) diff --git a/kernel/classes/datatypes/ezimage/ezimagefile.php b/kernel/classes/datatypes/ezimage/ezimagefile.php index 75ca2720fbf..ce9265f1d96 100644 --- a/kernel/classes/datatypes/ezimage/ezimagefile.php +++ b/kernel/classes/datatypes/ezimage/ezimagefile.php @@ -17,11 +17,6 @@ class eZImageFile extends eZPersistentObject { - function eZImageFile( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { static $definition = array( 'fields' => array( 'id' => array( 'name' => 'id', diff --git a/kernel/classes/datatypes/ezimage/ezimagetype.php b/kernel/classes/datatypes/ezimage/ezimagetype.php index af44de85ad5..9a67fd237ba 100644 --- a/kernel/classes/datatypes/ezimage/ezimagetype.php +++ b/kernel/classes/datatypes/ezimage/ezimagetype.php @@ -23,9 +23,9 @@ class eZImageType extends eZDataType const FILESIZE_VARIABLE = '_ezimage_max_filesize_'; const DATA_TYPE_STRING = "ezimage"; - function eZImageType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Image", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Image", 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezinisetting/ezinisettingtype.php b/kernel/classes/datatypes/ezinisetting/ezinisettingtype.php index d617d2ce4d6..df6a6a2f301 100644 --- a/kernel/classes/datatypes/ezinisetting/ezinisettingtype.php +++ b/kernel/classes/datatypes/ezinisetting/ezinisettingtype.php @@ -37,12 +37,9 @@ class eZIniSettingType extends eZDataType const CLASS_TYPE_ARRAY = 6; - /*! - Initializes with a string id and a description. - */ - function eZIniSettingType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'Ini Setting', 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'Ini Setting', 'Datatype name' ), array( 'translation_allowed' => false, 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezinteger/ezintegertype.php b/kernel/classes/datatypes/ezinteger/ezintegertype.php index 160d9618fc8..95e6c0d3140 100644 --- a/kernel/classes/datatypes/ezinteger/ezintegertype.php +++ b/kernel/classes/datatypes/ezinteger/ezintegertype.php @@ -35,9 +35,9 @@ class eZIntegerType extends eZDataType const HAS_MAX_VALUE = 2; const HAS_MIN_MAX_VALUE = 3; - function eZIntegerType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Integer", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Integer", 'Datatype name' ), array( 'serialize_supported' => true, 'object_serialize_map' => array( 'data_int' => 'value' ) ) ); $this->IntegerValidator = new eZIntegerValidator(); diff --git a/kernel/classes/datatypes/ezisbn/ezisbn10to13converter.php b/kernel/classes/datatypes/ezisbn/ezisbn10to13converter.php index 43a4bc7a3af..16eb764f6a3 100644 --- a/kernel/classes/datatypes/ezisbn/ezisbn10to13converter.php +++ b/kernel/classes/datatypes/ezisbn/ezisbn10to13converter.php @@ -17,7 +17,7 @@ class eZISBN10To13Converter \param $params custom parameters to the class. The Force parameter is now set as a class variable for the other functions. */ - function eZISBN10To13Converter( $script, $cli, $params ) + public function __construct( $script, $cli, $params ) { $this->Script = $script; $this->Cli = $cli; diff --git a/kernel/classes/datatypes/ezisbn/ezisbn13.php b/kernel/classes/datatypes/ezisbn/ezisbn13.php index ec778f3e4d9..9aa3b10456d 100644 --- a/kernel/classes/datatypes/ezisbn/ezisbn13.php +++ b/kernel/classes/datatypes/ezisbn/ezisbn13.php @@ -25,13 +25,13 @@ class eZISBN13 const PREFIX_978 = 978; const PREFIX_979 = 979; - /*! - Constructor - \param $isbnNr is the ISBN-13 number. example is: 978-0-11-000222-4 - \param $separator is the hyphen used in the ISBN number to make the - ISBN number more visible. - */ - function eZISBN13( $isbnNr = null, $separator = '-' ) + /** + * Constructor + * + * @param string|null $isbnNr The ISBN-13 number, e.g. 978-0-11-000222-4 + * @param string $separator The hyphen used in the ISBN number to make the ISBN number more visible. + */ + public function __construct( $isbnNr = null, $separator = '-' ) { if ( $isbnNr !== null ) { diff --git a/kernel/classes/datatypes/ezisbn/ezisbngroup.php b/kernel/classes/datatypes/ezisbn/ezisbngroup.php index 34ebf016b41..64fdb0b1308 100644 --- a/kernel/classes/datatypes/ezisbn/ezisbngroup.php +++ b/kernel/classes/datatypes/ezisbn/ezisbngroup.php @@ -22,14 +22,6 @@ class eZISBNGroup extends eZPersistentObject { - /*! - Constructor - */ - function eZISBNGroup( $row ) - { - $this->eZPersistentObject( $row ); - } - /*! \static returns a definition of the ISBN group. diff --git a/kernel/classes/datatypes/ezisbn/ezisbngrouprange.php b/kernel/classes/datatypes/ezisbn/ezisbngrouprange.php index ecf134d4493..e6485ff94e5 100644 --- a/kernel/classes/datatypes/ezisbn/ezisbngrouprange.php +++ b/kernel/classes/datatypes/ezisbn/ezisbngrouprange.php @@ -24,15 +24,6 @@ class eZISBNGroupRange extends eZPersistentObject { - /*! - Constructor - */ - function eZISBNGroupRange( $row ) - { - $this->eZPersistentObject( $row ); - } - - /*! Definition of the ranges for ISBN groups. */ diff --git a/kernel/classes/datatypes/ezisbn/ezisbnregistrantrange.php b/kernel/classes/datatypes/ezisbn/ezisbnregistrantrange.php index 1e7903a5fb8..947f926fcbd 100644 --- a/kernel/classes/datatypes/ezisbn/ezisbnregistrantrange.php +++ b/kernel/classes/datatypes/ezisbn/ezisbnregistrantrange.php @@ -28,14 +28,6 @@ class eZISBNRegistrantRange extends eZPersistentObject { - /*! - Constructor - */ - function eZISBNRegistrantRange( $row ) - { - $this->eZPersistentObject( $row ); - } - /*! Definition of the ranges for ISBN Registrant. */ diff --git a/kernel/classes/datatypes/ezisbn/ezisbntype.php b/kernel/classes/datatypes/ezisbn/ezisbntype.php index 6e51eb2fb08..8046288ce64 100644 --- a/kernel/classes/datatypes/ezisbn/ezisbntype.php +++ b/kernel/classes/datatypes/ezisbn/ezisbntype.php @@ -21,9 +21,9 @@ class eZISBNType extends eZDataType const CLASS_IS_ISBN13 = 'data_int1'; const CONTENT_VALUE = 'data_text'; - function eZISBNType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "ISBN", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "ISBN", 'Datatype name' ), array( 'serialize_supported' => true, 'object_serialize_map' => array( self::CONTENT_VALUE => 'isbn' ) ) ); } diff --git a/kernel/classes/datatypes/ezkeyword/ezkeyword.php b/kernel/classes/datatypes/ezkeyword/ezkeyword.php index 76f4f501091..5dd4ce7d1fb 100644 --- a/kernel/classes/datatypes/ezkeyword/ezkeyword.php +++ b/kernel/classes/datatypes/ezkeyword/ezkeyword.php @@ -17,13 +17,6 @@ class eZKeyword { - /*! - Construct a new keyword instance - */ - function eZKeyword( ) - { - } - function attributes() { return array( 'keywords', diff --git a/kernel/classes/datatypes/ezkeyword/ezkeywordtype.php b/kernel/classes/datatypes/ezkeyword/ezkeywordtype.php index be49785a22a..7ced5136580 100644 --- a/kernel/classes/datatypes/ezkeyword/ezkeywordtype.php +++ b/kernel/classes/datatypes/ezkeyword/ezkeywordtype.php @@ -21,12 +21,9 @@ class eZKeywordType extends eZDataType { const DATA_TYPE_STRING = 'ezkeyword'; - /*! - Initializes with a keyword id and a description. - */ - function eZKeywordType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'Keywords', 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'Keywords', 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezmatrix/ezmatrix.php b/kernel/classes/datatypes/ezmatrix/ezmatrix.php index 1dab44ae20b..eee68d67600 100644 --- a/kernel/classes/datatypes/ezmatrix/ezmatrix.php +++ b/kernel/classes/datatypes/ezmatrix/ezmatrix.php @@ -17,10 +17,12 @@ class eZMatrix { - /*! - Constructor - */ - function eZMatrix( $name, $numRows = false, $matrixColumnDefinition = false ) + /** + * @param string $name + * @param int|bool $numRows + * @param eZMatrixDefinition|bool $matrixColumnDefinition + */ + public function __construct( $name, $numRows = false, $matrixColumnDefinition = false ) { $this->Name = $name; $this->Matrix = array(); diff --git a/kernel/classes/datatypes/ezmatrix/ezmatrixdefinition.php b/kernel/classes/datatypes/ezmatrix/ezmatrixdefinition.php index a8938cad469..f6dd68af48d 100644 --- a/kernel/classes/datatypes/ezmatrix/ezmatrixdefinition.php +++ b/kernel/classes/datatypes/ezmatrix/ezmatrixdefinition.php @@ -17,10 +17,10 @@ class eZMatrixDefinition { - /*! - Constructor - */ - function eZMatrixDefinition() + /** + * Constructor + */ + public function __construct() { $this->ColumnNames = array(); } diff --git a/kernel/classes/datatypes/ezmatrix/ezmatrixtype.php b/kernel/classes/datatypes/ezmatrix/ezmatrixtype.php index c43c74c5f34..4c61c8e55c6 100644 --- a/kernel/classes/datatypes/ezmatrix/ezmatrixtype.php +++ b/kernel/classes/datatypes/ezmatrix/ezmatrixtype.php @@ -24,12 +24,9 @@ class eZMatrixType extends eZDataType const CELL_VARIABLE = '_ezmatrix_cell_'; const DATA_TYPE_STRING = 'ezmatrix'; - /*! - Constructor - */ - function eZMatrixType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'Matrix', 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'Matrix', 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezmedia/ezmedia.php b/kernel/classes/datatypes/ezmedia/ezmedia.php index 0fb01cc4edc..da679144ac3 100644 --- a/kernel/classes/datatypes/ezmedia/ezmedia.php +++ b/kernel/classes/datatypes/ezmedia/ezmedia.php @@ -17,11 +17,6 @@ class eZMedia extends eZPersistentObject { - function eZMedia( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { static $definition = array( "fields" => array( "contentobject_attribute_id" => array( 'name' => "ContentObjectAttributeID", diff --git a/kernel/classes/datatypes/ezmedia/ezmediatype.php b/kernel/classes/datatypes/ezmedia/ezmediatype.php index 92d4773a9c2..42d1345c576 100644 --- a/kernel/classes/datatypes/ezmedia/ezmediatype.php +++ b/kernel/classes/datatypes/ezmedia/ezmediatype.php @@ -23,9 +23,9 @@ class eZMediaType extends eZDataType const TYPE_FIELD = "data_text1"; const TYPE_VARIABLE = "_ezmedia_type_"; - function eZMediaType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Media", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Media", 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezmultioption/ezmultioption.php b/kernel/classes/datatypes/ezmultioption/ezmultioption.php index 19fc5ab8b95..c9b0c3724d2 100644 --- a/kernel/classes/datatypes/ezmultioption/ezmultioption.php +++ b/kernel/classes/datatypes/ezmultioption/ezmultioption.php @@ -113,9 +113,14 @@ class eZMultiOption { /*! - Initializes with empty multioption list. + */ - function eZMultiOption( $name ) + /** + * Initializes with empty multioption list. + * + * @param string $name + */ + public function __construct( $name ) { $this->Name = $name; $this->Options = array(); diff --git a/kernel/classes/datatypes/ezmultioption/ezmultioptiontype.php b/kernel/classes/datatypes/ezmultioption/ezmultioptiontype.php index cb9e7812eb7..895b9800bce 100644 --- a/kernel/classes/datatypes/ezmultioption/ezmultioptiontype.php +++ b/kernel/classes/datatypes/ezmultioption/ezmultioptiontype.php @@ -34,12 +34,9 @@ class eZMultiOptionType extends eZDataType const DEFAULT_NAME_VARIABLE = "_ezmultioption_default_name_"; const DATA_TYPE_STRING = "ezmultioption"; - /*! - Constructor to initialize the datatype. - */ - function eZMultiOptionType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Multi-option", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Multi-option", 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezmultioption2/ezmultioption2.php b/kernel/classes/datatypes/ezmultioption2/ezmultioption2.php index 916536478ed..e359571c4f1 100644 --- a/kernel/classes/datatypes/ezmultioption2/ezmultioption2.php +++ b/kernel/classes/datatypes/ezmultioption2/ezmultioption2.php @@ -15,10 +15,16 @@ */ class eZMultiOption2 { - /*! - Initializes with empty multioption2 list. - */ - function eZMultiOption2( $name, $id = 0, $multioptionIDCounter = 0, $optionCounter = 0, $groupID = 0 ) + /** + * Initializes with empty multioption2 list. + * + * @param $name + * @param int $id + * @param int $multioptionIDCounter + * @param int $optionCounter + * @param int $groupID + */ + public function __construct( $name, $id = 0, $multioptionIDCounter = 0, $optionCounter = 0, $groupID = 0 ) { $this->Name = $name; $this->ID = $id; diff --git a/kernel/classes/datatypes/ezmultioption2/ezmultioption2type.php b/kernel/classes/datatypes/ezmultioption2/ezmultioption2type.php index 656c2af8d35..8bfced00d41 100644 --- a/kernel/classes/datatypes/ezmultioption2/ezmultioption2type.php +++ b/kernel/classes/datatypes/ezmultioption2/ezmultioption2type.php @@ -38,9 +38,9 @@ class eZMultiOption2Type extends eZDataType /*! Constructor to initialize the datatype. */ - function eZMultiOption2Type() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Multi-option2", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Multi-option2", 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezmultiprice/ezmultiprice.php b/kernel/classes/datatypes/ezmultiprice/ezmultiprice.php index c07885439d9..4b54bcdae73 100644 --- a/kernel/classes/datatypes/ezmultiprice/ezmultiprice.php +++ b/kernel/classes/datatypes/ezmultiprice/ezmultiprice.php @@ -35,12 +35,9 @@ class eZMultiPrice extends eZSimplePrice const CALCULATION_TYPE_DISCOUNT_INCLUDE = 3; const CALCULATION_TYPE_DISCOUNT_EXCLUDE = 4; - /*! - Constructor - */ - function eZMultiPrice( $classAttribute, $contentObjectAttribute, $storedPrice = null ) + public function __construct( $classAttribute, $contentObjectAttribute, $storedPrice = null ) { - eZSimplePrice::eZSimplePrice( $classAttribute, $contentObjectAttribute, $storedPrice ); + parent::__construct( $classAttribute, $contentObjectAttribute, $storedPrice ); $isVatIncluded = ( $classAttribute->attribute( eZMultiPriceType::INCLUDE_VAT_FIELD ) == 1 ); $VATID = $classAttribute->attribute( eZMultiPriceType::VAT_ID_FIELD ); diff --git a/kernel/classes/datatypes/ezmultiprice/ezmultipricetype.php b/kernel/classes/datatypes/ezmultiprice/ezmultipricetype.php index 419a76d0320..eddd6c9e92e 100644 --- a/kernel/classes/datatypes/ezmultiprice/ezmultipricetype.php +++ b/kernel/classes/datatypes/ezmultiprice/ezmultipricetype.php @@ -27,9 +27,9 @@ class eZMultiPriceType extends eZDataType const INCLUDED_VAT = 1; const EXCLUDED_VAT = 2; - function eZMultiPriceType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'Multi-price', 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'Multi-price', 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezobjectrelation/ezobjectrelationtype.php b/kernel/classes/datatypes/ezobjectrelation/ezobjectrelationtype.php index 0e91362a22c..d353aeadbf2 100644 --- a/kernel/classes/datatypes/ezobjectrelation/ezobjectrelationtype.php +++ b/kernel/classes/datatypes/ezobjectrelation/ezobjectrelationtype.php @@ -19,12 +19,9 @@ class eZObjectRelationType extends eZDataType { const DATA_TYPE_STRING = "ezobjectrelation"; - /*! - Initializes with a string id and a description. - */ - function eZObjectRelationType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Object relation", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Object relation", 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezobjectrelationlist/ezobjectrelationlisttype.php b/kernel/classes/datatypes/ezobjectrelationlist/ezobjectrelationlisttype.php index 71377dc35d7..b8226fa2217 100755 --- a/kernel/classes/datatypes/ezobjectrelationlist/ezobjectrelationlisttype.php +++ b/kernel/classes/datatypes/ezobjectrelationlist/ezobjectrelationlisttype.php @@ -26,12 +26,9 @@ class eZObjectRelationListType extends eZDataType { const DATA_TYPE_STRING = "ezobjectrelationlist"; - /*! - Initializes with a string id and a description. - */ - function eZObjectRelationListType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Object relations", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Object relations", 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezoption/ezoption.php b/kernel/classes/datatypes/ezoption/ezoption.php index 553a8b037b4..fe5d717c8b2 100644 --- a/kernel/classes/datatypes/ezoption/ezoption.php +++ b/kernel/classes/datatypes/ezoption/ezoption.php @@ -27,7 +27,12 @@ class eZOption { - function eZOption( $name ) + /** + * Constructor + * + * @param string $name + */ + public function __construct( $name ) { $this->Name = $name; $this->Options = array(); diff --git a/kernel/classes/datatypes/ezoption/ezoptiontype.php b/kernel/classes/datatypes/ezoption/ezoptiontype.php index 7396abe8d9b..dfda83989bc 100644 --- a/kernel/classes/datatypes/ezoption/ezoptiontype.php +++ b/kernel/classes/datatypes/ezoption/ezoptiontype.php @@ -21,9 +21,9 @@ class eZOptionType extends eZDataType const DATA_TYPE_STRING = "ezoption"; - function eZOptionType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Option", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Option", 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezpackage/ezpackagetype.php b/kernel/classes/datatypes/ezpackage/ezpackagetype.php index b08b2428828..1431fb9ac77 100644 --- a/kernel/classes/datatypes/ezpackage/ezpackagetype.php +++ b/kernel/classes/datatypes/ezpackage/ezpackagetype.php @@ -24,12 +24,9 @@ class eZPackageType extends eZDataType const VIEW_MODE_FIELD = 'data_int1'; const VIEW_MODE_VARIABLE = '_ezpackage_view_mode_'; - /*! - Constructor - */ - function eZPackageType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'Package', 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'Package', 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezprice/ezprice.php b/kernel/classes/datatypes/ezprice/ezprice.php index 8f71d32a168..1a0e7b632c9 100644 --- a/kernel/classes/datatypes/ezprice/ezprice.php +++ b/kernel/classes/datatypes/ezprice/ezprice.php @@ -17,12 +17,9 @@ class eZPrice extends eZSimplePrice { - /*! - Constructor - */ - function eZPrice( $classAttribute, $contentObjectAttribute, $storedPrice = null ) + public function __construct( $classAttribute, $contentObjectAttribute, $storedPrice = null ) { - eZSimplePrice::eZSimplePrice( $classAttribute, $contentObjectAttribute, $storedPrice ); + parent::__construct( $classAttribute, $contentObjectAttribute, $storedPrice ); $isVatIncluded = ( $classAttribute->attribute( eZPriceType::INCLUDE_VAT_FIELD ) == 1 ); $VATID = $classAttribute->attribute( eZPriceType::VAT_ID_FIELD ); diff --git a/kernel/classes/datatypes/ezprice/ezpricetype.php b/kernel/classes/datatypes/ezprice/ezpricetype.php index b4a26827669..e2443e2d85e 100644 --- a/kernel/classes/datatypes/ezprice/ezpricetype.php +++ b/kernel/classes/datatypes/ezprice/ezpricetype.php @@ -25,9 +25,9 @@ class eZPriceType extends eZDataType const INCLUDED_VAT = 1; const EXCLUDED_VAT = 2; - function eZPriceType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Price", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Price", 'Datatype name' ), array( 'serialize_supported' => true, 'object_serialize_map' => array( 'data_float' => 'price' ) ) ); } diff --git a/kernel/classes/datatypes/ezproductcategory/ezproductcategorytype.php b/kernel/classes/datatypes/ezproductcategory/ezproductcategorytype.php index 6490a8e62c1..646fdaf70ee 100644 --- a/kernel/classes/datatypes/ezproductcategory/ezproductcategorytype.php +++ b/kernel/classes/datatypes/ezproductcategory/ezproductcategorytype.php @@ -19,9 +19,9 @@ class eZProductCategoryType extends eZDataType { const DATA_TYPE_STRING = "ezproductcategory"; - function eZProductCategoryType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Product category", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Product category", 'Datatype name' ), array( 'serialize_supported' => true, 'object_serialize_map' => array( 'data_int' => 'value' ) ) ); } diff --git a/kernel/classes/datatypes/ezrangeoption/ezrangeoption.php b/kernel/classes/datatypes/ezrangeoption/ezrangeoption.php index 7e566c47256..af723ba0529 100644 --- a/kernel/classes/datatypes/ezrangeoption/ezrangeoption.php +++ b/kernel/classes/datatypes/ezrangeoption/ezrangeoption.php @@ -17,10 +17,12 @@ class eZRangeOption { - /*! - Constructor - */ - function eZRangeOption( $name ) + /** + * Constructor + * + * @param string $name + */ + public function __construct( $name ) { $this->Name = $name; $this->Options = array(); diff --git a/kernel/classes/datatypes/ezrangeoption/ezrangeoptiontype.php b/kernel/classes/datatypes/ezrangeoption/ezrangeoptiontype.php index 64eeee9c94e..f65fceb0818 100644 --- a/kernel/classes/datatypes/ezrangeoption/ezrangeoptiontype.php +++ b/kernel/classes/datatypes/ezrangeoption/ezrangeoptiontype.php @@ -20,12 +20,9 @@ class eZRangeOptionType extends eZDataType const DATA_TYPE_STRING = "ezrangeoption"; - /*! - Constructor - */ - function eZRangeOptionType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Range option", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Range option", 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezselection/ezselectiontype.php b/kernel/classes/datatypes/ezselection/ezselectiontype.php index 70e9c2b23ca..9cb0f5f23db 100644 --- a/kernel/classes/datatypes/ezselection/ezselectiontype.php +++ b/kernel/classes/datatypes/ezselection/ezselectiontype.php @@ -21,12 +21,9 @@ class eZSelectionType extends eZDataType { const DATA_TYPE_STRING = "ezselection"; - /*! - Constructor - */ - function eZSelectionType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Selection", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Selection", 'Datatype name' ), array( 'serialize_supported' => true ) ); } @@ -375,7 +372,7 @@ function title( $contentObjectAttribute, $name = null ) function hasObjectAttributeContent( $contentObjectAttribute ) { $selected = $this->objectAttributeContent( $contentObjectAttribute ); - return isset( $selected[0] ) && $selected[0] != ''; + return isset( $selected[0] ) && $selected[0] != ''; } function sortKey( $contentObjectAttribute ) diff --git a/kernel/classes/datatypes/ezstring/ezstringtype.php b/kernel/classes/datatypes/ezstring/ezstringtype.php index 3f4079bb720..d3ed98d0ea4 100644 --- a/kernel/classes/datatypes/ezstring/ezstringtype.php +++ b/kernel/classes/datatypes/ezstring/ezstringtype.php @@ -34,9 +34,9 @@ class eZStringType extends eZDataType /*! Initializes with a string id and a description. */ - function eZStringType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'Text line', 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'Text line', 'Datatype name' ), array( 'serialize_supported' => true, 'object_serialize_map' => array( 'data_text' => 'text' ) ) ); $this->MaxLenValidator = new eZIntegerValidator(); diff --git a/kernel/classes/datatypes/ezsubtreesubscription/ezsubtreesubscriptiontype.php b/kernel/classes/datatypes/ezsubtreesubscription/ezsubtreesubscriptiontype.php index 04c6dc2a048..16289e7b9f6 100644 --- a/kernel/classes/datatypes/ezsubtreesubscription/ezsubtreesubscriptiontype.php +++ b/kernel/classes/datatypes/ezsubtreesubscription/ezsubtreesubscriptiontype.php @@ -18,12 +18,9 @@ class eZSubtreeSubscriptionType extends eZDataType { const DATA_TYPE_STRING = "ezsubtreesubscription"; - /*! - Constructor - */ - function eZSubtreeSubscriptionType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Subtree subscription", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Subtree subscription", 'Datatype name' ), array( 'serialize_supported' => true, 'object_serialize_map' => array( 'data_int' => 'value' ) ) ); } diff --git a/kernel/classes/datatypes/eztext/eztexttype.php b/kernel/classes/datatypes/eztext/eztexttype.php index 8593d20324a..a9abe2a8bdb 100644 --- a/kernel/classes/datatypes/eztext/eztexttype.php +++ b/kernel/classes/datatypes/eztext/eztexttype.php @@ -21,9 +21,9 @@ class eZTextType extends eZDataType const COLS_FIELD = 'data_int1'; const COLS_VARIABLE = '_eztext_cols_'; - function eZTextType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Text block", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Text block", 'Datatype name' ), array( 'serialize_supported' => true, 'object_serialize_map' => array( 'data_text' => 'text' ) ) ); } diff --git a/kernel/classes/datatypes/eztime/eztimetype.php b/kernel/classes/datatypes/eztime/eztimetype.php index a57f9ef1233..cdb058e7ee8 100644 --- a/kernel/classes/datatypes/eztime/eztimetype.php +++ b/kernel/classes/datatypes/eztime/eztimetype.php @@ -23,9 +23,9 @@ class eZTimeType extends eZDataType const DEFAULT_EMTPY = 0; const DEFAULT_CURRENT_DATE = 1; - function eZTimeType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Time", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "Time", 'Datatype name' ), array( 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezurl/ezurl.php b/kernel/classes/datatypes/ezurl/ezurl.php index f01f1b9d3bb..45072d755cf 100644 --- a/kernel/classes/datatypes/ezurl/ezurl.php +++ b/kernel/classes/datatypes/ezurl/ezurl.php @@ -21,11 +21,6 @@ class eZURL extends eZPersistentObject { - function eZURL( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { static $definition = array( 'fields' => array( 'id' => array( 'name' => 'ID', diff --git a/kernel/classes/datatypes/ezurl/ezurlobjectlink.php b/kernel/classes/datatypes/ezurl/ezurlobjectlink.php index 21126276934..15d8a0aca93 100644 --- a/kernel/classes/datatypes/ezurl/ezurlobjectlink.php +++ b/kernel/classes/datatypes/ezurl/ezurlobjectlink.php @@ -17,14 +17,6 @@ class eZURLObjectLink extends eZPersistentObject { - /*! - Constructor - */ - function eZURLObjectLink( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { static $definition = array( 'fields' => array( 'url_id' => array( 'name' => 'URLID', diff --git a/kernel/classes/datatypes/ezurl/ezurltype.php b/kernel/classes/datatypes/ezurl/ezurltype.php index 85cb5cdbaac..02b6050653f 100644 --- a/kernel/classes/datatypes/ezurl/ezurltype.php +++ b/kernel/classes/datatypes/ezurl/ezurltype.php @@ -20,12 +20,9 @@ class eZURLType extends eZDataType { const DATA_TYPE_STRING = 'ezurl'; - /*! - Initializes with a url id and a description. - */ - function eZURLType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'URL', 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', 'URL', 'Datatype name' ), array( 'serialize_supported' => true ) ); $this->MaxLenValidator = new eZIntegerValidator(); } diff --git a/kernel/classes/datatypes/ezuser/ezforgotpassword.php b/kernel/classes/datatypes/ezuser/ezforgotpassword.php index e7bc78a9b8d..e77468c9149 100644 --- a/kernel/classes/datatypes/ezuser/ezforgotpassword.php +++ b/kernel/classes/datatypes/ezuser/ezforgotpassword.php @@ -17,14 +17,6 @@ class eZForgotPassword extends eZPersistentObject { - /*! - Constructor - */ - function eZForgotPassword( $row = array() ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/datatypes/ezuser/ezldapuser.php b/kernel/classes/datatypes/ezuser/ezldapuser.php index 96cc54c96a6..aa4253a041d 100644 --- a/kernel/classes/datatypes/ezuser/ezldapuser.php +++ b/kernel/classes/datatypes/ezuser/ezldapuser.php @@ -16,13 +16,6 @@ */ class eZLDAPUser extends eZUser { - /*! - Constructor - */ - function eZLDAPUser() - { - } - /*! \static Logs in the user if applied username and password is diff --git a/kernel/classes/datatypes/ezuser/eztextfileuser.php b/kernel/classes/datatypes/ezuser/eztextfileuser.php index bc2956f65d0..2f132e41b65 100644 --- a/kernel/classes/datatypes/ezuser/eztextfileuser.php +++ b/kernel/classes/datatypes/ezuser/eztextfileuser.php @@ -25,10 +25,7 @@ class eZTextFileUser extends eZUser { - /*! - Constructor - */ - function eZTextFileUser() + public function __construct() { } diff --git a/kernel/classes/datatypes/ezuser/ezuser.php b/kernel/classes/datatypes/ezuser/ezuser.php index e4f5db9d5eb..318f2e0794d 100644 --- a/kernel/classes/datatypes/ezuser/ezuser.php +++ b/kernel/classes/datatypes/ezuser/ezuser.php @@ -52,9 +52,9 @@ class eZUser extends eZPersistentObject protected static $anonymousId = null; - function eZUser( $row = array() ) + public function __construct( $row = array() ) { - $this->eZPersistentObject( $row ); + parent::__construct( $row ); $this->OriginalPassword = false; $this->OriginalPasswordConfirm = false; } @@ -1175,7 +1175,7 @@ static function instance( $id = false ) $userId = $currentUser->attribute( 'contentobject_id' ); $userInfo = array(); - $userInfo[$userId] = array( + $userInfo[$userId] = array( 'contentobject_id' => $userId, 'login' => $currentUser->attribute( 'login' ), 'email' => $currentUser->attribute( 'email' ), @@ -1195,7 +1195,7 @@ static function instance( $id = false ) { eZDebug::writeError( "Undefined ssoHandler class: $className", __METHOD__ ); } - } + } } } diff --git a/kernel/classes/datatypes/ezuser/ezuseraccountkey.php b/kernel/classes/datatypes/ezuser/ezuseraccountkey.php index 3e254e2d5d3..74774e8ab0b 100644 --- a/kernel/classes/datatypes/ezuser/ezuseraccountkey.php +++ b/kernel/classes/datatypes/ezuser/ezuseraccountkey.php @@ -17,14 +17,6 @@ class eZUserAccountKey extends eZPersistentObject { - /*! - Constructor - */ - function eZUserAccountKey( $row = array() ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'id' => array( 'name' => 'ID', diff --git a/kernel/classes/datatypes/ezuser/ezuserloginhandler.php b/kernel/classes/datatypes/ezuser/ezuserloginhandler.php index 2c674cf176f..c0cf7ae0839 100644 --- a/kernel/classes/datatypes/ezuser/ezuserloginhandler.php +++ b/kernel/classes/datatypes/ezuser/ezuserloginhandler.php @@ -30,13 +30,6 @@ class eZUserLoginHandler const STEP_CHECK_USER = 3; const STEP_LOGIN_USER = 4; - /*! - Constructor - */ - function eZUserLoginHandler() - { - } - /*! \static Clean up session variables used by the login procedure. diff --git a/kernel/classes/datatypes/ezuser/ezusersetting.php b/kernel/classes/datatypes/ezuser/ezusersetting.php index f70fad234f0..82a6355f552 100644 --- a/kernel/classes/datatypes/ezuser/ezusersetting.php +++ b/kernel/classes/datatypes/ezuser/ezusersetting.php @@ -16,11 +16,6 @@ class eZUserSetting extends eZPersistentObject { - function eZUserSetting( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { static $definition = array( 'fields' => array( 'user_id' => array( 'name' => 'UserID', diff --git a/kernel/classes/datatypes/ezuser/ezusertype.php b/kernel/classes/datatypes/ezuser/ezusertype.php index f39b1598bb6..04292d939a0 100644 --- a/kernel/classes/datatypes/ezuser/ezusertype.php +++ b/kernel/classes/datatypes/ezuser/ezusertype.php @@ -19,9 +19,9 @@ class eZUserType extends eZDataType { const DATA_TYPE_STRING = "ezuser"; - function eZUserType( ) + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "User account", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "User account", 'Datatype name' ), array( 'translation_allowed' => false, 'serialize_supported' => true ) ); } diff --git a/kernel/classes/datatypes/ezxmltext/ezxmlinputhandler.php b/kernel/classes/datatypes/ezxmltext/ezxmlinputhandler.php index f9aa3a746d7..49f23cbbb20 100644 --- a/kernel/classes/datatypes/ezxmltext/ezxmlinputhandler.php +++ b/kernel/classes/datatypes/ezxmltext/ezxmlinputhandler.php @@ -17,10 +17,14 @@ class eZXMLInputHandler { - /*! - Constructor - */ - function eZXMLInputHandler( $xmlData, $aliasedType, $contentObjectAttribute ) + /** + * Constructor + * + * @param string $xmlData + * @param string $aliasedType + * @param eZContentObjectAttribute $contentObjectAttribute + */ + public function __construct( $xmlData, $aliasedType, $contentObjectAttribute ) { $this->XMLData = preg_replace( '/[^\x{0009}\x{000a}\x{000d}\x{0020}-\x{D7FF}\x{E000}-\x{FFFD}]+/u', '', $xmlData, -1, $count ); if ( $count > 0 ) diff --git a/kernel/classes/datatypes/ezxmltext/ezxmlinputparser.php b/kernel/classes/datatypes/ezxmltext/ezxmlinputparser.php index dac23d9896b..72aa25e4c47 100644 --- a/kernel/classes/datatypes/ezxmltext/ezxmlinputparser.php +++ b/kernel/classes/datatypes/ezxmltext/ezxmlinputparser.php @@ -117,7 +117,7 @@ function tagNameHandler( $tagName, &$attributes ) \param $detectErrorLevel Determines types of errors that will be detected and added to error log ($Messages). */ - function eZXMLInputParser( $validateErrorLevel = self::ERROR_NONE, $detectErrorLevel = self::ERROR_NONE, $parseLineBreaks = false, + public function __construct( $validateErrorLevel = self::ERROR_NONE, $detectErrorLevel = self::ERROR_NONE, $parseLineBreaks = false, $removeDefaultAttrs = false ) { // Back-compatibility fixes: diff --git a/kernel/classes/datatypes/ezxmltext/ezxmloutputhandler.php b/kernel/classes/datatypes/ezxmltext/ezxmloutputhandler.php index 1ed1d435d1e..d754dfbddb9 100644 --- a/kernel/classes/datatypes/ezxmltext/ezxmloutputhandler.php +++ b/kernel/classes/datatypes/ezxmltext/ezxmloutputhandler.php @@ -18,10 +18,14 @@ // if ( !class_exists( 'eZXMLSchema' ) ) class eZXMLOutputHandler { - /*! - Constructor - */ - function eZXMLOutputHandler( $xmlData, $aliasedType, $contentObjectAttribute = null ) + /** + * Constructor + * + * @param string $xmlData + * @param string $aliasedType + * @param eZContentObjectAttribute|null $contentObjectAttribute + */ + public function __construct( $xmlData, $aliasedType, $contentObjectAttribute = null ) { $this->XMLData = $xmlData; $this->AliasedHandler = null; diff --git a/kernel/classes/datatypes/ezxmltext/ezxmlschema.php b/kernel/classes/datatypes/ezxmltext/ezxmlschema.php index 440b44d9f61..d9197dd0dc0 100644 --- a/kernel/classes/datatypes/ezxmltext/ezxmlschema.php +++ b/kernel/classes/datatypes/ezxmltext/ezxmlschema.php @@ -139,7 +139,10 @@ class eZXMLSchema 'attributes' => false ) ); - function eZXMLSchema() + /** + * Constructor + */ + public function __construct() { $ini = eZINI::instance( 'content.ini' ); diff --git a/kernel/classes/datatypes/ezxmltext/ezxmltext.php b/kernel/classes/datatypes/ezxmltext/ezxmltext.php index d5b58ffe3f7..46f1b28d7bd 100644 --- a/kernel/classes/datatypes/ezxmltext/ezxmltext.php +++ b/kernel/classes/datatypes/ezxmltext/ezxmltext.php @@ -17,7 +17,13 @@ class eZXMLText { - function eZXMLText( $xmlData, $contentObjectAttribute ) + /** + * Constructor + * + * @param string $xmlData + * @param eZContentObjectAttribute $contentObjectAttribute + */ + public function __construct( $xmlData, $contentObjectAttribute ) { $this->XMLData = $xmlData; $this->ContentObjectAttribute = $contentObjectAttribute; diff --git a/kernel/classes/datatypes/ezxmltext/ezxmltexttype.php b/kernel/classes/datatypes/ezxmltext/ezxmltexttype.php index c88ddb85583..f81712097e6 100644 --- a/kernel/classes/datatypes/ezxmltext/ezxmltexttype.php +++ b/kernel/classes/datatypes/ezxmltext/ezxmltexttype.php @@ -95,9 +95,9 @@ class eZXMLTextType extends eZDataType // timestamp is less than this it needs to be upgraded until it is correct. const VERSION_TIMESTAMP = 1045487555; // AS 21-09-2007: should be the same as VERSION_30_TIMESTAMP - function eZXMLTextType() + public function __construct() { - $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "XML block", 'Datatype name' ), + parent::__construct( self::DATA_TYPE_STRING, ezpI18n::tr( 'kernel/classes/datatypes', "XML block", 'Datatype name' ), array( 'serialize_supported' => true ) ); $this->deletedStoredObjectAttribute = array(); } diff --git a/kernel/classes/datatypes/ezxmltext/handlers/input/ezsimplifiedxmlinput.php b/kernel/classes/datatypes/ezxmltext/handlers/input/ezsimplifiedxmlinput.php index daa82b9f444..6fd59132490 100644 --- a/kernel/classes/datatypes/ezxmltext/handlers/input/ezsimplifiedxmlinput.php +++ b/kernel/classes/datatypes/ezxmltext/handlers/input/ezsimplifiedxmlinput.php @@ -10,9 +10,9 @@ class eZSimplifiedXMLInput extends eZXMLInputHandler { - function eZSimplifiedXMLInput( $xmlData, $aliasedType, $contentObjectAttribute ) + public function __construct( $xmlData, $aliasedType, $contentObjectAttribute ) { - $this->eZXMLInputHandler( $xmlData, $aliasedType, $contentObjectAttribute ); + parent::__construct( $xmlData, $aliasedType, $contentObjectAttribute ); $this->IsInputValid = true; $this->ContentObjectAttribute = $contentObjectAttribute; diff --git a/kernel/classes/datatypes/ezxmltext/handlers/input/ezsimplifiedxmlinputparser.php b/kernel/classes/datatypes/ezxmltext/handlers/input/ezsimplifiedxmlinputparser.php index d7cb5e82a9c..473dfaa6fcf 100644 --- a/kernel/classes/datatypes/ezxmltext/handlers/input/ezsimplifiedxmlinputparser.php +++ b/kernel/classes/datatypes/ezxmltext/handlers/input/ezsimplifiedxmlinputparser.php @@ -107,11 +107,11 @@ class eZSimplifiedXMLInputParser extends eZXMLInputParser '#text' => array( 'structHandler' => 'structHandlerText' ) ); - function eZSimplifiedXMLInputParser( $contentObjectID, $validateErrorLevel = eZXMLInputParser::ERROR_ALL, $detectErrorLevel = eZXMLInputParser::ERROR_ALL, + public function __construct( $contentObjectID, $validateErrorLevel = eZXMLInputParser::ERROR_ALL, $detectErrorLevel = eZXMLInputParser::ERROR_ALL, $parseLineBreaks = false, $removeDefaultAttrs = false ) { $this->contentObjectID = $contentObjectID; - $this->eZXMLInputParser( $validateErrorLevel, $detectErrorLevel, $parseLineBreaks, $removeDefaultAttrs ); + parent::__construct( $validateErrorLevel, $detectErrorLevel, $parseLineBreaks, $removeDefaultAttrs ); } /* diff --git a/kernel/classes/datatypes/ezxmltext/handlers/output/ezpdfxmloutput.php b/kernel/classes/datatypes/ezxmltext/handlers/output/ezpdfxmloutput.php index 1679231a2f1..bb62312ad00 100644 --- a/kernel/classes/datatypes/ezxmltext/handlers/output/ezpdfxmloutput.php +++ b/kernel/classes/datatypes/ezxmltext/handlers/output/ezpdfxmloutput.php @@ -11,9 +11,9 @@ class eZPDFXMLOutput extends eZXHTMLXMLOutput { - function eZPDFXMLOutput( $xmlData, $aliasedType, $contentObjectAttribute = null ) + public function __construct( $xmlData, $aliasedType, $contentObjectAttribute = null ) { - $this->eZXHTMLXMLOutput( $xmlData, $aliasedType, $contentObjectAttribute ); + parent::__construct( $xmlData, $aliasedType, $contentObjectAttribute ); $this->OutputTags['table']['initHandler'] = 'initHandlerTable'; $this->OutputTags['li']['initHandler'] = 'initHandlerLi'; diff --git a/kernel/classes/datatypes/ezxmltext/handlers/output/ezplainxmloutput.php b/kernel/classes/datatypes/ezxmltext/handlers/output/ezplainxmloutput.php index 08ab4e279f5..c684b60d40d 100644 --- a/kernel/classes/datatypes/ezxmltext/handlers/output/ezplainxmloutput.php +++ b/kernel/classes/datatypes/ezxmltext/handlers/output/ezplainxmloutput.php @@ -10,11 +10,6 @@ class eZPlainXMLOutput extends eZXMLOutputHandler { - function eZPlainXMLOutput( $xmlData, $aliasedType ) - { - $this->eZXMLOutputHandler( $xmlData, $aliasedType ); - } - function &outputText() { $retText = "
" . htmlspecialchars( $this->xmlData() ) . "
"; diff --git a/kernel/classes/datatypes/ezxmltext/handlers/output/ezxhtmlxmloutput.php b/kernel/classes/datatypes/ezxmltext/handlers/output/ezxhtmlxmloutput.php index 61287247ccd..2ca94b0d48b 100644 --- a/kernel/classes/datatypes/ezxmltext/handlers/output/ezxhtmlxmloutput.php +++ b/kernel/classes/datatypes/ezxmltext/handlers/output/ezxhtmlxmloutput.php @@ -125,9 +125,9 @@ class eZXHTMLXMLOutput extends eZXMLOutputHandler 'renderHandler' => 'renderText' ) ); - function eZXHTMLXMLOutput( $xmlData, $aliasedType, $contentObjectAttribute = null ) + public function __construct( $xmlData, $aliasedType, $contentObjectAttribute = null ) { - $this->eZXMLOutputHandler( $xmlData, $aliasedType, $contentObjectAttribute ); + parent::__construct( $xmlData, $aliasedType, $contentObjectAttribute ); $ini = eZINI::instance('ezxml.ini'); if ( $ini->variable( 'ezxhtml', 'RenderParagraphInTableCells' ) == 'disabled' ) diff --git a/kernel/classes/ezaudit.php b/kernel/classes/ezaudit.php index 2cf5f6e6666..8d850b4fcb8 100644 --- a/kernel/classes/ezaudit.php +++ b/kernel/classes/ezaudit.php @@ -12,13 +12,6 @@ class eZAudit { const DEFAULT_LOG_DIR = 'log/audit'; - /** - * Creates a new audit object. - */ - function eZAudit() - { - } - /** * Returns an associative array of all names of audit and the log files used by this class, * Will be fetched from ini settings. diff --git a/kernel/classes/ezbasket.php b/kernel/classes/ezbasket.php index f9de0a985b2..b986ef5c02c 100644 --- a/kernel/classes/ezbasket.php +++ b/kernel/classes/ezbasket.php @@ -23,11 +23,6 @@ class eZBasket extends eZPersistentObject */ const ITEM_LIMIT = 3000; - function eZBasket( $row ) - { - $this->eZPersistentObject( $row ); - } - /*! \return the persistent object definition for the eZCard class. */ diff --git a/kernel/classes/ezbinaryfilehandler.php b/kernel/classes/ezbinaryfilehandler.php index 63cead626e2..27e3c0725b0 100644 --- a/kernel/classes/ezbinaryfilehandler.php +++ b/kernel/classes/ezbinaryfilehandler.php @@ -32,7 +32,14 @@ class eZBinaryFileHandler const RESULT_OK = 1; const RESULT_UNAVAILABLE = 2; - function eZBinaryFileHandler( $identifier, $name, $handleType ) + /** + * Constructor + * + * @param string $identifier + * @param string $name + * @param string $handleType + */ + public function __construct( $identifier, $name, $handleType ) { $this->Info = array(); $this->Info['identifier'] = $identifier; diff --git a/kernel/classes/ezclusterfilefailure.php b/kernel/classes/ezclusterfilefailure.php index d91c002e690..ac28be4f72d 100644 --- a/kernel/classes/ezclusterfilefailure.php +++ b/kernel/classes/ezclusterfilefailure.php @@ -22,11 +22,18 @@ class eZClusterFileFailure FILE_CONTENT_GENERATE = 2, FILE_RETRIEVAL_FAILED = 3; - // Error codes: - // 1 - file expired - // 2 - file contents must be manually generated - // 3 - Failed to retrieve file from DFS - function eZClusterFileFailure( $errno, $message = false ) + /** + * Constructor + * + * Error codes: + * 1 - file expired + * 2 - file contents must be manually generated + * 3 - Failed to retrieve file from DFS + * + * @param int $errno + * @param bool|string $message + */ + public function __construct( $errno, $message = false ) { $this->Errno = $errno; $this->Message = $message; diff --git a/kernel/classes/ezcodetemplate.php b/kernel/classes/ezcodetemplate.php index b0141202934..3be5b219552 100644 --- a/kernel/classes/ezcodetemplate.php +++ b/kernel/classes/ezcodetemplate.php @@ -25,10 +25,10 @@ class eZCodeTemplate /// Code file was updated, but no new elements has been added const STATUS_NO_CHANGE = 2; - /*! - Constructor - */ - function eZCodeTemplate() + /** + * + */ + public function __construct() { $ini = eZINI::instance( 'codetemplate.ini' ); $this->Templates = array(); diff --git a/kernel/classes/ezcollaborationgroup.php b/kernel/classes/ezcollaborationgroup.php index 5932d04b013..b43c58c5ace 100644 --- a/kernel/classes/ezcollaborationgroup.php +++ b/kernel/classes/ezcollaborationgroup.php @@ -16,14 +16,6 @@ class eZCollaborationGroup extends eZPersistentObject { - /*! - Constructor - */ - function eZCollaborationGroup( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'id' => array( 'name' => 'ID', diff --git a/kernel/classes/ezcollaborationitem.php b/kernel/classes/ezcollaborationitem.php index f73a9f288aa..229675ce384 100644 --- a/kernel/classes/ezcollaborationitem.php +++ b/kernel/classes/ezcollaborationitem.php @@ -20,14 +20,6 @@ class eZCollaborationItem extends eZPersistentObject const STATUS_INACTIVE = 2; const STATUS_ARCHIVE = 3; - /*! - Constructor - */ - function eZCollaborationItem( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'id' => array( 'name' => 'ID', diff --git a/kernel/classes/ezcollaborationitemgrouplink.php b/kernel/classes/ezcollaborationitemgrouplink.php index 951af5cc958..400a0682246 100644 --- a/kernel/classes/ezcollaborationitemgrouplink.php +++ b/kernel/classes/ezcollaborationitemgrouplink.php @@ -16,14 +16,6 @@ class eZCollaborationItemGroupLink extends eZPersistentObject { - /*! - Constructor - */ - function eZCollaborationItemGroupLink( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'collaboration_id' => array( 'name' => 'CollaborationID', diff --git a/kernel/classes/ezcollaborationitemhandler.php b/kernel/classes/ezcollaborationitemhandler.php index c2454d92d9b..2aef7441bed 100644 --- a/kernel/classes/ezcollaborationitemhandler.php +++ b/kernel/classes/ezcollaborationitemhandler.php @@ -24,10 +24,16 @@ class eZCollaborationItemHandler const NOTIFICATION_COLLECTION_PER_PARTICIPATION_ROLE = 3; /*! - Initializes the handler with identifier and name. - Optional parameters can be placed in \a $parameters. + */ - function eZCollaborationItemHandler( $typeIdentifier, $typeName, $parameters = array() ) + /** + * Initializes the handler with identifier and name and optional parameters + * + * @param string $typeIdentifier + * @param string $typeName + * @param array $parameters + */ + public function __construct( $typeIdentifier, $typeName, $parameters = array() ) { $parameters = array_merge( array( 'use-messages' => false, 'type-class-list' => array(), diff --git a/kernel/classes/ezcollaborationitemmessagelink.php b/kernel/classes/ezcollaborationitemmessagelink.php index 8c75f171d5e..9d1b7c37a23 100644 --- a/kernel/classes/ezcollaborationitemmessagelink.php +++ b/kernel/classes/ezcollaborationitemmessagelink.php @@ -16,14 +16,6 @@ class eZCollaborationItemMessageLink extends eZPersistentObject { - /*! - Constructor - */ - function eZCollaborationItemMessageLink( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'id' => array( 'name' => 'ID', diff --git a/kernel/classes/ezcollaborationitemparticipantlink.php b/kernel/classes/ezcollaborationitemparticipantlink.php index 5d926a0f20c..9c1c6d7987c 100644 --- a/kernel/classes/ezcollaborationitemparticipantlink.php +++ b/kernel/classes/ezcollaborationitemparticipantlink.php @@ -31,14 +31,6 @@ class eZCollaborationItemParticipantLink extends eZPersistentObject // Everything from 1024 and above is considered custom and is specific per collaboration handler. const ROLE_CUSTOM = 1024; - /*! - Constructor - */ - function eZCollaborationItemParticipantLink( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'collaboration_id' => array( 'name' => 'CollaborationID', diff --git a/kernel/classes/ezcollaborationitemstatus.php b/kernel/classes/ezcollaborationitemstatus.php index 6a6c25ade63..3bf74e691f7 100644 --- a/kernel/classes/ezcollaborationitemstatus.php +++ b/kernel/classes/ezcollaborationitemstatus.php @@ -16,14 +16,6 @@ class eZCollaborationItemStatus extends eZPersistentObject { - /*! - Constructor - */ - function eZCollaborationItemStatus( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'collaboration_id' => array( 'name' => 'CollaborationID', diff --git a/kernel/classes/ezcollaborationprofile.php b/kernel/classes/ezcollaborationprofile.php index 2c2a204a663..e258848e3a8 100644 --- a/kernel/classes/ezcollaborationprofile.php +++ b/kernel/classes/ezcollaborationprofile.php @@ -16,14 +16,6 @@ class eZCollaborationProfile extends eZPersistentObject { - /*! - Constructor - */ - function eZCollaborationProfile( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'id' => array( 'name' => 'ID', diff --git a/kernel/classes/ezcollaborationsimplemessage.php b/kernel/classes/ezcollaborationsimplemessage.php index 3bf5353dc11..a3fe29e5d99 100644 --- a/kernel/classes/ezcollaborationsimplemessage.php +++ b/kernel/classes/ezcollaborationsimplemessage.php @@ -16,14 +16,6 @@ class eZCollaborationSimpleMessage extends eZPersistentObject { - /*! - Constructor - */ - function eZCollaborationSimpleMessage( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'id' => array( 'name' => 'ID', diff --git a/kernel/classes/ezcollaborationviewhandler.php b/kernel/classes/ezcollaborationviewhandler.php index a2fb498ec0c..8fcb4745876 100644 --- a/kernel/classes/ezcollaborationviewhandler.php +++ b/kernel/classes/ezcollaborationviewhandler.php @@ -19,10 +19,13 @@ class eZCollaborationViewHandler const TYPE_STANDARD = 1; const TYPE_GROUP = 2; - /*! - Initializes the view mode. - */ - function eZCollaborationViewHandler( $viewMode, $viewType ) + /** + * Initializes the view mode. + * + * @param string $viewMode + * @param int $viewType + */ + public function __construct( $viewMode, $viewType ) { $this->ViewMode = $viewMode; $this->ViewType = $viewType; diff --git a/kernel/classes/ezconfirmorderhandler.php b/kernel/classes/ezconfirmorderhandler.php index e3e0d1e55c1..12c483f21cd 100644 --- a/kernel/classes/ezconfirmorderhandler.php +++ b/kernel/classes/ezconfirmorderhandler.php @@ -16,13 +16,6 @@ class eZConfirmOrderHandler { - /*! - Constructor - */ - function eZConfirmOrderHandler() - { - } - /** * Returns a shared instance of the eZConfirmOrderHandler class * as defined in shopaccount.ini[HandlerSettings]Repositories diff --git a/kernel/classes/ezcontentbrowse.php b/kernel/classes/ezcontentbrowse.php index 7b3658039cc..ffa7799c03a 100644 --- a/kernel/classes/ezcontentbrowse.php +++ b/kernel/classes/ezcontentbrowse.php @@ -31,11 +31,13 @@ class eZContentBrowse { - /*! - Initializes the object with the session data if they are found. - If \a $params is supplied it used instead. - */ - function eZContentBrowse( $params = array() ) + /** + * Initializes the object with the session data if they are found. + * If $params is supplied, it uses them instead + * + * @param array $params + */ + function __construct( $params = array() ) { $http = eZHTTPTool::instance(); if ( !$params && $http->hasSessionVariable( 'BrowseParameters' ) ) diff --git a/kernel/classes/ezcontentbrowsebookmark.php b/kernel/classes/ezcontentbrowsebookmark.php index 6e6de7b0bbc..bd89fc0f1e7 100644 --- a/kernel/classes/ezcontentbrowsebookmark.php +++ b/kernel/classes/ezcontentbrowsebookmark.php @@ -33,11 +33,6 @@ class eZContentBrowseBookmark extends eZPersistentObject { - function eZContentBrowseBookmark( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezcontentbrowserecent.php b/kernel/classes/ezcontentbrowserecent.php index 1ddb6f4aeb3..5ef867d57dd 100644 --- a/kernel/classes/ezcontentbrowserecent.php +++ b/kernel/classes/ezcontentbrowserecent.php @@ -32,11 +32,6 @@ */ class eZContentBrowseRecent extends eZPersistentObject { - function eZContentBrowseRecent( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezcontentclass.php b/kernel/classes/ezcontentclass.php index 593291ee6e6..9d8aa49e773 100644 --- a/kernel/classes/ezcontentclass.php +++ b/kernel/classes/ezcontentclass.php @@ -28,11 +28,11 @@ class eZContentClass extends eZPersistentObject */ const CONTENT_OBJECT_NAME_MAX_LENGTH = 255; - function eZContentClass( $row ) + public function __construct( $row ) { if ( is_array( $row ) ) { - $this->eZPersistentObject( $row ); + parent::__construct( $row ); $this->VersionCount = false; $this->InGroups = null; $this->AllGroups = null; diff --git a/kernel/classes/ezcontentclassattribute.php b/kernel/classes/ezcontentclassattribute.php index 7a9f0b0b5e6..8d837c7f452 100644 --- a/kernel/classes/ezcontentclassattribute.php +++ b/kernel/classes/ezcontentclassattribute.php @@ -17,9 +17,9 @@ class eZContentClassAttribute extends eZPersistentObject { - function eZContentClassAttribute( $row ) + public function __construct( $row ) { - $this->eZPersistentObject( $row ); + parent::__construct($row); $this->Content = null; $this->DisplayInfo = null; diff --git a/kernel/classes/ezcontentclassclassgroup.php b/kernel/classes/ezcontentclassclassgroup.php index 2f5b6583239..357d0695d42 100644 --- a/kernel/classes/ezcontentclassclassgroup.php +++ b/kernel/classes/ezcontentclassclassgroup.php @@ -16,11 +16,6 @@ class eZContentClassClassGroup extends eZPersistentObject { - function eZContentClassClassGroup( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "contentclass_id" => array( 'name' => "ContentClassID", diff --git a/kernel/classes/ezcontentclassgroup.php b/kernel/classes/ezcontentclassgroup.php index 4e47bc92574..efec0cc0e9c 100644 --- a/kernel/classes/ezcontentclassgroup.php +++ b/kernel/classes/ezcontentclassgroup.php @@ -16,11 +16,6 @@ class eZContentClassGroup extends eZPersistentObject { - function eZContentClassGroup( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezcontentclassname.php b/kernel/classes/ezcontentclassname.php index 07536965a83..1455d89c445 100644 --- a/kernel/classes/ezcontentclassname.php +++ b/kernel/classes/ezcontentclassname.php @@ -10,11 +10,6 @@ class eZContentClassName extends eZPersistentObject { - function eZContentClassName( $row ) - { - eZPersistentObject::eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'contentclass_id' => array( 'name' => 'ContentClassID', diff --git a/kernel/classes/ezcontentclassnamelist.php b/kernel/classes/ezcontentclassnamelist.php index 7fec1d4921f..ec5340d524e 100644 --- a/kernel/classes/ezcontentclassnamelist.php +++ b/kernel/classes/ezcontentclassnamelist.php @@ -10,9 +10,9 @@ class eZContentClassNameList extends eZSerializedObjectNameList { - function eZContentClassNameList( $serializedNameList = false ) + public function __construct( $serializedNameList = false ) { - eZSerializedObjectNameList::eZSerializedObjectNameList( $serializedNameList ); + parent::__construct( $serializedNameList ); } function create( $serializedNamesString = false ) diff --git a/kernel/classes/ezcontentlanguage.php b/kernel/classes/ezcontentlanguage.php index b230851e826..a0e347ba9c4 100644 --- a/kernel/classes/ezcontentlanguage.php +++ b/kernel/classes/ezcontentlanguage.php @@ -10,16 +10,6 @@ class eZContentLanguage extends eZPersistentObject { - /** - * Constructor. - * - * \param row Parameter passed to the constructor of eZPersistentObject. - */ - function eZContentLanguage( $row = array() ) - { - $this->eZPersistentObject( $row ); - } - /** * Persistent object's definition. */ diff --git a/kernel/classes/ezcontentobject.php b/kernel/classes/ezcontentobject.php index c762779f607..61082367654 100644 --- a/kernel/classes/ezcontentobject.php +++ b/kernel/classes/ezcontentobject.php @@ -45,9 +45,9 @@ class eZContentObject extends eZPersistentObject * * @param int|array $row */ - function eZContentObject( $row ) + public function __construct( $row ) { - $this->eZPersistentObject( $row ); + parent::__construct( $row ); $this->ClassIdentifier = false; if ( isset( $row['contentclass_identifier'] ) ) $this->ClassIdentifier = $row['contentclass_identifier']; diff --git a/kernel/classes/ezcontentobjectassignmenthandler.php b/kernel/classes/ezcontentobjectassignmenthandler.php index 7307f9bf078..8b7f6c1442c 100644 --- a/kernel/classes/ezcontentobjectassignmenthandler.php +++ b/kernel/classes/ezcontentobjectassignmenthandler.php @@ -16,10 +16,12 @@ class eZContentObjectAssignmentHandler { - /*! - Constructor - */ - function eZContentObjectAssignmentHandler( $contentObject, $contentVersion ) + /** + * Constructor + * @param eZContentObject $contentObject + * @param eZContentObjectVersion $contentVersion + */ + public function __construct( $contentObject, $contentVersion ) { $this->CurrentObject = $contentObject; $this->CurrentVersion = $contentVersion; @@ -214,7 +216,14 @@ function setupAssignments( $parameters ) } /// \privatesection + /** + * @var eZContentObject + */ public $CurrentObject; + + /** + * @var eZContentObjectVersion + */ public $ContentVersion; } diff --git a/kernel/classes/ezcontentobjectattribute.php b/kernel/classes/ezcontentobjectattribute.php index 1357a5d3809..64a6b4efa7e 100644 --- a/kernel/classes/ezcontentobjectattribute.php +++ b/kernel/classes/ezcontentobjectattribute.php @@ -18,7 +18,7 @@ class eZContentObjectAttribute extends eZPersistentObject { - function eZContentObjectAttribute( $row ) + public function __construct( $row ) { $this->Content = null; $this->DisplayInfo = null; @@ -31,7 +31,7 @@ function eZContentObjectAttribute( $row ) $this->HasValidationError = false; $this->DataTypeCustom = null; $this->DataTypeString = null; - $this->eZPersistentObject( $row ); + parent::__construct( $row ); } static function definition() diff --git a/kernel/classes/ezcontentobjectedithandler.php b/kernel/classes/ezcontentobjectedithandler.php index 0526605ee09..850f4983a2e 100644 --- a/kernel/classes/ezcontentobjectedithandler.php +++ b/kernel/classes/ezcontentobjectedithandler.php @@ -17,13 +17,6 @@ class eZContentObjectEditHandler { - /*! - Constructor - */ - function eZContentObjectEditHandler() - { - } - /*! Override this function in the extension to handle edit input parameters. */ diff --git a/kernel/classes/ezcontentobjecttranslation.php b/kernel/classes/ezcontentobjecttranslation.php index e9c6f13acf0..191e430aefc 100644 --- a/kernel/classes/ezcontentobjecttranslation.php +++ b/kernel/classes/ezcontentobjecttranslation.php @@ -18,7 +18,14 @@ class eZContentObjectTranslation { - function eZContentObjectTranslation( $contentObjectID, $version, $languageCode ) + /** + * Constructor + * + * @param int $contentObjectID + * @param int $version + * @param string $languageCode + */ + public function __construct( $contentObjectID, $version, $languageCode ) { $this->ContentObjectID = $contentObjectID; $this->Version = $version; diff --git a/kernel/classes/ezcontentobjecttrashnode.php b/kernel/classes/ezcontentobjecttrashnode.php index 7f2a9121010..cde292326e8 100644 --- a/kernel/classes/ezcontentobjecttrashnode.php +++ b/kernel/classes/ezcontentobjecttrashnode.php @@ -13,20 +13,6 @@ */ class eZContentObjectTrashNode extends eZContentObjectTreeNode { - /** - * Initializes the object with the $row. - * - * It will try to set each field taken from the database row. Calls fill - * to do the job. If $row is an integer, it will try to fetch it from the - * database using it as the unique ID. - * - * @param int|array $row - */ - function eZContentObjectTrashNode( $row = array() ) - { - $this->eZPersistentObject( $row ); - } - /** * @inheritdoc */ diff --git a/kernel/classes/ezcontentobjecttreenode.php b/kernel/classes/ezcontentobjecttreenode.php index 6aad6d306b8..e344f156260 100644 --- a/kernel/classes/ezcontentobjecttreenode.php +++ b/kernel/classes/ezcontentobjecttreenode.php @@ -32,20 +32,6 @@ class eZContentObjectTreeNode extends eZPersistentObject const SORT_ORDER_DESC = 0; const SORT_ORDER_ASC = 1; - /** - * Initializes the object with the $row. - * - * It will try to set each field taken from the database row. Calls fill - * to do the job. If $row is an integer, it will try to fetch it from the - * database using it as the unique ID. - * - * @param int|array $row - */ - function eZContentObjectTreeNode( $row = array() ) - { - $this->eZPersistentObject( $row ); - } - /** * @inheritdoc */ diff --git a/kernel/classes/ezcontentobjecttreenodeoperations.php b/kernel/classes/ezcontentobjecttreenodeoperations.php index 78fe1973b9b..100ed613d93 100644 --- a/kernel/classes/ezcontentobjecttreenodeoperations.php +++ b/kernel/classes/ezcontentobjecttreenodeoperations.php @@ -20,13 +20,6 @@ class eZContentObjectTreeNodeOperations { - /*! - Constructor - */ - function eZContentObjectTreeNodeOperations() - { - } - /*! \static A wrapper for eZContentObjectTreeNode's 'move' operation. diff --git a/kernel/classes/ezcontentobjectversion.php b/kernel/classes/ezcontentobjectversion.php index 37e20700fc3..4b4e3bedfbd 100755 --- a/kernel/classes/ezcontentobjectversion.php +++ b/kernel/classes/ezcontentobjectversion.php @@ -27,14 +27,14 @@ class eZContentObjectVersion extends eZPersistentObject const STATUS_REPEAT = 6; const STATUS_QUEUED = 7; - function eZContentObjectVersion( $row=array() ) + public function __construct( $row = array() ) { $this->ContentObjectAttributeArray = false; $this->DataMap = false; $this->TempNode = null; $this->VersionName = null; $this->VersionNameCache = array(); - $this->eZPersistentObject( $row ); + parent::__construct( $row ); } static function definition() diff --git a/kernel/classes/ezcontentupload.php b/kernel/classes/ezcontentupload.php index b309026c236..019aeced10f 100644 --- a/kernel/classes/ezcontentupload.php +++ b/kernel/classes/ezcontentupload.php @@ -50,11 +50,13 @@ class eZContentUpload const STATUS_PERMISSION_DENIED = 1; - /*! - Initializes the object with the session data if they are found. - If \a $params is supplied it used instead. - */ - function eZContentUpload( $params = false ) + /** + * Initializes the object with the session data if they are found. + * If $params is supplied it is used instead. + * + * @param bool $params + */ + public function __construct( $params = false ) { $http = eZHTTPTool::instance(); if ( !$params && $http->hasSessionVariable( 'ContentUploadParameters' ) ) diff --git a/kernel/classes/ezcontentuploadhandler.php b/kernel/classes/ezcontentuploadhandler.php index 1932bed6e25..15bc9f6a680 100644 --- a/kernel/classes/ezcontentuploadhandler.php +++ b/kernel/classes/ezcontentuploadhandler.php @@ -26,10 +26,13 @@ class eZContentUploadHandler { - /*! - Initialises the handler with the name. - */ - function eZContentUploadHandler( $name, $identifier ) + /** + * Initialises the handler with the name. + * + * @param string $name + * @param string $identifier + */ + public function __construct( $name, $identifier ) { $this->Name = $name; $this->Identifier = $identifier; diff --git a/kernel/classes/ezdatatype.php b/kernel/classes/ezdatatype.php index 5ef942c2fa5..b0d10bcba2a 100644 --- a/kernel/classes/ezdatatype.php +++ b/kernel/classes/ezdatatype.php @@ -44,11 +44,14 @@ function. See each function for more details. class eZDataType { - /*! - Initializes the datatype with the string id \a $dataTypeString and - the name \a $name. - */ - function eZDataType( $dataTypeString, $name, $properties = array() ) + /** + * Initializes the datatype with the string id $dataTypeString and the name $name. + * + * @param string $dataTypeString + * @param string $name + * @param array $properties + */ + public function __construct( $dataTypeString, $name, $properties = array() ) { $this->DataTypeString = $dataTypeString; $this->Name = $name; @@ -74,6 +77,18 @@ function eZDataType( $dataTypeString, $name, $properties = array() ) 'object_serialize_map' => $objectSerializeMap ); } + /** + * @deprecated Use eZDataType::__construct() instead + * @param string $dataTypeString + * @param string $name + * @param array $properties + */ + public function eZDataType( $dataTypeString, $name, $properties = array() ) + { + self::__construct( $dataTypeString, $name, $properties ); + + } + /*! \return the template name to use for viewing the attribute. \note Default is to return the datatype string which is OK diff --git a/kernel/classes/ezdiscount.php b/kernel/classes/ezdiscount.php index e3eff69d2c0..51e82499c2e 100644 --- a/kernel/classes/ezdiscount.php +++ b/kernel/classes/ezdiscount.php @@ -10,10 +10,6 @@ class eZDiscount { - function eZDiscount() - { - } - /*! \static params = array( 'contentclass_id' => classID, diff --git a/kernel/classes/ezdiscountrule.php b/kernel/classes/ezdiscountrule.php index 0bb6f24e1a2..8988853601d 100644 --- a/kernel/classes/ezdiscountrule.php +++ b/kernel/classes/ezdiscountrule.php @@ -16,14 +16,6 @@ class eZDiscountRule extends eZPersistentObject { - /*! - Constructor - */ - function eZDiscountRule( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezdiscountsubrule.php b/kernel/classes/ezdiscountsubrule.php index 1278d1dc1c8..6cd7507f045 100644 --- a/kernel/classes/ezdiscountsubrule.php +++ b/kernel/classes/ezdiscountsubrule.php @@ -16,14 +16,6 @@ class eZDiscountSubRule extends eZPersistentObject { - /*! - Constructor - */ - function eZDiscountSubRule( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezdiscountsubrulevalue.php b/kernel/classes/ezdiscountsubrulevalue.php index 41e1dc3fb7c..042482ac83c 100644 --- a/kernel/classes/ezdiscountsubrulevalue.php +++ b/kernel/classes/ezdiscountsubrulevalue.php @@ -15,14 +15,6 @@ */ class eZDiscountSubRuleValue extends eZPersistentObject { - /*! - Constructor - */ - function eZDiscountSubRuleValue( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "discountsubrule_id" => array( 'name' => "DiscountSubRuleID", diff --git a/kernel/classes/ezinformationcollection.php b/kernel/classes/ezinformationcollection.php index 7347ef04c17..7c6ab4dba6a 100644 --- a/kernel/classes/ezinformationcollection.php +++ b/kernel/classes/ezinformationcollection.php @@ -20,11 +20,6 @@ class eZInformationCollection extends eZPersistentObject { - function eZInformationCollection( $row ) - { - $this->eZPersistentObject( $row ); - } - /*! \return the persistent object definition for the eZInformationCollection class. */ diff --git a/kernel/classes/ezinformationcollectionattribute.php b/kernel/classes/ezinformationcollectionattribute.php index 561aef64722..0c4c5913fde 100644 --- a/kernel/classes/ezinformationcollectionattribute.php +++ b/kernel/classes/ezinformationcollectionattribute.php @@ -17,10 +17,10 @@ class eZInformationCollectionAttribute extends eZPersistentObject { - function eZInformationCollectionAttribute( $row ) + public function __construct( $row ) { $this->Content = null; - $this->eZPersistentObject( $row ); + parent::__construct( $row ); } /*! diff --git a/kernel/classes/eznodeassignment.php b/kernel/classes/eznodeassignment.php index fa37e9282c3..40195a7e411 100644 --- a/kernel/classes/eznodeassignment.php +++ b/kernel/classes/eznodeassignment.php @@ -32,14 +32,11 @@ class eZNodeAssignment extends eZPersistentObject const OP_CODE_SET_NOP = 8; const OP_CODE_SET = 9; - /*! - Constructor - */ - function eZNodeAssignment( $row ) + public function __construct( $row ) { $this->TempNode = null; $this->Name = false; - $this->eZPersistentObject( $row ); + parent::__construct( $row ); } static function definition() diff --git a/kernel/classes/ezorder.php b/kernel/classes/ezorder.php index a6151d2bd1c..e1572dbf40a 100644 --- a/kernel/classes/ezorder.php +++ b/kernel/classes/ezorder.php @@ -22,9 +22,9 @@ class eZOrder extends eZPersistentObject const SHOW_ARCHIVED = 1; const SHOW_ALL = 2; - function eZOrder( $row ) + public function __construct( $row ) { - $this->eZPersistentObject( $row ); + parent::__construct( $row ); $this->Status = null; } @@ -372,14 +372,14 @@ static function orderStatistics( $year = false, $month = false ) { $priceExVAT = $price / ( 100 + $vatValue ) * 100; $priceIncVAT = $price; - + } else { $priceExVAT = $price; $priceIncVAT = $price * ( 100 + $vatValue ) / 100; } - + $count = $productItem['item_count']; $realPricePercent = ( 100 - $productItem['discount'] ) / 100; $totalPriceExVAT = round( $count * $priceExVAT * $realPricePercent, 2 ); @@ -401,7 +401,7 @@ static function orderStatistics( $year = false, $month = false ) 'product' => &$contentObjectIDHash[$currentContentObjectID], 'product_info' => $productInfo ); - + // Fetching all ContentObject ids in one query, filling the hash with the corresponding ContentObject foreach ( eZContentObject::fetchList( true, array( "id" => array( array_keys( $contentObjectIDHash ) ) ) ) as $contentObject ) { @@ -803,7 +803,7 @@ function productItems( $asObject = true, array $sorts = null ) $priceExVAT = $price; $priceIncVAT = $price * ( 100 + $vatValue ) / 100; } - + $count = $productItem->attribute( 'item_count' ); $discountPercent = $productItem->attribute( 'discount' ); $realPricePercent = ( 100 - $discountPercent ) / 100; diff --git a/kernel/classes/ezorderitem.php b/kernel/classes/ezorderitem.php index 664993dc9d3..6e2df381fac 100644 --- a/kernel/classes/ezorderitem.php +++ b/kernel/classes/ezorderitem.php @@ -25,11 +25,6 @@ class eZOrderItem extends eZPersistentObject { - function eZOrderItem( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( 'id' => array( 'name' => 'ID', diff --git a/kernel/classes/ezorderstatus.php b/kernel/classes/ezorderstatus.php index 7b7d84594d2..57a9b57aab6 100644 --- a/kernel/classes/ezorderstatus.php +++ b/kernel/classes/ezorderstatus.php @@ -56,11 +56,6 @@ class eZOrderStatus extends eZPersistentObject // All custom order statuses have this value or higher const CUSTOM = 1000; - function eZOrderStatus( $row ) - { - $this->eZPersistentObject( $row ); - } - /*! \return the persistent object definition for the eZOrderStatus class. */ diff --git a/kernel/classes/ezorderstatushistory.php b/kernel/classes/ezorderstatushistory.php index 4af01ea2be8..594052800e2 100644 --- a/kernel/classes/ezorderstatushistory.php +++ b/kernel/classes/ezorderstatushistory.php @@ -33,13 +33,9 @@ class eZOrderStatusHistory extends eZPersistentObject { - /*! - Initialises the persistent object with \a $row. - If \c status_name is present in \a $row it will cache it in the $StatusName variable. - */ - function eZOrderStatusHistory( $row ) + public function __construct( $row ) { - $this->eZPersistentObject( $row ); + parent::__construct( $row ); $this->Modifier = null; $this->StatusName = null; if ( isset( $row['status_name'] ) ) diff --git a/kernel/classes/ezpackage.php b/kernel/classes/ezpackage.php index 59d2cd75d73..fd877b22266 100644 --- a/kernel/classes/ezpackage.php +++ b/kernel/classes/ezpackage.php @@ -28,10 +28,13 @@ class eZPackage const NON_INTERACTIVE = -1; - /*! - Constructor - */ - function eZPackage( $parameters = array(), $repositoryPath = false ) + /** + * Constructor + * + * @param array $parameters + * @param string|bool $repositoryPath + */ + public function __construct( $parameters = array(), $repositoryPath = false ) { $this->setParameters( $parameters ); if ( !$repositoryPath ) diff --git a/kernel/classes/ezpackagecreationhandler.php b/kernel/classes/ezpackagecreationhandler.php index 7d4541574dd..fb05bb595e2 100644 --- a/kernel/classes/ezpackagecreationhandler.php +++ b/kernel/classes/ezpackagecreationhandler.php @@ -17,10 +17,14 @@ class eZPackageCreationHandler { - /*! - Constructor - */ - function eZPackageCreationHandler( $id, $name, $steps ) + /** + * Constructor + * + * @param int $id + * @param string $name + * @param array $steps + */ + public function __construct( $id, $name, $steps ) { $this->Attributes = array( 'id' => $id, 'name' => $name, diff --git a/kernel/classes/ezpackagehandler.php b/kernel/classes/ezpackagehandler.php index 4020cbe0808..7197555be29 100644 --- a/kernel/classes/ezpackagehandler.php +++ b/kernel/classes/ezpackagehandler.php @@ -16,10 +16,13 @@ class eZPackageHandler { - /*! - Constructor - */ - function eZPackageHandler( $handlerType, $parameters = array() ) + /** + * Constructor + * + * @param string $handlerType + * @param array $parameters + */ + public function __construct( $handlerType, $parameters = array() ) { $parameters = array_merge( array( 'extract-install-content' => false ), $parameters ); diff --git a/kernel/classes/ezpackageinstallationhandler.php b/kernel/classes/ezpackageinstallationhandler.php index 90d2095119e..0da4b333c36 100644 --- a/kernel/classes/ezpackageinstallationhandler.php +++ b/kernel/classes/ezpackageinstallationhandler.php @@ -17,10 +17,16 @@ class eZPackageInstallationHandler { - /*! - Constructor - */ - function eZPackageInstallationHandler( $package, $type, $installItem, $name = null, $steps = null ) + /** + * Constructor + * + * @param eZPackage $package + * @param string $type + * @param mixed $installItem + * @param string $name + * @param array $steps + */ + public function __construct( $package, $type, $installItem, $name = null, $steps = null ) { $this->Package = $package; $this->Attributes = array( 'type' => $type, diff --git a/kernel/classes/ezpathelement.php b/kernel/classes/ezpathelement.php index fe5eb424674..ddfeee5034a 100644 --- a/kernel/classes/ezpathelement.php +++ b/kernel/classes/ezpathelement.php @@ -21,10 +21,7 @@ class eZPathElement extends eZPersistentObject { - /*! - Initializes a new path element. - */ - function eZPathElement( $row ) + public function __construct( $row ) { $this->Path = null; $this->PathArray = null; @@ -32,7 +29,7 @@ function eZPathElement( $row ) { $this->AlwaysAvailable = $row['always_available']; } - $this->eZPersistentObject( $row ); + parent::__construct( $row ); } static public function definition() diff --git a/kernel/classes/ezpdfexport.php b/kernel/classes/ezpdfexport.php index fb9fb4e9324..4deb91e7416 100644 --- a/kernel/classes/ezpdfexport.php +++ b/kernel/classes/ezpdfexport.php @@ -23,14 +23,6 @@ class eZPDFExport extends eZPersistentObject const CREATE_ONCE = 1; const CREATE_ONFLY = 2; - /*! - Initializes a new eZPDFExport. - */ - function eZPDFExport( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'id' => array( 'name' => 'ID', diff --git a/kernel/classes/ezpersistentobject.php b/kernel/classes/ezpersistentobject.php index d10ee83456b..e8a507a4d1e 100644 --- a/kernel/classes/ezpersistentobject.php +++ b/kernel/classes/ezpersistentobject.php @@ -49,7 +49,7 @@ class eZPersistentObject * * @param int|array $row */ - public function eZPersistentObject( $row ) + public function __construct( $row ) { $this->PersistentDataDirty = false; if ( is_numeric( $row ) ) @@ -57,6 +57,15 @@ public function eZPersistentObject( $row ) $this->fill( $row ); } + /** + * @deprecated Use eZPersistentObject::__construct() instead + * @param array $row + */ + public function eZPersistentObject( $row ) + { + self::__construct( $row ); + } + /** * Tries to fill in the data in the object by using the object definition * which is returned by the function definition() and the database row diff --git a/kernel/classes/ezpolicy.php b/kernel/classes/ezpolicy.php index 6880841bc78..76dde4b2efd 100644 --- a/kernel/classes/ezpolicy.php +++ b/kernel/classes/ezpolicy.php @@ -17,12 +17,9 @@ class eZPolicy extends eZPersistentObject { - /*! - Constructor - */ - function eZPolicy( $row ) + public function __construct( $row ) { - $this->eZPersistentObject( $row ); + parent::__construct( $row ); $this->NodeID = 0; } diff --git a/kernel/classes/ezpolicylimitation.php b/kernel/classes/ezpolicylimitation.php index ccbb2fbb3c0..c5d5456fa11 100644 --- a/kernel/classes/ezpolicylimitation.php +++ b/kernel/classes/ezpolicylimitation.php @@ -19,9 +19,9 @@ class eZPolicyLimitation extends eZPersistentObject /*! Constructor */ - function eZPolicyLimitation( $row ) + public function __construct( $row ) { - $this->eZPersistentObject( $row ); + parent::__construct( $row ); $this->NodeID = 0; } diff --git a/kernel/classes/ezpolicylimitationvalue.php b/kernel/classes/ezpolicylimitationvalue.php index 410429eaf7f..a1a19022c46 100644 --- a/kernel/classes/ezpolicylimitationvalue.php +++ b/kernel/classes/ezpolicylimitationvalue.php @@ -16,15 +16,6 @@ */ class eZPolicyLimitationValue extends eZPersistentObject { - /*! - Constructor - */ - function eZPolicyLimitationValue( $row ) - { - $this->eZPersistentObject( $row ); - } - - static function definition() { static $definition = array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezproductcategory.php b/kernel/classes/ezproductcategory.php index 4b5352899de..36068dec3ec 100644 --- a/kernel/classes/ezproductcategory.php +++ b/kernel/classes/ezproductcategory.php @@ -16,11 +16,6 @@ class eZProductCategory extends eZPersistentObject { - function eZProductCategory( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezproductcollection.php b/kernel/classes/ezproductcollection.php index feb3313fdec..52eb79a0d56 100644 --- a/kernel/classes/ezproductcollection.php +++ b/kernel/classes/ezproductcollection.php @@ -14,11 +14,6 @@ class eZProductCollection extends eZPersistentObject { - function eZProductCollection( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezproductcollectionitem.php b/kernel/classes/ezproductcollectionitem.php index 171c89bfd7f..724f2e1d730 100644 --- a/kernel/classes/ezproductcollectionitem.php +++ b/kernel/classes/ezproductcollectionitem.php @@ -18,11 +18,6 @@ class eZProductCollectionItem extends eZPersistentObject { - function eZProductCollectionItem( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezproductcollectionitemoption.php b/kernel/classes/ezproductcollectionitemoption.php index f5d8b2628c9..5f79c9505bd 100644 --- a/kernel/classes/ezproductcollectionitemoption.php +++ b/kernel/classes/ezproductcollectionitemoption.php @@ -10,18 +10,6 @@ class eZProductCollectionItemOption extends eZPersistentObject { - /** - * Initialized an eZProductCollectionItemOption object with the given - * attribute array - * - * @param array $row Array of object attributes - */ - function eZProductCollectionItemOption( $row ) - { - $this->eZPersistentObject( $row ); - - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezrole.php b/kernel/classes/ezrole.php index 0d6b2e45752..95c33243521 100644 --- a/kernel/classes/ezrole.php +++ b/kernel/classes/ezrole.php @@ -33,12 +33,9 @@ */ class eZRole extends eZPersistentObject { - /*! - Constructor - */ - function eZRole( $row = array() ) + public function __construct( $row = array() ) { - $this->eZPersistentObject( $row ); + parent::__construct( $row ); $this->PolicyArray = 0; $this->LimitIdentifier = false; $this->LimitValue = false; diff --git a/kernel/classes/ezrssexport.php b/kernel/classes/ezrssexport.php index e644eb7374e..808cdf2b425 100644 --- a/kernel/classes/ezrssexport.php +++ b/kernel/classes/ezrssexport.php @@ -20,14 +20,6 @@ class eZRSSExport extends eZPersistentObject const STATUS_VALID = 1; const STATUS_DRAFT = 0; - /*! - Initializes a new RSSExport. - */ - function eZRSSExport( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'id' => array( 'name' => 'ID', diff --git a/kernel/classes/ezrssexportitem.php b/kernel/classes/ezrssexportitem.php index 695f9e021d6..5181b493249 100644 --- a/kernel/classes/ezrssexportitem.php +++ b/kernel/classes/ezrssexportitem.php @@ -17,15 +17,6 @@ class eZRSSExportItem extends eZPersistentObject { - - /*! - Initializes a new RSSExportItem. - */ - function eZRSSExportItem( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'id' => array( 'name' => 'ID', diff --git a/kernel/classes/ezrssimport.php b/kernel/classes/ezrssimport.php index 5c0dcffef59..61658f9c73e 100644 --- a/kernel/classes/ezrssimport.php +++ b/kernel/classes/ezrssimport.php @@ -20,14 +20,6 @@ class eZRSSImport extends eZPersistentObject const STATUS_VALID = 1; const STATUS_DRAFT = 0; - /*! - Initializes a new RSSImport. - */ - function eZRSSImport( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezscript.php b/kernel/classes/ezscript.php index 2e6ef35f712..8ca6b1480fd 100644 --- a/kernel/classes/ezscript.php +++ b/kernel/classes/ezscript.php @@ -47,9 +47,9 @@ class. */ class eZScript { - /*! - Constructor - */ + /** + * @param array $settings + */ function __construct( $settings = array() ) { $settings += array( diff --git a/kernel/classes/ezsearch.php b/kernel/classes/ezsearch.php index f0b07da6b2f..ee9405362a7 100644 --- a/kernel/classes/ezsearch.php +++ b/kernel/classes/ezsearch.php @@ -17,11 +17,6 @@ class eZSearch { - function eZSearch() - { - - } - /*! \static determine how to pass the commit argument, for deletes and updates diff --git a/kernel/classes/ezsection.php b/kernel/classes/ezsection.php index b938eebbee6..336af6af600 100644 --- a/kernel/classes/ezsection.php +++ b/kernel/classes/ezsection.php @@ -16,13 +16,13 @@ class eZSection extends eZPersistentObject { - function eZSection( $row ) + public function __construct( $row ) { if ( !isset( $row['id'] ) ) { $row['id'] = null; } - $this->eZPersistentObject( $row ); + parent::__construct( $row ); } /*! diff --git a/kernel/classes/ezserializedobjectnamelist.php b/kernel/classes/ezserializedobjectnamelist.php index e820b7b73b7..ba44048c5ec 100644 --- a/kernel/classes/ezserializedobjectnamelist.php +++ b/kernel/classes/ezserializedobjectnamelist.php @@ -12,7 +12,7 @@ class eZSerializedObjectNameList { const ALWAYS_AVAILABLE_STR = 'always-available'; - function eZSerializedObjectNameList( $serializedNamesString = false ) + public function __construct( $serializedNamesString = false ) { $this->DefaultLanguage = null; diff --git a/kernel/classes/ezshopaccounthandler.php b/kernel/classes/ezshopaccounthandler.php index e5c1386abfd..42487f1cfa3 100644 --- a/kernel/classes/ezshopaccounthandler.php +++ b/kernel/classes/ezshopaccounthandler.php @@ -10,11 +10,6 @@ class eZShopAccountHandler { - function eZShopAccountHandler() - { - - } - /** * Returns a shared instance of the eZShopAccountHandler class * as defined in shopaccount.ini[HandlerSettings]Repositories diff --git a/kernel/classes/ezsiteaccess.php b/kernel/classes/ezsiteaccess.php index eb5b50150d5..2bc0f309ccc 100644 --- a/kernel/classes/ezsiteaccess.php +++ b/kernel/classes/ezsiteaccess.php @@ -34,13 +34,6 @@ class eZSiteAccess const SUBTYPE_PRE = 1; const SUBTYPE_POST = 2; - /*! - Constructor - */ - function eZSiteAccess() - { - } - static function siteAccessList() { $siteAccessList = array(); diff --git a/kernel/classes/ezsiteinstaller.php b/kernel/classes/ezsiteinstaller.php index f2f78c22fed..35bab62d11d 100644 --- a/kernel/classes/ezsiteinstaller.php +++ b/kernel/classes/ezsiteinstaller.php @@ -25,7 +25,7 @@ class eZSiteInstaller const ERR_ABORT = 1; const ERR_CONTINUE = 2; - function eZSiteInstaller( $parameters = false ) + public function __construct( $parameters = false ) { $this->initSettings( $parameters ); $this->initSteps(); diff --git a/kernel/classes/ezsubtreecache.php b/kernel/classes/ezsubtreecache.php index 85da9dc3aa8..57b593f6184 100644 --- a/kernel/classes/ezsubtreecache.php +++ b/kernel/classes/ezsubtreecache.php @@ -16,13 +16,6 @@ class eZSubtreeCache { - /*! - Constructor - */ - function eZSubtreeCache() - { - } - /*! \static Removes caches which were created using 'cache-block' operator with 'subtree_expiry' parameter. diff --git a/kernel/classes/eztextinputparser.php b/kernel/classes/eztextinputparser.php index b322938f13c..3c31e764cc9 100644 --- a/kernel/classes/eztextinputparser.php +++ b/kernel/classes/eztextinputparser.php @@ -18,14 +18,6 @@ class eZTextInputParser const CHUNK_TEXT = 1; const CHUNK_TAG = 2; - /*! - - */ - function eZTextInputParser() - { - - } - /*! Will parse the input text and create an array of the input. False will be returned if the parsing diff --git a/kernel/classes/eztipafriendcounter.php b/kernel/classes/eztipafriendcounter.php index b1267ff71fb..1e214f9d167 100644 --- a/kernel/classes/eztipafriendcounter.php +++ b/kernel/classes/eztipafriendcounter.php @@ -16,11 +16,6 @@ class eZTipafriendCounter extends eZPersistentObject { - function eZTipafriendCounter( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'node_id' => array( 'name' => 'NodeID', diff --git a/kernel/classes/eztipafriendrequest.php b/kernel/classes/eztipafriendrequest.php index 19418a8bf84..bc81d256b9f 100644 --- a/kernel/classes/eztipafriendrequest.php +++ b/kernel/classes/eztipafriendrequest.php @@ -15,14 +15,6 @@ */ class eZTipafriendRequest extends eZPersistentObject { - /*! - Constructor - */ - function eZTipafriendRequest( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( 'email_receiver' => array( 'name' => 'EmailReceiver', diff --git a/kernel/classes/eztrigger.php b/kernel/classes/eztrigger.php index 4227ea389b6..c44adcf0505 100644 --- a/kernel/classes/eztrigger.php +++ b/kernel/classes/eztrigger.php @@ -24,14 +24,6 @@ class eZTrigger extends eZPersistentObject const WORKFLOW_RESET = 6; const FETCH_TEMPLATE_REPEAT = 7; - /*! - Constructor - */ - function eZTrigger( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( 'id' => array( 'name' => 'ID', diff --git a/kernel/classes/ezurlaliasfilter.php b/kernel/classes/ezurlaliasfilter.php index aeade270d15..49b62b8d707 100644 --- a/kernel/classes/ezurlaliasfilter.php +++ b/kernel/classes/ezurlaliasfilter.php @@ -20,13 +20,6 @@ abstract class eZURLAliasFilter { - /** - * Initialize the filter object. - */ - public function eZURLAliasFilter() - { - } - /* * * Process the url alias element $text and return the new element as a string. diff --git a/kernel/classes/ezurlaliasml.php b/kernel/classes/ezurlaliasml.php index 9165987af30..29d5b05554d 100644 --- a/kernel/classes/ezurlaliasml.php +++ b/kernel/classes/ezurlaliasml.php @@ -130,13 +130,9 @@ class eZURLAliasML extends eZPersistentObject */ private static $charset = null; - /*! - Initializes a new URL alias from database row. - \note If 'path' is set it will be cached in $Path. - */ - function eZURLAliasML( $row ) + public function __construct( $row ) { - $this->eZPersistentObject( $row ); + parent::__construct( $row ); $this->Path = null; if ( isset( $row['path'] ) ) { diff --git a/kernel/classes/ezurlaliasquery.php b/kernel/classes/ezurlaliasquery.php index af184416272..95bc30ececd 100644 --- a/kernel/classes/ezurlaliasquery.php +++ b/kernel/classes/ezurlaliasquery.php @@ -95,10 +95,6 @@ class eZURLAliasQuery */ public $items; - function eZURLAliasQuery() - { - } - function hasAttribute( $name ) { return $name !== "query" && array_key_exists( $name, get_object_vars( $this ) ); diff --git a/kernel/classes/ezurlwildcard.php b/kernel/classes/ezurlwildcard.php index 5f24154423f..40709844809 100644 --- a/kernel/classes/ezurlwildcard.php +++ b/kernel/classes/ezurlwildcard.php @@ -49,15 +49,6 @@ class eZURLWildcard extends eZPersistentObject */ protected static $wildcardsIndex = null; - /** - * Initializes a new URL alias persistent object - * @param array $row - */ - public function eZURLWildcard( $row ) - { - $this->eZPersistentObject( $row ); - } - public static function definition() { static $definition = array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezuserdiscountrule.php b/kernel/classes/ezuserdiscountrule.php index 974d093eba2..d7db3927c64 100644 --- a/kernel/classes/ezuserdiscountrule.php +++ b/kernel/classes/ezuserdiscountrule.php @@ -16,14 +16,6 @@ class eZUserDiscountRule extends eZPersistentObject { - /*! - Constructor - */ - function eZUserDiscountRule( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezvatrule.php b/kernel/classes/ezvatrule.php index bfb01401d98..9dbb7af2b38 100644 --- a/kernel/classes/ezvatrule.php +++ b/kernel/classes/ezvatrule.php @@ -16,10 +16,10 @@ class eZVatRule extends eZPersistentObject { - function eZVatRule( $row ) + public function __construct( $row ) { $this->ProductCategories = null; - $this->eZPersistentObject( $row ); + parent::__construct( $row ); } static function definition() diff --git a/kernel/classes/ezvattype.php b/kernel/classes/ezvattype.php index 41792f49220..db29924ffd9 100644 --- a/kernel/classes/ezvattype.php +++ b/kernel/classes/ezvattype.php @@ -17,11 +17,6 @@ class eZVatType extends eZPersistentObject { - function eZVatType( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezviewcounter.php b/kernel/classes/ezviewcounter.php index 39d3b661313..75d479d0aea 100644 --- a/kernel/classes/ezviewcounter.php +++ b/kernel/classes/ezviewcounter.php @@ -10,11 +10,6 @@ class eZViewCounter extends eZPersistentObject { - function eZViewCounter( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "node_id" => array( 'name' => "NodeID", diff --git a/kernel/classes/ezwishlist.php b/kernel/classes/ezwishlist.php index 18553e8617c..b2c38e5ed1d 100644 --- a/kernel/classes/ezwishlist.php +++ b/kernel/classes/ezwishlist.php @@ -18,11 +18,6 @@ class eZWishList extends eZPersistentObject { - function eZWishList( $row = array() ) - { - $this->eZPersistentObject( $row ); - } - /*! \return the persistent object definition for the eZCard class. */ diff --git a/kernel/classes/ezworkflow.php b/kernel/classes/ezworkflow.php index 8ba1d57ed42..d84006e16ec 100644 --- a/kernel/classes/ezworkflow.php +++ b/kernel/classes/ezworkflow.php @@ -28,11 +28,6 @@ class eZWorkflow extends eZPersistentObject const STATUS_WAITING_PARENT = 9; const STATUS_FETCH_TEMPLATE_REPEAT = 10; - function eZWorkflow( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezworkflowevent.php b/kernel/classes/ezworkflowevent.php index cede99eea9c..69ad7a00cca 100644 --- a/kernel/classes/ezworkflowevent.php +++ b/kernel/classes/ezworkflowevent.php @@ -16,12 +16,21 @@ class eZWorkflowEvent extends eZPersistentObject { - function eZWorkflowEvent( $row ) + public function __construct( $row ) { - $this->eZPersistentObject( $row ); + parent::__construct( $row ); $this->Content = null; } + /** + * @deprecated Use eZWorkflowEvent::__construct() instead + * @param array $row + */ + public function eZWorkflowEvent( $row ) + { + self::__construct( $row ); + } + static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezworkfloweventtype.php b/kernel/classes/ezworkfloweventtype.php index 99b73319f13..a284ca4ed24 100644 --- a/kernel/classes/ezworkfloweventtype.php +++ b/kernel/classes/ezworkfloweventtype.php @@ -16,9 +16,25 @@ class eZWorkflowEventType extends eZWorkflowType { - function eZWorkflowEventType( $typeString, $name ) + /** + * Constructor + * + * @param string $typeString + * @param string $name + */ + public function __construct( $typeString, $name ) { - $this->eZWorkflowType( "event", $typeString, ezpI18n::tr( 'kernel/workflow/event', "Event" ), $name ); + parent::__construct( "event", $typeString, ezpI18n::tr( 'kernel/workflow/event', "Event" ), $name ); + } + + /** + * @deprecated + * @param string $typeString + * @param string $name + */ + public function eZWorkflowEventType( $typeString, $name ) + { + self::__construct( $typeString, $name ); } static function registerEventType( $typeString, $class_name ) diff --git a/kernel/classes/ezworkflowgroup.php b/kernel/classes/ezworkflowgroup.php index 8ddca45e85a..f9bf2c85eea 100644 --- a/kernel/classes/ezworkflowgroup.php +++ b/kernel/classes/ezworkflowgroup.php @@ -16,11 +16,6 @@ class eZWorkflowGroup extends eZPersistentObject { - function eZWorkflowGroup( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/ezworkflowgrouplink.php b/kernel/classes/ezworkflowgrouplink.php index 7f1388bcd48..a019b93c149 100644 --- a/kernel/classes/ezworkflowgrouplink.php +++ b/kernel/classes/ezworkflowgrouplink.php @@ -16,11 +16,6 @@ class eZWorkflowGroupLink extends eZPersistentObject { - function eZWorkflowGroupLink( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "workflow_id" => array( 'name' => "WorkflowID", diff --git a/kernel/classes/ezworkflowgrouptype.php b/kernel/classes/ezworkflowgrouptype.php index 697edcf33ce..2477456eb31 100644 --- a/kernel/classes/ezworkflowgrouptype.php +++ b/kernel/classes/ezworkflowgrouptype.php @@ -16,9 +16,15 @@ class eZWorkflowGroupType extends eZWorkflowType { - function eZWorkflowGroupType( $typeString, $name ) + /** + * Constructor + * + * @param string $typeString + * @param string $name + */ + public function __construct( $typeString, $name ) { - $this->eZWorkflowType( "group", $typeString, ezpI18n::tr( 'kernel/workflow/group', "Group" ), $name ); + parent::__construct( "group", $typeString, ezpI18n::tr( 'kernel/workflow/group', "Group" ), $name ); } static function registerGroupType( $typeString, $class_name ) diff --git a/kernel/classes/ezworkflowprocess.php b/kernel/classes/ezworkflowprocess.php index da14943ebbb..042f0ce009b 100644 --- a/kernel/classes/ezworkflowprocess.php +++ b/kernel/classes/ezworkflowprocess.php @@ -16,11 +16,6 @@ class eZWorkflowProcess extends eZPersistentObject { - function eZWorkflowProcess( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'id' => array( 'name' => 'ID', diff --git a/kernel/classes/ezworkflowtype.php b/kernel/classes/ezworkflowtype.php index d49c0dd9116..55d8b87aca8 100644 --- a/kernel/classes/ezworkflowtype.php +++ b/kernel/classes/ezworkflowtype.php @@ -30,8 +30,15 @@ class eZWorkflowType const STATUS_REDIRECT_REPEAT = 11; const STATUS_WORKFLOW_RESET = 12; - function eZWorkflowType( $group, $type, - $groupName, $name ) + /** + * Constructor + * + * @param string $group + * @param string $type + * @param string $groupName + * @param string $name + */ + public function __construct( $group, $type, $groupName, $name ) { $this->Group = $group; $this->Type = $type; @@ -50,6 +57,18 @@ function eZWorkflowType( $group, $type, $this->Attributes["activation_date"] =& $this->ActivationDate; } + /** + * @deprecated Use eZWorkflowType::__construct() instead + * @param string $group + * @param string $type + * @param string $groupName + * @param string $name + */ + public function eZWorkflowType( $group, $type, $groupName, $name ) + { + self::__construct( $group, $type, $groupName, $name ); + } + static function statusName( $status ) { $statusNameMap = self::statusNameMap(); diff --git a/kernel/classes/notification/event/ezcollaboration/ezcollaborationtype.php b/kernel/classes/notification/event/ezcollaboration/ezcollaborationtype.php index 703f5fa7ad6..d80c0a030b9 100644 --- a/kernel/classes/notification/event/ezcollaboration/ezcollaborationtype.php +++ b/kernel/classes/notification/event/ezcollaboration/ezcollaborationtype.php @@ -18,12 +18,9 @@ class eZCollaborationEventType extends eZNotificationEventType { const NOTIFICATION_TYPE_STRING = 'ezcollaboration'; - /*! - Constructor - */ - function eZCollaborationEventType() + public function __construct() { - $this->eZNotificationEventType( self::NOTIFICATION_TYPE_STRING ); + parent::__construct( self::NOTIFICATION_TYPE_STRING ); } function initializeEvent( $event, $params ) diff --git a/kernel/classes/notification/event/ezcurrenttime/ezcurrenttimetype.php b/kernel/classes/notification/event/ezcurrenttime/ezcurrenttimetype.php index bd051c8a0f1..f13290f5a18 100644 --- a/kernel/classes/notification/event/ezcurrenttime/ezcurrenttimetype.php +++ b/kernel/classes/notification/event/ezcurrenttime/ezcurrenttimetype.php @@ -17,12 +17,9 @@ class eZCurrentTimeType extends eZNotificationEventType { const NOTIFICATION_TYPE_STRING = 'ezcurrenttime'; - /*! - Constructor - */ - function eZCurrentTimeType() + public function __construct() { - $this->eZNotificationEventType( self::NOTIFICATION_TYPE_STRING ); + parent::__construct( self::NOTIFICATION_TYPE_STRING ); } function initializeEvent( $event, $params ) diff --git a/kernel/classes/notification/event/ezpublish/ezpublishtype.php b/kernel/classes/notification/event/ezpublish/ezpublishtype.php index 67ea07ae87e..c82b9e0cbf9 100644 --- a/kernel/classes/notification/event/ezpublish/ezpublishtype.php +++ b/kernel/classes/notification/event/ezpublish/ezpublishtype.php @@ -18,12 +18,9 @@ class eZPublishType extends eZNotificationEventType { const NOTIFICATION_TYPE_STRING = 'ezpublish'; - /*! - Constructor - */ - function eZPublishType() + public function __construct() { - $this->eZNotificationEventType( self::NOTIFICATION_TYPE_STRING ); + parent::__construct( self::NOTIFICATION_TYPE_STRING ); } function initializeEvent( $event, $params ) diff --git a/kernel/classes/notification/ezmailnotificationtransport.php b/kernel/classes/notification/ezmailnotificationtransport.php index 7b75c2410eb..e3c03a767c3 100644 --- a/kernel/classes/notification/ezmailnotificationtransport.php +++ b/kernel/classes/notification/ezmailnotificationtransport.php @@ -16,14 +16,6 @@ class eZMailNotificationTransport extends eZNotificationTransport { - /*! - Constructor - */ - function eZMailNotificationTransport() - { - $this->eZNotificationTransport(); - } - function send( $addressList = array(), $subject, $body, $transportData = null, $parameters = array() ) { $ini = eZINI::instance(); diff --git a/kernel/classes/notification/eznotificationcollection.php b/kernel/classes/notification/eznotificationcollection.php index c2399a82aa0..6993d5ceefc 100644 --- a/kernel/classes/notification/eznotificationcollection.php +++ b/kernel/classes/notification/eznotificationcollection.php @@ -15,14 +15,6 @@ */ class eZNotificationCollection extends eZPersistentObject { - /*! - Constructor - */ - function eZNotificationCollection( $row = array() ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/notification/eznotificationcollectionitem.php b/kernel/classes/notification/eznotificationcollectionitem.php index d5a018f6bce..2af67ed1499 100644 --- a/kernel/classes/notification/eznotificationcollectionitem.php +++ b/kernel/classes/notification/eznotificationcollectionitem.php @@ -16,14 +16,6 @@ class eZNotificationCollectionItem extends eZPersistentObject { - /*! - Constructor - */ - function eZNotificationCollectionItem( $row = array() ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/notification/eznotificationevent.php b/kernel/classes/notification/eznotificationevent.php index 2b4f1f25313..3e04f025de7 100644 --- a/kernel/classes/notification/eznotificationevent.php +++ b/kernel/classes/notification/eznotificationevent.php @@ -18,12 +18,9 @@ class eZNotificationEvent extends eZPersistentObject const STATUS_CREATED = 0; const STATUS_HANDLED = 1; - /*! - Constructor - */ - function eZNotificationEvent( $row = array() ) + public function __construct( $row = array() ) { - $this->eZPersistentObject( $row ); + parent::__construct( $row ); $this->TypeString = $this->attribute( 'event_type_string' ); } diff --git a/kernel/classes/notification/eznotificationeventfilter.php b/kernel/classes/notification/eznotificationeventfilter.php index 4d83d2410e0..197e403061a 100644 --- a/kernel/classes/notification/eznotificationeventfilter.php +++ b/kernel/classes/notification/eznotificationeventfilter.php @@ -15,13 +15,6 @@ */ class eZNotificationEventFilter { - /*! - Constructor - */ - function eZNotificationEventFilter() - { - } - /*! \note Transaction unsafe. If you call several transaction unsafe methods you must enclose the calls within a db transaction; thus within db->begin and db->commit. diff --git a/kernel/classes/notification/eznotificationeventhandler.php b/kernel/classes/notification/eznotificationeventhandler.php index f3ad8cc966e..f14b9467d4e 100644 --- a/kernel/classes/notification/eznotificationeventhandler.php +++ b/kernel/classes/notification/eznotificationeventhandler.php @@ -20,11 +20,14 @@ class eZNotificationEventHandler const EVENT_SKIPPED = 1; const EVENT_UNKNOWN = 2; const EVENT_ERROR = 3; - - /*! - Constructor - */ - function eZNotificationEventHandler( $idString, $name ) + + /** + * Constructor + * + * @param string $idString + * @param string $name + */ + public function __construct( $idString, $name ) { $this->IDString = $idString; $this->Name = $name; diff --git a/kernel/classes/notification/eznotificationeventtype.php b/kernel/classes/notification/eznotificationeventtype.php index a777ad9c707..016e9293b10 100644 --- a/kernel/classes/notification/eznotificationeventtype.php +++ b/kernel/classes/notification/eznotificationeventtype.php @@ -16,10 +16,12 @@ class eZNotificationEventType { - /*! - Constructor - */ - function eZNotificationEventType( $notificationEventTypeString ) + /** + * Constructor + * + * @param string $notificationEventTypeString + */ + public function __construct( $notificationEventTypeString ) { $this->NotificationEventTypeString = $notificationEventTypeString; } diff --git a/kernel/classes/notification/eznotificationschedule.php b/kernel/classes/notification/eznotificationschedule.php index 55c13b3eca7..984dcb5185a 100644 --- a/kernel/classes/notification/eznotificationschedule.php +++ b/kernel/classes/notification/eznotificationschedule.php @@ -16,13 +16,6 @@ class eZNotificationSchedule { - /*! - Constructor - */ - function eZNotificationSchedule() - { - } - static function setDateForItem( $item, $settings ) { if ( !is_array( $settings ) ) diff --git a/kernel/classes/notification/eznotificationtransport.php b/kernel/classes/notification/eznotificationtransport.php index 701e75617da..a66ab7ae0a8 100644 --- a/kernel/classes/notification/eznotificationtransport.php +++ b/kernel/classes/notification/eznotificationtransport.php @@ -15,13 +15,6 @@ */ class eZNotificationTransport { - /*! - Constructor - */ - function eZNotificationTransport() - { - } - /** * Returns a shared instance of the eZNotificationTransport class. * diff --git a/kernel/classes/notification/handler/ezcollaborationnotification/ezcollaborationnotificationhandler.php b/kernel/classes/notification/handler/ezcollaborationnotification/ezcollaborationnotificationhandler.php index 8129fac01cb..46e05ad0e27 100644 --- a/kernel/classes/notification/handler/ezcollaborationnotification/ezcollaborationnotificationhandler.php +++ b/kernel/classes/notification/handler/ezcollaborationnotification/ezcollaborationnotificationhandler.php @@ -19,12 +19,9 @@ class eZCollaborationNotificationHandler extends eZNotificationEventHandler const NOTIFICATION_HANDLER_ID = 'ezcollaboration'; const TRANSPORT = 'ezmail'; - /*! - Constructor - */ - function eZCollaborationNotificationHandler() + public function __construct() { - $this->eZNotificationEventHandler( self::NOTIFICATION_HANDLER_ID, "Collaboration Handler" ); + parent::__construct( self::NOTIFICATION_HANDLER_ID, "Collaboration Handler" ); } function attributes() diff --git a/kernel/classes/notification/handler/ezcollaborationnotification/ezcollaborationnotificationrule.php b/kernel/classes/notification/handler/ezcollaborationnotification/ezcollaborationnotificationrule.php index 73bee04cd73..5a0aab32c02 100644 --- a/kernel/classes/notification/handler/ezcollaborationnotification/ezcollaborationnotificationrule.php +++ b/kernel/classes/notification/handler/ezcollaborationnotification/ezcollaborationnotificationrule.php @@ -15,14 +15,6 @@ */ class eZCollaborationNotificationRule extends eZPersistentObject { - /*! - Constructor - */ - function eZCollaborationNotificationRule( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/notification/handler/ezgeneraldigest/ezgeneraldigesthandler.php b/kernel/classes/notification/handler/ezgeneraldigest/ezgeneraldigesthandler.php index 10056f5d866..6e40529d516 100644 --- a/kernel/classes/notification/handler/ezgeneraldigest/ezgeneraldigesthandler.php +++ b/kernel/classes/notification/handler/ezgeneraldigest/ezgeneraldigesthandler.php @@ -17,12 +17,9 @@ class eZGeneralDigestHandler extends eZNotificationEventHandler { const NOTIFICATION_HANDLER_ID = 'ezgeneraldigest'; - /*! - Constructor - */ - function eZGeneralDigestHandler() + public function __construct() { - $this->eZNotificationEventHandler( self::NOTIFICATION_HANDLER_ID, "General Digest Handler" ); + parent::__construct( self::NOTIFICATION_HANDLER_ID, "General Digest Handler" ); } diff --git a/kernel/classes/notification/handler/ezgeneraldigest/ezgeneraldigestusersettings.php b/kernel/classes/notification/handler/ezgeneraldigest/ezgeneraldigestusersettings.php index 4fb7ec5e1fc..a01b2d9bd50 100644 --- a/kernel/classes/notification/handler/ezgeneraldigest/ezgeneraldigestusersettings.php +++ b/kernel/classes/notification/handler/ezgeneraldigest/ezgeneraldigestusersettings.php @@ -21,14 +21,6 @@ class eZGeneralDigestUserSettings extends eZPersistentObject const TYPE_MONTHLY = 2; const TYPE_DAILY = 3; - /*! - Constructor - */ - function eZGeneralDigestUserSettings( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/notification/handler/ezsubtree/ezsubtreehandler.php b/kernel/classes/notification/handler/ezsubtree/ezsubtreehandler.php index ab1948b4674..0cbb8d82e36 100644 --- a/kernel/classes/notification/handler/ezsubtree/ezsubtreehandler.php +++ b/kernel/classes/notification/handler/ezsubtree/ezsubtreehandler.php @@ -19,12 +19,9 @@ class eZSubTreeHandler extends eZNotificationEventHandler const NOTIFICATION_HANDLER_ID = 'ezsubtree'; const TRANSPORT = 'ezmail'; - /*! - Constructor - */ - function eZSubTreeHandler() + public function __construct() { - $this->eZNotificationEventHandler( self::NOTIFICATION_HANDLER_ID, "Subtree Handler" ); + parent::__construct( self::NOTIFICATION_HANDLER_ID, "Subtree Handler" ); } function attributes() diff --git a/kernel/classes/notification/handler/ezsubtree/ezsubtreenotificationrule.php b/kernel/classes/notification/handler/ezsubtree/ezsubtreenotificationrule.php index 62cbdaf5df3..fe59aaaf969 100644 --- a/kernel/classes/notification/handler/ezsubtree/ezsubtreenotificationrule.php +++ b/kernel/classes/notification/handler/ezsubtree/ezsubtreenotificationrule.php @@ -15,14 +15,6 @@ */ class eZSubtreeNotificationRule extends eZPersistentObject { - /*! - Constructor - */ - function eZSubtreeNotificationRule( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( "fields" => array( "id" => array( 'name' => 'ID', diff --git a/kernel/classes/packagecreators/ezcontentclass/ezcontentclasspackagecreator.php b/kernel/classes/packagecreators/ezcontentclass/ezcontentclasspackagecreator.php index 490561b74e0..f296ef0dba3 100644 --- a/kernel/classes/packagecreators/ezcontentclass/ezcontentclasspackagecreator.php +++ b/kernel/classes/packagecreators/ezcontentclass/ezcontentclasspackagecreator.php @@ -17,7 +17,7 @@ class eZContentClassPackageCreator extends eZPackageCreationHandler { - function eZContentClassPackageCreator( $id ) + public function __construct( $id ) { $steps = array(); $steps[] = array( 'id' => 'class', @@ -29,9 +29,7 @@ function eZContentClassPackageCreator( $id ) $steps[] = $this->packageInformationStep(); $steps[] = $this->packageMaintainerStep(); $steps[] = $this->packageChangelogStep(); - $this->eZPackageCreationHandler( $id, - ezpI18n::tr( 'kernel/package', 'Content class export' ), - $steps ); + parent::__construct( $id, ezpI18n::tr( 'kernel/package', 'Content class export' ), $steps ); } /*! diff --git a/kernel/classes/packagecreators/ezcontentobject/ezcontentobjectpackagecreator.php b/kernel/classes/packagecreators/ezcontentobject/ezcontentobjectpackagecreator.php index 32baac32b79..d917b66959c 100644 --- a/kernel/classes/packagecreators/ezcontentobject/ezcontentobjectpackagecreator.php +++ b/kernel/classes/packagecreators/ezcontentobject/ezcontentobjectpackagecreator.php @@ -16,7 +16,7 @@ class eZContentObjectPackageCreator extends eZPackageCreationHandler { - function eZContentObjectPackageCreator( $id ) + public function __construct( $id ) { $steps = array(); $steps[] = array( 'id' => 'object', @@ -34,9 +34,7 @@ function eZContentObjectPackageCreator( $id ) $steps[] = $this->packageInformationStep(); $steps[] = $this->packageMaintainerStep(); $steps[] = $this->packageChangelogStep(); - $this->eZPackageCreationHandler( $id, - ezpI18n::tr( 'kernel/package', 'Content object export' ), - $steps ); + parent::__construct( $id, ezpI18n::tr( 'kernel/package', 'Content object export' ), $steps ); } /*! diff --git a/kernel/classes/packagecreators/ezextension/ezextensionpackagecreator.php b/kernel/classes/packagecreators/ezextension/ezextensionpackagecreator.php index 55b2498a478..e713fdb7995 100644 --- a/kernel/classes/packagecreators/ezextension/ezextensionpackagecreator.php +++ b/kernel/classes/packagecreators/ezextension/ezextensionpackagecreator.php @@ -17,10 +17,7 @@ class eZExtensionPackageCreator extends eZPackageCreationHandler { - /*! - Constructor - */ - function eZExtensionPackageCreator( $id ) + public function __construct( $id ) { $steps = array(); $steps[] = array( 'id' => 'extensionlist', @@ -33,9 +30,7 @@ function eZExtensionPackageCreator( $id ) $steps[] = $this->packageInformationStep(); $steps[] = $this->packageMaintainerStep(); $steps[] = $this->packageChangelogStep(); - $this->eZPackageCreationHandler( $id, - ezpI18n::tr( 'kernel/package', 'Extension export' ), - $steps ); + parent::__construct( $id, ezpI18n::tr( 'kernel/package', 'Extension export' ), $steps ); } function finalize( &$package, $http, &$persistentData ) diff --git a/kernel/classes/packagecreators/ezstyle/ezstylepackagecreator.php b/kernel/classes/packagecreators/ezstyle/ezstylepackagecreator.php index 3a2bf55aa6e..4be639f4394 100644 --- a/kernel/classes/packagecreators/ezstyle/ezstylepackagecreator.php +++ b/kernel/classes/packagecreators/ezstyle/ezstylepackagecreator.php @@ -17,10 +17,7 @@ class eZStylePackageCreator extends eZPackageCreationHandler { - /*! - Constructor - */ - function eZStylePackageCreator( $id ) + public function __construct( $id ) { $steps = array(); $steps[] = $this->packageThumbnailStep(); @@ -39,9 +36,7 @@ function eZStylePackageCreator( $id ) $steps[] = $this->packageInformationStep(); $steps[] = $this->packageMaintainerStep(); $steps[] = $this->packageChangelogStep(); - $this->eZPackageCreationHandler( $id, - ezpI18n::tr( 'kernel/package', 'Site style' ), - $steps ); + parent::__construct( $id, ezpI18n::tr( 'kernel/package', 'Site style' ), $steps ); } function finalize( &$package, $http, &$persistentData ) diff --git a/kernel/classes/packagehandlers/ezcontentclass/ezcontentclasspackagehandler.php b/kernel/classes/packagehandlers/ezcontentclass/ezcontentclasspackagehandler.php index fd33b6b6357..d05de3145d7 100644 --- a/kernel/classes/packagehandlers/ezcontentclass/ezcontentclasspackagehandler.php +++ b/kernel/classes/packagehandlers/ezcontentclass/ezcontentclasspackagehandler.php @@ -24,13 +24,9 @@ class eZContentClassPackageHandler extends eZPackageHandler const ACTION_NEW = 3; const ACTION_DELETE = 4; - /*! - Constructor - */ - function eZContentClassPackageHandler() + public function __construct() { - $this->eZPackageHandler( 'ezcontentclass', - array( 'extract-install-content' => true ) ); + parent::__construct( 'ezcontentclass', array( 'extract-install-content' => true ) ); } /*! diff --git a/kernel/classes/packagehandlers/ezcontentobject/ezcontentobjectpackagehandler.php b/kernel/classes/packagehandlers/ezcontentobject/ezcontentobjectpackagehandler.php index 4b61b9ffbbe..8110bbe33de 100644 --- a/kernel/classes/packagehandlers/ezcontentobject/ezcontentobjectpackagehandler.php +++ b/kernel/classes/packagehandlers/ezcontentobject/ezcontentobjectpackagehandler.php @@ -28,13 +28,9 @@ class eZContentObjectPackageHandler extends eZPackageHandler const UNINSTALL_OBJECTS_ERROR_RANGE_FROM = 101; const UNINSTALL_OBJECTS_ERROR_RANGE_TO = 200; - /*! - Constructor - */ - function eZContentObjectPackageHandler() + public function __construct() { - $this->eZPackageHandler( 'ezcontentobject', - array( 'extract-install-content' => true ) ); + parent::__construct( 'ezcontentobject', array( 'extract-install-content' => true ) ); } /*! diff --git a/kernel/classes/packagehandlers/ezdb/ezdbpackagehandler.php b/kernel/classes/packagehandlers/ezdb/ezdbpackagehandler.php index 39ec9139167..fffae09e36b 100644 --- a/kernel/classes/packagehandlers/ezdb/ezdbpackagehandler.php +++ b/kernel/classes/packagehandlers/ezdb/ezdbpackagehandler.php @@ -16,12 +16,9 @@ class eZDBPackageHandler extends eZPackageHandler { - /*! - Constructor - */ - function eZDBPackageHandler() + public function __construct() { - $this->eZPackageHandler( 'ezdb' ); + parent::__construct( 'ezdb' ); } /*! diff --git a/kernel/classes/packagehandlers/ezextension/ezextensionpackagehandler.php b/kernel/classes/packagehandlers/ezextension/ezextensionpackagehandler.php index 69f195b16dc..5bd58e02311 100644 --- a/kernel/classes/packagehandlers/ezextension/ezextensionpackagehandler.php +++ b/kernel/classes/packagehandlers/ezextension/ezextensionpackagehandler.php @@ -21,13 +21,9 @@ class eZExtensionPackageHandler extends eZPackageHandler const ACTION_REPLACE = 1; const ACTION_SKIP = 2; - /*! - Constructor - */ - function eZExtensionPackageHandler() + public function __construct() { - $this->eZPackageHandler( 'ezextension', - array( 'extract-install-content' => true ) ); + parent::__construct( 'ezextension', array( 'extract-install-content' => true ) ); } /*! diff --git a/kernel/classes/packagehandlers/ezfile/ezfilepackagehandler.php b/kernel/classes/packagehandlers/ezfile/ezfilepackagehandler.php index 2419192b729..07fa84642d9 100644 --- a/kernel/classes/packagehandlers/ezfile/ezfilepackagehandler.php +++ b/kernel/classes/packagehandlers/ezfile/ezfilepackagehandler.php @@ -16,12 +16,9 @@ class eZFilePackageHandler extends eZPackageHandler { - /*! - Constructor - */ - function eZFilePackageHandler() + public function __construct() { - $this->eZPackageHandler( 'ezfile' ); + parent::__construct( 'ezfile' ); } function install( $package, $installType, $parameters, diff --git a/kernel/classes/packagehandlers/eziniaddon/eziniaddonpackagehandler.php b/kernel/classes/packagehandlers/eziniaddon/eziniaddonpackagehandler.php index af99958dab7..808cebbb8d3 100644 --- a/kernel/classes/packagehandlers/eziniaddon/eziniaddonpackagehandler.php +++ b/kernel/classes/packagehandlers/eziniaddon/eziniaddonpackagehandler.php @@ -16,13 +16,9 @@ class eZINIAddonPackageHandler extends eZPackageHandler { - /*! - Constructor - */ - function eZINIAddonPackageHandler() + public function __construct() { - $this->eZPackageHandler( 'eziniaddon', - array( 'extract-install-content' => true ) ); + parent::__construct( 'eziniaddon', array( 'extract-install-content' => true ) ); } /*! diff --git a/kernel/classes/packagehandlers/ezinstallscript/ezinstallscriptpackagehandler.php b/kernel/classes/packagehandlers/ezinstallscript/ezinstallscriptpackagehandler.php index 77705648a40..37e7824ef6a 100644 --- a/kernel/classes/packagehandlers/ezinstallscript/ezinstallscriptpackagehandler.php +++ b/kernel/classes/packagehandlers/ezinstallscript/ezinstallscriptpackagehandler.php @@ -17,13 +17,9 @@ class eZInstallScriptPackageHandler extends eZPackageHandler { - /*! - Constructor - */ - function eZInstallScriptPackageHandler() + public function __construct() { - $this->eZPackageHandler( 'ezinstallscript', - array( 'extract-install-content' => false ) ); + parent::__construct( 'ezinstallscript', array( 'extract-install-content' => false ) ); } /*! diff --git a/kernel/classes/packageinstallers/ezcontentobject/ezcontentobjectpackageinstaller.php b/kernel/classes/packageinstallers/ezcontentobject/ezcontentobjectpackageinstaller.php index df088504f76..14230516e99 100644 --- a/kernel/classes/packageinstallers/ezcontentobject/ezcontentobjectpackageinstaller.php +++ b/kernel/classes/packageinstallers/ezcontentobject/ezcontentobjectpackageinstaller.php @@ -16,8 +16,14 @@ class eZContentObjectPackageInstaller extends eZPackageInstallationHandler { - - function eZContentObjectPackageInstaller( $package, $type, $installItem ) + /** + * Constructor + * + * @param eZPackage $package + * @param string $type + * @param mixed $installItem + */ + public function __construct( $package, $type, $installItem ) { $steps = array(); $steps[] = array( 'id' => 'site_access', @@ -35,11 +41,9 @@ function eZContentObjectPackageInstaller( $package, $type, $installItem ) 'methods' => array( 'initialize' => 'initializeAdvancedOptions', 'validate' => 'validateAdvancedOptions' ), 'template' => 'advanced_options.tpl' ); - $this->eZPackageInstallationHandler( $package, - $type, - $installItem, - ezpI18n::tr( 'kernel/package', 'Content object import' ), - $steps ); + parent::__construct( + $package, $type, $installItem, ezpI18n::tr( 'kernel/package', 'Content object import' ), $steps + ); } /*! diff --git a/kernel/classes/packageinstallers/ezinstallscript/ezinstallscriptpackageinstaller.php b/kernel/classes/packageinstallers/ezinstallscript/ezinstallscriptpackageinstaller.php index 38eee0aa528..142712e6150 100644 --- a/kernel/classes/packageinstallers/ezinstallscript/ezinstallscriptpackageinstaller.php +++ b/kernel/classes/packageinstallers/ezinstallscript/ezinstallscriptpackageinstaller.php @@ -15,13 +15,14 @@ class eZInstallScriptPackageInstaller extends eZPackageInstallationHandler { - /* - Constructor should be implemented in the child class - and call the constructor of eZPackageInstallationHandler. + /** + * The Constructor should be implemented in the child class + * and call the constructor of eZPackageInstallationHandler. */ - function eZInstallScriptPackageInstaller( $package, $type, $installItem ) + public function __construct( $package, $type, $installItem, $name = null, $steps = null ) { } + /*! Returns \c 'stable', content class packages are always stable. */ diff --git a/kernel/classes/shopaccounthandlers/ezdefaultshopaccounthandler.php b/kernel/classes/shopaccounthandlers/ezdefaultshopaccounthandler.php index f5b471fc8c1..3adbc041d98 100644 --- a/kernel/classes/shopaccounthandlers/ezdefaultshopaccounthandler.php +++ b/kernel/classes/shopaccounthandlers/ezdefaultshopaccounthandler.php @@ -10,11 +10,6 @@ class eZDefaultShopAccountHandler { - function eZDefaultShopAccountHandler() - { - - } - /*! Will verify that the user has supplied the correct user information. Returns true if we have all the information needed about the user. diff --git a/kernel/classes/shopaccounthandlers/ezsimpleshopaccounthandler.php b/kernel/classes/shopaccounthandlers/ezsimpleshopaccounthandler.php index ff28b658879..c7a07dbd3fa 100644 --- a/kernel/classes/shopaccounthandlers/ezsimpleshopaccounthandler.php +++ b/kernel/classes/shopaccounthandlers/ezsimpleshopaccounthandler.php @@ -10,11 +10,6 @@ class eZSimpleShopAccountHandler { - function eZSimpleShopAccountHandler() - { - - } - /*! Will verify that the user has supplied the correct user information. Returns true if we have all the information needed about the user. diff --git a/kernel/classes/shopaccounthandlers/ezusershopaccounthandler.php b/kernel/classes/shopaccounthandlers/ezusershopaccounthandler.php index 688f8069dca..3461f87557f 100644 --- a/kernel/classes/shopaccounthandlers/ezusershopaccounthandler.php +++ b/kernel/classes/shopaccounthandlers/ezusershopaccounthandler.php @@ -10,11 +10,6 @@ class eZUserShopAccountHandler { - function eZUserShopAccountHandler() - { - - } - /*! Will verify that the user has supplied the correct user information. Returns true if we have all the information needed about the user. diff --git a/kernel/classes/workflowtypes/event/ezapprove/ezapprovetype.php b/kernel/classes/workflowtypes/event/ezapprove/ezapprovetype.php index 5ea747fbef2..a8d0f95aea8 100644 --- a/kernel/classes/workflowtypes/event/ezapprove/ezapprovetype.php +++ b/kernel/classes/workflowtypes/event/ezapprove/ezapprovetype.php @@ -31,9 +31,9 @@ class eZApproveType extends eZWorkflowEventType const VERSION_OPTION_EXCEPT_FIRST = 2; const VERSION_OPTION_ALL = 3; - function eZApproveType() + public function __construct() { - $this->eZWorkflowEventType( eZApproveType::WORKFLOW_TYPE_STRING, ezpI18n::tr( 'kernel/workflow/event', "Approve" ) ); + parent::__construct( eZApproveType::WORKFLOW_TYPE_STRING, ezpI18n::tr( 'kernel/workflow/event', "Approve" ) ); $this->setTriggerTypes( array( 'content' => array( 'publish' => array( 'before' ) ) ) ); } diff --git a/kernel/classes/workflowtypes/event/ezfinishuserregister/ezfinishuserregistertype.php b/kernel/classes/workflowtypes/event/ezfinishuserregister/ezfinishuserregistertype.php index 0bffec01178..a2efd6cd767 100644 --- a/kernel/classes/workflowtypes/event/ezfinishuserregister/ezfinishuserregistertype.php +++ b/kernel/classes/workflowtypes/event/ezfinishuserregister/ezfinishuserregistertype.php @@ -19,7 +19,7 @@ class eZFinishUserRegisterType extends eZWorkflowEventType { public function __construct() { - $this->eZWorkflowEventType( eZFinishUserRegisterType::WORKFLOW_TYPE_STRING, ezpI18n::tr( 'kernel/workflow/event', "Finish User Registration" ) ); + parent::__construct( eZFinishUserRegisterType::WORKFLOW_TYPE_STRING, ezpI18n::tr( 'kernel/workflow/event', "Finish User Registration" ) ); $this->setTriggerTypes( array( 'content' => array( 'publish' => array( 'after' ) ) ) ); } diff --git a/kernel/classes/workflowtypes/event/ezmultiplexer/ezmultiplexertype.php b/kernel/classes/workflowtypes/event/ezmultiplexer/ezmultiplexertype.php index 065b798f11d..6585709dc96 100644 --- a/kernel/classes/workflowtypes/event/ezmultiplexer/ezmultiplexertype.php +++ b/kernel/classes/workflowtypes/event/ezmultiplexer/ezmultiplexertype.php @@ -30,9 +30,9 @@ class eZMultiplexerType extends eZWorkflowEventType /*! Constructor */ - function eZMultiplexerType() + public function __construct() { - $this->eZWorkflowEventType( eZMultiplexerType::WORKFLOW_TYPE_STRING, ezpI18n::tr( 'kernel/workflow/event', 'Multiplexer' ) ); + parent::__construct( eZMultiplexerType::WORKFLOW_TYPE_STRING, ezpI18n::tr( 'kernel/workflow/event', 'Multiplexer' ) ); } function attributeDecoder( $event, $attr ) diff --git a/kernel/classes/workflowtypes/event/ezpaymentgateway/ezpaymentgatewaytype.php b/kernel/classes/workflowtypes/event/ezpaymentgateway/ezpaymentgatewaytype.php index 54363fe1a8a..ead2366bf97 100644 --- a/kernel/classes/workflowtypes/event/ezpaymentgateway/ezpaymentgatewaytype.php +++ b/kernel/classes/workflowtypes/event/ezpaymentgateway/ezpaymentgatewaytype.php @@ -22,15 +22,11 @@ class eZPaymentGatewayType extends eZWorkflowEventType const GATEWAY_NOT_SELECTED = 0; const GATEWAY_SELECTED = 1; - /*! - Constructor. - */ - - function eZPaymentGatewayType() + public function __construct() { - $this->logger = eZPaymentLogger::CreateForAdd( "var/log/eZPaymentGatewayType.log" ); + $this->logger = eZPaymentLogger::CreateForAdd( "var/log/eZPaymentGatewayType.log" ); - $this->eZWorkflowEventType( eZPaymentGatewayType::WORKFLOW_TYPE_STRING, ezpI18n::tr( 'kernel/workflow/event', "Payment Gateway" ) ); + parent::__construct( eZPaymentGatewayType::WORKFLOW_TYPE_STRING, ezpI18n::tr( 'kernel/workflow/event', "Payment Gateway" ) ); $this->loadAndRegisterGateways(); } diff --git a/kernel/classes/workflowtypes/event/ezpaymentgateway/ezpaymentlogger.php b/kernel/classes/workflowtypes/event/ezpaymentgateway/ezpaymentlogger.php index 795fffe7522..2bc9f64ce13 100644 --- a/kernel/classes/workflowtypes/event/ezpaymentgateway/ezpaymentlogger.php +++ b/kernel/classes/workflowtypes/event/ezpaymentgateway/ezpaymentlogger.php @@ -14,7 +14,7 @@ class eZPaymentLogger { - function eZPaymentLogger( $fileName, $mode ) + public function __construct( $fileName, $mode ) { $this->file = fopen( $fileName, $mode ); } diff --git a/kernel/classes/workflowtypes/event/ezsimpleshipping/ezsimpleshippingtype.php b/kernel/classes/workflowtypes/event/ezsimpleshipping/ezsimpleshippingtype.php index 32f3e260e52..36bee2adab8 100644 --- a/kernel/classes/workflowtypes/event/ezsimpleshipping/ezsimpleshippingtype.php +++ b/kernel/classes/workflowtypes/event/ezsimpleshipping/ezsimpleshippingtype.php @@ -17,12 +17,9 @@ class eZSimpleShippingType extends eZWorkflowEventType { const WORKFLOW_TYPE_STRING = 'ezsimpleshipping'; - /*! - Constructor - */ - function eZSimpleShippingType() + public function __construct() { - $this->eZWorkflowEventType( eZSimpleShippingType::WORKFLOW_TYPE_STRING, ezpI18n::tr( 'kernel/workflow/event', "Simple shipping" ) ); + parent::__construct( eZSimpleShippingType::WORKFLOW_TYPE_STRING, ezpI18n::tr( 'kernel/workflow/event', "Simple shipping" ) ); $this->setTriggerTypes( array( 'shop' => array( 'confirmorder' => array ( 'before' ) ) ) ); } diff --git a/kernel/classes/workflowtypes/event/ezwaituntildate/ezwaituntildate.php b/kernel/classes/workflowtypes/event/ezwaituntildate/ezwaituntildate.php index 875966b1cdf..8aa580f8d27 100644 --- a/kernel/classes/workflowtypes/event/ezwaituntildate/ezwaituntildate.php +++ b/kernel/classes/workflowtypes/event/ezwaituntildate/ezwaituntildate.php @@ -15,7 +15,11 @@ */ class eZWaitUntilDate { - function eZWaitUntilDate( $eventID, $eventVersion ) + /** + * @param int $eventID + * @param int $eventVersion + */ + public function __construct( $eventID, $eventVersion ) { $this->WorkflowEventID = $eventID; $this->WorkflowEventVersion = $eventVersion; diff --git a/kernel/classes/workflowtypes/event/ezwaituntildate/ezwaituntildatetype.php b/kernel/classes/workflowtypes/event/ezwaituntildate/ezwaituntildatetype.php index 8611715a7bf..954d5e199d8 100644 --- a/kernel/classes/workflowtypes/event/ezwaituntildate/ezwaituntildatetype.php +++ b/kernel/classes/workflowtypes/event/ezwaituntildate/ezwaituntildatetype.php @@ -17,12 +17,9 @@ class eZWaitUntilDateType extends eZWorkflowEventType { const WORKFLOW_TYPE_STRING = "ezwaituntildate"; - /*! - Constructor - */ - function eZWaitUntilDateType() + public function __construct() { - $this->eZWorkflowEventType( eZWaitUntilDateType::WORKFLOW_TYPE_STRING, ezpI18n::tr( 'kernel/workflow/event', "Wait until date" ) ); + parent::__construct( eZWaitUntilDateType::WORKFLOW_TYPE_STRING, ezpI18n::tr( 'kernel/workflow/event', "Wait until date" ) ); $this->setTriggerTypes( array( 'content' => array( 'publish' => array( 'before', 'after' ) ) ) ); } diff --git a/kernel/classes/workflowtypes/event/ezwaituntildate/ezwaituntildatevalue.php b/kernel/classes/workflowtypes/event/ezwaituntildate/ezwaituntildatevalue.php index 7edf187aecc..482a68f9551 100644 --- a/kernel/classes/workflowtypes/event/ezwaituntildate/ezwaituntildatevalue.php +++ b/kernel/classes/workflowtypes/event/ezwaituntildate/ezwaituntildatevalue.php @@ -16,12 +16,9 @@ class eZWaitUntilDateValue extends eZPersistentObject { - /*! - Constructor - */ - function eZWaitUntilDateValue( $row ) + public function __construct( $row ) { - $this->eZPersistentObject( $row ); + parent::__construct( $row ); $this->ClassName = null; $this->ClassAttributeName = null; diff --git a/kernel/collaboration/ezcollaborationfunctioncollection.php b/kernel/collaboration/ezcollaborationfunctioncollection.php index 44b863f833a..f4e366d177e 100644 --- a/kernel/collaboration/ezcollaborationfunctioncollection.php +++ b/kernel/collaboration/ezcollaborationfunctioncollection.php @@ -16,13 +16,6 @@ class eZCollaborationFunctionCollection { - /*! - Constructor - */ - function eZCollaborationFunctionCollection() - { - } - function fetchParticipant( $itemID, $participantID ) { if ( $participantID === false ) diff --git a/kernel/common/ezalphabetoperator.php b/kernel/common/ezalphabetoperator.php index c057ae39273..2fabf564e23 100644 --- a/kernel/common/ezalphabetoperator.php +++ b/kernel/common/ezalphabetoperator.php @@ -17,7 +17,12 @@ class eZAlphabetOperator { - function eZAlphabetOperator( $alphabet = 'alphabet' ) + /** + * Constructor + * + * @param string $alphabet + */ + public function __construct( $alphabet = 'alphabet' ) { $this->Operators = array( $alphabet ); $this->Alphabet = $alphabet; diff --git a/kernel/common/ezautolinkoperator.php b/kernel/common/ezautolinkoperator.php index 50617741633..a78514e6884 100644 --- a/kernel/common/ezautolinkoperator.php +++ b/kernel/common/ezautolinkoperator.php @@ -10,7 +10,12 @@ class eZAutoLinkOperator { - function eZAutoLinkOperator( $name = 'autolink' ) + /** + * Constructor + * + * @param string $name + */ + public function __construct( $name = 'autolink' ) { $this->Operators = array( $name ); } diff --git a/kernel/common/ezcontentstructuretreeoperator.php b/kernel/common/ezcontentstructuretreeoperator.php index 52b52b03b97..f253c66ca82 100644 --- a/kernel/common/ezcontentstructuretreeoperator.php +++ b/kernel/common/ezcontentstructuretreeoperator.php @@ -15,7 +15,12 @@ class eZContentStructureTreeOperator { - function eZContentStructureTreeOperator( $name = 'content_structure_tree' ) + /** + * Constructor + * + * @param string $name + */ + public function __construct( $name = 'content_structure_tree' ) { $this->Operators = array( $name ); } diff --git a/kernel/common/ezdateoperatorcollection.php b/kernel/common/ezdateoperatorcollection.php index f1a4dd9c64b..a3f5731e6cd 100644 --- a/kernel/common/ezdateoperatorcollection.php +++ b/kernel/common/ezdateoperatorcollection.php @@ -10,7 +10,12 @@ class eZDateOperatorCollection { - function eZDateOperatorCollection( $monthName = 'month_overview' ) + /** + * Constructor + * + * @param string $monthName + */ + public function __construct( $monthName = 'month_overview' ) { $this->MonthOverviewName = $monthName; $this->Operators = array( $monthName ); diff --git a/kernel/common/ezi18noperator.php b/kernel/common/ezi18noperator.php index 74f656ff7ff..e503e3472c4 100644 --- a/kernel/common/ezi18noperator.php +++ b/kernel/common/ezi18noperator.php @@ -16,7 +16,14 @@ class eZi18nOperator { - function eZi18nOperator( $name = 'i18n', $extensionName = 'x18n', $dynamicName = 'd18n' ) + /** + * Constructor + * + * @param string $name + * @param string $extensionName + * @param string $dynamicName + */ + public function __construct( $name = 'i18n', $extensionName = 'x18n', $dynamicName = 'd18n' ) { $this->Operators = array( $name, $extensionName, $dynamicName ); $this->Name = $name; diff --git a/kernel/common/ezkerneloperator.php b/kernel/common/ezkerneloperator.php index 3098e720a90..c82ec01d7ab 100644 --- a/kernel/common/ezkerneloperator.php +++ b/kernel/common/ezkerneloperator.php @@ -15,10 +15,12 @@ */ class eZKernelOperator { - /*! - Initializes the object with the name $name - */ - function eZKernelOperator( $name = "ezpreference" ) + /** + * Constructor + * + * @param string $name + */ + public function __construct( $name = "ezpreference" ) { $this->Operators = array( $name ); } diff --git a/kernel/common/ezmoduleoperator.php b/kernel/common/ezmoduleoperator.php index 54abe739cf4..d3a6e9ae1e9 100644 --- a/kernel/common/ezmoduleoperator.php +++ b/kernel/common/ezmoduleoperator.php @@ -17,10 +17,12 @@ class eZModuleOperator { - /*! - Constructor - */ - function eZModuleOperator( $name = 'ezmodule' ) + /** + * Constructor + * + * @param string $name + */ + public function __construct( $name = 'ezmodule' ) { $this->Operators = array( $name ); } diff --git a/kernel/common/ezmoduleparamsoperator.php b/kernel/common/ezmoduleparamsoperator.php index b378237d12a..7b61e4d2051 100644 --- a/kernel/common/ezmoduleparamsoperator.php +++ b/kernel/common/ezmoduleparamsoperator.php @@ -30,13 +30,6 @@ class eZModuleParamsOperator { - /*! - Constructor, does nothing by default. - */ - function eZModuleParamsOperator() - { - } - /*! \return an array with the template operator name. */ diff --git a/kernel/common/ezobjectforwarder.php b/kernel/common/ezobjectforwarder.php index 76f0813d0a1..71c879d605f 100644 --- a/kernel/common/ezobjectforwarder.php +++ b/kernel/common/ezobjectforwarder.php @@ -16,7 +16,12 @@ class eZObjectForwarder { - function eZObjectForwarder( $rules ) + /** + * Constructor + * + * @param array $rules + */ + public function __construct( $rules ) { $this->Rules = $rules; } diff --git a/kernel/common/ezpackageoperator.php b/kernel/common/ezpackageoperator.php index f660699373f..7af6a6863a0 100644 --- a/kernel/common/ezpackageoperator.php +++ b/kernel/common/ezpackageoperator.php @@ -16,10 +16,12 @@ class eZPackageOperator { - /*! - Constructor - */ - function eZPackageOperator( $name = 'ezpackage' ) + /** + * Constructor + * + * @param string $name + */ + public function __construct( $name = 'ezpackage' ) { $this->Operators = array( $name ); } diff --git a/kernel/common/ezsimpletagsoperator.php b/kernel/common/ezsimpletagsoperator.php index 1d29bf6af7f..6cc1d019269 100644 --- a/kernel/common/ezsimpletagsoperator.php +++ b/kernel/common/ezsimpletagsoperator.php @@ -10,7 +10,12 @@ class eZSimpleTagsOperator { - function eZSimpleTagsOperator( $name = 'simpletags' ) + /** + * Constructor + * + * @param string $name + */ + public function __construct( $name = 'simpletags' ) { $this->Operators = array( $name ); } diff --git a/kernel/common/eztemplatedesignresource.php b/kernel/common/eztemplatedesignresource.php index d9c97968eb9..27eaf87f9ee 100644 --- a/kernel/common/eztemplatedesignresource.php +++ b/kernel/common/eztemplatedesignresource.php @@ -27,12 +27,14 @@ class eZTemplateDesignResource extends eZTemplateFileResource */ protected static $overrideArrayCache = null; - /*! - Initializes with a default resource name "design". - */ - function eZTemplateDesignResource( $name = "design" ) + /** + * Constructor + * + * @param string $name + */ + public function __construct( $name = "design" ) { - $this->eZTemplateFileResource( $name, true ); + parent::__construct( $name, true ); $this->Keys = array(); $this->KeyStack = array(); } diff --git a/kernel/common/eztocoperator.php b/kernel/common/eztocoperator.php index 506df115239..abbf7fe5859 100644 --- a/kernel/common/eztocoperator.php +++ b/kernel/common/eztocoperator.php @@ -16,13 +16,6 @@ class eZTOCOperator { - /*! - Constructor - */ - function eZTOCOperator() - { - } - /*! \return an array with the template operator name. */ diff --git a/kernel/common/eztopmenuoperator.php b/kernel/common/eztopmenuoperator.php index d80a3129c55..483a5fb46dd 100644 --- a/kernel/common/eztopmenuoperator.php +++ b/kernel/common/eztopmenuoperator.php @@ -17,10 +17,12 @@ class eZTopMenuOperator { - /*! - Constructor - */ - function eZTopMenuOperator( $name = 'topmenu' ) + /** + * Constructor + * + * @param string $name + */ + public function __construct( $name = 'topmenu' ) { $this->Operators = array( $name ); $this->DefaultNames = array( diff --git a/kernel/common/eztreemenuoperator.php b/kernel/common/eztreemenuoperator.php index 2e11e5f8337..190a915ad5a 100644 --- a/kernel/common/eztreemenuoperator.php +++ b/kernel/common/eztreemenuoperator.php @@ -10,7 +10,12 @@ class eZTreeMenuOperator { - function eZTreeMenuOperator( $name = 'treemenu' ) + /** + * Constructor + * + * @param string $name + */ + public function __construct( $name = 'treemenu' ) { $this->Operators = array( $name ); } diff --git a/kernel/common/ezurloperator.php b/kernel/common/ezurloperator.php index 99126a9b875..0416e806b14 100644 --- a/kernel/common/ezurloperator.php +++ b/kernel/common/ezurloperator.php @@ -21,10 +21,21 @@ class eZURLOperator const HTTP_OPERATOR_TYPE_SESSION = 3; const HTTP_OPERATOR_TYPE_COOKIE = 4; - /*! - Initializes the image operator with the operator name $name. - */ - function eZURLOperator( $url_name = 'ezurl', + /** + * Constructor + * + * @param string $url_name + * @param string $urlroot_name + * @param string $ezsys_name + * @param string $design_name + * @param string $image_name + * @param string $ext_name + * @param string $httpName + * @param string $iniName + * @param string $iniNameHasVariable + * @param string $httpNameHasVariable + */ + public function __construct( $url_name = 'ezurl', $urlroot_name = 'ezroot', $ezsys_name = 'ezsys', $design_name = 'ezdesign', diff --git a/kernel/common/ezwordtoimageoperator.php b/kernel/common/ezwordtoimageoperator.php index 01d99cdaaf9..9fc552f5097 100644 --- a/kernel/common/ezwordtoimageoperator.php +++ b/kernel/common/ezwordtoimageoperator.php @@ -15,10 +15,10 @@ */ class eZWordToImageOperator { - /*! - Initializes the object with the name $name, default is "wash". - */ - function eZWordToImageOperator() + /** + * Constructor + */ + public function __construct() { $this->Operators = array( "wordtoimage", "mimetype_icon", "class_icon", "classgroup_icon", "action_icon", "icon", diff --git a/kernel/content/ezcontentfunctioncollection.php b/kernel/content/ezcontentfunctioncollection.php index d83e60324e6..ee9dc2f5e4e 100644 --- a/kernel/content/ezcontentfunctioncollection.php +++ b/kernel/content/ezcontentfunctioncollection.php @@ -16,13 +16,6 @@ class eZContentFunctionCollection { - /*! - Constructor - */ - function eZContentFunctionCollection() - { - } - static public function fetchContentObject( $objectID, $remoteID = false ) { if ( $objectID === false && $remoteID !== false ) @@ -843,7 +836,7 @@ static public function fetchKeywordCount( $alphabet, INNER JOIN ezcontentobject_tree ON (ezcontentobject_tree.contentobject_id = ezcontentobject.id) INNER JOIN ezcontentclass ON (ezcontentclass.id = ezcontentobject.contentclass_id) $sqlPermissionChecking[from] - WHERE + WHERE $parentNodeIDString $sqlMatching $showInvisibleNodesCond diff --git a/kernel/content/ezcontentoperationcollection.php b/kernel/content/ezcontentoperationcollection.php index 9019ecccf55..fc7e189680a 100644 --- a/kernel/content/ezcontentoperationcollection.php +++ b/kernel/content/ezcontentoperationcollection.php @@ -21,13 +21,6 @@ class eZContentOperationCollection */ private static $operationsStack = 0; - /*! - Constructor - */ - function eZContentOperationCollection() - { - } - static public function readNode( $nodeID ) { diff --git a/kernel/infocollector/ezinfocollectorfunctioncollection.php b/kernel/infocollector/ezinfocollectorfunctioncollection.php index c81939a7914..4cf0a0d9d2f 100644 --- a/kernel/infocollector/ezinfocollectorfunctioncollection.php +++ b/kernel/infocollector/ezinfocollectorfunctioncollection.php @@ -16,13 +16,6 @@ class eZInfocollectorFunctionCollection { - /*! - Constructor - */ - function eZInfocollectorFunctionCollection() - { - } - static public function fetchCollectedInfoCount( $objectAttributeID, $objectID, $value, $creatorID = false, $userIdentifier = false ) { if ( $objectAttributeID ) diff --git a/kernel/layout/ezlayoutfunctioncollection.php b/kernel/layout/ezlayoutfunctioncollection.php index ce4f299741d..b51655528ac 100644 --- a/kernel/layout/ezlayoutfunctioncollection.php +++ b/kernel/layout/ezlayoutfunctioncollection.php @@ -16,13 +16,6 @@ class eZLayoutFunctionCollection { - /*! - Constructor - */ - function eZLayoutFunctionCollection() - { - } - function fetchSitedesignList() { $contentINI = eZINI::instance( 'content.ini' ); diff --git a/kernel/notification/eznotificationfunctioncollection.php b/kernel/notification/eznotificationfunctioncollection.php index 5fbda63443b..9a9d4156418 100644 --- a/kernel/notification/eznotificationfunctioncollection.php +++ b/kernel/notification/eznotificationfunctioncollection.php @@ -16,13 +16,6 @@ class eZNotificationFunctionCollection { - /*! - Constructor - */ - function eZNotificationFunctionCollection() - { - } - function handlerList() { $availableHandlers = eZNotificationEventFilter::availableHandlers(); diff --git a/kernel/package/ezpackagefunctioncollection.php b/kernel/package/ezpackagefunctioncollection.php index 9969993156f..511c019c89a 100644 --- a/kernel/package/ezpackagefunctioncollection.php +++ b/kernel/package/ezpackagefunctioncollection.php @@ -16,13 +16,6 @@ class eZPackageFunctionCollection { - /*! - Constructor - */ - function eZPackageFunctionCollection() - { - } - function fetchList( $filterArray = false, $offset, $limit, $repositoryID ) { $filterParams = array(); diff --git a/kernel/private/classes/clusterfilehandlers/dfsbackends/mysqlbackenderror.php b/kernel/private/classes/clusterfilehandlers/dfsbackends/mysqlbackenderror.php index 6de162ca9f9..c5d8fe2c1b3 100644 --- a/kernel/private/classes/clusterfilehandlers/dfsbackends/mysqlbackenderror.php +++ b/kernel/private/classes/clusterfilehandlers/dfsbackends/mysqlbackenderror.php @@ -15,7 +15,13 @@ class eZDFSMySQLBackendError { - function eZDFSMySQLBackendError( $value, $text ) + /** + * Constructor + * + * @param mixed $value + * @param string $text + */ + public function __construct( $value, $text ) { $this->errorValue = $value; $this->errorText = $text; diff --git a/kernel/private/classes/ezcontentobjectstate.php b/kernel/private/classes/ezcontentobjectstate.php index a6a435703d3..27f320aa2fe 100644 --- a/kernel/private/classes/ezcontentobjectstate.php +++ b/kernel/private/classes/ezcontentobjectstate.php @@ -18,11 +18,6 @@ class eZContentObjectState extends eZPersistentObject { const MAX_IDENTIFIER_LENGTH = 45; - function __construct( $row = array() ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { static $definition = array( "fields" => array( "id" => array( "name" => "ID", diff --git a/kernel/private/classes/ezcontentobjectstategroup.php b/kernel/private/classes/ezcontentobjectstategroup.php index 89a54b36f1c..8ef56dc738a 100644 --- a/kernel/private/classes/ezcontentobjectstategroup.php +++ b/kernel/private/classes/ezcontentobjectstategroup.php @@ -25,11 +25,6 @@ class eZContentObjectStateGroup extends eZPersistentObject */ static $allowInternalCUD = false; - function __construct( $row = array() ) - { - $this->eZPersistentObject( $row ); - } - public static function definition() { static $definition = array( "fields" => array( "id" => array( "name" => "ID", diff --git a/kernel/private/classes/ezcontentobjectstategrouplanguage.php b/kernel/private/classes/ezcontentobjectstategrouplanguage.php index 9ea1ba7afc6..24ddc5b5017 100644 --- a/kernel/private/classes/ezcontentobjectstategrouplanguage.php +++ b/kernel/private/classes/ezcontentobjectstategrouplanguage.php @@ -19,11 +19,6 @@ */ class eZContentObjectStateGroupLanguage extends eZPersistentObject { - function __construct( $row = array() ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { static $definition = array( "fields" => array( "contentobject_state_group_id" => array( "name" => "ContentObjectStateGroupID", diff --git a/kernel/private/classes/ezcontentobjectstatelanguage.php b/kernel/private/classes/ezcontentobjectstatelanguage.php index c3322db760d..a8842ed0594 100644 --- a/kernel/private/classes/ezcontentobjectstatelanguage.php +++ b/kernel/private/classes/ezcontentobjectstatelanguage.php @@ -19,11 +19,6 @@ */ class eZContentObjectStateLanguage extends eZPersistentObject { - function __construct( $row = array() ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { static $definition = array( "fields" => array( "contentobject_state_id" => array( "name" => "ContentObjectStateID", diff --git a/kernel/role/ezrolefunctioncollection.php b/kernel/role/ezrolefunctioncollection.php index 5481505b506..8371a53a54c 100644 --- a/kernel/role/ezrolefunctioncollection.php +++ b/kernel/role/ezrolefunctioncollection.php @@ -16,13 +16,6 @@ class eZRoleFunctionCollection { - /*! - Constructor - */ - function eZRoleFunctionCollection() - { - } - function fetchRole( $roleID ) { $role = eZRole::fetch( $roleID ); diff --git a/kernel/search/ezsearchfunctioncollection.php b/kernel/search/ezsearchfunctioncollection.php index d5c214ee15f..48d241b1d9d 100644 --- a/kernel/search/ezsearchfunctioncollection.php +++ b/kernel/search/ezsearchfunctioncollection.php @@ -16,13 +16,6 @@ class eZSearchFunctionCollection { - /*! - Constructor - */ - function eZSearchFunctionCollection() - { - } - function fetchSearchListCount() { $db = eZDB::instance(); diff --git a/kernel/search/plugins/ezsearchengine/ezsearchengine.php b/kernel/search/plugins/ezsearchengine/ezsearchengine.php index 4a45296bf00..3166a139e0a 100644 --- a/kernel/search/plugins/ezsearchengine/ezsearchengine.php +++ b/kernel/search/plugins/ezsearchengine/ezsearchengine.php @@ -15,7 +15,7 @@ class eZSearchEngine implements ezpSearchEngine { - function eZSearchEngine() + public function __construct() { $generalFilter = array( 'subTreeTable' => '', 'searchDateQuery' => '', diff --git a/kernel/section/ezsectionfunctioncollection.php b/kernel/section/ezsectionfunctioncollection.php index a0343c8800d..7e88ca39171 100644 --- a/kernel/section/ezsectionfunctioncollection.php +++ b/kernel/section/ezsectionfunctioncollection.php @@ -16,13 +16,6 @@ class eZSectionFunctionCollection { - /*! - Constructor - */ - function eZSectionFunctionCollection() - { - } - /** * Fetch section object given either section id or section identifier. There should be one and only one parameter. * @param integer $sectionID diff --git a/kernel/setup/ezsetup_summary.php b/kernel/setup/ezsetup_summary.php index fd0e7f57f7e..ae60282d5d4 100644 --- a/kernel/setup/ezsetup_summary.php +++ b/kernel/setup/ezsetup_summary.php @@ -16,15 +16,13 @@ class eZSetupSummary { - /*! - Constructor - - Create new object for generating summary - - \param template - \param persistence list - */ - function eZSetupSummary( $tpl, &$persistenceList ) + /** + * Creates a new object for generating summary + * + * @param eZTemplate $tpl + * @param array $persistenceList + */ + public function __construct( $tpl, &$persistenceList ) { $this->Tpl =& $tpl; $this->PersistenceList =& $persistenceList; diff --git a/kernel/setup/ezsetupfunctioncollection.php b/kernel/setup/ezsetupfunctioncollection.php index 1fc288b29aa..30fb9594825 100644 --- a/kernel/setup/ezsetupfunctioncollection.php +++ b/kernel/setup/ezsetupfunctioncollection.php @@ -16,14 +16,6 @@ class eZSetupFunctionCollection { - /*! - Constructor - */ - function eZSetupFunctionCollection() - { - } - - function fetchFullVersionString() { return array( 'result' => eZPublishSDK::version() ); diff --git a/kernel/setup/steps/ezstep_create_sites.php b/kernel/setup/steps/ezstep_create_sites.php index 487340bad8b..372ee7d0997 100644 --- a/kernel/setup/steps/ezstep_create_sites.php +++ b/kernel/setup/steps/ezstep_create_sites.php @@ -46,13 +46,17 @@ class eZStepCreateSites extends eZStepInstaller { - /*! - Constructor - */ - function eZStepCreateSites( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'create_sites', 'Create sites' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'create_sites', 'Create sites' ); } function processPostData() diff --git a/kernel/setup/steps/ezstep_data.php b/kernel/setup/steps/ezstep_data.php index ad8b012c93b..b3856abbb6e 100644 --- a/kernel/setup/steps/ezstep_data.php +++ b/kernel/setup/steps/ezstep_data.php @@ -16,10 +16,6 @@ class eZStepData { - function eZStepData( ) - { - } - /*! \static Get file and class info for specified step diff --git a/kernel/setup/steps/ezstep_database_choice.php b/kernel/setup/steps/ezstep_database_choice.php index 47a6b37dd1b..31e7d5eefbc 100644 --- a/kernel/setup/steps/ezstep_database_choice.php +++ b/kernel/setup/steps/ezstep_database_choice.php @@ -16,12 +16,17 @@ class eZStepDatabaseChoice extends eZStepInstaller { - /*! - Constructor - */ - function eZStepDatabaseChoice( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, + parent::__construct( $tpl, $http, $ini, $persistenceList, 'database_choice', 'Database choice' ); } diff --git a/kernel/setup/steps/ezstep_database_init.php b/kernel/setup/steps/ezstep_database_init.php index 2baf5fd9294..f70bbe8e804 100644 --- a/kernel/setup/steps/ezstep_database_init.php +++ b/kernel/setup/steps/ezstep_database_init.php @@ -16,13 +16,17 @@ class eZStepDatabaseInit extends eZStepInstaller { - /*! - Constructor - */ - function eZStepDatabaseInit( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'database_init', 'Database init' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'database_init', 'Database init' ); } function processPostData() diff --git a/kernel/setup/steps/ezstep_email_settings.php b/kernel/setup/steps/ezstep_email_settings.php index cbc7164eff2..8f165f2c24f 100644 --- a/kernel/setup/steps/ezstep_email_settings.php +++ b/kernel/setup/steps/ezstep_email_settings.php @@ -16,13 +16,17 @@ class eZStepEmailSettings extends eZStepInstaller { - /*! - Constructor - */ - function eZStepEmailSettings( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'email_settings', 'Email settings' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'email_settings', 'Email settings' ); } function processPostData() diff --git a/kernel/setup/steps/ezstep_final.php b/kernel/setup/steps/ezstep_final.php index 47c2a88f5eb..fdbb4e5de84 100644 --- a/kernel/setup/steps/ezstep_final.php +++ b/kernel/setup/steps/ezstep_final.php @@ -16,13 +16,17 @@ class eZStepFinal extends eZStepInstaller { - /*! - Constructor - */ - function eZStepFinal( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'final', 'Final' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'final', 'Final' ); } function processPostData() diff --git a/kernel/setup/steps/ezstep_installer.php b/kernel/setup/steps/ezstep_installer.php index 93137711609..49e747f6551 100644 --- a/kernel/setup/steps/ezstep_installer.php +++ b/kernel/setup/steps/ezstep_installer.php @@ -40,7 +40,7 @@ class eZStepInstaller * @param string $identifier * @param string $name */ - function eZStepInstaller( eZTemplate $tpl, eZHTTPTool $http, eZINI $ini, array &$persistenceList, + public function __construct( eZTemplate $tpl, eZHTTPTool $http, eZINI $ini, array &$persistenceList, $identifier, $name ) { $this->Tpl = $tpl; diff --git a/kernel/setup/steps/ezstep_language_options.php b/kernel/setup/steps/ezstep_language_options.php index 09b596f56c1..3c789c8ce6c 100644 --- a/kernel/setup/steps/ezstep_language_options.php +++ b/kernel/setup/steps/ezstep_language_options.php @@ -16,13 +16,17 @@ class eZStepLanguageOptions extends eZStepInstaller { - /*! - Constructor - */ - function eZStepLanguageOptions( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'language_options', 'Language options' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'language_options', 'Language options' ); } function processPostData() diff --git a/kernel/setup/steps/ezstep_package_language_options.php b/kernel/setup/steps/ezstep_package_language_options.php index b9073352ce4..e1ab3807771 100644 --- a/kernel/setup/steps/ezstep_package_language_options.php +++ b/kernel/setup/steps/ezstep_package_language_options.php @@ -16,13 +16,17 @@ class eZStepPackageLanguageOptions extends eZStepInstaller { - /*! - Constructor - */ - function eZStepPackageLanguageOptions( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'package_language_options', 'Package language options' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'package_language_options', 'Package language options' ); } function processPostData() diff --git a/kernel/setup/steps/ezstep_registration.php b/kernel/setup/steps/ezstep_registration.php index 4b050a93f91..28846bc9d51 100644 --- a/kernel/setup/steps/ezstep_registration.php +++ b/kernel/setup/steps/ezstep_registration.php @@ -24,10 +24,9 @@ class eZStepRegistration extends eZStepInstaller * @param \eZINI $ini * @param array $persistenceList */ - function eZStepRegistration( eZTemplate $tpl, eZHTTPTool $http, eZINI $ini, array &$persistenceList ) + public function __construct( eZTemplate $tpl, eZHTTPTool $http, eZINI $ini, array &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'registration', 'Registration' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'registration', 'Registration' ); } /** diff --git a/kernel/setup/steps/ezstep_security.php b/kernel/setup/steps/ezstep_security.php index 6c066145a11..ebeae91f097 100644 --- a/kernel/setup/steps/ezstep_security.php +++ b/kernel/setup/steps/ezstep_security.php @@ -16,13 +16,17 @@ class eZStepSecurity extends eZStepInstaller { - /*! - Constructor - */ - function eZStepSecurity( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'security', 'Security' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'security', 'Security' ); } function processPostData() diff --git a/kernel/setup/steps/ezstep_site_access.php b/kernel/setup/steps/ezstep_site_access.php index 0cbcea2dd0f..a421fe75104 100644 --- a/kernel/setup/steps/ezstep_site_access.php +++ b/kernel/setup/steps/ezstep_site_access.php @@ -16,13 +16,17 @@ class eZStepSiteAccess extends eZStepInstaller { - /*! - Constructor - */ - function eZStepSiteAccess( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'site_access', 'Site access' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'site_access', 'Site access' ); } function processPostData() diff --git a/kernel/setup/steps/ezstep_site_admin.php b/kernel/setup/steps/ezstep_site_admin.php index eb7152dfc35..d38e881e3a1 100644 --- a/kernel/setup/steps/ezstep_site_admin.php +++ b/kernel/setup/steps/ezstep_site_admin.php @@ -24,13 +24,17 @@ class eZStepSiteAdmin extends eZStepInstaller const PASSWORD_MISSING = 6; const PASSWORD_TOO_SHORT = 7; - /*! - Constructor - */ - function eZStepSiteAdmin( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'site_admin', 'Site admin' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'site_admin', 'Site admin' ); } function processPostData() diff --git a/kernel/setup/steps/ezstep_site_details.php b/kernel/setup/steps/ezstep_site_details.php index fd529dab440..78cd6aed724 100644 --- a/kernel/setup/steps/ezstep_site_details.php +++ b/kernel/setup/steps/ezstep_site_details.php @@ -22,13 +22,17 @@ class eZStepSiteDetails extends eZStepInstaller const SITE_ACCESS_HOSTNAME_REGEXP = '/^([a-zA-Z0-9.\-:]*)$/'; const SITE_ACCESS_PORT_REGEXP = '/^([0-9]*)$/'; - /*! - Constructor - */ - function eZStepSiteDetails( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'site_details', 'Site details' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'site_details', 'Site details' ); } function processPostData() diff --git a/kernel/setup/steps/ezstep_site_packages.php b/kernel/setup/steps/ezstep_site_packages.php index f41a120a482..0d04f5107d1 100644 --- a/kernel/setup/steps/ezstep_site_packages.php +++ b/kernel/setup/steps/ezstep_site_packages.php @@ -16,13 +16,17 @@ class eZStepSitePackages extends eZStepInstaller { - /*! - Constructor - */ - function eZStepSitePackages( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'site_packages', 'Site packages' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'site_packages', 'Site packages' ); } function processPostData() diff --git a/kernel/setup/steps/ezstep_site_templates.php b/kernel/setup/steps/ezstep_site_templates.php index e12529b2b7c..c0e4df61036 100644 --- a/kernel/setup/steps/ezstep_site_templates.php +++ b/kernel/setup/steps/ezstep_site_templates.php @@ -16,13 +16,17 @@ class eZStepSiteTemplates extends eZStepInstaller { - /*! - Constructor - */ - function eZStepSiteTemplates( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'site_templates', 'Site templates' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'site_templates', 'Site templates' ); } function processPostData() diff --git a/kernel/setup/steps/ezstep_site_types.php b/kernel/setup/steps/ezstep_site_types.php index 68e51aa8f32..ea0a9ac7857 100644 --- a/kernel/setup/steps/ezstep_site_types.php +++ b/kernel/setup/steps/ezstep_site_types.php @@ -16,10 +16,15 @@ class eZStepSiteTypes extends eZStepInstaller { - /*! - Constructor - */ - function eZStepSiteTypes( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { $ini = eZINI::instance( 'package.ini' ); $indexURL = trim( $ini->variable( 'RepositorySettings', 'RemotePackagesIndexURL' ) ); @@ -39,8 +44,7 @@ function eZStepSiteTypes( $tpl, $http, $ini, &$persistenceList ) else $this->XMLIndexURL = $this->IndexURL . '/index.xml'; - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'site_types', 'Site types' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'site_types', 'Site types' ); } /** diff --git a/kernel/setup/steps/ezstep_system_check.php b/kernel/setup/steps/ezstep_system_check.php index 3f19da17313..df9a5922364 100644 --- a/kernel/setup/steps/ezstep_system_check.php +++ b/kernel/setup/steps/ezstep_system_check.php @@ -16,13 +16,17 @@ class eZStepSystemCheck extends eZStepInstaller { - /*! - Constructor - */ - function eZStepSystemCheck( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'system_check', 'System check' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'system_check', 'System check' ); } function processPostData() diff --git a/kernel/setup/steps/ezstep_system_finetune.php b/kernel/setup/steps/ezstep_system_finetune.php index 459e971eeb5..3d78aacf6b6 100644 --- a/kernel/setup/steps/ezstep_system_finetune.php +++ b/kernel/setup/steps/ezstep_system_finetune.php @@ -16,13 +16,17 @@ class eZStepSystemFinetune extends eZStepInstaller { - /*! - Constructor - */ - function eZStepSystemFinetune( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'system_finetune', 'System finetune' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'system_finetune', 'System finetune' ); } function processPostData() diff --git a/kernel/setup/steps/ezstep_welcome.php b/kernel/setup/steps/ezstep_welcome.php index 1ee6a66c48b..02238ed7223 100644 --- a/kernel/setup/steps/ezstep_welcome.php +++ b/kernel/setup/steps/ezstep_welcome.php @@ -16,13 +16,17 @@ class eZStepWelcome extends eZStepInstaller { - /*! - Constructor - */ - function eZStepWelcome( $tpl, $http, $ini, &$persistenceList ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZHTTPTool $http + * @param eZINI $ini + * @param array $persistenceList + */ + public function __construct( $tpl, $http, $ini, &$persistenceList ) { - $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, - 'welcome', 'Welcome' ); + parent::__construct( $tpl, $http, $ini, $persistenceList, 'welcome', 'Welcome' ); } function processPostData() diff --git a/kernel/shop/classes/exchangeratehandlers/ezecb/ezecbhandler.php b/kernel/shop/classes/exchangeratehandlers/ezecb/ezecbhandler.php index f1d9351b38c..9e42c95faf2 100644 --- a/kernel/shop/classes/exchangeratehandlers/ezecb/ezecbhandler.php +++ b/kernel/shop/classes/exchangeratehandlers/ezecb/ezecbhandler.php @@ -10,13 +10,13 @@ class eZECBHandler extends eZExchangeRatesUpdateHandler { - function eZECBHandler() + public function __construct() { $this->ServerName = false; $this->ServerPort = false; $this->RatesURI = false; - eZExchangeRatesUpdateHandler::eZExchangeRatesUpdateHandler(); + parent::__construct(); } function initialize( $params = array() ) diff --git a/kernel/shop/classes/exchangeratehandlers/ezexchangeratesupdatehandler.php b/kernel/shop/classes/exchangeratehandlers/ezexchangeratesupdatehandler.php index 528f91f8124..ac5bd09fbeb 100644 --- a/kernel/shop/classes/exchangeratehandlers/ezexchangeratesupdatehandler.php +++ b/kernel/shop/classes/exchangeratehandlers/ezexchangeratesupdatehandler.php @@ -17,7 +17,7 @@ class eZExchangeRatesUpdateHandler const UNKNOWN_BASE_CURRENCY = 4; const INVALID_BASE_CROSS_RATE = 5; - function eZExchangeRatesUpdateHandler() + public function __construct() { $this->RateList = false; $this->BaseCurrency = false; diff --git a/kernel/shop/classes/ezcurrencyconverter.php b/kernel/shop/classes/ezcurrencyconverter.php index 4b8af1e972a..323ba4bc6af 100644 --- a/kernel/shop/classes/ezcurrencyconverter.php +++ b/kernel/shop/classes/ezcurrencyconverter.php @@ -23,7 +23,7 @@ class eZCurrencyConverter const ROUNDING_TYPE_CEIL = 3; const ROUNDING_TYPE_FLOOR = 4; - function eZCurrencyConverter() + public function __construct() { $this->setMathHandler( null ); $this->setRoundingType( null ); diff --git a/kernel/shop/classes/ezcurrencydata.php b/kernel/shop/classes/ezcurrencydata.php index 0c7aef69db4..8e33a4947f6 100644 --- a/kernel/shop/classes/ezcurrencydata.php +++ b/kernel/shop/classes/ezcurrencydata.php @@ -22,9 +22,9 @@ class eZCurrencyData extends eZPersistentObject const STATUS_ACTIVE = '1'; const STATUS_INACTIVE = '2'; - function eZCurrencyData( $row ) + public function __construct( $row ) { - $this->eZPersistentObject( $row ); + parent::__construct( $row ); $this->RateValue = false; } diff --git a/kernel/shop/classes/ezmultipricedata.php b/kernel/shop/classes/ezmultipricedata.php index 1e082115e06..1e5bbd076ea 100644 --- a/kernel/shop/classes/ezmultipricedata.php +++ b/kernel/shop/classes/ezmultipricedata.php @@ -17,11 +17,6 @@ class eZMultiPriceData extends eZPersistentObject const ERROR_OK = 0; const ERROR_AUTOPRICES_UPDATE_FAILED = 1; - function eZMultiPriceData( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'id' => array( 'name' => 'ID', diff --git a/kernel/shop/classes/ezpaymentcallbackchecker.php b/kernel/shop/classes/ezpaymentcallbackchecker.php index fdc63a3214a..39a6802f988 100644 --- a/kernel/shop/classes/ezpaymentcallbackchecker.php +++ b/kernel/shop/classes/ezpaymentcallbackchecker.php @@ -17,10 +17,12 @@ class eZPaymentCallbackChecker { - /*! - Constructor. - */ - function eZPaymentCallbackChecker( $iniFile ) + /** + * Constructor + * + * @param string $iniFile + */ + public function __construct( $iniFile ) { $this->logger = eZPaymentLogger::CreateForAdd( 'var/log/eZPaymentChecker.log' ); $this->ini = eZINI::instance( $iniFile ); diff --git a/kernel/shop/classes/ezpaymentgateway.php b/kernel/shop/classes/ezpaymentgateway.php index 56a0aa5bea5..7165e7d9bba 100644 --- a/kernel/shop/classes/ezpaymentgateway.php +++ b/kernel/shop/classes/ezpaymentgateway.php @@ -15,10 +15,7 @@ class eZPaymentGateway { - /*! - Constructor. - */ - function eZPaymentGateway() + public function __construct() { $this->logger = eZPaymentLogger::CreateForAdd( "var/log/eZPaymentGateway.log" ); } diff --git a/kernel/shop/classes/ezpaymentobject.php b/kernel/shop/classes/ezpaymentobject.php index d9859daa9a5..82e709a857d 100644 --- a/kernel/shop/classes/ezpaymentobject.php +++ b/kernel/shop/classes/ezpaymentobject.php @@ -23,14 +23,6 @@ class eZPaymentObject extends eZPersistentObject const STATUS_NOT_APPROVED = 0; const STATUS_APPROVED = 1; - /*! - Constructor. - */ - function eZPaymentObject( $row ) - { - $this->eZPersistentObject( $row ); - } - /*! \static Creates new object. diff --git a/kernel/shop/classes/ezredirectgateway.php b/kernel/shop/classes/ezredirectgateway.php index ceee2158823..0464b6bbd49 100644 --- a/kernel/shop/classes/ezredirectgateway.php +++ b/kernel/shop/classes/ezredirectgateway.php @@ -22,10 +22,7 @@ class eZRedirectGateway extends eZPaymentGateway const OBJECT_NOT_CREATED = 1; const OBJECT_CREATED = 2; - /*! - Constructor. - */ - function eZRedirectGateway() + public function __construct() { //__DEBUG__ $this->logger = eZPaymentLogger::CreateForAdd( "var/log/eZRedirectGateway.log" ); diff --git a/kernel/shop/classes/ezshopfunctions.php b/kernel/shop/classes/ezshopfunctions.php index 2f5d750f1f2..6a56b6926a8 100644 --- a/kernel/shop/classes/ezshopfunctions.php +++ b/kernel/shop/classes/ezshopfunctions.php @@ -10,10 +10,6 @@ class eZShopFunctions { - function eZShopFunctions() - { - } - /*! \static */ diff --git a/kernel/shop/classes/ezsimpleprice.php b/kernel/shop/classes/ezsimpleprice.php index 6eec57f5217..457f20ff1ea 100644 --- a/kernel/shop/classes/ezsimpleprice.php +++ b/kernel/shop/classes/ezsimpleprice.php @@ -35,7 +35,14 @@ class eZSimplePrice { - function eZSimplePrice( $classAttribute, $contentObjectAttribute, $storedPrice = null ) + /** + * Constructor + * + * @param eZContentClassAttribute $classAttribute + * @param eZContentObjectAttribute $contentObjectAttribute + * @param float $storedPrice + */ + public function __construct( $classAttribute, $contentObjectAttribute, $storedPrice = null ) { $this->setVATIncluded( false ); diff --git a/kernel/shop/ezshopfunctioncollection.php b/kernel/shop/ezshopfunctioncollection.php index abece995b2e..14d797c0f76 100644 --- a/kernel/shop/ezshopfunctioncollection.php +++ b/kernel/shop/ezshopfunctioncollection.php @@ -16,13 +16,6 @@ class eZShopFunctionCollection { - /*! - Constructor - */ - function eZShopFunctionCollection() - { - } - function fetchBasket( ) { $http = eZHTTPTool::instance(); diff --git a/kernel/shop/ezshopoperationcollection.php b/kernel/shop/ezshopoperationcollection.php index 287fd9e2198..4adeccbbca3 100644 --- a/kernel/shop/ezshopoperationcollection.php +++ b/kernel/shop/ezshopoperationcollection.php @@ -15,13 +15,6 @@ */ class eZShopOperationCollection { - /*! - Constructor - */ - function eZShopOperationCollection() - { - } - function fetchOrder( $orderID ) { return array( 'status' => eZModuleOperationInfo::STATUS_CONTINUE ); diff --git a/kernel/url/ezurlfunctioncollection.php b/kernel/url/ezurlfunctioncollection.php index b55edd56ca5..146ab7becfa 100644 --- a/kernel/url/ezurlfunctioncollection.php +++ b/kernel/url/ezurlfunctioncollection.php @@ -16,13 +16,6 @@ class eZURLFunctionCollection { - /*! - Constructor - */ - function eZURLFunctionCollection() - { - } - function fetchList( $isValid, $offset, $limit, $onlyPublished ) { $parameters = array( 'is_valid' => $isValid, diff --git a/kernel/user/ezuserfunctioncollection.php b/kernel/user/ezuserfunctioncollection.php index 925f2490dfc..b1e7e812e96 100644 --- a/kernel/user/ezuserfunctioncollection.php +++ b/kernel/user/ezuserfunctioncollection.php @@ -16,13 +16,6 @@ class eZUserFunctionCollection { - /*! - Constructor - */ - function eZUserFunctionCollection() - { - } - function fetchCurrentUser() { $user = eZUser::currentUser(); diff --git a/kernel/user/ezuseroperationcollection.php b/kernel/user/ezuseroperationcollection.php index 5a6b3ca67b9..c11df666657 100644 --- a/kernel/user/ezuseroperationcollection.php +++ b/kernel/user/ezuseroperationcollection.php @@ -16,13 +16,6 @@ class eZUserOperationCollection { - /*! - Constructor - */ - function eZUserOperationCollection() - { - } - /** * Changes user settings * diff --git a/kernel/workflow/ezworkflowfunctioncollection.php b/kernel/workflow/ezworkflowfunctioncollection.php index 3de7493b934..5cb58eb07bc 100644 --- a/kernel/workflow/ezworkflowfunctioncollection.php +++ b/kernel/workflow/ezworkflowfunctioncollection.php @@ -16,14 +16,6 @@ class eZWorkflowFunctionCollection { - /*! - Constructor - */ - function eZWorkflowFunctionCollection() - { - } - - function fetchWorkflowStatuses() { return array( 'result' => eZWorkflow::statusNameMap() ); diff --git a/lib/ezdb/classes/ezdbinterface.php b/lib/ezdb/classes/ezdbinterface.php index 54f0b648398..5f7d16c1ccd 100644 --- a/lib/ezdb/classes/ezdbinterface.php +++ b/lib/ezdb/classes/ezdbinterface.php @@ -47,7 +47,7 @@ class eZDBInterface * * @param array $parameters */ - function eZDBInterface( $parameters ) + public function __construct( $parameters ) { $server = $parameters['server']; $port = $parameters['port']; diff --git a/lib/ezdb/classes/ezmysqlidb.php b/lib/ezdb/classes/ezmysqlidb.php index d8818b544fe..49e3201449f 100644 --- a/lib/ezdb/classes/ezmysqlidb.php +++ b/lib/ezdb/classes/ezmysqlidb.php @@ -22,12 +22,14 @@ class eZMySQLiDB extends eZDBInterface const RELATION_FOREIGN_KEY = 5; const RELATION_FOREIGN_KEY_BIT = 32; - /*! - Create a new eZMySQLiDB object and connects to the database backend. - */ - function eZMySQLiDB( $parameters ) + /** + * Create a new eZMySQLiDB object and connects to the database backend. + * + * @param array $parameters + */ + public function __construct( $parameters ) { - $this->eZDBInterface( $parameters ); + parent::__construct( $parameters ); if ( !extension_loaded( 'mysqli' ) ) { diff --git a/lib/ezdb/classes/eznulldb.php b/lib/ezdb/classes/eznulldb.php index 84a2b27d1b2..56738a458c7 100644 --- a/lib/ezdb/classes/eznulldb.php +++ b/lib/ezdb/classes/eznulldb.php @@ -18,14 +18,6 @@ class eZNullDB extends eZDBInterface { - /*! - Does nothing. - */ - function eZNullDB( $parameters ) - { - $this->eZDBInterface( $parameters ); - } - /*! Does nothing. */ diff --git a/lib/ezdb/classes/ezpostgresqldb.php b/lib/ezdb/classes/ezpostgresqldb.php index b2078a8c4c1..bfab7550e23 100644 --- a/lib/ezdb/classes/ezpostgresqldb.php +++ b/lib/ezdb/classes/ezpostgresqldb.php @@ -19,12 +19,15 @@ */ class eZPostgreSQLDB extends eZDBInterface { - /*! - Creates a new eZPostgreSQLDB object and connects to the database. - */ - function eZPostgreSQLDB( $parameters ) + /** + * Creates a new eZPostgreSQLDB object and connects to the database. + * + * @param array $parameters + * @throws eZDBNoConnectionException + */ + public function __construct( $parameters ) { - $this->eZDBInterface( $parameters ); + parent::__construct( $parameters ); if ( !extension_loaded( 'pgsql' ) ) { diff --git a/lib/ezdbschema/classes/ezdbschemainterface.php b/lib/ezdbschema/classes/ezdbschemainterface.php index 77bc7d49600..abfee45366a 100644 --- a/lib/ezdbschema/classes/ezdbschemainterface.php +++ b/lib/ezdbschema/classes/ezdbschemainterface.php @@ -60,12 +60,12 @@ class eZDBSchemaInterface { - /*! - Constructor - - \sa eZDB + /** + * Constructor + * + * @param array $params */ - function eZDBSchemaInterface( $params ) + public function __construct( $params ) { $this->DBInstance = $params['instance']; $this->Schema = false; diff --git a/lib/ezdbschema/classes/ezlintschema.php b/lib/ezdbschema/classes/ezlintschema.php index e0f7e963725..050a1f960b2 100644 --- a/lib/ezdbschema/classes/ezlintschema.php +++ b/lib/ezdbschema/classes/ezlintschema.php @@ -39,15 +39,15 @@ class eZLintSchema extends eZDBSchemaInterface { - /*! - Initializes the lint checker with a foreign db schema. - - \param $db A dummy parameter, pass \c false. - \param $otherSchema The db schema that should be checked - */ - function eZLintSchema( $db, $otherSchema ) + /** + * Initializes the lint checker with a foreign db schema. + * + * @param array $db A dummy parameter, pass false. + * @param eZDBSchemaInterface $otherSchema The db schema that should be checked + */ + public function __construct( $db, $otherSchema ) { - $this->eZDBSchemaInterface( $db ); + parent::__construct( $db ); $this->OtherSchema = $otherSchema; $this->CorrectSchema = false; $this->IsLintChecked = false; diff --git a/lib/ezdbschema/classes/ezmysqlschema.php b/lib/ezdbschema/classes/ezmysqlschema.php index c1e2321442a..b0c412e5472 100644 --- a/lib/ezdbschema/classes/ezmysqlschema.php +++ b/lib/ezdbschema/classes/ezmysqlschema.php @@ -17,17 +17,6 @@ class eZMysqlSchema extends eZDBSchemaInterface { - - /*! - Constructor - - \param db instance - */ - function eZMysqlSchema( $params ) - { - $this->eZDBSchemaInterface( $params ); - } - function schema( $params = array() ) { $params = array_merge( array( 'meta_data' => false, diff --git a/lib/ezdbschema/classes/ezpgsqlschema.php b/lib/ezdbschema/classes/ezpgsqlschema.php index 7bfed7973b8..5f540170e5f 100644 --- a/lib/ezdbschema/classes/ezpgsqlschema.php +++ b/lib/ezdbschema/classes/ezpgsqlschema.php @@ -68,16 +68,6 @@ class eZPgsqlSchema extends eZDBSchemaInterface WHERE a.attrelid = \'<>\' AND a.attnum IN (<>) AND NOT a.attisdropped ORDER BY a.attnum'; - /*! - Constructor - - \param db instance - */ - function eZPgsqlSchema( $db ) - { - $this->eZDBSchemaInterface( $db ); - } - function schema( $params = array() ) { $params = array_merge( array( 'meta_data' => false, diff --git a/lib/ezdiff/classes/ezdiff.php b/lib/ezdiff/classes/ezdiff.php index a77df1fb225..3c04611c57b 100644 --- a/lib/ezdiff/classes/ezdiff.php +++ b/lib/ezdiff/classes/ezdiff.php @@ -18,11 +18,12 @@ */ class eZDiff { - /*! - Instantiates the eZDiff object - \param $diffEngineType The type of diff engine to initialize at start - */ - function eZDiff( $diffEngineType = false ) + /** + * Instantiates the eZDiff object + * + * @param string|bool $diffEngineType The type of diff engine to initialize at start + */ + public function __construct( $diffEngineType = false ) { if ( $diffEngineType ) { diff --git a/lib/ezdiff/classes/ezdiffcontainerobject.php b/lib/ezdiff/classes/ezdiffcontainerobject.php index e882d823425..cdb5254363b 100644 --- a/lib/ezdiff/classes/ezdiffcontainerobject.php +++ b/lib/ezdiff/classes/ezdiffcontainerobject.php @@ -16,11 +16,6 @@ class eZDiffContainerObject extends eZDiffContent { - /*! - Constructor - */ - function eZDiffContainerObject() - { - } + } ?> diff --git a/lib/ezdiff/classes/ezdiffcontainerobjectengine.php b/lib/ezdiff/classes/ezdiffcontainerobjectengine.php index abbe15f6af4..91c1404dc88 100644 --- a/lib/ezdiff/classes/ezdiffcontainerobjectengine.php +++ b/lib/ezdiff/classes/ezdiffcontainerobjectengine.php @@ -19,10 +19,6 @@ class eZDiffContainerObjectEngine extends eZDiffEngine { - function eZDiffContainerObjectEngine() - { - } - /*! Create containerobject containig content from two versions */ diff --git a/lib/ezdiff/classes/ezdiffmatrix.php b/lib/ezdiff/classes/ezdiffmatrix.php index dc9d9bf9790..20b79a6c625 100644 --- a/lib/ezdiff/classes/ezdiffmatrix.php +++ b/lib/ezdiff/classes/ezdiffmatrix.php @@ -19,11 +19,13 @@ class eZDiffMatrix { - - /*! - Constructor - */ - function eZDiffMatrix( $rows = null, $cols = null) + /** + * Constructor + * + * @param int|null $rows + * @param int|null $cols + */ + public function __construct( $rows = null, $cols = null) { if ( isset( $rows ) && is_numeric( $rows ) ) $this->Rows = $rows; diff --git a/lib/ezdiff/classes/ezdifftextengine.php b/lib/ezdiff/classes/ezdifftextengine.php index bbe1bedd3be..9baae1195fb 100644 --- a/lib/ezdiff/classes/ezdifftextengine.php +++ b/lib/ezdiff/classes/ezdifftextengine.php @@ -19,10 +19,6 @@ class eZDiffTextEngine extends eZDiffEngine { - function eZDiffTextEngine() - { - } - /*! This function calculates changes in plain text and creates an object to hold overview of changes. diff --git a/lib/ezdiff/classes/ezdiffxmltextengine.php b/lib/ezdiff/classes/ezdiffxmltextengine.php index b2960ef86e1..ed2b49bf2cf 100644 --- a/lib/ezdiff/classes/ezdiffxmltextengine.php +++ b/lib/ezdiff/classes/ezdiffxmltextengine.php @@ -16,10 +16,6 @@ class eZDiffXMLTextEngine extends eZDiffEngine { - function eZDiffXMLTextEngine() - { - } - /*! This function calculates changes in xml text and creates an object to hold overview of changes. diff --git a/lib/ezdiff/classes/eztextdiff.php b/lib/ezdiff/classes/eztextdiff.php index 9d029fe827f..8a562058136 100644 --- a/lib/ezdiff/classes/eztextdiff.php +++ b/lib/ezdiff/classes/eztextdiff.php @@ -19,11 +19,6 @@ class eZTextDiff extends eZDiffContent { - /*! - Constructor - */ - function eZTextDiff() - { - } + } ?> diff --git a/lib/ezdiff/classes/ezxmltextdiff.php b/lib/ezdiff/classes/ezxmltextdiff.php index 36852be46d3..fa00da55cc8 100644 --- a/lib/ezdiff/classes/ezxmltextdiff.php +++ b/lib/ezdiff/classes/ezxmltextdiff.php @@ -16,11 +16,6 @@ class eZXMLTextDiff extends eZDiffContent { - /*! - Constructor - */ - function eZXMLTextDiff() - { - } + } ?> diff --git a/lib/ezfile/classes/ezbzip2compressionhandler.php b/lib/ezfile/classes/ezbzip2compressionhandler.php index 040d57d5d7c..970eb6e253a 100644 --- a/lib/ezfile/classes/ezbzip2compressionhandler.php +++ b/lib/ezfile/classes/ezbzip2compressionhandler.php @@ -21,9 +21,9 @@ class eZBZIP2Handler extends eZCompressionHandler /*! See eZCompressionHandler::eZCompressionHandler */ - function eZBZIP2Handler() + public function __construct() { - $this->eZCompressionHandler( 'BZIP2', 'bz2' ); + parent::__construct( 'BZIP2', 'bz2' ); } function doOpen( $filename, $mode ) diff --git a/lib/ezfile/classes/ezcompressionhandler.php b/lib/ezfile/classes/ezcompressionhandler.php index 8a1156177d1..c37f9cf3873 100644 --- a/lib/ezfile/classes/ezcompressionhandler.php +++ b/lib/ezfile/classes/ezcompressionhandler.php @@ -32,15 +32,6 @@ class eZCompressionHandler extends eZFileHandler { - /*! - Initializes the handler. Optionally the parameters \a $filename - and \a $mode may be provided to automatically open the file. - */ - function eZCompressionHandler( $handlerIdentifier, $handlerName ) - { - $this->eZFileHandler( $handlerIdentifier, $handlerName ); - } - /*! \pure Compress the \a $source string and return it as compressed data. diff --git a/lib/ezfile/classes/ezfilehandler.php b/lib/ezfile/classes/ezfilehandler.php index 8feb6e39de3..90ecb91c1de 100644 --- a/lib/ezfile/classes/ezfilehandler.php +++ b/lib/ezfile/classes/ezfilehandler.php @@ -54,11 +54,13 @@ class eZFileHandler { - /*! - Initializes the handler. Optionally the parameters \a $filename - and \a $mode may be provided to automatically open the file. - */ - function eZFileHandler( $handlerIdentifier = false, $handlerName = false ) + /** + * Initializes the handler. + * + * @param string|bool $handlerIdentifier + * @param string|bool $handlerName + */ + public function __construct( $handlerIdentifier = false, $handlerName = false ) { if ( !$handlerIdentifier ) { diff --git a/lib/ezfile/classes/ezforwardcompressionhandler.php b/lib/ezfile/classes/ezforwardcompressionhandler.php index 427515d0f5e..a48707479e0 100644 --- a/lib/ezfile/classes/ezforwardcompressionhandler.php +++ b/lib/ezfile/classes/ezforwardcompressionhandler.php @@ -18,14 +18,17 @@ class eZForwardCompressionHandler extends eZCompressionHandler { - /*! - See eZCompressionHandler::eZCompressionHandler - */ - function eZForwardCompressionHandler( &$handler, - $name, $identifier ) + /** + * Constructor + * + * @param bool|string $handler + * @param bool|string $name + * @param string $identifier + */ + public function __construct( &$handler, $name, $identifier ) { $this->ForwardHandler =& $handler; - $this->eZCompressionHandler( $name, $identifier ); + parent::__construct( $name, $identifier ); } /*! diff --git a/lib/ezfile/classes/ezgzipcompressionhandler.php b/lib/ezfile/classes/ezgzipcompressionhandler.php index 0b19fdd7859..7e38c0d604a 100644 --- a/lib/ezfile/classes/ezgzipcompressionhandler.php +++ b/lib/ezfile/classes/ezgzipcompressionhandler.php @@ -23,7 +23,7 @@ class eZGZIPCompressionHandler extends eZForwardCompressionHandler /*! See eZCompressionHandler::eZCompressionHandler and eZForwardCompressionHandler::eZForwardCompressionHandler. */ - function eZGZIPCompressionHandler() + public function __construct() { if ( eZGZIPZLIBCompressionHandler::isAvailable() ) $handler = new eZGZIPZLIBCompressionHandler(); @@ -31,8 +31,7 @@ function eZGZIPCompressionHandler() $handler = new eZGZIPShellCompressionHandler(); else $handler = new eZNoCompressionHandler(); - $this->eZForwardCompressionHandler( $handler, - 'GZIP', 'gzip' ); + parent::__construct( $handler, 'GZIP', 'gzip' ); } /*! diff --git a/lib/ezfile/classes/ezgzipshellcompressionhandler.php b/lib/ezfile/classes/ezgzipshellcompressionhandler.php index d9b063ebce7..4c5d33e9f02 100644 --- a/lib/ezfile/classes/ezgzipshellcompressionhandler.php +++ b/lib/ezfile/classes/ezgzipshellcompressionhandler.php @@ -20,11 +20,11 @@ class eZGZIPShellCompressionHandler extends eZCompressionHandler { - function eZGZIPShellCompressionHandler() + public function __construct() { $this->File = false; - $thus->Level = false; - $this->eZCompressionHandler( 'GZIP (shell)', 'gzipshell' ); + $this->Level = false; + parent::__construct( 'GZIP (shell)', 'gzipshell' ); } /*! diff --git a/lib/ezfile/classes/ezgzipzlibcompressionhandler.php b/lib/ezfile/classes/ezgzipzlibcompressionhandler.php index 6fd8db74612..b425b90f557 100644 --- a/lib/ezfile/classes/ezgzipzlibcompressionhandler.php +++ b/lib/ezfile/classes/ezgzipzlibcompressionhandler.php @@ -18,11 +18,11 @@ class eZGZIPZLIBCompressionHandler extends eZCompressionHandler { - function eZGZIPZLIBCompressionHandler() + public function __construct() { $this->File = false; $this->Level = false; - $this->eZCompressionHandler( 'GZIP (zlib)', 'gzipzlib' ); + parent::__construct( 'GZIP (zlib)', 'gzipzlib' ); } /*! diff --git a/lib/ezfile/classes/ezlog.php b/lib/ezfile/classes/ezlog.php index 45ac223069c..016f22a5970 100644 --- a/lib/ezfile/classes/ezlog.php +++ b/lib/ezfile/classes/ezlog.php @@ -21,13 +21,6 @@ class eZLog const MAX_LOGROTATE_FILES = 3; const MAX_LOGFILE_SIZE = 204800; // 200*1024 - /*! - Creates a new log object. - */ - function eZLog( ) - { - } - /*! \static \public diff --git a/lib/ezfile/classes/eznocompressionhandler.php b/lib/ezfile/classes/eznocompressionhandler.php index f9fbe3d9ce9..c97542c9387 100644 --- a/lib/ezfile/classes/eznocompressionhandler.php +++ b/lib/ezfile/classes/eznocompressionhandler.php @@ -16,12 +16,9 @@ class eZNoCompressionHandler extends eZCompressionHandler { - /*! - See eZCompressionHandler::eZCompressionHandler - */ - function eZNoCompressionHandler() + public function __construct() { - $this->eZCompressionHandler( 'No compression', 'no' ); + parent::__construct( 'No compression', 'no' ); } } diff --git a/lib/ezi18n/classes/ez1337translator.php b/lib/ezi18n/classes/ez1337translator.php index 52ca58e32b5..97283b15113 100644 --- a/lib/ezi18n/classes/ez1337translator.php +++ b/lib/ezi18n/classes/ez1337translator.php @@ -28,12 +28,9 @@ class eZ1337Translator extends eZTranslatorHandler { - /*! - Construct the translator and loads the translation file $file if is set and exists. - */ - function eZ1337Translator() + public function __construct() { - $this->eZTranslatorHandler( false ); + parent::__construct( false ); $this->Messages = array(); } diff --git a/lib/ezi18n/classes/ezborktranslator.php b/lib/ezi18n/classes/ezborktranslator.php index 286ccc88470..b2ded43688b 100644 --- a/lib/ezi18n/classes/ezborktranslator.php +++ b/lib/ezi18n/classes/ezborktranslator.php @@ -44,12 +44,9 @@ class eZBorkTranslator extends eZTranslatorHandler { - /*! - Construct the translator. - */ - function eZBorkTranslator() + public function __construct() { - $this->eZTranslatorHandler( false ); + parent::__construct( false ); $this->Messages = array(); } diff --git a/lib/ezi18n/classes/ezchartransform.php b/lib/ezi18n/classes/ezchartransform.php index 20250875bdd..626fcda9ce1 100644 --- a/lib/ezi18n/classes/ezchartransform.php +++ b/lib/ezi18n/classes/ezchartransform.php @@ -26,13 +26,6 @@ class eZCharTransform /// 24. Apr. 2007 - 1177423380 const CODE_DATE = 1177423380; - /*! - Constructor - */ - function eZCharTransform() - { - } - /*! Transforms the text according to the rules defined in \a $rule using character set \a $charset. \param $text The text string to be converted, currently Unicode arrays are not supported diff --git a/lib/ezi18n/classes/ezcodemapper.php b/lib/ezi18n/classes/ezcodemapper.php index 223de9dcd98..2287ead3d03 100644 --- a/lib/ezi18n/classes/ezcodemapper.php +++ b/lib/ezi18n/classes/ezcodemapper.php @@ -21,10 +21,7 @@ class eZCodeMapper const TYPE_RANGE = 2; const TYPE_REPLACE = 3; - /*! - Constructor - */ - function eZCodeMapper() + public function __construct() { $this->TransformationTables = array(); $this->TransformationFiles = array(); diff --git a/lib/ezi18n/classes/ezcodepage.php b/lib/ezi18n/classes/ezcodepage.php index ebd40c4f1ea..a64c3a28297 100644 --- a/lib/ezi18n/classes/ezcodepage.php +++ b/lib/ezi18n/classes/ezcodepage.php @@ -18,11 +18,14 @@ class eZCodePage { const CACHE_CODE_DATE = 1028204478; - - /*! - Initializes the codepage with the charset code $charset_code, and then loads it. - */ - function eZCodePage( $charset_code, $use_cache = true ) + + /** + * Initializes the codepage with the charset code $charset_code, and then loads it. + * + * @param string $charset_code + * @param bool $use_cache + */ + public function __construct( $charset_code, $use_cache = true ) { $this->RequestedCharsetCode = $charset_code; $this->CharsetCode = eZCharsetInfo::realCharsetCode( $charset_code ); diff --git a/lib/ezi18n/classes/ezcodepagecodec.php b/lib/ezi18n/classes/ezcodepagecodec.php index 9ca210096bf..7e05d43c7df 100644 --- a/lib/ezi18n/classes/ezcodepagecodec.php +++ b/lib/ezi18n/classes/ezcodepagecodec.php @@ -20,9 +20,9 @@ class eZCodePageCodec extends eZTextCodec /*! Initializes the codepage codec with $name */ - function eZCodePageCodec( $name ) + public function __construct( $name ) { - $this->eZTextCodec( $name ); + parent::__construct( $name ); $this->CodePage = false; } diff --git a/lib/ezi18n/classes/ezcodepagemapper.php b/lib/ezi18n/classes/ezcodepagemapper.php index 9688e6caf1e..faa9024625b 100644 --- a/lib/ezi18n/classes/ezcodepagemapper.php +++ b/lib/ezi18n/classes/ezcodepagemapper.php @@ -18,10 +18,14 @@ class eZCodePageMapper { const CACHE_CODE_DATE = 1026316422; - /*! - Constructor - */ - function eZCodePageMapper( $input_charset_code, $output_charset_code, $use_cache = true ) + /** + * Constructor + * + * @param string $input_charset_code + * @param string $output_charset_code + * @param bool $use_cache + */ + public function __construct( $input_charset_code, $output_charset_code, $use_cache = true ) { $this->RequestedInputCharsetCode = $input_charset_code; $this->InputCharsetCode = eZCharsetInfo::realCharsetCode( $input_charset_code ); diff --git a/lib/ezi18n/classes/ezmbstringmapper.php b/lib/ezi18n/classes/ezmbstringmapper.php index 163b71a3af4..6a25f2caec0 100644 --- a/lib/ezi18n/classes/ezmbstringmapper.php +++ b/lib/ezi18n/classes/ezmbstringmapper.php @@ -23,10 +23,13 @@ class eZMBStringMapper { - /*! - Constructor - */ - function eZMBStringMapper( $input_charset_code, $output_charset_code ) + /** + * Constructor + * + * @param string $input_charset_code + * @param string $output_charset_code + */ + public function __construct( $input_charset_code, $output_charset_code ) { $this->RequestedInputCharsetCode = $input_charset_code; $this->InputCharsetCode = eZCharsetInfo::realCharsetCode( $input_charset_code ); diff --git a/lib/ezi18n/classes/ezrandomtranslator.php b/lib/ezi18n/classes/ezrandomtranslator.php index 6be8e5eb8ca..26147298dc6 100644 --- a/lib/ezi18n/classes/ezrandomtranslator.php +++ b/lib/ezi18n/classes/ezrandomtranslator.php @@ -17,12 +17,9 @@ class eZRandomTranslator extends eZTranslatorGroup { - /*! - Constructor - */ - function eZRandomTranslator( $is_key_based ) + public function __construct( $is_key_based ) { - $this->eZTranslatorGroup( $is_key_based ); + parent::__construct( $is_key_based ); mt_srand(); } diff --git a/lib/ezi18n/classes/ezshuffletranslator.php b/lib/ezi18n/classes/ezshuffletranslator.php index 0f515dd0351..c84910d8f69 100644 --- a/lib/ezi18n/classes/ezshuffletranslator.php +++ b/lib/ezi18n/classes/ezshuffletranslator.php @@ -17,12 +17,14 @@ class eZShuffleTranslator extends eZTranslatorHandler { - /*! - Construct the translator and loads the translation file $file if is set and exists. - */ - function eZShuffleTranslator( $max_chars = 3 ) + /** + * Constructor + * + * @param int $max_chars + */ + public function __construct( $max_chars = 3 ) { - $this->eZTranslatorHandler( false ); + parent::__construct( false ); $this->MaxChars = $max_chars; $this->Messages = array(); diff --git a/lib/ezi18n/classes/eztextcodec.php b/lib/ezi18n/classes/eztextcodec.php index 01d9ef596e1..8d0579ce9ca 100644 --- a/lib/ezi18n/classes/eztextcodec.php +++ b/lib/ezi18n/classes/eztextcodec.php @@ -21,7 +21,15 @@ class eZTextCodec { - function eZTextCodec( $inputCharsetCode, $outputCharsetCode, + /** + * @param string $inputCharsetCode + * @param string $outputCharsetCode + * @param string $realInputCharsetCode + * @param string $realOutputCharsetCode + * @param string $inputEncoding + * @param string $outputEncoding + */ + public function __construct( $inputCharsetCode, $outputCharsetCode, $realInputCharsetCode, $realOutputCharsetCode, $inputEncoding, $outputEncoding ) { diff --git a/lib/ezi18n/classes/eztranslatorgroup.php b/lib/ezi18n/classes/eztranslatorgroup.php index b7410d868d3..0593443f439 100644 --- a/lib/ezi18n/classes/eztranslatorgroup.php +++ b/lib/ezi18n/classes/eztranslatorgroup.php @@ -17,12 +17,9 @@ class eZTranslatorGroup extends eZTranslatorHandler { - /*! - Constructor - */ - function eZTranslatorGroup( $is_key_based ) + public function __construct( $is_key_based ) { - $this->eZTranslatorHandler( $is_key_based ); + parent::__construct( $is_key_based ); $this->Handlers = array(); } diff --git a/lib/ezi18n/classes/eztranslatorhandler.php b/lib/ezi18n/classes/eztranslatorhandler.php index 108fd6d64cd..b5290a06e52 100644 --- a/lib/ezi18n/classes/eztranslatorhandler.php +++ b/lib/ezi18n/classes/eztranslatorhandler.php @@ -17,10 +17,12 @@ class eZTranslatorHandler { - /*! - Constructor - */ - function eZTranslatorHandler( $is_key_based ) + /** + * Constructor + * + * @param bool $is_key_based + */ + public function __construct( $is_key_based ) { $this->IsKeyBased = $is_key_based; } diff --git a/lib/ezi18n/classes/eztranslatormanager.php b/lib/ezi18n/classes/eztranslatormanager.php index f4bef0fafd3..3e1e8c18b11 100644 --- a/lib/ezi18n/classes/eztranslatormanager.php +++ b/lib/ezi18n/classes/eztranslatormanager.php @@ -31,7 +31,7 @@ class eZTranslatorManager { const DYNAMIC_TRANSLATIONS_ENABLED = 'eZTMDynamicTranslationsEnabled'; - function eZTranslatorManager() + public function __construct() { $this->Handlers = array(); } diff --git a/lib/ezi18n/classes/eztstranslator.php b/lib/ezi18n/classes/eztstranslator.php index 50747ac0fc4..54e5370da5a 100644 --- a/lib/ezi18n/classes/eztstranslator.php +++ b/lib/ezi18n/classes/eztstranslator.php @@ -21,7 +21,7 @@ class eZTSTranslator extends eZTranslatorHandler * @param string $filename * @param bool $useCache */ - function eZTSTranslator( $locale, $filename = null, $useCache = true ) + public function __construct( $locale, $filename = null, $useCache = true ) { $this->UseCache = $useCache; if ( isset( $GLOBALS['eZSiteBasics'] ) ) @@ -31,7 +31,7 @@ function eZTSTranslator( $locale, $filename = null, $useCache = true ) $this->UseCache = false; } $this->BuildCache = false; - $this->eZTranslatorHandler( true ); + parent::__construct( true ); $this->Locale = $locale; $this->File = $filename; diff --git a/lib/ezi18n/classes/ezutf8codec.php b/lib/ezi18n/classes/ezutf8codec.php index f3e93f5cd49..f5dc2e31846 100644 --- a/lib/ezi18n/classes/ezutf8codec.php +++ b/lib/ezi18n/classes/ezutf8codec.php @@ -20,13 +20,6 @@ class eZUTF8Codec { - /*! - Initializes utf8 codec. - */ - function eZUTF8Codec() - { - } - /*! Converts an UTF8 string into Unicode values and returns an array with the values. */ diff --git a/lib/ezimage/classes/ezexifimageanalyzer.php b/lib/ezimage/classes/ezexifimageanalyzer.php index 2da4290c48a..eba43abbe40 100644 --- a/lib/ezimage/classes/ezexifimageanalyzer.php +++ b/lib/ezimage/classes/ezexifimageanalyzer.php @@ -17,13 +17,6 @@ class eZEXIFImageAnalyzer { - /*! - Constructor - */ - function eZEXIFImageAnalyzer() - { - } - /*! Checks the file for EXIF data and returns the information. */ diff --git a/lib/ezimage/classes/ezgifimageanalyzer.php b/lib/ezimage/classes/ezgifimageanalyzer.php index 9e8aaf86808..4e0c34e3148 100644 --- a/lib/ezimage/classes/ezgifimageanalyzer.php +++ b/lib/ezimage/classes/ezgifimageanalyzer.php @@ -17,13 +17,6 @@ class eZGIFImageAnalyzer { - /*! - Constructor - */ - function eZGIFImageAnalyzer() - { - } - /*! Checks the file for GIF data blocks and returns information on the GIF file. */ diff --git a/lib/ezimage/classes/ezimageanalyzer.php b/lib/ezimage/classes/ezimageanalyzer.php index ef10f364154..43a1bf9b9cd 100644 --- a/lib/ezimage/classes/ezimageanalyzer.php +++ b/lib/ezimage/classes/ezimageanalyzer.php @@ -30,10 +30,7 @@ class eZImageAnalyzer const TRANSPARENCY_TRANSPARENT = 2; const TRANSPARENCY_TRANSLUCENT = 3; - /*! - Constructor - */ - function eZImageAnalyzer() + public function __construct() { $this->Name = false; $this->MIMEList = array(); diff --git a/lib/ezimage/classes/ezimagefactory.php b/lib/ezimage/classes/ezimagefactory.php index c3fcbee366c..77ed77d2c45 100644 --- a/lib/ezimage/classes/ezimagefactory.php +++ b/lib/ezimage/classes/ezimagefactory.php @@ -19,10 +19,12 @@ class eZImageFactory { - /*! - Initializes the factory with the name \a $name. - */ - function eZImageFactory( $name ) + /** + * Initializes the factory with the name $name. + * + * @param string $name + */ + public function __construct( $name ) { $this->Name = $name; } diff --git a/lib/ezimage/classes/ezimagefont.php b/lib/ezimage/classes/ezimagefont.php index 678fe603b79..3a270b56bee 100644 --- a/lib/ezimage/classes/ezimagefont.php +++ b/lib/ezimage/classes/ezimagefont.php @@ -28,12 +28,16 @@ class eZImageFont { - /*! - Initializes the object with a family, point size and path. - X and y adjustment may also be specified. - */ - function eZImageFont( $family, $size, $path, - $xAdjustment = 0, $yAdjustment = 0 ) + /** + * Initializes the object with a family, point size and path. X and y adjustment may also be specified. + * + * @param string $family + * @param int $size + * @param string $path + * @param int $xAdjustment + * @param int $yAdjustment + */ + public function __construct( $family, $size, $path, $xAdjustment = 0, $yAdjustment = 0 ) { $this->FontFamily = $family; $this->FontPath = $path; diff --git a/lib/ezimage/classes/ezimagegdfactory.php b/lib/ezimage/classes/ezimagegdfactory.php index 7b50b62502b..8c20ad59e38 100644 --- a/lib/ezimage/classes/ezimagegdfactory.php +++ b/lib/ezimage/classes/ezimagegdfactory.php @@ -10,12 +10,9 @@ class eZImageGDFactory extends eZImageFactory { - /*! - Initializes the factory with the name \c 'shell' - */ - function eZImageGDFactory() + public function __construct() { - $this->eZImageFactory( 'gd' ); + parent::__construct( 'gd' ); } /*! diff --git a/lib/ezimage/classes/ezimagegdhandler.php b/lib/ezimage/classes/ezimagegdhandler.php index d2d25b8c9c9..03c339e8f0f 100644 --- a/lib/ezimage/classes/ezimagegdhandler.php +++ b/lib/ezimage/classes/ezimagegdhandler.php @@ -22,10 +22,7 @@ class eZImageGDHandler extends eZImageHandler { - /*! - Constructor - */ - function eZImageGDHandler( $handlerName, $isGloballyEnabled, + public function __construct( $handlerName, $isGloballyEnabled, $outputRewriteType = self::REPLACE_SUFFIX, $conversionRules = false ) { @@ -106,10 +103,15 @@ function eZImageGDHandler( $handlerName, $isGloballyEnabled, { $filters[] = array( 'name' => $filterName ); } - $this->eZImageHandler( $handlerName, $isEnabled, - $outputRewriteType, - $supportedInputMIMETypes, $supportedOutputMIMETypes, - $conversionRules, $filters ); + parent::__construct( + $handlerName, + $isEnabled, + $outputRewriteType, + $supportedInputMIMETypes, + $supportedOutputMIMETypes, + $conversionRules, + $filters + ); } /*! diff --git a/lib/ezimage/classes/ezimagehandler.php b/lib/ezimage/classes/ezimagehandler.php index 3624de90e4b..a0b7a2bf0da 100644 --- a/lib/ezimage/classes/ezimagehandler.php +++ b/lib/ezimage/classes/ezimagehandler.php @@ -21,18 +21,19 @@ class eZImageHandler const REPLACE_SUFFIX = 2; const PREPEND_TAG_REPLACE_SUFFIX = 3; - /*! - Initializes the image handler with data sent from the inheriting class. - \param $handlerName The name of the current handler - \param $isEnabled A boolean which tells whether the handler can be used or not - \param $outputRewriteType Defines how output filenames are rewritten - \param $supportedInputMIMETypes A list of MIME-Types the handler supports as input or \c false if no type as defined - \param $supportedOutputMIMETypes A list of MIME-Types the handler supports as output or \c false if no type as defined - \param $conversionRules A list of conversion rules specific for this handler, is combined with the global rules - \param $filters A list of filters this handler supports - \param $mimeTagMap A mapping table which maps from a MIME-Type to a specific tag, this tag can be used when rewriting the filename. - */ - function eZImageHandler( $handlerName, $isEnabled = true, $outputRewriteType = self::REPLACE_SUFFIX, + /** + * Initializes the image handler with data sent from the inheriting class. + * + * @param string $handlerName The name of the current handler + * @param bool $isEnabled A boolean which tells whether the handler can be used or not + * @param int $outputRewriteType Defines how output filenames are rewritten + * @param array|bool $supportedInputMIMETypes A list of MIME-Types the handler supports as input or \c false if no type as defined + * @param array|$supportedOutputMIMETypes A list of MIME-Types the handler supports as output or \c false if no type as defined + * @param array|bool $conversionRules A list of conversion rules specific for this handler, is combined with the global rules + * @param array|bool $filters A list of filters this handler supports + * @param array|bool $mimeTagMap A mapping table which maps from a MIME-Type to a specific tag, this tag can be used when rewriting the filename. + */ + public function __construct( $handlerName, $isEnabled = true, $outputRewriteType = self::REPLACE_SUFFIX, $supportedInputMIMETypes = false, $supportedOutputMIMETypes, $conversionRules = false, $filters = false, $mimeTagMap = false ) { diff --git a/lib/ezimage/classes/ezimageinterface.php b/lib/ezimage/classes/ezimageinterface.php index 7f6a99a1894..e4d7a7e0be1 100644 --- a/lib/ezimage/classes/ezimageinterface.php +++ b/lib/ezimage/classes/ezimageinterface.php @@ -18,7 +18,15 @@ class eZImageInterface { - function eZImageInterface( $imageObjectRef = null, $imageObject = null, $width = false, $height = false ) + /** + * Constructor + * + * @param string $imageObjectRef + * @param eZContentObject $imageObject + * @param int|bool $width + * @param int|bool $height + */ + public function __construct( $imageObjectRef = null, $imageObject = null, $width = false, $height = false ) { $this->ImageObjectRef = $imageObjectRef; $this->ImageObject = $imageObject; diff --git a/lib/ezimage/classes/ezimagelayer.php b/lib/ezimage/classes/ezimagelayer.php index 61f37c3bcbd..8d727733f3f 100644 --- a/lib/ezimage/classes/ezimagelayer.php +++ b/lib/ezimage/classes/ezimagelayer.php @@ -17,13 +17,10 @@ class eZImageLayer extends eZImageInterface { - /*! - Constructor - */ - function eZImageLayer( $imageObjectRef = null, $imageObject = null, + public function __construct( $imageObjectRef = null, $imageObject = null, $width = false, $height = false, $font = false ) { - $this->eZImageInterface( $imageObjectRef, $imageObject, $width, $height ); + parent::__construct( $imageObjectRef, $imageObject, $width, $height ); $this->setFont( $font ); $this->TemplateURI = 'design:image/layer.tpl'; } diff --git a/lib/ezimage/classes/ezimagemanager.php b/lib/ezimage/classes/ezimagemanager.php index f42d7a072b7..f71e50e39db 100644 --- a/lib/ezimage/classes/ezimagemanager.php +++ b/lib/ezimage/classes/ezimagemanager.php @@ -83,11 +83,10 @@ class eZImageManager { - /*! - Initializes the manager by registering a application/octet-stream mimetype - which is applied for all unknown files. - */ - function eZImageManager() + /** + * Initializes the manager by registering a application/octet-stream mimetype which is applied for all unknown files. + */ + public function __construct() { $this->SupportedFormats = array(); $this->SupportedMIMEMap = array(); @@ -941,7 +940,7 @@ function createImageAlias( $aliasName, &$existingAliasList, $parameters = array( // url and alias name. ezpEvent::getInstance()->notify( 'image/alias', array( $currentAliasData['url'], $currentAliasData['name'] ) ); - + return true; } // conversion failed, we abort generation diff --git a/lib/ezimage/classes/ezimageobject.php b/lib/ezimage/classes/ezimageobject.php index e682b940367..db125bd1e0b 100644 --- a/lib/ezimage/classes/ezimageobject.php +++ b/lib/ezimage/classes/ezimageobject.php @@ -32,9 +32,9 @@ class eZImageObject extends eZImageInterface const PLACE_RELATIVE = 2; ///@} - function eZImageObject( $imageObjectRef = null, $imageObject = null, $width = false, $height = false ) + public function __construct( $imageObjectRef = null, $imageObject = null, $width = false, $height = false ) { - $this->eZImageInterface( $imageObjectRef, $imageObject, $width, $height ); + parent::__construct( $imageObjectRef, $imageObject, $width, $height ); $this->TemplateURI = 'design:image/imageobject.tpl'; $this->ImageLayers = array(); $this->ImageLayerCounter = 0; diff --git a/lib/ezimage/classes/ezimageshellfactory.php b/lib/ezimage/classes/ezimageshellfactory.php index 404420f285d..a6bd9587bd2 100644 --- a/lib/ezimage/classes/ezimageshellfactory.php +++ b/lib/ezimage/classes/ezimageshellfactory.php @@ -10,12 +10,9 @@ class eZImageShellFactory extends eZImageFactory { - /*! - Initializes the factory with the name \c 'shell' - */ - function eZImageShellFactory() + public function __construct() { - $this->eZImageFactory( 'shell' ); + parent::__construct( 'shell' ); } /*! diff --git a/lib/ezimage/classes/ezimageshellhandler.php b/lib/ezimage/classes/ezimageshellhandler.php index becad042912..2d1bd0881c7 100644 --- a/lib/ezimage/classes/ezimageshellhandler.php +++ b/lib/ezimage/classes/ezimageshellhandler.php @@ -17,14 +17,11 @@ class eZImageShellHandler extends eZImageHandler { - /*! - Constructor - */ - function eZImageShellHandler( $handlerName, $isEnabled = true, $outputRewriteType = self::REPLACE_SUFFIX, + public function __construct( $handlerName, $isEnabled = true, $outputRewriteType = self::REPLACE_SUFFIX, $supportedInputMIMETypes = false, $supportedOutputMIMETypes = false, $conversionRules = false, $filters = false, $mimeTagMap = false) { - $this->eZImageHandler( $handlerName, $isEnabled, $outputRewriteType, + parent::__construct( $handlerName, $isEnabled, $outputRewriteType, $supportedInputMIMETypes, $supportedOutputMIMETypes, $conversionRules, $filters, $mimeTagMap ); $this->Path = false; diff --git a/lib/ezimage/classes/ezimagetextlayer.php b/lib/ezimage/classes/ezimagetextlayer.php index f40208baf84..fbf992d34ad 100644 --- a/lib/ezimage/classes/ezimagetextlayer.php +++ b/lib/ezimage/classes/ezimagetextlayer.php @@ -17,14 +17,11 @@ class eZImageTextLayer extends eZImageLayer { - /*! - Constructor - */ - function eZImageTextLayer( $imageObjectRef = null, $imageObject = null, + public function __construct( $imageObjectRef = null, $imageObject = null, $width = false, $height = false, $font = false, $boundingBox = null, $text = null, $textAngle = 0 ) { - $this->eZImageLayer( $imageObjectRef, $imageObject, $width, $height, $font ); + parent::__construct( $imageObjectRef, $imageObject, $width, $height, $font ); $this->Text = $text; $this->TextAngle = $textAngle; $this->TextBoundingBox = $boundingBox; diff --git a/lib/ezlocale/classes/ezcurrency.php b/lib/ezlocale/classes/ezcurrency.php index 7875407612c..3449471aec2 100644 --- a/lib/ezlocale/classes/ezcurrency.php +++ b/lib/ezlocale/classes/ezcurrency.php @@ -31,11 +31,13 @@ class eZCurrency { - /*! - Creates a new eZCurrency object with the currency value $value. $value can be a numerical - value or an eZCurrency object in which case the value is extracted and copied. - */ - function eZCurrency( $value ) + /** + * Creates a new eZCurrency object with the currency value $value. $value can be a numerical + * value or an eZCurrency object in which case the value is extracted and copied. + * + * @param eZCurrency|number $value + */ + public function __construct( $value ) { if ( $value instanceof eZCurrency ) { diff --git a/lib/ezlocale/classes/ezdate.php b/lib/ezlocale/classes/ezdate.php index 0c6248cf921..cd1dfe6fcd6 100644 --- a/lib/ezlocale/classes/ezdate.php +++ b/lib/ezlocale/classes/ezdate.php @@ -56,11 +56,11 @@ function which returns a new eZDate object. You can also create a copy class eZDate { - /*! - Creates a new date object with default locale, if $date is not supplied - the current date is used. - */ - function eZDate( $date = false ) + /** + * Creates a new date object with default locale, if $date is not supplied the current date is used. + * @param int|bool $date + */ + public function __construct( $date = false ) { if ( $date === false ) { diff --git a/lib/ezlocale/classes/ezdatetime.php b/lib/ezlocale/classes/ezdatetime.php index 2a960640ef1..ef2887d95e3 100644 --- a/lib/ezlocale/classes/ezdatetime.php +++ b/lib/ezlocale/classes/ezdatetime.php @@ -60,11 +60,12 @@ function which returns a new eZDateTime object. You can also create a copy class eZDateTime { - /*! - Creates a new datetime object with default locale, if $datetime is not supplied - the current datetime is used. - */ - function eZDateTime( $datetime = false ) + /** + * Creates a new datetime object with default locale, if $datetime is not supplied the current datetime is used. + * + * @param eZDate|eZTime|bool $datetime + */ + public function __construct( $datetime = false ) { if ( $datetime instanceof eZDate ) { diff --git a/lib/ezlocale/classes/ezlocale.php b/lib/ezlocale/classes/ezlocale.php index 2001c2fc17a..08f5702e47b 100644 --- a/lib/ezlocale/classes/ezlocale.php +++ b/lib/ezlocale/classes/ezlocale.php @@ -111,11 +111,13 @@ class eZLocale { const DEBUG_INTERNALS = false; - /*! - Initializes the locale with the locale string \a $localeString. - All locale data is read from locale/$localeString.ini - */ - function eZLocale( $localeString ) + /** + * Initializes the locale with the locale string \a $localeString. + * All locale data is read from locale/$localeString.ini + * + * @param string $localeString + */ + public function __construct( $localeString ) { $this->IsValid = false; $this->TimePHPArray = array( 'g', 'G', 'h', 'H', 'i', 's', 'U', 'I', 'L', 't' ); diff --git a/lib/ezlocale/classes/eztime.php b/lib/ezlocale/classes/eztime.php index 6d5881b74f9..2139eb87efa 100644 --- a/lib/ezlocale/classes/eztime.php +++ b/lib/ezlocale/classes/eztime.php @@ -72,11 +72,12 @@ class eZTime */ const SECONDS_A_DAY = 86400; // 24*60*60 - /*! - Creates a new time object with default locale, if $time is not supplied - the current time is used. - */ - function eZTime( $timestamp = false ) + /** + * Creates a new time object with default locale, if $time is not supplied the current time is used. + * + * @param int|bool $timestamp + */ + public function __construct( $timestamp = false ) { if ( $timestamp === false ) { diff --git a/lib/ezmath/classes/mathhandlers/ezbcmath.php b/lib/ezmath/classes/mathhandlers/ezbcmath.php index 00f1ca4d8ec..a1b3a862be0 100644 --- a/lib/ezmath/classes/mathhandlers/ezbcmath.php +++ b/lib/ezmath/classes/mathhandlers/ezbcmath.php @@ -17,7 +17,7 @@ class eZBCMath extends eZPHPMath { const DEFAULT_SCALE = 10; - function eZBCMath( $params = array () ) + public function __construct( $params = array () ) { if( isset( $params['scale'] ) && is_numeric( $params['scale'] ) ) $this->setScale( $params['scale'] ); diff --git a/lib/ezmath/classes/mathhandlers/ezphpmath.php b/lib/ezmath/classes/mathhandlers/ezphpmath.php index 4407932082a..e788ef091c7 100644 --- a/lib/ezmath/classes/mathhandlers/ezphpmath.php +++ b/lib/ezmath/classes/mathhandlers/ezphpmath.php @@ -15,10 +15,6 @@ class eZPHPMath { - function eZPHPMath( $params = array() ) - { - } - static function create( $type, $params = array() ) { $filename = 'lib/ezmath/classes/mathhandlers/' . $type . '.php'; diff --git a/lib/ezpdf/classes/class.ezpdf.php b/lib/ezpdf/classes/class.ezpdf.php index 62385c9f71a..dc2bc58bb6e 100644 --- a/lib/ezpdf/classes/class.ezpdf.php +++ b/lib/ezpdf/classes/class.ezpdf.php @@ -24,7 +24,13 @@ class Cezpdf extends Cpdf // ------------------------------------------------------------------------------ - function Cezpdf( $paper = 'a4', $orientation = 'portrait' ) + /** + * Constructor + * + * @param string $paper + * @param string $orientation + */ + public function __construct( $paper = 'a4', $orientation = 'portrait' ) { // Assuming that people don't want to specify the paper size using the absolute coordinates // allow a couple of options: @@ -117,7 +123,7 @@ function Cezpdf( $paper = 'a4', $orientation = 'portrait' ) $size[3] = ( $paper[1] / 2.54 ) * 72; } } - $this->Cpdf( $size ); + parent::__construct( $size ); $this->ez['pageWidth']=$size[2]; $this->ez['pageHeight']=$size[3]; diff --git a/lib/ezpdf/classes/class.ezpdftable.php b/lib/ezpdf/classes/class.ezpdftable.php index 61b0ed334b0..f49c5d8a702 100644 --- a/lib/ezpdf/classes/class.ezpdftable.php +++ b/lib/ezpdf/classes/class.ezpdftable.php @@ -26,11 +26,16 @@ class eZPDFTable extends Cezpdf const HEADER_LEVEL_INDEX = '#indexLevel'; /** - Constructor. This class is only used to encapsulate a table. - */ + * Constructor + * + * This class is only used to encapsulate a table. + * + * @param string $paper + * @param string $orientation + */ function eZPDFTable($paper='a4',$orientation='portrait') { - $this->Cezpdf($paper, $orientation); + parent::__construct( $paper, $orientation ); $this->TOC = array(); $this->KeywordArray = array(); $this->PageCounter = array(); diff --git a/lib/ezpdf/classes/class.pdf.php b/lib/ezpdf/classes/class.pdf.php index e1c62100829..f812e2b0e78 100644 --- a/lib/ezpdf/classes/class.pdf.php +++ b/lib/ezpdf/classes/class.pdf.php @@ -224,11 +224,11 @@ class Cpdf public $checkpoint = ''; /** - * class constructor - * this will start a new document - * @var array array of 4 numbers, defining the bottom left and upper right corner of the page. first two are normally zero. + * Constructor + * + * @param array $pageSize array of 4 numbers, defining the bottom left and upper right corner of the page. first two are normally zero. */ - function Cpdf ( $pageSize = array( 0, 0, 612, 792 ) ) + public function __construct( $pageSize = array( 0, 0, 612, 792 ) ) { $this->currentColour = eZMath::rgbToCMYK( array( 'r' => -1, 'g' => -1, diff --git a/lib/ezpdf/classes/ezpdf.php b/lib/ezpdf/classes/ezpdf.php index 5f2e79ea0a4..85be7ea08af 100644 --- a/lib/ezpdf/classes/ezpdf.php +++ b/lib/ezpdf/classes/ezpdf.php @@ -20,11 +20,12 @@ class eZPDF { - - /*! - Initializes the object with the name $name, default is "attribute". - */ - function eZPDF( $name = "pdf" ) + /** + * Initializes the object with the name $name, default is "pdf". + * + * @param string $name + */ + public function __construct( $name = "pdf" ) { $this->Operators = array( $name ); $this->Config = eZINI::instance( 'pdf.ini' ); diff --git a/lib/ezsoap/classes/ezsoapbody.php b/lib/ezsoap/classes/ezsoapbody.php index 64d125da0b4..46e2390db60 100644 --- a/lib/ezsoap/classes/ezsoapbody.php +++ b/lib/ezsoap/classes/ezsoapbody.php @@ -15,13 +15,6 @@ class eZSOAPBody { - /*! - Creates a new SOAP body object. - */ - function eZSOAPBody( ) - { - - } } diff --git a/lib/ezsoap/classes/ezsoapclient.php b/lib/ezsoap/classes/ezsoapclient.php index bef68541e84..da807517cb1 100644 --- a/lib/ezsoap/classes/ezsoapclient.php +++ b/lib/ezsoap/classes/ezsoapclient.php @@ -47,17 +47,17 @@ class eZSOAPClient { - /*! - Creates a new SOAP client. - - \param $server The remote server to connect to - \param $path The path to the SOAP service on the remote server - \param $port The port to connect to, 80 by default. You can use 'ssl' as well to specify that you want to use port 443 over SSL, - but omit the last parameter $useSSL of this method then or set it to true. When $port equals 443, SSL will also be - used if $useSSL is omitted or set to true. - \param $useSSL If we need to connect to the remote server with (https://) or without (http://) SSL - */ - function eZSOAPClient( $server, $path = '/', $port = 80, $useSSL = null ) + /** + * Creates a new SOAP client. + * + * @param string $server The remote server to connect to + * @param string $path The path to the SOAP service on the remote server + * @param int $port The port to connect to, 80 by default. You can use 'ssl' as well to specify that you want + * to use port 443 over SSL, but omit the last parameter $useSSL of this method then or set it + * to true. When $port equals 443, SSL will also be used if $useSSL is omitted or set to true. + * @param bool $useSSL If we need to connect to the remote server with (https://) or without (http://) SSL + */ + public function __construct( $server, $path = '/', $port = 80, $useSSL = null ) { $this->Login = ""; $this->Password = ""; diff --git a/lib/ezsoap/classes/ezsoapcodec.php b/lib/ezsoap/classes/ezsoapcodec.php index 859dc9d9706..c0ccb43807d 100644 --- a/lib/ezsoap/classes/ezsoapcodec.php +++ b/lib/ezsoap/classes/ezsoapcodec.php @@ -16,13 +16,6 @@ class eZSOAPCodec { - /*! - Constructor - */ - function eZSOAPCodec() - { - } - /*! \static Encodes a PHP variable into a SOAP datatype. diff --git a/lib/ezsoap/classes/ezsoapenvelope.php b/lib/ezsoap/classes/ezsoapenvelope.php index 4546904a57f..f0f520cfe42 100644 --- a/lib/ezsoap/classes/ezsoapenvelope.php +++ b/lib/ezsoap/classes/ezsoapenvelope.php @@ -32,10 +32,10 @@ class eZSOAPEnvelope const INT = 1; const STRING = 2; - /*! - Constructs a new SOAP envelope object. - */ - function eZSOAPEnvelope( ) + /** + * Constructs a new SOAP envelope object. + */ + public function __construct( ) { $this->Header = new eZSOAPHeader(); $this->Body = new eZSOAPBody(); diff --git a/lib/ezsoap/classes/ezsoapfault.php b/lib/ezsoap/classes/ezsoapfault.php index 67e7c267b99..813f36900f2 100644 --- a/lib/ezsoap/classes/ezsoapfault.php +++ b/lib/ezsoap/classes/ezsoapfault.php @@ -17,10 +17,13 @@ class eZSOAPFault { - /*! - Constructs a new eZSOAPFault object - */ - function eZSOAPFault( $faultCode = "", $faultString = "" ) + /** + * Constructs a new eZSOAPFault object + * + * @param string $faultCode + * @param string $faultString + */ + public function __construct( $faultCode = "", $faultString = "" ) { $this->FaultCode = $faultCode; $this->FaultString = $faultString; diff --git a/lib/ezsoap/classes/ezsoapheader.php b/lib/ezsoap/classes/ezsoapheader.php index 8257f26c14a..f2c7f0b775f 100644 --- a/lib/ezsoap/classes/ezsoapheader.php +++ b/lib/ezsoap/classes/ezsoapheader.php @@ -17,11 +17,6 @@ class eZSOAPHeader { - function eZSOAPHeader( ) - { - - } - /*! */ diff --git a/lib/ezsoap/classes/ezsoapparameter.php b/lib/ezsoap/classes/ezsoapparameter.php index d0c699f83f4..61871674884 100644 --- a/lib/ezsoap/classes/ezsoapparameter.php +++ b/lib/ezsoap/classes/ezsoapparameter.php @@ -18,10 +18,13 @@ class eZSOAPParameter { - /*! - Creates a new SOAP parameter object. - */ - function eZSOAPParameter( $name, $value) + /** + * Creates a new SOAP parameter object. + * + * @param string $name + * @param mixed $value + */ + public function __construct( $name, $value) { $this->Name = $name; $this->Value = $value; diff --git a/lib/ezsoap/classes/ezsoaprequest.php b/lib/ezsoap/classes/ezsoaprequest.php index d9ab162e277..9b60da5c34d 100644 --- a/lib/ezsoap/classes/ezsoaprequest.php +++ b/lib/ezsoap/classes/ezsoaprequest.php @@ -17,21 +17,18 @@ class eZSOAPRequest extends eZSOAPEnvelope { - /*! - Constructs a new eZSOAPRequest object. You have to provide the request name - and the target namespace for the request. - - \param name - \param namespace - \param parameters, assosiative array, example: array( 'param1' => 'value1, 'param2' => 'value2' ) - */ - function eZSOAPRequest( $name="", $namespace="", $parameters = array() ) + /** + * Constructs a new eZSOAPRequest object. You have to provide the request name and the target namespace for the request. + * @param string $name + * @param string $namespace + * @param array $parameters + */ + public function __construct( $name="", $namespace="", $parameters = array() ) { $this->Name = $name; $this->Namespace = $namespace; - // call the parents constructor - $this->eZSOAPEnvelope(); + parent::__construct(); foreach( $parameters as $name => $value ) { diff --git a/lib/ezsoap/classes/ezsoapresponse.php b/lib/ezsoap/classes/ezsoapresponse.php index bd17091b80f..e9e466c075c 100644 --- a/lib/ezsoap/classes/ezsoapresponse.php +++ b/lib/ezsoap/classes/ezsoapresponse.php @@ -17,16 +17,18 @@ class eZSOAPResponse extends eZSOAPEnvelope { - /*! - Constructs a new SOAP response - */ - function eZSOAPResponse( $name="", $namespace="" ) + /** + * Constructs a new SOAP response + * + * @param string $name + * @param string $namespace + */ + public function __construct( $name="", $namespace="" ) { $this->Name = $name; $this->Namespace = $namespace; - // call the parents constructor - $this->eZSOAPEnvelope(); + parent::__construct(); } /*! diff --git a/lib/ezsoap/classes/ezsoapserver.php b/lib/ezsoap/classes/ezsoapserver.php index 993c4619d84..f31c98b510c 100644 --- a/lib/ezsoap/classes/ezsoapserver.php +++ b/lib/ezsoap/classes/ezsoapserver.php @@ -48,10 +48,7 @@ function subNumbers( $valueA, $valueB ) class eZSOAPServer { - /*! - Creates a new eZSOAPServer object. - */ - function eZSOAPServer() + public function __construct() { global $HTTP_RAW_POST_DATA; $this->RawPostData = $HTTP_RAW_POST_DATA; diff --git a/lib/eztemplate/classes/eztemplate.php b/lib/eztemplate/classes/eztemplate.php index e86d83302cf..08fba8de785 100644 --- a/lib/eztemplate/classes/eztemplate.php +++ b/lib/eztemplate/classes/eztemplate.php @@ -289,11 +289,11 @@ class eZTemplate const FILE_ERRORS = 1; - /*! - Intializes the template with left and right delimiters being { and }, - and a file resource. The literal tag "literal" is also registered. - */ - function eZTemplate() + /** + * Intializes the template with left and right delimiters being { and }, and a file resource. + * The literal tag "literal" is also registered. + */ + public function __construct() { $this->Tree = array( eZTemplate::NODE_ROOT, false ); $this->LDelim = "{"; diff --git a/lib/eztemplate/classes/eztemplatearithmeticoperator.php b/lib/eztemplate/classes/eztemplatearithmeticoperator.php index c786fbc04de..6a3dc5c5079 100644 --- a/lib/eztemplate/classes/eztemplatearithmeticoperator.php +++ b/lib/eztemplate/classes/eztemplatearithmeticoperator.php @@ -38,10 +38,7 @@ class eZTemplateArithmeticOperator { - /*! - Constructor - */ - function eZTemplateArithmeticOperator() + public function __construct() { $this->Operators = array( 'sum', 'sub', 'inc', 'dec', 'div', 'mod', 'mul', diff --git a/lib/eztemplate/classes/eztemplatearrayoperator.php b/lib/eztemplate/classes/eztemplatearrayoperator.php index af2ff44842e..c6657d884ba 100644 --- a/lib/eztemplate/classes/eztemplatearrayoperator.php +++ b/lib/eztemplate/classes/eztemplatearrayoperator.php @@ -26,10 +26,7 @@ class eZTemplateArrayOperator { - /*! - Initializes the array operator with the operator name $name. - */ - function eZTemplateArrayOperator( $arrayName = 'array', + public function __construct( $arrayName = 'array', $hashName = 'hash', $arrayPrependName = 'array_prepend', // DEPRECATED/OBSOLETE $prependName = 'prepend', // New, replaces array_prepend. diff --git a/lib/eztemplate/classes/eztemplateattributeoperator.php b/lib/eztemplate/classes/eztemplateattributeoperator.php index 8f3fc2c9dbe..02df3151a3a 100644 --- a/lib/eztemplate/classes/eztemplateattributeoperator.php +++ b/lib/eztemplate/classes/eztemplateattributeoperator.php @@ -54,11 +54,13 @@ class eZTemplateAttributeOperator { - /*! - Initializes the object with the name $attributeName, default is "attribute" and $dumpName, default is 'dump' - */ - function eZTemplateAttributeOperator( $attributeName = 'attribute', - $dumpName = 'dump' ) + /** + * Initializes the object with the name $attributeName, default is "attribute" and $dumpName, default is 'dump' + * + * @param string $attributeName + * @param string $dumpName + */ + public function __construct( $attributeName = 'attribute', $dumpName = 'dump' ) { $this->AttributeName = $attributeName; $this->DumpName = $dumpName; diff --git a/lib/eztemplate/classes/eztemplateblockfunction.php b/lib/eztemplate/classes/eztemplateblockfunction.php index e2662fe804e..28f031d340a 100644 --- a/lib/eztemplate/classes/eztemplateblockfunction.php +++ b/lib/eztemplate/classes/eztemplateblockfunction.php @@ -52,10 +52,12 @@ class eZTemplateBlockFunction const SCOPE_ROOT = 2; const SCOPE_GLOBAL = 3; - /*! - Initializes the object with names. - */ - function eZTemplateBlockFunction( $blockName = 'set-block', + /** + * @param string $blockName + * @param string $appendBlockName + * @param string $onceName + */ + public function __construct( $blockName = 'set-block', $appendBlockName = 'append-block', $onceName = 'run-once' ) { diff --git a/lib/eztemplate/classes/eztemplatecachefunction.php b/lib/eztemplate/classes/eztemplatecachefunction.php index e3e1e133130..b0120775e8f 100644 --- a/lib/eztemplate/classes/eztemplatecachefunction.php +++ b/lib/eztemplate/classes/eztemplatecachefunction.php @@ -19,10 +19,12 @@ class eZTemplateCacheFunction { const DEFAULT_TTL = 7200; // 2 hours = 60*60*2 - /*! - Initializes the object with names. - */ - function eZTemplateCacheFunction( $blockName = 'cache-block' ) + /** + * Initializes the object with names. + * + * @param string $blockName + */ + public function __construct( $blockName = 'cache-block' ) { $this->BlockName = $blockName; } diff --git a/lib/eztemplate/classes/eztemplatecompiledloop.php b/lib/eztemplate/classes/eztemplatecompiledloop.php index a22b310103e..d850670bc98 100644 --- a/lib/eztemplate/classes/eztemplatecompiledloop.php +++ b/lib/eztemplate/classes/eztemplatecompiledloop.php @@ -15,8 +15,19 @@ */ class eZTemplateCompiledLoop { - function eZTemplateCompiledLoop( $name, &$newNodes, $parameters, $nodePlacement, $uniqid, - $node, $tpl, $privateData ) + /** + * Constructor + * + * @param string $name + * @param array $newNodes + * @param array $parameters + * @param $nodePlacement + * @param string $uniqid + * @param mixed $node + * @param eZTemplate $tpl + * @param array $privateData + */ + public function __construct( $name, &$newNodes, $parameters, $nodePlacement, $uniqid, $node, $tpl, $privateData ) { $this->Name = $name; $this->Parameters = $parameters; diff --git a/lib/eztemplate/classes/eztemplatecontroloperator.php b/lib/eztemplate/classes/eztemplatecontroloperator.php index 28983aee17d..0cd12aac92f 100644 --- a/lib/eztemplate/classes/eztemplatecontroloperator.php +++ b/lib/eztemplate/classes/eztemplatecontroloperator.php @@ -24,10 +24,13 @@ class eZTemplateControlOperator { - /*! - Initializes the operator class with the various operator names. - */ - function eZTemplateControlOperator( /*! The name array */ + /** + * Initializes the operator class with the various operator names. + * + * @param string $condName + * @param string $firstSetName + */ + public function __construct( /*! The name array */ $condName = 'cond', $firstSetName = 'first_set' ) { diff --git a/lib/eztemplate/classes/eztemplatedebugfunction.php b/lib/eztemplate/classes/eztemplatedebugfunction.php index 7b1c5c79bfd..9576e924604 100644 --- a/lib/eztemplate/classes/eztemplatedebugfunction.php +++ b/lib/eztemplate/classes/eztemplatedebugfunction.php @@ -61,10 +61,15 @@ class eZTemplateDebugFunction { - /*! - Initializes the object with names. - */ - function eZTemplateDebugFunction( $timingPoint = 'debug-timing-point', + /** + * Initializes the object with names. + * + * @param string $timingPoint + * @param string $accumulator + * @param string $log + * @param string $trace + */ + public function __construct( $timingPoint = 'debug-timing-point', $accumulator = 'debug-accumulator', $log = 'debug-log', $trace = 'debug-trace' ) diff --git a/lib/eztemplate/classes/eztemplatedelimitfunction.php b/lib/eztemplate/classes/eztemplatedelimitfunction.php index 60961069108..37ff082cbd0 100644 --- a/lib/eztemplate/classes/eztemplatedelimitfunction.php +++ b/lib/eztemplate/classes/eztemplatedelimitfunction.php @@ -35,11 +35,11 @@ class as template functions you can get these characters with {ldelim} and {rdel class eZTemplateDelimitFunction { - /*! - Initializes the object with a name for the left and right delimiter. - Default is ldelim for left and rdelim for right. - */ - function eZTemplateDelimitFunction() + /** + * Initializes the object with a name for the left and right delimiter. + * Default is ldelim for left and rdelim for right. + */ + public function __construct() { $this->LName = 'ldelim'; $this->RName = 'rdelim'; diff --git a/lib/eztemplate/classes/eztemplatedigestoperator.php b/lib/eztemplate/classes/eztemplatedigestoperator.php index f849f91f7a5..3db84e8697a 100644 --- a/lib/eztemplate/classes/eztemplatedigestoperator.php +++ b/lib/eztemplate/classes/eztemplatedigestoperator.php @@ -19,10 +19,7 @@ class eZTemplateDigestOperator { - /*! - Constructor. - */ - function eZTemplateDigestOperator() + public function __construct() { $this->Operators = array( 'crc32', 'md5', 'rot13' ); if ( function_exists( 'sha1' ) ) diff --git a/lib/eztemplate/classes/eztemplateelementparser.php b/lib/eztemplate/classes/eztemplateelementparser.php index 067de712626..aba2d2dfbd7 100644 --- a/lib/eztemplate/classes/eztemplateelementparser.php +++ b/lib/eztemplate/classes/eztemplateelementparser.php @@ -16,13 +16,6 @@ class eZTemplateElementParser { - /*! - Constructor - */ - function eZTemplateElementParser() - { - } - function templateTypeName( $type ) { switch ( $type ) diff --git a/lib/eztemplate/classes/eztemplateexecuteoperator.php b/lib/eztemplate/classes/eztemplateexecuteoperator.php index c272bf5bef2..4f0533a2bed 100644 --- a/lib/eztemplate/classes/eztemplateexecuteoperator.php +++ b/lib/eztemplate/classes/eztemplateexecuteoperator.php @@ -16,10 +16,13 @@ class eZTemplateExecuteOperator { - /*! - Constructor - */ - function eZTemplateExecuteOperator( $fetchName = 'fetch', $fetchAliasName = 'fetch_alias' ) + /** + * Constructor + * + * @param string $fetchName + * @param string $fetchAliasName + */ + public function __construct( $fetchName = 'fetch', $fetchAliasName = 'fetch_alias' ) { $this->Operators = array( $fetchName, $fetchAliasName ); $this->Fetch = $fetchName; diff --git a/lib/eztemplate/classes/eztemplatefileresource.php b/lib/eztemplate/classes/eztemplatefileresource.php index 67f92954d2d..db10bc5ce78 100644 --- a/lib/eztemplate/classes/eztemplatefileresource.php +++ b/lib/eztemplate/classes/eztemplatefileresource.php @@ -18,12 +18,14 @@ class eZTemplateFileResource { - /*! - Initializes with a default resource name "file". - Also sets whether the resource servers static data files, this is needed - for the cache system. - */ - function eZTemplateFileResource( $name = "file", $servesStaticData = true ) + /** + * Initializes with a default resource name "file". + * Also sets whether the resource servers static data files, this is needed for the cache system. + * + * @param string $name + * @param bool $servesStaticData + */ + public function __construct( $name = "file", $servesStaticData = true ) { $this->Name = $name; $this->ServesStaticData = $servesStaticData; diff --git a/lib/eztemplate/classes/eztemplatefunctionelement.php b/lib/eztemplate/classes/eztemplatefunctionelement.php index dbed95ba623..67face28122 100644 --- a/lib/eztemplate/classes/eztemplatefunctionelement.php +++ b/lib/eztemplate/classes/eztemplatefunctionelement.php @@ -24,10 +24,14 @@ class eZTemplateFunctionElement { - /*! - Initializes the function with a name and parameter array. - */ - function eZTemplateFunctionElement( $name, $params, $children = array() ) + /** + * Initializes the function with a name and parameter array. + * + * @param string $name + * @param array $params + * @param array $children + */ + public function __construct( $name, $params, $children = array() ) { $this->Name = $name; $this->Params =& $params; diff --git a/lib/eztemplate/classes/eztemplateimageoperator.php b/lib/eztemplate/classes/eztemplateimageoperator.php index 985124dc1ca..f55ffebc1de 100644 --- a/lib/eztemplate/classes/eztemplateimageoperator.php +++ b/lib/eztemplate/classes/eztemplateimageoperator.php @@ -22,10 +22,14 @@ class eZTemplateImageOperator { - /*! - Initializes the image operator with the operator name $name. - */ - function eZTemplateImageOperator( $texttoimageName = "texttoimage", + /** + * Initializes the image operator with the operator name $name. + * + * @param string $texttoimageName + * @param string $imageName + * @param string $imagefileName + */ + public function __construct( $texttoimageName = "texttoimage", $imageName = "image", $imagefileName = "imagefile" ) { diff --git a/lib/eztemplate/classes/eztemplateincludefunction.php b/lib/eztemplate/classes/eztemplateincludefunction.php index 6c18a8d5334..f9538d208dd 100644 --- a/lib/eztemplate/classes/eztemplateincludefunction.php +++ b/lib/eztemplate/classes/eztemplateincludefunction.php @@ -31,10 +31,12 @@ class eZTemplateIncludeFunction { - /*! - Initializes the function with the function name $inc_name. - */ - function eZTemplateIncludeFunction( $inc_name = "include" ) + /** + * Initializes the function with the function name $inc_name. + * + * @param string $inc_name + */ + public function __construct( $inc_name = "include" ) { $this->IncludeName = $inc_name; } diff --git a/lib/eztemplate/classes/eztemplatelocaleoperator.php b/lib/eztemplate/classes/eztemplatelocaleoperator.php index 611dc0a43d4..8ae67e3d2df 100644 --- a/lib/eztemplate/classes/eztemplatelocaleoperator.php +++ b/lib/eztemplate/classes/eztemplatelocaleoperator.php @@ -28,11 +28,12 @@ class eZTemplateLocaleOperator { - /*! - Initializes the object with the default locale. - \note Add support for specifying the locale object. - */ - function eZTemplateLocaleOperator() + /** + * Initializes the object with the default locale. + * + * @todo Add support for specifying the locale object. + */ + public function __construct() { $this->Operators = array( 'l10n', 'locale', 'datetime', 'currentdate', 'maketime', 'makedate', 'gettime' ); $this->LocaleName = 'l10n'; diff --git a/lib/eztemplate/classes/eztemplatelogicoperator.php b/lib/eztemplate/classes/eztemplatelogicoperator.php index 1f4a67fdbeb..605f22bff43 100644 --- a/lib/eztemplate/classes/eztemplatelogicoperator.php +++ b/lib/eztemplate/classes/eztemplatelogicoperator.php @@ -66,10 +66,10 @@ class eZTemplateLogicOperator { - /*! - Initializes the operator class with the various operator names. - */ - function eZTemplateLogicOperator() + /** + * Initializes the operator class with the various operator names. + */ + public function __construct() { $this->Operators = array( 'lt', 'gt', 'le', 'ge', 'eq', 'ne', 'null', 'not', diff --git a/lib/eztemplate/classes/eztemplateloop.php b/lib/eztemplate/classes/eztemplateloop.php index 923fa672fad..303c659a989 100644 --- a/lib/eztemplate/classes/eztemplateloop.php +++ b/lib/eztemplate/classes/eztemplateloop.php @@ -11,7 +11,12 @@ // private class, should not be used outside of this file class eZTemplateLoopSequence { - function eZTemplateLoopSequence( $array ) + /** + * Constructor + * + * @param array $array + */ + public function __construct( $array ) { $this->ArrayRef = $array; $this->CurVal = current( $this->ArrayRef ); @@ -42,7 +47,7 @@ function next() */ class eZTemplateLoop { - function eZTemplateLoop( $functionName, &$functionParameters, $functionChildren, $functionPlacement, + public function __construct( $functionName, &$functionParameters, $functionChildren, $functionPlacement, $tpl, &$textElements, $rootNamespace, $currentNamespace ) { $this->SkipDelimiter = true; diff --git a/lib/eztemplate/classes/eztemplatemenufunction.php b/lib/eztemplate/classes/eztemplatemenufunction.php index 1372cb8b6e0..644fc52733e 100644 --- a/lib/eztemplate/classes/eztemplatemenufunction.php +++ b/lib/eztemplate/classes/eztemplatemenufunction.php @@ -16,10 +16,12 @@ class eZTemplateMenuFunction { - /*! - Initializes the object with names. - */ - function eZTemplateMenuFunction( $blockName = 'menu' ) + /** + * Initializes the object with names. + * + * @param string $blockName + */ + public function __construct( $blockName = 'menu' ) { $this->BlockName = $blockName; } diff --git a/lib/eztemplate/classes/eztemplatemultipassparser.php b/lib/eztemplate/classes/eztemplatemultipassparser.php index 83fe8903f6d..2dee04ad25c 100644 --- a/lib/eztemplate/classes/eztemplatemultipassparser.php +++ b/lib/eztemplate/classes/eztemplatemultipassparser.php @@ -16,10 +16,7 @@ class eZTemplateMultiPassParser extends eZTemplateParser { - /*! - Constructor - */ - function eZTemplateMultiPassParser() + public function __construct() { $this->ElementParser = eZTemplateElementParser::instance(); } diff --git a/lib/eztemplate/classes/eztemplatenl2broperator.php b/lib/eztemplate/classes/eztemplatenl2broperator.php index 301f3f4b942..5fbaba9dfad 100644 --- a/lib/eztemplate/classes/eztemplatenl2broperator.php +++ b/lib/eztemplate/classes/eztemplatenl2broperator.php @@ -19,10 +19,10 @@ class eZTemplateNl2BrOperator { - /*! - Initializes the object with the name $name, default is "nl2br". - */ - function eZTemplateNl2BrOperator() + /** + * Initializes the object with the name $name, default is "nl2br". + */ + public function __construct() { $this->Operators = array( 'nl2br' ); $this->Nl2brName = 'nl2br'; diff --git a/lib/eztemplate/classes/eztemplateoperatorelement.php b/lib/eztemplate/classes/eztemplateoperatorelement.php index 5dc6617392f..10ad1e031ea 100644 --- a/lib/eztemplate/classes/eztemplateoperatorelement.php +++ b/lib/eztemplate/classes/eztemplateoperatorelement.php @@ -22,10 +22,15 @@ class eZTemplateOperatorElement { - /*! - Initializes the operator with a name and parameters. - */ - function eZTemplateOperatorElement( $name, $params, $resource = null, $templateName = null ) + /** + * Initializes the operator with a name and parameters. + * + * @param string $name + * @param array $params + * @param mixed $resource + * @param string $templateName + */ + public function __construct( $name, $params, $resource = null, $templateName = null ) { $this->Name = $name; $this->Params = $params; diff --git a/lib/eztemplate/classes/eztemplateparser.php b/lib/eztemplate/classes/eztemplateparser.php index f0bc8d77377..09ab7451d31 100644 --- a/lib/eztemplate/classes/eztemplateparser.php +++ b/lib/eztemplate/classes/eztemplateparser.php @@ -16,13 +16,6 @@ class eZTemplateParser { - /*! - Constructor - */ - function eZTemplateParser() - { - } - /*! Parses the template file $txt. The actual parsing implementation is done by inheriting classes. */ diff --git a/lib/eztemplate/classes/eztemplatephpoperator.php b/lib/eztemplate/classes/eztemplatephpoperator.php index d6e5504a79c..e1f848a8754 100644 --- a/lib/eztemplate/classes/eztemplatephpoperator.php +++ b/lib/eztemplate/classes/eztemplatephpoperator.php @@ -28,10 +28,12 @@ class eZTemplatePHPOperator { - /*! - Initializes the object with the redirection array. - */ - function eZTemplatePHPOperator( $php_names ) + /** + * Initializes the object with the redirection array. + * + * @param array $php_names + */ + public function __construct( $php_names ) { if ( !is_array( $php_names ) ) $php_names = array( $php_names ); diff --git a/lib/eztemplate/classes/eztemplateroot.php b/lib/eztemplate/classes/eztemplateroot.php index 90bf64c28fe..10fca407362 100644 --- a/lib/eztemplate/classes/eztemplateroot.php +++ b/lib/eztemplate/classes/eztemplateroot.php @@ -24,10 +24,12 @@ class eZTemplateRoot { - /*! - Initializes the object. - */ - function eZTemplateRoot( $children = array() ) + /** + * Constructor + * + * @param array $children + */ + public function __construct( $children = array() ) { $this->Children = $children; } diff --git a/lib/eztemplate/classes/eztemplatesectionfunction.php b/lib/eztemplate/classes/eztemplatesectionfunction.php index 652d7ca49af..a8c306a3860 100644 --- a/lib/eztemplate/classes/eztemplatesectionfunction.php +++ b/lib/eztemplate/classes/eztemplatesectionfunction.php @@ -56,11 +56,12 @@ class eZTemplateSectionFunction { - /*! - Initializes the object with a name, the name is required for determining - the name of the -else tag. - */ - function eZTemplateSectionFunction( $name = "section" ) + /** + * Initializes the object with a name, the name is required for determining the name of the -else tag. + * + * @param string $name + */ + public function __construct( $name = "section" ) { $this->Name = $name; } diff --git a/lib/eztemplate/classes/eztemplatesectioniterator.php b/lib/eztemplate/classes/eztemplatesectioniterator.php index f6c25234456..52ad0e226ae 100644 --- a/lib/eztemplate/classes/eztemplatesectioniterator.php +++ b/lib/eztemplate/classes/eztemplatesectioniterator.php @@ -26,10 +26,10 @@ class eZTemplateSectionIterator { - /*! - Initializes the iterator with empty values. - */ - function eZTemplateSectionIterator() + /** + * Initializes the iterator with empty values. + */ + public function __construct() { $this->InternalAttributes = array( 'item' => false, 'key' => false, diff --git a/lib/eztemplate/classes/eztemplatesequencefunction.php b/lib/eztemplate/classes/eztemplatesequencefunction.php index 40b1cb9d8b0..9c87f850319 100644 --- a/lib/eztemplate/classes/eztemplatesequencefunction.php +++ b/lib/eztemplate/classes/eztemplatesequencefunction.php @@ -32,10 +32,7 @@ class eZTemplateSequenceFunction { - /*! - Initializes the function with the function name $inc_name. - */ - function eZTemplateSequenceFunction() + public function __construct() { $this->SequenceName = 'sequence'; } diff --git a/lib/eztemplate/classes/eztemplatesetfunction.php b/lib/eztemplate/classes/eztemplatesetfunction.php index 491166eae1d..8fd8a9b70da 100644 --- a/lib/eztemplate/classes/eztemplatesetfunction.php +++ b/lib/eztemplate/classes/eztemplatesetfunction.php @@ -39,10 +39,14 @@ class eZTemplateSetFunction const SCOPE_ROOT = 2; const SCOPE_GLOBAL = 3; - /*! - Initializes the function with the function names $setName and $letName. - */ - function eZTemplateSetFunction( $setName = 'set', $letName = 'let', $defaultName = 'default' ) + /** + * Initializes the function with the function names $setName and $letName. + * + * @param string $setName + * @param string $letName + * @param string $defaultName + */ + public function __construct( $setName = 'set', $letName = 'let', $defaultName = 'default' ) { $this->SetName = $setName; $this->LetName = $letName; diff --git a/lib/eztemplate/classes/eztemplatestringoperator.php b/lib/eztemplate/classes/eztemplatestringoperator.php index 4ae6c6d83bc..45a901a4c9c 100644 --- a/lib/eztemplate/classes/eztemplatestringoperator.php +++ b/lib/eztemplate/classes/eztemplatestringoperator.php @@ -19,10 +19,7 @@ class eZTemplateStringOperator { - /*! - Constructor. - */ - function eZTemplateStringOperator() + public function __construct() { $this->Operators = array( 'upcase', 'downcase', 'count_words', 'count_chars', diff --git a/lib/eztemplate/classes/eztemplateswitchfunction.php b/lib/eztemplate/classes/eztemplateswitchfunction.php index 613af2a4c62..01750c56365 100644 --- a/lib/eztemplate/classes/eztemplateswitchfunction.php +++ b/lib/eztemplate/classes/eztemplateswitchfunction.php @@ -41,10 +41,10 @@ class eZTemplateSwitchFunction { - /*! - Initializes the function with the name $name, default is "switch". - */ - function eZTemplateSwitchFunction() + /** + * Initializes the function with the name $name, default is "switch". + */ + public function __construct() { $this->SwitchName = 'switch'; } diff --git a/lib/eztemplate/classes/eztemplatetextelement.php b/lib/eztemplate/classes/eztemplatetextelement.php index 337489b55fa..89528dcdbbd 100644 --- a/lib/eztemplate/classes/eztemplatetextelement.php +++ b/lib/eztemplate/classes/eztemplatetextelement.php @@ -18,10 +18,12 @@ class eZTemplateTextElement { - /*! - Initializes the object with the text. - */ - function eZTemplateTextElement( $text ) + /** + * Initializes the object with $text. + * + * @param $text + */ + public function __construct( $text ) { $this->Text = $text; } diff --git a/lib/eztemplate/classes/eztemplatetextoperator.php b/lib/eztemplate/classes/eztemplatetextoperator.php index 510e370a1e9..94b18dbecba 100644 --- a/lib/eztemplate/classes/eztemplatetextoperator.php +++ b/lib/eztemplate/classes/eztemplatetextoperator.php @@ -16,10 +16,7 @@ class eZTemplateTextOperator { - /*! - Constructor - */ - function eZTemplateTextOperator() + public function __construct() { $this->Operators= array( 'concat', 'indent' ); diff --git a/lib/eztemplate/classes/eztemplatetoolbarfunction.php b/lib/eztemplate/classes/eztemplatetoolbarfunction.php index 514b7199f41..666471b64f7 100644 --- a/lib/eztemplate/classes/eztemplatetoolbarfunction.php +++ b/lib/eztemplate/classes/eztemplatetoolbarfunction.php @@ -16,11 +16,12 @@ class eZTemplateToolbarFunction { - - /*! - Initializes the object with names. - */ - function eZTemplateToolbarFunction( $blockName = 'tool_bar' ) + /** + * Initializes the object with names. + * + * @param string $blockName + */ + public function __construct( $blockName = 'tool_bar' ) { $this->BlockName = $blockName; } diff --git a/lib/eztemplate/classes/eztemplatetypeoperator.php b/lib/eztemplate/classes/eztemplatetypeoperator.php index 2edc057e13c..ce54e292850 100644 --- a/lib/eztemplate/classes/eztemplatetypeoperator.php +++ b/lib/eztemplate/classes/eztemplatetypeoperator.php @@ -33,10 +33,24 @@ class eZTemplateTypeOperator { - /*! - Initializes the operator class with the various operator names. - */ - function eZTemplateTypeOperator( /*! The name array */ + /** + * Initializes the operator class with the various operator names. + * + * @param string $isArrayName + * @param string $isBooleanName + * @param string $isIntegerName + * @param string $isFloatName + * @param string $isNumericName + * @param string $isStringName + * @param string $isObjectName + * @param string $isClassName + * @param string $isNullName + * @param string $isSetName + * @param string $isUnsetName + * @param string $getTypeName + * @param string $getClassName + */ + public function __construct( /*! The name array */ $isArrayName = "is_array", $isBooleanName = "is_boolean", $isIntegerName = "is_integer", diff --git a/lib/eztemplate/classes/eztemplateunitoperator.php b/lib/eztemplate/classes/eztemplateunitoperator.php index 0759623e917..d1b8c4205a4 100644 --- a/lib/eztemplate/classes/eztemplateunitoperator.php +++ b/lib/eztemplate/classes/eztemplateunitoperator.php @@ -37,10 +37,12 @@ class eZTemplateUnitOperator { - /*! - Initializes the operator with the name $name, default is "si" - */ - function eZTemplateUnitOperator( $name = "si" ) + /** + * Initializes the operator with the name $name, default is "si" + * + * @param string $name + */ + public function __construct( $name = "si" ) { $this->SIName = $name; $this->Operators = array( $name ); diff --git a/lib/eztemplate/classes/eztemplatevariableelement.php b/lib/eztemplate/classes/eztemplatevariableelement.php index b8c9b78e834..041de3c5595 100644 --- a/lib/eztemplate/classes/eztemplatevariableelement.php +++ b/lib/eztemplate/classes/eztemplatevariableelement.php @@ -18,10 +18,12 @@ class eZTemplateVariableElement { - /*! - Initializes the object with the value array and operators. - */ - function eZTemplateVariableElement( $data ) + /** + * Initializes the object with the value array and operators. + * + * @param mixed $data + */ + public function __construct( $data ) { $this->Variable = $data; } diff --git a/lib/ezutils/classes/ezcli.php b/lib/ezutils/classes/ezcli.php index 97efc24f00d..3846c1d9498 100644 --- a/lib/ezutils/classes/ezcli.php +++ b/lib/ezutils/classes/ezcli.php @@ -31,10 +31,10 @@ class eZCLI { const TERMINAL_ENDOFLINE_STRING = "\n"; - /*! - Initializes object and detects if the CLI is used. - */ - function eZCLI() + /** + * Initializes object and detects if the CLI is used. + */ + public function __construct() { $endl = "
"; $webOutput = true; diff --git a/lib/ezutils/classes/ezdatetimevalidator.php b/lib/ezutils/classes/ezdatetimevalidator.php index e9fa6d56546..24e9ffd01e2 100644 --- a/lib/ezutils/classes/ezdatetimevalidator.php +++ b/lib/ezutils/classes/ezdatetimevalidator.php @@ -16,13 +16,6 @@ class eZDateTimeValidator extends eZInputValidator { - /*! - Constructor - */ - function eZDateTimeValidator() - { - } - static function validateDate( $day, $month, $year ) { $check = checkdate( $month, $day, $year ); diff --git a/lib/ezutils/classes/ezexpiryhandler.php b/lib/ezutils/classes/ezexpiryhandler.php index 2c4fb482116..a4173d78ec2 100644 --- a/lib/ezutils/classes/ezexpiryhandler.php +++ b/lib/ezutils/classes/ezexpiryhandler.php @@ -14,10 +14,7 @@ */ class eZExpiryHandler { - /** - * Constructor - */ - function eZExpiryHandler() + public function __construct() { $this->Timestamps = array(); $this->IsModified = false; diff --git a/lib/ezutils/classes/ezextension.php b/lib/ezutils/classes/ezextension.php index 69050b7915a..cf8937e5353 100644 --- a/lib/ezutils/classes/ezextension.php +++ b/lib/ezutils/classes/ezextension.php @@ -30,13 +30,6 @@ class eZExtension */ protected static $activeExtensionsCache = array(); - /*! - Constructor - */ - function eZExtension() - { - } - /** * return the base directory for extensions * diff --git a/lib/ezutils/classes/ezfiletransport.php b/lib/ezutils/classes/ezfiletransport.php index 0112abc0751..18e962c3a7d 100644 --- a/lib/ezutils/classes/ezfiletransport.php +++ b/lib/ezutils/classes/ezfiletransport.php @@ -16,13 +16,6 @@ class eZFileTransport extends eZMailTransport { - /*! - Constructor - */ - function eZFileTransport() - { - } - function sendMail( eZMail $mail ) { $ini = eZINI::instance(); diff --git a/lib/ezutils/classes/ezfloatvalidator.php b/lib/ezutils/classes/ezfloatvalidator.php index 66b4a6a0e26..6ca9349192b 100644 --- a/lib/ezutils/classes/ezfloatvalidator.php +++ b/lib/ezutils/classes/ezfloatvalidator.php @@ -16,15 +16,18 @@ class eZFloatValidator extends eZRegExpValidator { - /*! - Constructor - */ - function eZFloatValidator( $min = false, $max = false ) + /** + * Constructor + * + * @param float|bool $min + * @param float|bool $max + */ + public function __construct( $min = false, $max = false ) { $rule = array( "accepted" => "/^-?[0-9]+([.][0-9]+)?$/", "intermediate" => "/(-?[0-9]+([.][0-9]+)?)/", "fixup" => "" ); - $this->eZRegExpValidator( $rule ); + parent::__construct( $rule ); $this->MinValue = $min; $this->MaxValue = $max; if ( $max !== false and $min !== false ) diff --git a/lib/ezutils/classes/ezhttpfile.php b/lib/ezutils/classes/ezhttpfile.php index 8a36d811c35..c1c4e55345b 100644 --- a/lib/ezutils/classes/ezhttpfile.php +++ b/lib/ezutils/classes/ezhttpfile.php @@ -32,8 +32,8 @@ class eZHTTPFile /*! Initializes with a name and http variable. */ - function eZHTTPFile( /*! Name of the HTTP variable */ $http_name, - /*! The HTTP variable structure */ $variable ) + public function __construct( /*! Name of the HTTP variable */ $http_name, + /*! The HTTP variable structure */ $variable ) { $this->HTTPName = $http_name; $this->OriginalFilename = $variable["name"]; diff --git a/lib/ezutils/classes/ezhttptool.php b/lib/ezutils/classes/ezhttptool.php index 3a26fb85e34..73b27de8328 100644 --- a/lib/ezutils/classes/ezhttptool.php +++ b/lib/ezutils/classes/ezhttptool.php @@ -25,7 +25,7 @@ class eZHTTPTool /*! Initializes the class. Use eZHTTPTool::instance to get a single instance. */ - function eZHTTPTool() + public function __construct() { $this->UseFullUrl = false; } diff --git a/lib/ezutils/classes/ezini.php b/lib/ezutils/classes/ezini.php index d83d4e9aebb..33d8f0adf02 100644 --- a/lib/ezutils/classes/ezini.php +++ b/lib/ezutils/classes/ezini.php @@ -152,7 +152,7 @@ class eZINI * @param bool $load @since 4.5 Lets you disable automatic loading of ini values in * cases where changes on instance will be done first. */ - function eZINI( $fileName = 'site.ini', $rootDir = '', $useTextCodec = null, $useCache = null, $useLocalOverrides = null, $directAccess = false, $addArrayDefinition = false, $load = true ) + public function __construct( $fileName = 'site.ini', $rootDir = '', $useTextCodec = null, $useCache = null, $useLocalOverrides = null, $directAccess = false, $addArrayDefinition = false, $load = true ) { $this->Charset = 'utf8'; if ( $fileName == '' ) diff --git a/lib/ezutils/classes/ezinputvalidator.php b/lib/ezutils/classes/ezinputvalidator.php index 5a5b46284f8..bd67f1c6334 100644 --- a/lib/ezutils/classes/ezinputvalidator.php +++ b/lib/ezutils/classes/ezinputvalidator.php @@ -80,13 +80,6 @@ class eZInputValidator const STATE_INTERMEDIATE = 2; const STATE_INVALID = 3; - /*! - Default constructor, does nothing. - */ - function eZInputValidator() - { - } - /*! Tries to validate to the text \a $text and returns one of the validator states eZInputValidator::STATE_ACCEPTED, eZInputValidator::STATE_INTERMEDIATE or diff --git a/lib/ezutils/classes/ezintegervalidator.php b/lib/ezutils/classes/ezintegervalidator.php index fee4b25b8b9..4015d4ff8bc 100644 --- a/lib/ezutils/classes/ezintegervalidator.php +++ b/lib/ezutils/classes/ezintegervalidator.php @@ -16,15 +16,18 @@ class eZIntegerValidator extends eZRegExpValidator { - /*! - Constructor - */ - function eZIntegerValidator( $min = false, $max = false ) + /** + * Constructor + * + * @param int|bool $min + * @param int|bool $max + */ + public function __construct( $min = false, $max = false ) { $rule = array( "accepted" => "/^-?[0-9]+$/", "intermediate" => "/(-?[0-9]+)/", "fixup" => "" ); - $this->eZRegExpValidator( $rule ); + parent::__construct( $rule ); $this->MinValue = $min; $this->MaxValue = $max; if ( $max !== false and $min !== false ) diff --git a/lib/ezutils/classes/ezmail.php b/lib/ezutils/classes/ezmail.php index 7d163304931..dbe23593392 100644 --- a/lib/ezutils/classes/ezmail.php +++ b/lib/ezutils/classes/ezmail.php @@ -60,10 +60,7 @@ class eZMail { const REGEXP = '(((\"[^\"\f\n\r\t\v\b]+\")|([A-Za-z0-9_\!\#\$\%\&\'\*\+\-\~\/\^\`\|\{\}]+(\.[A-Za-z0-9_\!\#\$\%\&\'\*\+\-\~\/\^\`\|\{\}]+)*))@((\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\-])+\.)+[A-Za-z\-]{2,})))'; - /*! - Constructs a new eZMail object. - */ - function eZMail() + public function __construct() { $this->Mail = new ezpMail(); diff --git a/lib/ezutils/classes/ezmailtransport.php b/lib/ezutils/classes/ezmailtransport.php index 80a89247f3e..6f4d4d2842c 100644 --- a/lib/ezutils/classes/ezmailtransport.php +++ b/lib/ezutils/classes/ezmailtransport.php @@ -16,13 +16,6 @@ class eZMailTransport { - /*! - Constructor - */ - function eZMailTransport() - { - } - /*! Tries to send the contents of the email object \a $mail and returns \c true if succesful. diff --git a/lib/ezutils/classes/ezmath.php b/lib/ezutils/classes/ezmath.php index 50a611480bd..34da8456525 100644 --- a/lib/ezutils/classes/ezmath.php +++ b/lib/ezutils/classes/ezmath.php @@ -19,13 +19,6 @@ class eZMath { - /*! - Constructor - */ - function eZMath() - { - } - /*! \static diff --git a/lib/ezutils/classes/ezmimetype.php b/lib/ezutils/classes/ezmimetype.php index c4cd3dc9429..8dbbffb4c0d 100644 --- a/lib/ezutils/classes/ezmimetype.php +++ b/lib/ezutils/classes/ezmimetype.php @@ -32,10 +32,7 @@ class eZMimeType { - /*! - Constructor - */ - function eZMimeType() + public function __construct() { $this->SuffixList = array(); $this->PrefixList = array(); diff --git a/lib/ezutils/classes/ezmodule.php b/lib/ezutils/classes/ezmodule.php index 31b8c322fc1..93190854e11 100644 --- a/lib/ezutils/classes/ezmodule.php +++ b/lib/ezutils/classes/ezmodule.php @@ -254,7 +254,7 @@ class eZModule * Always set to false in the current code base, since the check is * usually performed before the constructor is called */ - function eZModule( $path, $file, $moduleName, $checkFileExistence = true ) + public function __construct( $path, $file, $moduleName, $checkFileExistence = true ) { $this->initialize( $path, $file, $moduleName, $checkFileExistence); } diff --git a/lib/ezutils/classes/ezmodulefunctioninfo.php b/lib/ezutils/classes/ezmodulefunctioninfo.php index ec5c72fd6c0..f83d9cb7d35 100644 --- a/lib/ezutils/classes/ezmodulefunctioninfo.php +++ b/lib/ezutils/classes/ezmodulefunctioninfo.php @@ -21,10 +21,12 @@ class eZModuleFunctionInfo const ERROR_CLASS_INSTANTIATE_FAILED = 7; const ERROR_MISSING_PARAMETER = 8; - /*! - Constructor - */ - function eZModuleFunctionInfo( $moduleName ) + /** + * Constructor + * + * @param string $moduleName + */ + public function __construct( $moduleName ) { $this->ModuleName = $moduleName; $this->IsValid = false; diff --git a/lib/ezutils/classes/ezmoduleoperationinfo.php b/lib/ezutils/classes/ezmoduleoperationinfo.php index 2858d0c378f..c24f1b09e62 100644 --- a/lib/ezutils/classes/ezmoduleoperationinfo.php +++ b/lib/ezutils/classes/ezmoduleoperationinfo.php @@ -29,10 +29,11 @@ class eZModuleOperationInfo /** * Constructor + * * @param string $moduleName * @param bool $useTriggers */ - function eZModuleOperationInfo( $moduleName, $useTriggers = true ) + public function __construct( $moduleName, $useTriggers = true ) { $this->ModuleName = $moduleName; $this->IsValid = false; diff --git a/lib/ezutils/classes/ezmutex.php b/lib/ezutils/classes/ezmutex.php index e41aae4b1d6..2ea89b29b2b 100644 --- a/lib/ezutils/classes/ezmutex.php +++ b/lib/ezutils/classes/ezmutex.php @@ -18,14 +18,11 @@ class eZMutex { const STEAL_STRING = '_eZMutex_Steal'; - /*! - Constructor. Creates a mutex object for - mutext . The mutex is file based, and a - mutex is valid across PHP processes. - - \param mutex name - */ - function eZMutex( $name ) + /** + * Creates a mutex object for mutext . The mutex is file based, and valid across PHP processes. + * @param string $name + */ + public function __construct( $name ) { $this->Name = md5( $name ); $mutexPath = eZDir::path( array( eZSys::cacheDirectory(), diff --git a/lib/ezutils/classes/ezoperationhandler.php b/lib/ezutils/classes/ezoperationhandler.php index 3b2e0c47b14..d81e6783dd2 100644 --- a/lib/ezutils/classes/ezoperationhandler.php +++ b/lib/ezutils/classes/ezoperationhandler.php @@ -16,13 +16,6 @@ class eZOperationHandler { - /*! - Constructor - */ - function eZOperationHandler() - { - } - /** * Factory for modules' moduleOperationInfo objects. * diff --git a/lib/ezutils/classes/ezoperationmemento.php b/lib/ezutils/classes/ezoperationmemento.php index aff85d7decf..d3619acd143 100644 --- a/lib/ezutils/classes/ezoperationmemento.php +++ b/lib/ezutils/classes/ezoperationmemento.php @@ -16,14 +16,6 @@ class eZOperationMemento extends eZPersistentObject { - /*! - Constructor - */ - function eZOperationMemento( $row ) - { - $this->eZPersistentObject( $row ); - } - static function definition() { return array( 'fields' => array( 'id' => array( 'name' => 'ID', diff --git a/lib/ezutils/classes/ezphpcreator.php b/lib/ezutils/classes/ezphpcreator.php index b1978b7008d..28b378a7ece 100644 --- a/lib/ezutils/classes/ezphpcreator.php +++ b/lib/ezutils/classes/ezphpcreator.php @@ -73,10 +73,15 @@ class eZPHPCreator const METHOD_CALL_PARAMETER_VALUE = 1; const METHOD_CALL_PARAMETER_VARIABLE = 2; - /*! - Initializes the creator with the directory path \a $dir and filename \a $file. - */ - function eZPHPCreator( $dir, $file, $prefix = '', $options = array() ) + /** + * Initializes the creator with the directory path $dir and filename $file. + * + * @param string $dir + * @param string $file + * @param string $prefix + * @param array $options + */ + public function __construct( $dir, $file, $prefix = '', $options = array() ) { $this->PHPDir = $dir; $this->PHPFile = $file; diff --git a/lib/ezutils/classes/ezregexpvalidator.php b/lib/ezutils/classes/ezregexpvalidator.php index cf4a187ede2..ef2d7bf6351 100644 --- a/lib/ezutils/classes/ezregexpvalidator.php +++ b/lib/ezutils/classes/ezregexpvalidator.php @@ -16,9 +16,13 @@ class eZRegExpValidator extends eZInputValidator { - function eZRegExpValidator( $rule = null ) + /** + * Constructor + * + * @param string $rule + */ + public function __construct( $rule = null ) { - $this->eZInputValidator(); $this->RegExpRule = $rule; } diff --git a/lib/ezutils/classes/ezsendmailtransport.php b/lib/ezutils/classes/ezsendmailtransport.php index 1f4340ff0ff..14745da7529 100644 --- a/lib/ezutils/classes/ezsendmailtransport.php +++ b/lib/ezutils/classes/ezsendmailtransport.php @@ -18,13 +18,6 @@ class eZSendmailTransport extends eZMailTransport { - /*! - Constructor - */ - function eZSendmailTransport() - { - } - function sendMail( eZMail $mail ) { $ini = eZINI::instance(); diff --git a/lib/ezutils/classes/ezsmtptransport.php b/lib/ezutils/classes/ezsmtptransport.php index efa5b26c94e..8bfef114237 100644 --- a/lib/ezutils/classes/ezsmtptransport.php +++ b/lib/ezutils/classes/ezsmtptransport.php @@ -16,13 +16,6 @@ class eZSMTPTransport extends eZMailTransport { - /*! - Constructor - */ - function eZSMTPTransport() - { - } - function sendMail( eZMail $mail ) { $ini = eZINI::instance(); diff --git a/lib/ezutils/classes/ezstringutils.php b/lib/ezutils/classes/ezstringutils.php index e8710550c04..249892be1b5 100644 --- a/lib/ezutils/classes/ezstringutils.php +++ b/lib/ezutils/classes/ezstringutils.php @@ -16,13 +16,6 @@ class eZStringUtils { - /*! - Constructor - */ - function eZStringUtils() - { - } - static function explodeStr( $str, $delimiter = '|' ) { $offset = 0; diff --git a/lib/ezutils/classes/ezsysinfo.php b/lib/ezutils/classes/ezsysinfo.php index 6e9b39f37fb..c978a888b25 100644 --- a/lib/ezutils/classes/ezsysinfo.php +++ b/lib/ezutils/classes/ezsysinfo.php @@ -30,13 +30,6 @@ class eZSysInfo { - /*! - Constructor - */ - function eZSysInfo() - { - } - /*! \return An array with available attributes. The available attributes: diff --git a/lib/ezutils/classes/ezwizardbase.php b/lib/ezutils/classes/ezwizardbase.php index 67e82ad5299..5b4dbe9dc38 100644 --- a/lib/ezutils/classes/ezwizardbase.php +++ b/lib/ezutils/classes/ezwizardbase.php @@ -19,14 +19,14 @@ class eZWizardBase const STAGE_PRE = 0; const STAGE_POST = 1; - /*! - Constructor - - \param $tpl Template class - \param $module Module - \param $storageName Storage Name, optional. - */ - function eZWizardBase( $tpl, &$module, $storageName = false ) + /** + * Constructor + * + * @param eZTemplate $tpl + * @param eZModule $module + * @param string|bool $storageName + */ + public function __construct( $tpl, &$module, $storageName = false ) { if ( $storageName ) {