[DoctrineBundle] Fixed typo

symfony · Feb 26, 2011 · Feb 26, 2011 · Feb 26, 2011 · Feb 26, 2011 · Feb 26, 2011
commit 68140021fc84ad055e529c1a5cef067915251442
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.