From 80d242042f72fa515e2071fce842d8ba64612b51 Mon Sep 17 00:00:00 2001 From: Ken Guest Date: Sat, 21 Feb 2015 00:32:10 +0000 Subject: [PATCH] Move away from PHP4 style constructors. Finally. --- Date/Holidays.php | 2 +- Date/Holidays/Driver.php | 2 +- Date/Holidays/Driver/Australia.php | 2 +- Date/Holidays/Driver/AustraliaNSW.php | 2 +- Date/Holidays/Driver/AustraliaQLD.php | 2 +- Date/Holidays/Driver/AustraliaSA.php | 2 +- Date/Holidays/Driver/AustraliaWA.php | 2 +- Date/Holidays/Driver/Austria.php | 2 +- Date/Holidays/Driver/Brazil.php | 2 +- Date/Holidays/Driver/Chile.php | 2 +- Date/Holidays/Driver/Christian.php | 2 +- Date/Holidays/Driver/Composite.php | 2 +- Date/Holidays/Driver/Croatia.php | 2 +- Date/Holidays/Driver/Czech.php | 2 +- Date/Holidays/Driver/Denmark.php | 2 +- Date/Holidays/Driver/Discordian.php | 2 +- Date/Holidays/Driver/EasternChristian.php | 2 +- Date/Holidays/Driver/EnglandWales.php | 2 +- Date/Holidays/Driver/Finland.php | 2 +- Date/Holidays/Driver/France.php | 2 +- Date/Holidays/Driver/Germany.php | 2 +- Date/Holidays/Driver/Iceland.php | 2 +- Date/Holidays/Driver/Ireland.php | 2 +- Date/Holidays/Driver/Italy.php | 2 +- Date/Holidays/Driver/Japan.php | 2 +- Date/Holidays/Driver/Jewish.php | 2 +- Date/Holidays/Driver/Netherlands.php | 2 +- Date/Holidays/Driver/Norway.php | 2 +- Date/Holidays/Driver/PHPdotNet.php | 2 +- Date/Holidays/Driver/Portugal.php | 2 +- Date/Holidays/Driver/Romania.php | 2 +- Date/Holidays/Driver/Russia.php | 2 +- Date/Holidays/Driver/SanMarino.php | 2 +- Date/Holidays/Driver/Serbia.php | 4 ++-- Date/Holidays/Driver/Slovenia.php | 2 +- Date/Holidays/Driver/Spain.php | 2 +- Date/Holidays/Driver/Sweden.php | 2 +- Date/Holidays/Driver/Turkey.php | 2 +- Date/Holidays/Driver/UNO.php | 2 +- Date/Holidays/Driver/USA.php | 2 +- Date/Holidays/Driver/Ukraine.php | 2 +- Date/Holidays/Driver/Venezuela.php | 2 +- Date/Holidays/Holiday.php | 2 +- examples/creating_drivers.php | 2 +- 44 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Date/Holidays.php b/Date/Holidays.php index 5b1a632..6e48a9d 100644 --- a/Date/Holidays.php +++ b/Date/Holidays.php @@ -98,7 +98,7 @@ class Date_Holidays * * @access protected */ - function Date_Holidays() + protected function __construct() { } diff --git a/Date/Holidays/Driver.php b/Date/Holidays/Driver.php index 1b44e98..abddb18 100644 --- a/Date/Holidays/Driver.php +++ b/Date/Holidays/Driver.php @@ -217,7 +217,7 @@ class Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Australia.php b/Date/Holidays/Driver/Australia.php index e3a72ef..21d353a 100644 --- a/Date/Holidays/Driver/Australia.php +++ b/Date/Holidays/Driver/Australia.php @@ -45,7 +45,7 @@ class Date_Holidays_Driver_Australia extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Australia() + protected function __construct() { } diff --git a/Date/Holidays/Driver/AustraliaNSW.php b/Date/Holidays/Driver/AustraliaNSW.php index 9b87855..f22043e 100644 --- a/Date/Holidays/Driver/AustraliaNSW.php +++ b/Date/Holidays/Driver/AustraliaNSW.php @@ -40,7 +40,7 @@ class Date_Holidays_Driver_AustraliaNSW extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_AustraliaNSW() + protected function __construct() { } diff --git a/Date/Holidays/Driver/AustraliaQLD.php b/Date/Holidays/Driver/AustraliaQLD.php index 0cc1282..cc5218d 100644 --- a/Date/Holidays/Driver/AustraliaQLD.php +++ b/Date/Holidays/Driver/AustraliaQLD.php @@ -50,7 +50,7 @@ class Date_Holidays_Driver_AustraliaQLD extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_AustraliaQLD() + protected function __construct() { } diff --git a/Date/Holidays/Driver/AustraliaSA.php b/Date/Holidays/Driver/AustraliaSA.php index 24908f7..d5acd93 100644 --- a/Date/Holidays/Driver/AustraliaSA.php +++ b/Date/Holidays/Driver/AustraliaSA.php @@ -45,7 +45,7 @@ class Date_Holidays_Driver_AustraliaSA extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_AustraliaSA() + protected function __construct() { } diff --git a/Date/Holidays/Driver/AustraliaWA.php b/Date/Holidays/Driver/AustraliaWA.php index d9133cf..e86f4f4 100644 --- a/Date/Holidays/Driver/AustraliaWA.php +++ b/Date/Holidays/Driver/AustraliaWA.php @@ -41,7 +41,7 @@ class Date_Holidays_Driver_AustraliaWA extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_AustraliaWA() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Austria.php b/Date/Holidays/Driver/Austria.php index 4e8ce3d..14f06dc 100644 --- a/Date/Holidays/Driver/Austria.php +++ b/Date/Holidays/Driver/Austria.php @@ -58,7 +58,7 @@ class Date_Holidays_Driver_Austria extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Austria() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Brazil.php b/Date/Holidays/Driver/Brazil.php index 27829f7..92ad2c4 100644 --- a/Date/Holidays/Driver/Brazil.php +++ b/Date/Holidays/Driver/Brazil.php @@ -57,7 +57,7 @@ class Date_Holidays_Driver_Brazil extends Date_Holidays_Driver_Christian * * @access protected */ - function Date_Holidays_Driver_Brazil() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Chile.php b/Date/Holidays/Driver/Chile.php index f1b288e..71860e5 100644 --- a/Date/Holidays/Driver/Chile.php +++ b/Date/Holidays/Driver/Chile.php @@ -57,7 +57,7 @@ class Date_Holidays_Driver_Chile extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Chile() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Christian.php b/Date/Holidays/Driver/Christian.php index 7b5b52e..1d88109 100644 --- a/Date/Holidays/Driver/Christian.php +++ b/Date/Holidays/Driver/Christian.php @@ -52,7 +52,7 @@ class Date_Holidays_Driver_Christian extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Christian() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Composite.php b/Date/Holidays/Driver/Composite.php index 1deaa12..0a8a620 100644 --- a/Date/Holidays/Driver/Composite.php +++ b/Date/Holidays/Driver/Composite.php @@ -75,7 +75,7 @@ class Date_Holidays_Driver_Composite extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Composite() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Croatia.php b/Date/Holidays/Driver/Croatia.php index 7ae0828..efdb20c 100644 --- a/Date/Holidays/Driver/Croatia.php +++ b/Date/Holidays/Driver/Croatia.php @@ -36,7 +36,7 @@ class Date_Holidays_Driver_Croatia extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Croatia() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Czech.php b/Date/Holidays/Driver/Czech.php index c26a59d..ccc0927 100644 --- a/Date/Holidays/Driver/Czech.php +++ b/Date/Holidays/Driver/Czech.php @@ -58,7 +58,7 @@ class Date_Holidays_Driver_Czech extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Czech() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Denmark.php b/Date/Holidays/Driver/Denmark.php index 47857e9..5ac9205 100644 --- a/Date/Holidays/Driver/Denmark.php +++ b/Date/Holidays/Driver/Denmark.php @@ -54,7 +54,7 @@ class Date_Holidays_Driver_Denmark extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Denmark() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Discordian.php b/Date/Holidays/Driver/Discordian.php index f479389..af2f244 100644 --- a/Date/Holidays/Driver/Discordian.php +++ b/Date/Holidays/Driver/Discordian.php @@ -53,7 +53,7 @@ class Date_Holidays_Driver_Discordian extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Discordian() + protected function __construct() { } diff --git a/Date/Holidays/Driver/EasternChristian.php b/Date/Holidays/Driver/EasternChristian.php index ede111e..04a929f 100644 --- a/Date/Holidays/Driver/EasternChristian.php +++ b/Date/Holidays/Driver/EasternChristian.php @@ -52,7 +52,7 @@ class Date_Holidays_Driver_EasternChristian extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_EasternChristian() + protected function __construct() { } diff --git a/Date/Holidays/Driver/EnglandWales.php b/Date/Holidays/Driver/EnglandWales.php index d174bc2..78a47d0 100644 --- a/Date/Holidays/Driver/EnglandWales.php +++ b/Date/Holidays/Driver/EnglandWales.php @@ -53,7 +53,7 @@ class Date_Holidays_Driver_EnglandWales extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_EnglandWales() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Finland.php b/Date/Holidays/Driver/Finland.php index 7b4e84d..9b45ad8 100644 --- a/Date/Holidays/Driver/Finland.php +++ b/Date/Holidays/Driver/Finland.php @@ -47,7 +47,7 @@ class Date_Holidays_Driver_Finland extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Finland() + protected function __construct() { } diff --git a/Date/Holidays/Driver/France.php b/Date/Holidays/Driver/France.php index 136a2bb..15e3287 100644 --- a/Date/Holidays/Driver/France.php +++ b/Date/Holidays/Driver/France.php @@ -59,7 +59,7 @@ class Date_Holidays_Driver_France extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_France() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Germany.php b/Date/Holidays/Driver/Germany.php index d04eff9..2a932f0 100644 --- a/Date/Holidays/Driver/Germany.php +++ b/Date/Holidays/Driver/Germany.php @@ -59,7 +59,7 @@ class Date_Holidays_Driver_Germany extends Date_Holidays_Driver_Christian * * @access protected */ - function Date_Holidays_Driver_Germany() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Iceland.php b/Date/Holidays/Driver/Iceland.php index de38a2e..90d79b2 100644 --- a/Date/Holidays/Driver/Iceland.php +++ b/Date/Holidays/Driver/Iceland.php @@ -56,7 +56,7 @@ class Date_Holidays_Driver_Iceland extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Iceland() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Ireland.php b/Date/Holidays/Driver/Ireland.php index ef1057c..dd3521d 100755 --- a/Date/Holidays/Driver/Ireland.php +++ b/Date/Holidays/Driver/Ireland.php @@ -56,7 +56,7 @@ class Date_Holidays_Driver_Ireland extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Ireland() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Italy.php b/Date/Holidays/Driver/Italy.php index f5f8382..4850891 100644 --- a/Date/Holidays/Driver/Italy.php +++ b/Date/Holidays/Driver/Italy.php @@ -56,7 +56,7 @@ class Date_Holidays_Driver_Italy extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Italy() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Japan.php b/Date/Holidays/Driver/Japan.php index 1ba6122..7fcf755 100644 --- a/Date/Holidays/Driver/Japan.php +++ b/Date/Holidays/Driver/Japan.php @@ -129,7 +129,7 @@ class Date_Holidays_Driver_Japan extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Japan() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Jewish.php b/Date/Holidays/Driver/Jewish.php index adddfd8..d351f98 100644 --- a/Date/Holidays/Driver/Jewish.php +++ b/Date/Holidays/Driver/Jewish.php @@ -53,7 +53,7 @@ class Date_Holidays_Driver_Jewish extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Jewish() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Netherlands.php b/Date/Holidays/Driver/Netherlands.php index e5d8d8f..0049fe7 100644 --- a/Date/Holidays/Driver/Netherlands.php +++ b/Date/Holidays/Driver/Netherlands.php @@ -57,7 +57,7 @@ class Date_Holidays_Driver_Netherlands extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Netherlands() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Norway.php b/Date/Holidays/Driver/Norway.php index 08f75c3..27c1d51 100755 --- a/Date/Holidays/Driver/Norway.php +++ b/Date/Holidays/Driver/Norway.php @@ -56,7 +56,7 @@ class Date_Holidays_Driver_Norway extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Norway () + protected function __construct() { } diff --git a/Date/Holidays/Driver/PHPdotNet.php b/Date/Holidays/Driver/PHPdotNet.php index 848171c..1cc1bdd 100644 --- a/Date/Holidays/Driver/PHPdotNet.php +++ b/Date/Holidays/Driver/PHPdotNet.php @@ -52,7 +52,7 @@ class Date_Holidays_Driver_PHPdotNet extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_PHPdotNet() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Portugal.php b/Date/Holidays/Driver/Portugal.php index 69ed21d..a54979b 100644 --- a/Date/Holidays/Driver/Portugal.php +++ b/Date/Holidays/Driver/Portugal.php @@ -58,7 +58,7 @@ class Date_Holidays_Driver_Portugal extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Portugal() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Romania.php b/Date/Holidays/Driver/Romania.php index 84df694..b2db15f 100755 --- a/Date/Holidays/Driver/Romania.php +++ b/Date/Holidays/Driver/Romania.php @@ -54,7 +54,7 @@ class Date_Holidays_Driver_Romania extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Romania() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Russia.php b/Date/Holidays/Driver/Russia.php index 833f5cb..b268a64 100644 --- a/Date/Holidays/Driver/Russia.php +++ b/Date/Holidays/Driver/Russia.php @@ -47,7 +47,7 @@ class Date_Holidays_Driver_Russia extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Russia() + protected function __construct() { } diff --git a/Date/Holidays/Driver/SanMarino.php b/Date/Holidays/Driver/SanMarino.php index b501b99..4772ab5 100644 --- a/Date/Holidays/Driver/SanMarino.php +++ b/Date/Holidays/Driver/SanMarino.php @@ -43,7 +43,7 @@ class Date_Holidays_Driver_SanMarino extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_SanMarino() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Serbia.php b/Date/Holidays/Driver/Serbia.php index 1b37c7b..a018426 100644 --- a/Date/Holidays/Driver/Serbia.php +++ b/Date/Holidays/Driver/Serbia.php @@ -44,7 +44,7 @@ class Date_Holidays_Driver_Serbia extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Serbia() + protected function __construct() { } @@ -187,4 +187,4 @@ function getISO3166Codes() return array('rs', 'srb'); } } -?> \ No newline at end of file +?> diff --git a/Date/Holidays/Driver/Slovenia.php b/Date/Holidays/Driver/Slovenia.php index 959b38f..1b446a3 100644 --- a/Date/Holidays/Driver/Slovenia.php +++ b/Date/Holidays/Driver/Slovenia.php @@ -55,7 +55,7 @@ class Date_Holidays_Driver_Slovenia extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Slovenia() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Spain.php b/Date/Holidays/Driver/Spain.php index db81cc5..05db027 100644 --- a/Date/Holidays/Driver/Spain.php +++ b/Date/Holidays/Driver/Spain.php @@ -49,7 +49,7 @@ class Date_Holidays_Driver_Spain extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Spain() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Sweden.php b/Date/Holidays/Driver/Sweden.php index 0aeacb9..c2fe405 100644 --- a/Date/Holidays/Driver/Sweden.php +++ b/Date/Holidays/Driver/Sweden.php @@ -55,7 +55,7 @@ class Date_Holidays_Driver_Sweden extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Sweden() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Turkey.php b/Date/Holidays/Driver/Turkey.php index 9b80f71..a642276 100644 --- a/Date/Holidays/Driver/Turkey.php +++ b/Date/Holidays/Driver/Turkey.php @@ -45,7 +45,7 @@ class Date_Holidays_Driver_Turkey extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Turkey() + protected function __construct() { } diff --git a/Date/Holidays/Driver/UNO.php b/Date/Holidays/Driver/UNO.php index d71ca66..a775d6e 100644 --- a/Date/Holidays/Driver/UNO.php +++ b/Date/Holidays/Driver/UNO.php @@ -53,7 +53,7 @@ class Date_Holidays_Driver_UNO extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_UNO() + protected function __construct() { } diff --git a/Date/Holidays/Driver/USA.php b/Date/Holidays/Driver/USA.php index 779f163..e446679 100644 --- a/Date/Holidays/Driver/USA.php +++ b/Date/Holidays/Driver/USA.php @@ -54,7 +54,7 @@ class Date_Holidays_Driver_USA extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_USA() + protected function __function() { } diff --git a/Date/Holidays/Driver/Ukraine.php b/Date/Holidays/Driver/Ukraine.php index c1cce3a..0032c5e 100755 --- a/Date/Holidays/Driver/Ukraine.php +++ b/Date/Holidays/Driver/Ukraine.php @@ -54,7 +54,7 @@ class Date_Holidays_Driver_Ukraine extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Ukraine() + protected function __construct() { } diff --git a/Date/Holidays/Driver/Venezuela.php b/Date/Holidays/Driver/Venezuela.php index 9680bcb..4ed69bf 100644 --- a/Date/Holidays/Driver/Venezuela.php +++ b/Date/Holidays/Driver/Venezuela.php @@ -39,7 +39,7 @@ class Date_Holidays_Driver_Venezuela extends Date_Holidays_Driver_Christian * * @access protected */ - function Date_Holidays_Driver_Venezuela() + protected function __construct() { } diff --git a/Date/Holidays/Holiday.php b/Date/Holidays/Holiday.php index 32dec22..1a12bf1 100644 --- a/Date/Holidays/Holiday.php +++ b/Date/Holidays/Holiday.php @@ -78,7 +78,7 @@ class Date_Holidays_Holiday * @access public * @return void */ - function Date_Holidays_Holiday($internalName, $title, &$date, $properties) + public function __construct($internalName, $title, &$date, $properties) { $this->_internalName = $internalName; $this->_title = $title; diff --git a/examples/creating_drivers.php b/examples/creating_drivers.php index ed72457..ba4a1d1 100644 --- a/examples/creating_drivers.php +++ b/examples/creating_drivers.php @@ -26,7 +26,7 @@ class Date_Holidays_Driver_Example extends Date_Holidays_Driver * * @access protected */ - function Date_Holidays_Driver_Example() + function __construct() { }