Rename Horde_Array::array_merge_recursive_overwrite() to Horde_Array::replaceRecursive().

diff --git a/framework/Core/lib/Horde/Core/Factory/MimeViewer.php b/framework/Core/lib/Horde/Core/Factory/MimeViewer.php
index d21dd01..77198cb 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/MimeViewer.php
+++ b/framework/Core/lib/Horde/Core/Factory/MimeViewer.php
@@ -320,7 +320,7 @@ class Horde_Core_Factory_MimeViewer
                     unset($tmp['icons']);
                 }
 
-                $config = array_merge(Horde_Array::array_merge_recursive_overwrite($config, $tmp), array(
+                $config = array_merge(Horde_Array::replaceRecursive($config, $tmp), array(
                     'app' => $val[0],
                     'driver' => $driver
                 ));

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 3ce295d..92beff7 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -1377,7 +1377,7 @@ class Horde_Registry
 
         $GLOBALS['conf'] = ($app == 'horde')
             ? $this->_confCache['horde']
-            : Horde_Array::array_merge_recursive_overwrite($this->_confCache['horde'], $this->_confCache[$app]);
+            : Horde_Array::replaceRecursive($this->_confCache['horde'], $this->_confCache[$app]);
     }
 
     /**

diff --git a/framework/Util/lib/Horde/Array.php b/framework/Util/lib/Horde/Array.php
index 919579b..f0e763d 100644 (file)
--- a/framework/Util/lib/Horde/Array.php
+++ b/framework/Util/lib/Horde/Array.php
@@ -202,9 +202,7 @@ class Horde_Array
     }
 
     /**
-     * Enhanced array_merge_recursive() function.  Main difference from PHP's
-     * stock function is later value always overwrites earlier value (stock
-     * function will instead create an array with all values of key).
+     * Backported array_replace_recursive().
      *
      * @todo Remove when requiring PHP 5.3.
      *
@@ -213,7 +211,7 @@ class Horde_Array
      *
      * @return array  The merged array.
      */
-    static public function array_merge_recursive_overwrite(array $a1, array $a2)
+    static public function replaceRecursive(array $a1, array $a2)
     {
         if (function_exists('array_replace_recursive')) {
             return array_replace_recursive($a1, $a2);
@@ -225,7 +223,7 @@ class Horde_Array
             }
 
             $a1[$key] = (is_array($val))
-                ? self::array_merge_recursive_overwrite($a1[$key], $val)
+                ? self::replaceRecursive($a1[$key], $val)
                 : $val;
         }
 

diff --git a/framework/Util/package.xml b/framework/Util/package.xml
index bfea252..b38689c 100644 (file)
--- a/framework/Util/package.xml
+++ b/framework/Util/package.xml
@@ -16,8 +16,8 @@
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2010-12-21</date>
- <time>23:03:12</time>
+ <date>2011-01-03</date>
+ <time>13:04:38</time>
  <version>
   <release>0.2.0</release>
   <api>0.2.0</api>
@@ -28,16 +28,17 @@
  </stability>
  <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
  <notes>
+* Renamed Horde_Array::array_merge_recursive_overwrite() to Horde_Array::replaceRecursive().
 * Added Horde_Domhtml::.
- * Removed Horde_Util::assertDriverConfig().
- * Removed Horde_Util::bufferOutput().
- * Removed Horde_Util::uriB64Encode() and Horde_Util::uriB64Decode().
- * Removed Horde_Util::strftime2date() and Horde_Util::date2strftime().
- * Removed Horde_Util::closeWindowJs() and Horde_Util::nocacheUrl().
- * Added Horde_String::convertToUtf8().
- * Added Horde_Util::abbreviate().
- * Removed Horde_Array::combine() and Horde_Util::hmac().
- * Initial Horde 4 package.
+* Removed Horde_Util::assertDriverConfig().
+* Removed Horde_Util::bufferOutput().
+* Removed Horde_Util::uriB64Encode() and Horde_Util::uriB64Decode().
+* Removed Horde_Util::strftime2date() and Horde_Util::date2strftime().
+* Removed Horde_Util::closeWindowJs() and Horde_Util::nocacheUrl().
+* Added Horde_String::convertToUtf8().
+* Added Horde_Util::abbreviate().
+* Removed Horde_Array::combine() and Horde_Util::hmac().
+* Initial Horde 4 package.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -243,19 +244,20 @@ Converted to package.xml 2.0 for pear.horde.org
     <release>beta</release>
     <api>beta</api>
    </stability>
-   <date>2010-12-21</date>
+   <date>2011-01-03</date>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
    <notes>
+* Renamed Horde_Array::array_merge_recursive_overwrite() to Horde_Array::replaceRecursive().
 * Added Horde_Domhtml::.
- * Removed Horde_Util::assertDriverConfig().
- * Removed Horde_Util::bufferOutput().
- * Removed Horde_Util::uriB64Encode() and Horde_Util::uriB64Decode().
- * Removed Horde_Util::strftime2date() and Horde_Util::date2strftime().
- * Removed Horde_Util::closeWindowJs() and Horde_Util::nocacheUrl().
- * Added Horde_String::convertToUtf8().
- * Added Horde_Util::abbreviate().
- * Removed Horde_Array::combine() and Horde_Util::hmac().
- * Initial Horde 4 package.
+* Removed Horde_Util::assertDriverConfig().
+* Removed Horde_Util::bufferOutput().
+* Removed Horde_Util::uriB64Encode() and Horde_Util::uriB64Decode().
+* Removed Horde_Util::strftime2date() and Horde_Util::date2strftime().
+* Removed Horde_Util::closeWindowJs() and Horde_Util::nocacheUrl().
+* Added Horde_String::convertToUtf8().
+* Added Horde_Util::abbreviate().
+* Removed Horde_Array::combine() and Horde_Util::hmac().
+* Initial Horde 4 package.
    </notes>
   </release>
  </changelog>

diff --git a/framework/Util/test/Horde/Util/ArrayTest.php b/framework/Util/test/Horde/Util/ArrayTest.php
index 3ac74fa..be78ae5 100644 (file)
--- a/framework/Util/test/Horde/Util/ArrayTest.php
+++ b/framework/Util/test/Horde/Util/ArrayTest.php
@@ -62,7 +62,7 @@ class Horde_Util_ArrayTest extends PHPUnit_Framework_TestCase
                                  'two/two' => 22),
                   'three' => 33,
                   'four' => 4),
-            Horde_Array::array_merge_recursive_overwrite(
+            Horde_Array::replaceRecursive(
                 array('one' => 1,
                       'two' => array('two/one' => 1,
                                      'two/two' => 2),

diff --git a/luxor/lib/Luxor.php b/luxor/lib/Luxor.php
index 9fef226..89b2057 100644 (file)
--- a/luxor/lib/Luxor.php
+++ b/luxor/lib/Luxor.php
@@ -118,10 +118,10 @@ class Luxor
         extract($result);
         $result = Horde::loadConfiguration('mime_drivers.php', array('mime_drivers', 'mime_drivers_map'), 'luxor');
         if (isset($result['mime_drivers'])) {
-            $mime_drivers = Horde_Array::array_merge_recursive_overwrite($mime_drivers, $result['mime_drivers']);
+            $mime_drivers = Horde_Array::replaceRecursive($mime_drivers, $result['mime_drivers']);
         }
         if (isset($result['mime_drivers_map'])) {
-            $mime_drivers_map = Horde_Array::array_merge_recursive_overwrite($mime_drivers_map, $result['mime_drivers_map']);
+            $mime_drivers_map = Horde_Array::replaceRecursive($mime_drivers_map, $result['mime_drivers_map']);
         }
 
         $nodes = $files->getDir($dir);
@@ -199,8 +199,8 @@ class Luxor
             $result = Horde::loadConfiguration('mime_drivers.php', array('mime_drivers', 'mime_drivers_map'), 'horde');
             extract($result);
             $result = Horde::loadConfiguration('mime_drivers.php', array('mime_drivers', 'mime_drivers_map'), 'luxor');
-            $mime_drivers = Horde_Array::array_merge_recursive_overwrite($mime_drivers, $result['mime_drivers']);
-            $mime_drivers_map = Horde_Array::array_merge_recursive_overwrite($mime_drivers_map, $result['mime_drivers_map']);
+            $mime_drivers = Horde_Array::replaceRecursive($mime_drivers, $result['mime_drivers']);
+            $mime_drivers_map = Horde_Array::replaceRecursive($mime_drivers_map, $result['mime_drivers_map']);
 
             $contents = file_get_contents($filename);
 

diff --git a/luxor/source.php b/luxor/source.php
index 185bf57..d283185 100644 (file)
--- a/luxor/source.php
+++ b/luxor/source.php
@@ -96,11 +96,11 @@ function printfile_raw($pathname)
     extract($result);
     $result = Horde::loadConfiguration('mime_drivers.php', array('mime_drivers', 'mime_drivers_map'), 'luxor');
     if (isset($result['mime_drivers'])) {
-        $mime_drivers = Horde_Array::array_merge_recursive_overwrite(
+        $mime_drivers = Horde_Array::replaceRecursive(
             $mime_drivers, $result['mime_drivers']);
     }
     if (isset($result['mime_drivers_map'])) {
-        $mime_drivers_map = Horde_Array::array_merge_recursive_overwrite(
+        $mime_drivers_map = Horde_Array::replaceRecursive(
             $mime_drivers_map, $result['mime_drivers_map']);
     }