fix for Bug #16021 PHP 4 regression

git-svn-id: http://svn.php.net/repository/pear/packages/Date_Holidays/trunk@277166 c90b9560-bf6c-de11-be94-00142212c4b1
pear · Mar 14, 2009 · 098733c · 098733c
1 parent 7f55e7c
commit 098733c
Show file tree

Hide file tree

Showing 24 changed files with 198 additions and 10 deletions.
diff --git a/Holidays/Driver.php b/Holidays/Driver.php
@@ -124,6 +124,13 @@
  */
 class Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName;
 
     /**
      * locale setting for output
@@ -296,24 +303,21 @@ function addTranslation($locale)
     {
         $data_dir = "@DATA-DIR@";
         $bestLocale = $this->_findBestLocale($locale);
-        $name = get_class($this);
-        $parts = explode("_", $name);
-        $drivername = $parts[3];
         $matches = array();
         $loaded = false;
 
         //Christian driver is exceptional...
-        if ($drivername == 'Christian') {
+        if ($this->_driverName == 'Christian') {
             $stubdir = "$data_dir/Date_Holidays/lang/Christian/";
         } else {
-            $stubdir = "$data_dir/Date_Holidays_{$drivername}/lang/{$drivername}/";
+            $stubdir = "$data_dir/Date_Holidays_{$this->_driverName}/lang/{$this->_driverName}/";
             if (! is_dir($stubdir)) {
                 $stubdir = $data_dir . "/Date_Holidays/lang/";
             }
         }
         $stubdirs = array(
             $stubdir,
-            "$data_dir/Date_Holidays_{$drivername}/lang/Christian/");
+            "$data_dir/Date_Holidays_{$this->_driverName}/lang/Christian/");
 
         foreach ($stubdirs as $stubdir) {
             if (is_dir($stubdir)) {

diff --git a/Holidays/Driver/Austria.php b/Holidays/Driver/Austria.php
@@ -42,6 +42,14 @@
  */
 class Date_Holidays_Driver_Austria extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Austria';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/Brazil.php b/Holidays/Driver/Brazil.php
@@ -41,6 +41,14 @@
  */
 class Date_Holidays_Driver_Brazil extends Date_Holidays_Driver_Christian
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Brazil';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/Christian.php b/Holidays/Driver/Christian.php
@@ -36,6 +36,14 @@
  */
 class Date_Holidays_Driver_Christian extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Christian';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/Composite.php b/Holidays/Driver/Composite.php
@@ -43,6 +43,14 @@
  */
 class Date_Holidays_Driver_Composite extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Composite';
+
     /**
      * compound of drivers
      *

diff --git a/Holidays/Driver/Denmark.php b/Holidays/Driver/Denmark.php
@@ -38,6 +38,14 @@
  */
 class Date_Holidays_Driver_Denmark extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Denmark';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/Discordian.php b/Holidays/Driver/Discordian.php
@@ -37,6 +37,14 @@
  */
 class Date_Holidays_Driver_Discordian extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Discordian';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/EasternChristian.php b/Holidays/Driver/EasternChristian.php
@@ -34,8 +34,16 @@
  * @version    CVS: $Id$
  * @link       http://pear.php.net/package/Date_Holidays
  */
-class Date_Holidays_Driver_Eastern_Christian extends Date_Holidays_Driver
+class Date_Holidays_Driver_EasternChristian extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'EasternChristian';
+
     /**
      * Constructor
      *
@@ -44,7 +52,7 @@ class Date_Holidays_Driver_Eastern_Christian extends Date_Holidays_Driver
      *
      * @access   protected
      */
-    function Date_Holidays_Driver_Eastern_Christian()
+    function Date_Holidays_Driver_EasternChristian()
     {
     }
 

diff --git a/Holidays/Driver/EnglandWales.php b/Holidays/Driver/EnglandWales.php
@@ -38,6 +38,14 @@
  */
 class Date_Holidays_Driver_EnglandWales extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'EnglandWales';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/Germany.php b/Holidays/Driver/Germany.php
@@ -43,6 +43,14 @@
  */
 class Date_Holidays_Driver_Germany extends Date_Holidays_Driver_Christian
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Germany';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/Iceland.php b/Holidays/Driver/Iceland.php
@@ -40,6 +40,14 @@
  */
 class Date_Holidays_Driver_Iceland extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Iceland';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/Ireland.php b/Holidays/Driver/Ireland.php
@@ -40,6 +40,14 @@
  */
 class Date_Holidays_Driver_Ireland extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Ireland';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/Italy.php b/Holidays/Driver/Italy.php
@@ -40,6 +40,14 @@
  */
 class Date_Holidays_Driver_Italy extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Italy';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/Japan.php b/Holidays/Driver/Japan.php
@@ -99,6 +99,14 @@
  */
 class Date_Holidays_Driver_Japan extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Japan';
+
     /**
      * a translation file name
      *

diff --git a/Holidays/Driver/Jewish.php b/Holidays/Driver/Jewish.php
@@ -37,6 +37,14 @@
  */
 class Date_Holidays_Driver_Jewish extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Jewish';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/Netherlands.php b/Holidays/Driver/Netherlands.php
@@ -39,6 +39,14 @@
 
 class Date_Holidays_Driver_Netherlands extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Netherlands';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/Norway.php b/Holidays/Driver/Norway.php
@@ -40,6 +40,14 @@
  */
 class Date_Holidays_Driver_Norway extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Norway';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/PHPdotNet.php b/Holidays/Driver/PHPdotNet.php
@@ -36,6 +36,14 @@
  */
 class Date_Holidays_Driver_PHPdotNet extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'PHPdotNet';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/Romania.php b/Holidays/Driver/Romania.php
@@ -38,6 +38,14 @@
  */
 class Date_Holidays_Driver_Romania extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Romania';
+
     /**
      * Constructor
      *
@@ -115,7 +123,7 @@ function _buildHolidays()
      */
     function calcEaster($year)
     {
-        return Date_Holidays_Driver_Eastern_Christian::calcEaster($year);
+        return Date_Holidays_Driver_EasternChristian::calcEaster($year);
     }
 
     /**

diff --git a/Holidays/Driver/Slovenia.php b/Holidays/Driver/Slovenia.php
@@ -39,6 +39,14 @@
  */
 class Date_Holidays_Driver_Slovenia extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Slovenia';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/Sweden.php b/Holidays/Driver/Sweden.php
@@ -39,6 +39,14 @@
  */
 class Date_Holidays_Driver_Sweden extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'Sweden';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/UNO.php b/Holidays/Driver/UNO.php
@@ -37,6 +37,14 @@
  */
 class Date_Holidays_Driver_UNO extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'UNO';
+
     /**
      * Constructor
      *

diff --git a/Holidays/Driver/USA.php b/Holidays/Driver/USA.php
@@ -38,6 +38,14 @@
  */
 class Date_Holidays_Driver_USA extends Date_Holidays_Driver
 {
+    /**
+     * this driver's name
+     *
+     * @access   protected
+     * @var      string
+     */
+    var $_driverName = 'USA';
+
     /**
      * Constructor
      *