فهرست منبع

Doc block updates for Zend_Config_Ini/Xml/Yaml constructor. Fixes ZF-11397

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24044 44c647ce-9c0f-0410-b52a-842ac1e357ba
rob 14 سال پیش
والد
کامیت
e31fecfd17
3فایلهای تغییر یافته به همراه20 افزوده شده و 9 حذف شده
  1. 4 3
      library/Zend/Config/Ini.php
  2. 13 3
      library/Zend/Config/Xml.php
  3. 3 3
      library/Zend/Config/Yaml.php

+ 4 - 3
library/Zend/Config/Ini.php

@@ -83,16 +83,17 @@ class Zend_Config_Ini extends Zend_Config
      *
      * The $options parameter may be provided as either a boolean or an array.
      * If provided as a boolean, this sets the $allowModifications option of
-     * Zend_Config. If provided as an array, there are two configuration
+     * Zend_Config. If provided as an array, there are three configuration
      * directives that may be set. For example:
      *
      * $options = array(
      *     'allowModifications' => false,
-     *     'nestSeparator'      => '->'
+     *     'nestSeparator'      => ':',
+     *     'skipExtends'        => false,
      *      );
      *
      * @param  string        $filename
-     * @param  string|null   $section
+     * @param  mixed         $section
      * @param  boolean|array $options
      * @throws Zend_Config_Exception
      * @return void

+ 13 - 3
library/Zend/Config/Xml.php

@@ -58,10 +58,20 @@ class Zend_Config_Xml extends Zend_Config
      *
      * Note that the keys in $section will override any keys of the same
      * name in the sections that have been included via "extends".
+     * 
+     * The $options parameter may be provided as either a boolean or an array.
+     * If provided as a boolean, this sets the $allowModifications option of
+     * Zend_Config. If provided as an array, there are two configuration
+     * directives that may be set. For example:
      *
-     * @param  string  $xml     XML file or string to process
-     * @param  mixed   $section Section to process
-     * @param  boolean $options Whether modifications are allowed at runtime
+     * $options = array(
+     *     'allowModifications' => false,
+     *     'skipExtends'        => false
+     *      );
+     *
+     * @param  string        $xml     XML file or string to process
+     * @param  mixed         $section Section to process
+     * @param  array|boolean $options 
      * @throws Zend_Config_Exception When xml is not set or cannot be loaded
      * @throws Zend_Config_Exception When section $sectionName cannot be found in $xml
      */

+ 3 - 3
library/Zend/Config/Yaml.php

@@ -124,9 +124,9 @@ class Zend_Config_Yaml extends Zend_Config
      * - skip_extends: whether or not to skip processing of parent configuration
      * - yaml_decoder: a callback to use to decode the Yaml source
      *
-     * @param  string  $yaml     YAML file to process
-     * @param  mixed   $section Section to process
-     * @param  boolean $options Whether modifiacations are allowed at runtime
+     * @param  string        $yaml     YAML file to process
+     * @param  mixed         $section  Section to process
+     * @param  array|boolean $options 
      */
     public function __construct($yaml, $section = null, $options = false)
     {