Fixes zendframework#465 -Zend_Currency creates invalid cache ids for values with fractions

Author: froschdesign

library/Zend/Locale/Data.php

@@ -327,7 +327,7 @@ public static function getList($locale, $path, $value = false)
         }
 
         $val = urlencode($val);
-        $id = strtr('Zend_LocaleL_' . $locale . '_' . $path . '_' . $val, array('-' => '_', '%' => '_', '+' => '_'));
+        $id  = self::_filterCacheId('Zend_LocaleL_' . $locale . '_' . $path . '_' . $val);
         if (!self::$_cacheDisabled && ($result = self::$_cache->load($id))) {
             return unserialize($result);
         }
@@ -976,7 +976,7 @@ public static function getContent($locale, $path, $value = false)
             $val = implode('_' , $value);
         }
         $val = urlencode($val);
-        $id = strtr('Zend_LocaleC_' . $locale . '_' . $path . '_' . $val, array('-' => '_', '%' => '_', '+' => '_'));
+        $id  = self::_filterCacheId('Zend_LocaleC_' . $locale . '_' . $path . '_' . $val);
         if (!self::$_cacheDisabled && ($result = self::$_cache->load($id))) {
             return unserialize($result);
         }
@@ -1581,4 +1581,23 @@ private static function _getTagSupportForCache()
 
         return self::$_cacheTags;
     }
+
+    /**
+     * Filter an ID to only allow valid variable characters
+     *
+     * @param  string $value
+     * @return string
+     */
+    protected static function _filterCacheId($value)
+    {
+        return strtr(
+            $value,
+            array(
+                '-' => '_',
+                '%' => '_',
+                '+' => '_',
+                '.' => '_',
+            )
+        );
+    }
 }

tests/Zend/Locale/DataTest.php

@@ -7230,4 +7230,28 @@ public function testGetListEmptyTypeReturnsNonemptyArray()
         $this->assertTrue(is_array($result));
         $this->assertTrue(count($result) > 0);
     }
+
+    /**
+     * @group GH-465
+     */
+    public function testCreateValidCacheIdsInGetContentMethod()
+    {
+        try {
+            $content = Zend_Locale_Data::getContent('de_DE', 'language', 1234.56);
+        } catch (Zend_Cache_Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+    /**
+     * @group GH-465
+     */
+    public function testCreateValidCacheIdsInGetListMethod()
+    {
+        try {
+            $list = Zend_Locale_Data::getList('de_DE', 'language', 1234.56);
+        } catch (Zend_Cache_Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
 }