Merge branch 'ZF-11055' of https://github.com/thomasweidner/zf2 into …

…zf2/master
ericsilva · Feb 23, 2011 · 45a7842 · 45a7842
2 parents e620169 + 098467a
commit 45a7842
Show file tree

Hide file tree

Showing 12 changed files with 692 additions and 131 deletions.
diff --git a/documentation/manual/en/ref/requirements-php-extensions-table.xml b/documentation/manual/en/ref/requirements-php-extensions-table.xml
@@ -476,7 +476,7 @@
                 </entry>
             </row>
             <row>
-                <entry morerows="7" valign="middle">
+                <entry morerows="9" valign="middle">
                     <emphasis>
                         <ulink
                             url="&php.manual.link;/ref.iconv.php">iconv</ulink>
@@ -538,6 +538,22 @@
                     </ulink>
                 </entry>
             </row>
+            <row>
+                <entry>
+                    <ulink
+                        url="&zf.manual.link;/zend.validate.hostname.html">
+                        <classname>Zend_Validate_Hostname</classname>
+                    </ulink>
+                </entry>
+            </row>
+            <row>
+                <entry>
+                    <ulink
+                        url="&zf.manual.link;/zend.validate.stringlength.html">
+                        <classname>Zend_Validate_StringLength</classname>
+                    </ulink>
+                </entry>
+            </row>
             <row>
                 <entry>
                     <ulink

diff --git a/documentation/manual/en/ref/requirements-zendcomponents-table.xml b/documentation/manual/en/ref/requirements-zendcomponents-table.xml
@@ -1239,6 +1239,36 @@
                         url="&php.manual.link;/book.reflection.php">Reflection</ulink>
                 </entry>
             </row>
+            <row>
+                <entry>
+                    <emphasis>
+                        <ulink
+                            url="&zf.manual.link;/zend.validate.hostname.html">
+                            <classname>Zend_Validate_Hostname</classname>
+                        </ulink>
+                    </emphasis>
+                </entry>
+                <entry>&requirements.hard;</entry>
+                <entry>
+                    <ulink
+                        url="&php.manual.link;/ref.iconv.php">iconv</ulink>
+                </entry>
+            </row>
+            <row>
+                <entry>
+                    <emphasis>
+                        <ulink
+                            url="&zf.manual.link;/zend.validate.stringlength.html">
+                            <classname>Zend_Validate_StringLength</classname>
+                        </ulink>
+                    </emphasis>
+                </entry>
+                <entry>&requirements.hard;</entry>
+                <entry>
+                    <ulink
+                        url="&php.manual.link;/ref.iconv.php">iconv</ulink>
+                </entry>
+            </row>
             <row>
                 <entry>
                     <emphasis>

diff --git a/library/Zend/Date/Date.php b/library/Zend/Date/Date.php
@@ -276,7 +276,7 @@ public static function setOptions(array $options = array())
                             }
 
                             parent::$_cache     = $value;
-                            parent::$_cacheTags = Zend_Date_DateObject::_getTagSupportForCache();
+                            parent::$_cacheTags = Zend_Date_DateObject::hasCacheTagSupport();
                             Cldr::setCache($value);
                         }
                         break;

diff --git a/library/Zend/Locale/Data/AbstractLocale.php b/library/Zend/Locale/Data/AbstractLocale.php
@@ -43,22 +43,6 @@
  */
 abstract class AbstractLocale
 {
-    /**
-     * Locale files
-     *
-     * @var ressource
-     * @access private
-     */
-    private static $_ldml = array();
-
-    /**
-     * List of values which are collected
-     *
-     * @var array
-     * @access private
-     */
-    private static $_list = array();
-
     /**
      * Internal cache for ldml values
      *
@@ -82,27 +66,6 @@ abstract class AbstractLocale
      */
     protected static $_cacheTags = false;
 
-    /**
-     * Internal function for checking the locale
-     *
-     * @param string|\Zend\Locale $locale Locale to check
-     * @return string
-     */
-    protected static function _checkLocale($locale)
-    {
-        if (empty($locale)) {
-            $locale = new Locale();
-        }
-
-        if (!(Locale::isLocale((string) $locale))) {
-            throw new InvalidArgumentException(
-              "Locale (" . (string) $locale . ") is no known locale"
-            );
-        }
-
-        return (string) $locale;
-    }
-
     /**
      * Returns the set cache
      *
@@ -170,19 +133,39 @@ public static function clearCache($tag = null)
     /**
      * Disables the cache
      *
-     * @param unknown_type $flag
+     * @param boolean $flag
      */
     public static function disableCache($flag)
     {
         self::$_cacheDisabled = (boolean) $flag;
     }
 
+    /**
+     * Returns true when the cache is disabled
+     *
+     * @return boolean
+     */
+    public static function isCacheDisabled()
+    {
+        return self::$_cacheDisabled;
+    }
+
+    /**
+     * Returns true when the actual set cache supports tags
+     *
+     * @return boolean
+     */
+    public static function hasCacheTagSupport()
+    {
+      return self::$_cacheTags;
+    }
+
     /**
      * Internal method to check if the given cache supports tags
      *
      * @return false|string
      */
-    private static function _getTagSupportForCache()
+    protected static function _getTagSupportForCache()
     {
         $backend = self::$_cache->getBackend();
         if ($backend instanceof \Zend\Cache\Backend\ExtendedInterface) {
@@ -194,4 +177,70 @@ private static function _getTagSupportForCache()
 
         return self::$_cacheTags;
     }
+
+    /**
+     * Returns detailed informations from the language table
+     * If no detail is given a complete table is returned
+     *
+     * @param string  $locale  Normalized locale
+     * @param boolean $reverse Invert output of the data
+     * @param string|array $detail Detail to return information for
+     * @return array
+     */
+    public static function getDisplayLanguage($locale, $invert = false, $detail = null)
+    {
+        throw new UnsupportedMethod('This implementation does not support the selected locale information');
+    }
+
+    /**
+     * Returns detailed informations from the script table
+     * If no detail is given a complete table is returned
+     *
+     * @param string  $locale Normalized locale
+     * @param boolean $invert Invert output of the data
+     * @param string|array $detail Detail to return information for
+     * @return array
+     */
+    public static function getDisplayScript($locale, $invert = false, $detail = null)
+    {
+        throw new UnsupportedMethod('This implementation does not support the selected locale information');
+    }
+
+    /**
+     * Returns detailed informations from the territory table
+     * If no detail is given a complete table is returned
+     *
+     * @param string  $locale Normalized locale
+     * @param boolean $invert Invert output of the data
+     * @param string|array $detail Detail to return information for
+     * @return array
+     */
+    public static function getDisplayTerritory($locale, $invert = false, $detail = null)
+    {
+        throw new UnsupportedMethod('This implementation does not support the selected locale information');
+    }
+
+    /**
+     * Returns detailed informations from the variant table
+     * If no detail is given a complete table is returned
+     *
+     * @param string  $locale Normalized locale
+     * @param boolean $invert Invert output of the data
+     * @param string|array $detail Detail to return information for
+     * @return array
+     */
+    public static function getDisplayVariant($locale, $invert = false, $detail = null)
+    {
+        throw new UnsupportedMethod('This implementation does not support the selected locale information');
+    }
+
+    public static function toInteger()
+    public static function toFloat()
+    public static function toDecimal()
+    public static function toScientific()
+
+    public static function toCurrency()
+
+    public static function toArray()
+    public static function toDateString()
 }