Browse Source

[ZF-7409]Constructor function wrong doc.

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@17266 44c647ce-9c0f-0410-b52a-842ac1e357ba
yoshida@zend.co.jp 16 years ago
parent
commit
fe3b0894b9
1 changed files with 20 additions and 20 deletions
  1. 20 20
      library/Zend/Config/Xml.php

+ 20 - 20
library/Zend/Config/Xml.php

@@ -38,14 +38,14 @@ class Zend_Config_Xml extends Zend_Config
      * XML namespace for ZF-related tags and attributes
      */
     const XML_NAMESPACE = 'http://framework.zend.com/xml/zend-config-xml/1.0/';
-    
+
     /**
      * Wether to skip extends or not
      *
      * @var boolean
      */
     protected $_skipExtends = false;
-    
+
     /**
      * Loads the section $section from the config file (or string $xml for
      * access facilitated by nested object properties.
@@ -59,9 +59,9 @@ 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".
      *
-     * @param  string  $xml                XML file or string to process
-     * @param  mixed   $section            Section to process
-     * @param  boolean $allowModifications Wether modifiacations are allowed at runtime
+     * @param  string  $xml     XML file or string to process
+     * @param  mixed   $section Section to process
+     * @param  boolean $options Whether modifiacations are allowed at runtime
      * @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
      */
@@ -83,7 +83,7 @@ class Zend_Config_Xml extends Zend_Config
                 $this->_skipExtends = (bool) $options['skipExtends'];
             }
         }
-        
+
         set_error_handler(array($this, '_loadFileErrorHandler')); // Warnings and errors are suppressed
         if (strstr($xml, '<?xml')) {
             $config = simplexml_load_string($xml);
@@ -153,12 +153,12 @@ class Zend_Config_Xml extends Zend_Config
         }
 
         $thisSection  = $element->$section;
-        $nsAttributes = $thisSection->attributes(self::XML_NAMESPACE);  
+        $nsAttributes = $thisSection->attributes(self::XML_NAMESPACE);
 
         if (isset($thisSection['extends']) || isset($nsAttributes['extends'])) {
             $extendedSection = (string) (isset($nsAttributes['extends']) ? $nsAttributes['extends'] : $thisSection['extends']);
             $this->_assertValidExtend($section, $extendedSection);
-            
+
             if (!$this->_skipExtends) {
                 $config = $this->_processExtends($element, $extendedSection, $config);
             }
@@ -206,9 +206,9 @@ class Zend_Config_Xml extends Zend_Config
         if (count($xmlObject->children(self::XML_NAMESPACE)) > 0) {
             if (count($xmlObject->children()) > 0) {
                 require_once 'Zend/Config/Exception.php';
-                throw new Zend_Config_Exception("A node with a 'const' childnode may not have any other children");                 
+                throw new Zend_Config_Exception("A node with a 'const' childnode may not have any other children");
             }
-            
+
             $dom                 = dom_import_simplexml($xmlObject);
             $namespaceChildNodes = array();
 
@@ -219,33 +219,33 @@ class Zend_Config_Xml extends Zend_Config
                     $namespaceChildNodes[] = $node;
                 }
             }
-            
+
             foreach ($namespaceChildNodes as $node) {
                 switch ($node->localName) {
                     case 'const':
                         if (!$node->hasAttributeNS(self::XML_NAMESPACE, 'name')) {
                             require_once 'Zend/Config/Exception.php';
-                            throw new Zend_Config_Exception("Misssing 'name' attribute in 'const' node");                            
+                            throw new Zend_Config_Exception("Misssing 'name' attribute in 'const' node");
                         }
-                        
+
                         $constantName = $node->getAttributeNS(self::XML_NAMESPACE, 'name');
-                        
+
                         if (!defined($constantName)) {
                             require_once 'Zend/Config/Exception.php';
-                            throw new Zend_Config_Exception("Constant with name '$constantName' was not defined");                            
+                            throw new Zend_Config_Exception("Constant with name '$constantName' was not defined");
                         }
-                        
+
                         $constantValue = constant($constantName);
-                        
+
                         $dom->replaceChild($dom->ownerDocument->createTextNode($constantValue), $node);
                         break;
-                        
+
                     default:
                         require_once 'Zend/Config/Exception.php';
-                        throw new Zend_Config_Exception("Unknown node with name '$node->localName' found");  
+                        throw new Zend_Config_Exception("Unknown node with name '$node->localName' found");
                 }
             }
-            
+
             return (string) simplexml_import_dom($dom);
         }