symfony · Feb 26, 2011 · Feb 26, 2011 · Feb 26, 2011 · Feb 26, 2011 · Feb 26, 2011
diff --git a/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php
@@ -127,7 +127,7 @@ protected function setMappingDriverAlias($mappingConfig, $mappingName)
     }
 
     /**
-     * Registter the mapping driver configuration for later use with the object managers metadata driver chain.
+     * Register the mapping driver configuration for later use with the object managers metadata driver chain.
      *
      * @param array $mappingConfig
      * @param string $mappingName
@@ -298,7 +298,7 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
     }
 
     /**
-     * Prefixes the relative dependency injenction container path with the object manager prefix.
+     * Prefixes the relative dependency injection container path with the object manager prefix.
      *
      * @example $name is 'entity_manager' then the result would be 'doctrine.orm.entity_manager'
      *

diff --git a/src/Symfony/Bundle/DoctrineBundle/CacheWarmer/ProxyCacheWarmer.php b/src/Symfony/Bundle/DoctrineBundle/CacheWarmer/ProxyCacheWarmer.php
@@ -38,7 +38,7 @@ public function __construct(Container $container)
     }
 
     /**
-     * This cache warmer is not optional, without proxies fatal error occour!
+     * This cache warmer is not optional, without proxies fatal error occurs!
      *
      * @return false
      */

diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php
@@ -43,7 +43,7 @@ protected function configure()
 
   <info>./app/console doctrine:generate:entities "MyCustomBundle" --entity="User"</info>
 
-You have to specifiy the shortname (without namespace) of the entity you want to filter for.
+You have to specify the shortname (without namespace) of the entity you want to filter for.
 EOT
         );
     }
@@ -66,7 +66,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
                 if (strpos($metadata->name, $foundBundle->getNamespace()) === false) {
                     throw new \RuntimeException(
-                        "Entity " . $metadata->name . " and bundle don't have a commont namespace, ".
+                        "Entity " . $metadata->name . " and bundle don't have a common namespace, ".
                         "generation failed because the target directory cannot be detected.");
                 }
 

diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateRepositoriesDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateRepositoriesDoctrineCommand.php
@@ -60,7 +60,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 if ($metadata->customRepositoryClassName) {
                     if (strpos($metadata->customRepositoryClassName, $foundBundle->getName()) === false) {
                         throw new \RuntimeException(
-                            "Repository " . $metadata->customRepositoryClassName . " and bundle don't have a commont namespace, ".
+                            "Repository " . $metadata->customRepositoryClassName . " and bundle don't have a common namespace, ".
                             "generation failed because the target directory cannot be detected.");
                     }
 

diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/RunDqlDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/RunDqlDoctrineCommand.php
@@ -42,7 +42,7 @@ protected function configure()
 
   <info>./app/console doctrine:query:dql "SELECT u FROM UserBundle:User u" --hydrate=array</info>
 
-Additionaly you can specify the first result and maximum amount of results to show:
+Additionally you can specify the first result and maximum amount of results to show:
 
   <info>./app/console doctrine:query:dql "SELECT u FROM UserBundle:User u" --first-result=0 --max-result=30</info>
 EOT

diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
@@ -108,7 +108,7 @@ protected function mergeDbalConfig(array $configs, $container)
             'wrapper-class'         => 'wrapperClass', // doctrine conv.
             'charset'               => 'charset',
         );
-        $supportedContrainerParams = array(
+        $supportedContainerParams = array(
             'platform-service'      => 'platform_service',
             'platform_service'      => 'platform_service',
             'logging'               => 'logging',
@@ -173,8 +173,8 @@ protected function mergeDbalConfig(array $configs, $container)
                 foreach ($connection as $k => $v) {
                     if (isset($supportedConnectionParams[$k])) {
                         $mergedConfig['connections'][$connectionName]['driver'][$supportedConnectionParams[$k]] = $v;
-                    } else if (isset($supportedContrainerParams[$k])) {
-                        $mergedConfig['connections'][$connectionName]['container'][$supportedContrainerParams[$k]] = $v;
+                    } else if (isset($supportedContainerParams[$k])) {
+                        $mergedConfig['connections'][$connectionName]['container'][$supportedContainerParams[$k]] = $v;
                     }
                 }
             }
@@ -447,8 +447,8 @@ protected function loadOrmEntityManager(array $entityManager, ContainerBuilder $
      *
      * There are two distinct configuration possibilities for mapping information:
      *
-     * 1. Specifiy a bundle and optionally details where the entity and mapping information reside.
-     * 2. Specifiy an arbitrary mapping location.
+     * 1. Specify a bundle and optionally details where the entity and mapping information reside.
+     * 2. Specify an arbitrary mapping location.
      *
      * @example
      *

diff --git a/src/Symfony/Bundle/DoctrineBundle/Tests/CacheWarmer/ProxyCacheWarmerTest.php b/src/Symfony/Bundle/DoctrineBundle/Tests/CacheWarmer/ProxyCacheWarmerTest.php
@@ -16,7 +16,7 @@
 class ProxyCacheWarmerTest extends \Symfony\Bundle\DoctrineBundle\Tests\TestCase
 {
     /**
-     * This is not necessarily a good test, it doesnt generate any proxies
+     * This is not necessarily a good test, it doesn't generate any proxies
      * because there are none in the AnnotationsBundle. However that is
      * rather a task of doctrine to test. We touch the lines here and
      * verify that the container is called correctly for the relevant information.

diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/CacheWarmer/HydratorCacheWarmer.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/CacheWarmer/HydratorCacheWarmer.php
@@ -39,7 +39,7 @@ public function __construct(Container $container)
     }
 
     /**
-     * This cache warmer is not optional, without hydrators fatal error occour!
+     * This cache warmer is not optional, without hydrators fatal error occurs!
      *
      * @return false
      */

diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/CacheWarmer/ProxyCacheWarmer.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/CacheWarmer/ProxyCacheWarmer.php
@@ -39,7 +39,7 @@ public function __construct(Container $container)
     }
 
     /**
-     * This cache warmer is not optional, without proxies fatal error occour!
+     * This cache warmer is not optional, without proxies fatal error occurs!
      *
      * @return false
      */

diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/GenerateDocumentsDoctrineODMCommand.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/GenerateDocumentsDoctrineODMCommand.php
@@ -43,7 +43,7 @@ protected function configure()
 
   <info>./app/console doctrine:generate:documents "MyCustomBundle" --document="User"</info>
 
-You have to specifiy the shortname (without namespace) of the document you want to filter for.
+You have to specify the shortname (without namespace) of the document you want to filter for.
 EOT
         );
     }
@@ -66,7 +66,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
                 if (strpos($metadata->name, $foundBundle->getNamespace()) === false) {
                     throw new \RuntimeException(
-                        "Document " . $metadata->name . " and bundle don't have a commont namespace, ".
+                        "Document " . $metadata->name . " and bundle don't have a common namespace, ".
                         "generation failed because the target directory cannot be detected.");
                 }
 

diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/GenerateRepositoriesDoctrineODMCommand.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/GenerateRepositoriesDoctrineODMCommand.php
@@ -60,7 +60,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 if ($metadata->customRepositoryClassName) {
                     if (strpos($metadata->customRepositoryClassName, $foundBundle->getName()) === false) {
                         throw new \RuntimeException(
-                            "Repository " . $metadata->customRepositoryClassName . " and bundle don't have a commont namespace, ".
+                            "Repository " . $metadata->customRepositoryClassName . " and bundle don't have a common namespace, ".
                             "generation failed because the target directory cannot be detected.");
                     }
 

diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php
@@ -299,8 +299,8 @@ protected function getConnections(array $config, ContainerBuilder $container)
      *
      * There are two distinct configuration possibilities for mapping information:
      *
-     * 1. Specifiy a bundle and optionally details where the entity and mapping information reside.
-     * 2. Specifiy an arbitrary mapping location.
+     * 1. Specify a bundle and optionally details where the entity and mapping information reside.
+     * 2. Specify an arbitrary mapping location.
      *
      * @example
      *

diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/CacheWarmer/ProxyCacheWarmerTest.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/CacheWarmer/ProxyCacheWarmerTest.php
@@ -16,7 +16,7 @@
 class ProxyCacheWarmerTest extends \Symfony\Bundle\DoctrineMongoDBBundle\Tests\TestCase
 {
     /**
-     * This is not necessarily a good test, it doesnt generate any proxies
+     * This is not necessarily a good test, it doesn't generate any proxies
      * because there are none in the AnnotationsBundle. However that is
      * rather a task of doctrine to test. We touch the lines here and
      * verify that the container is called correctly for the relevant information.

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
@@ -43,7 +43,7 @@ public function __construct(KernelInterface $kernel, LoggerInterface $logger = n
      *
      * @param string $controller A short notation controller (a:b:c)
      *
-     * @param string A controler (class::method)
+     * @param string A controller (class::method)
      */
     public function parse($controller)
     {

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -365,7 +365,7 @@ private function registerTemplatingConfiguration(array $config, ContainerBuilder
         $container->setParameter('templating.engines', $config['engines']);
         $engines = array_map(function($engine) { return new Reference('templating.engine.'.$engine); }, $config['engines']);
 
-        // Use a deligation unless only a single engine was registered
+        // Use a delegation unless only a single engine was registered
         if (1 === count($engines)) {
             $container->setAlias('templating', (string) reset($engines));
         } else {

diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
@@ -41,7 +41,7 @@ public function __construct(HttpKernelInterface $kernel)
     /**
      * Forwards the Request to the backend and returns the Response.
      *
-     * @param Requset  $request  A Request instance
+     * @param Request  $request  A Request instance
      * @param Boolean  $raw      Whether to catch exceptions or not
      * @param Response $response A Response instance (the stale entry if present, null otherwise)
      *

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -48,6 +48,6 @@ public function testMainConfigTreeWithFactories()
         $config = $processor->process($tree, array($config));
 
         $this->assertFalse(array_key_exists('factory', $config), 'The factory key is silently removed without an exception');
-        $this->assertEquals(array(), $config['factories'], 'The factories key is jsut an empty array');
+        $this->assertEquals(array(), $config['factories'], 'The factories key is just an empty array');
     }
 }
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php b/src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php
@@ -40,7 +40,7 @@ public function testEvalutateAddsAppGlobal()
         $this->assertSame($app, $globals['app']);
     }
 
-    public function testEvalutateWithoutAvailableRequest()
+    public function testEvaluateWithoutAvailableRequest()
     {
         $environment = $this->getTwigEnvironment();
         $container = new Container();

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;
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,7 @@ public function __construct(Container $container) @@
         }
         /**
-         * This cache warmer is not optional, without proxies fatal error occour!
+         * This cache warmer is not optional, without proxies fatal error occurs!
          *
          * @return false
          */
@@ Expand Down @@