[Config] Fixed typo

symfony · Feb 26, 2011 · Feb 26, 2011 · Feb 26, 2011 · Feb 26, 2011 · Feb 26, 2011
commit e1ec66cbb8b1eb97d33c32c103b63fe6a7861c2d
diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php
@@ -238,7 +238,7 @@ public function getDefaultValue()
      * Sets the node prototype.
      *
      * @param PrototypeNodeInterface $node 
-     * @throws \RuntimeException if the node doesnt have concrete children
+     * @throws \RuntimeException if the node doesn't have concrete children
      */
     public function setPrototype(PrototypeNodeInterface $node)
     {
@@ -279,7 +279,7 @@ public function addChild(NodeInterface $node)
      * @param mixed $value 
      * @return mixed The finalised value
      * @throws UnsetKeyException
-     * @throws InvalidConfigurationException if the node doesnt have enough children
+     * @throws InvalidConfigurationException if the node doesn't have enough children
      */
     protected function finalizeValue($value)
     {

diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -53,7 +53,7 @@ public function __construct($name, NodeInterface $parent = null)
     }
 
     /**
-     * Adds an equivilent value.
+     * Adds an equivalent value.
      *
      * @param mixed $originalValue 
      * @param mixed $equivalentValue 
@@ -173,7 +173,8 @@ public final function merge($leftSide, $rightSide)
      * Normalizes a value, applying all normalization closures.
      *
      * @param mixed $value Value to normalize.
-     * @return mied The normalized value.
+     *
+     * @return mixed The normalized value.
      */
     public final function normalize($value)
     {

diff --git a/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php
@@ -1,73 +1,73 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Config\Definition\Builder;
-
-/**
- * This class builds merge conditions.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class MergeBuilder
-{
-    public $parent;
-    public $allowFalse;
-    public $allowOverwrite;
-
-    /**
-     * Constructor
-     *
-     * @param Symfony\Component\Config\Definition\Builder\NodeBuilder $parent The parent node
-     */
-    public function __construct($parent)
-    {
-        $this->parent = $parent;
-        $this->allowFalse = false;
-        $this->allowOverwrite = true;
-    }
-
-    /**
-     * Sets whether the node can be unset.
-     *
-     * @param boolean $allow
-     * @return Symfony\Component\Config\Definition\Builder\MergeBuilder
-     */
-    public function allowUnset($allow = true)
-    {
-        $this->allowFalse = $allow;
-
-        return $this;
-    }
-
-    /**
-     * Sets whether the node can be overwritten.
-     *
-     * @param boolean $deny Whether the overwritting is forbidden or not
-     *
-     * @return Symfony\Component\Config\Definition\Builder\MergeBuilder
-     */
-    public function denyOverwrite($deny = true)
-    {
-        $this->allowOverwrite = !$deny;
-
-        return $this;
-    }
-
-    /**
-     * Returns the parent node.
-     *
-     * @return Symfony\Component\Config\Definition\Builder\NodeBuilder
-     */
-    public function end()
-    {
-        return $this->parent;
-    }
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Definition\Builder;
+
+/**
+ * This class builds merge conditions.
+ *
+ * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ */
+class MergeBuilder
+{
+    public $parent;
+    public $allowFalse;
+    public $allowOverwrite;
+
+    /**
+     * Constructor
+     *
+     * @param Symfony\Component\Config\Definition\Builder\NodeBuilder $parent The parent node
+     */
+    public function __construct($parent)
+    {
+        $this->parent = $parent;
+        $this->allowFalse = false;
+        $this->allowOverwrite = true;
+    }
+
+    /**
+     * Sets whether the node can be unset.
+     *
+     * @param boolean $allow
+     * @return Symfony\Component\Config\Definition\Builder\MergeBuilder
+     */
+    public function allowUnset($allow = true)
+    {
+        $this->allowFalse = $allow;
+
+        return $this;
+    }
+
+    /**
+     * Sets whether the node can be overwritten.
+     *
+     * @param boolean $deny Whether the overwriting is forbidden or not
+     *
+     * @return Symfony\Component\Config\Definition\Builder\MergeBuilder
+     */
+    public function denyOverwrite($deny = true)
+    {
+        $this->allowOverwrite = !$deny;
+
+        return $this;
+    }
+
+    /**
+     * Returns the parent node.
+     *
+     * @return Symfony\Component\Config\Definition\Builder\NodeBuilder
+     */
+    public function end()
+    {
+        return $this->parent;
+    }
 }
diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
@@ -399,7 +399,7 @@ protected function merge()
     /**
      * Sets whether the node can be overwritten.
      *
-     * @param boolean $deny Whether the overwritting is forbidden or not
+     * @param boolean $deny Whether the overwriting is forbidden or not
      *
      * @return Symfony\Component\Config\Definition\Builder\NodeBuilder
      */

diff --git a/src/Symfony/Component/Config/FileLocator.php b/src/Symfony/Component/Config/FileLocator.php
@@ -38,7 +38,7 @@ public function __construct($paths = array())
      *
      * @param mixed   $name        The file name to locate
      * @param string  $currentPath The current path
-     * @param Boolean $first       Wether to return the first occurence or an array of filenames
+     * @param Boolean $first       Whether to return the first occurrence or an array of filenames
      *
      * @return string|array The full path to the file|An array of file paths
      *

diff --git a/src/Symfony/Component/Config/FileLocatorInterface.php b/src/Symfony/Component/Config/FileLocatorInterface.php
@@ -21,7 +21,7 @@ interface FileLocatorInterface
      *
      * @param mixed   $name        The file name to locate
      * @param string  $currentPath The current path
-     * @param Boolean $first       Wether to return the first occurence or an array of filenames
+     * @param Boolean $first       Whether to return the first occurrence or an array of filenames
      *
      * @return string|array The full path to the file|An array of file paths
      *