From ffb6ccdae28485a5898140924e4b9052d246b74d Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Mon, 3 Jan 2011 13:05:20 +0100 Subject: [PATCH] Rename Horde_Array::array_merge_recursive_overwrite() to Horde_Array::replaceRecursive(). --- .../Core/lib/Horde/Core/Factory/MimeViewer.php | 2 +- framework/Core/lib/Horde/Registry.php | 2 +- framework/Util/lib/Horde/Array.php | 8 ++-- framework/Util/package.xml | 44 +++++++++++----------- framework/Util/test/Horde/Util/ArrayTest.php | 2 +- luxor/lib/Luxor.php | 8 ++-- luxor/source.php | 4 +- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/framework/Core/lib/Horde/Core/Factory/MimeViewer.php b/framework/Core/lib/Horde/Core/Factory/MimeViewer.php index d21dd01de..77198cb37 100644 --- 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 3ce295d55..92beff741 100644 --- 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 919579b46..f0e763d0e 100644 --- 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 bfea252b2..b38689c98 100644 --- a/framework/Util/package.xml +++ b/framework/Util/package.xml @@ -16,8 +16,8 @@ jan@horde.org yes - 2010-12-21 - + 2011-01-03 + 0.2.0 0.2.0 @@ -28,16 +28,17 @@ LGPL +* 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. @@ -243,19 +244,20 @@ Converted to package.xml 2.0 for pear.horde.org beta beta - 2010-12-21 + 2011-01-03 LGPL +* 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. diff --git a/framework/Util/test/Horde/Util/ArrayTest.php b/framework/Util/test/Horde/Util/ArrayTest.php index 3ac74fae8..be78ae52b 100644 --- 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 9fef226ff..89b205768 100644 --- 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 185bf57d4..d283185be 100644 --- 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']); } -- 2.11.0