EZP-27804: Constructor refactoring (PHP4 to PHP5 __construct()) (ezsy…

…stems#1233) * Removed empty constructors * Added __construct() constructor for popular classes … and marked the old style constructors as deprecated. This is done to not break third party extensions that don't call the parent constructor with parent::__construct() * Removed constructors that just call the parent constructor * Replaced PHP4 constructors and calls with PHP5 constructors * Fix broken UTF-8 chars * Rename forgotten PHP4 constructor * Restory empty constructors
fwoldt · Sep 25, 2017 · 4316b42 · 4316b42
1 parent a4a0470
commit 4316b42
Show file tree

Hide file tree

Showing 452 changed files with 1,449 additions and 2,199 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 ) );
     }