symfony · pborreli · Oct 3, 2015 · javiereguiluz · Oct 3, 2015 · pborreli
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -403,7 +403,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
     /**
      * Returns a modified version of $managerConfigs.
      *
-     * The manager called $autoMappedManager will map all bundles that are not mepped by other managers.
+     * The manager called $autoMappedManager will map all bundles that are not mapped by other managers.
      *
      * @param array $managerConfigs
      * @param array $bundles

diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
@@ -160,7 +160,7 @@ public function write($sessionId, $data)
                 $mergeStmt->bindParam(':data', $encoded, \PDO::PARAM_STR);
                 $mergeStmt->bindValue(':time', time(), \PDO::PARAM_INT);
 
-                //Oracle has a bug that will intermitently happen if you
+                //Oracle has a bug that will intermittently happen if you
                 //have only 1 bind on a CLOB field for 2 different statements
                 //(INSERT and UPDATE in this case)
                 if ('oracle' == $this->con->getDatabasePlatform()->getName()) {

diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -63,7 +63,7 @@ public function testFixManagersAutoMappingsWithTwoAutomappings()
         );
 
         $bundles = array(
-            'FristBundle' => 'My\FristBundle',
+            'FirstBundle' => 'My\FirstBundle',
             'SecondBundle' => 'My\SecondBundle',
         );
 
@@ -97,7 +97,7 @@ public function getAutomappingData()
                 array(),
                 array(
                     'mappings' => array(
-                        'FristBundle' => array(
+                        'FirstBundle' => array(
                             'mapping' => true,
                             'is_bundle' => true,
                         ),
@@ -131,7 +131,7 @@ public function getAutomappingData()
                 ),
                 array(
                     'mappings' => array(
-                        'FristBundle' => array(
+                        'FirstBundle' => array(
                             'mapping' => true,
                             'is_bundle' => true,
                         ),
@@ -152,7 +152,7 @@ public function testFixManagersAutoMappings(array $originalEm1, array $originalE
         );
 
         $bundles = array(
-            'FristBundle' => 'My\FristBundle',
+            'FirstBundle' => 'My\FirstBundle',
             'SecondBundle' => 'My\SecondBundle',
         );
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
@@ -113,7 +113,7 @@ public function testGetControllerInvokableService()
      */
     public function testGetControllerOnNonUndefinedFunction($controller, $exceptionName = null, $exceptionMessage = null)
     {
-        // All this logic needs to be duplicated, since calling parent::testGetControllerOnNonUndefinedFunction will override the expected excet
8000
ion and not use the regex
+        // All this logic needs to be duplicated, since calling parent::testGetControllerOnNonUndefinedFunction will override the expected exception and not use the regex
         $resolver = $this->createControllerResolver();
         $this->setExpectedExceptionRegExp($exceptionName, $exceptionMessage);
 

diff --git a/...y/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php b/...y/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php
@@ -89,7 +89,7 @@ public function testProcessThrowAnExceptionIfTheServiceIsNotASubclassOfCommand()
         $container->compile();
     }
 
-    public function testHttpKernelRegisterCommandsIngoreCommandAsAService()
+    public function testHttpKernelRegisterCommandsIgnoreCommandAsAService()
     {
         $container = new ContainerBuilder();
         $container->addCompilerPass(new AddConsoleCommandPass());

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
@@ -218,11 +218,11 @@ protected function getContainer($loader)
         return $container;
     }
 
-    public function getTranslator($loader, $options = array(), $loaderFomat = 'loader', $translatorClass = '\Symfony\Bundle\FrameworkBundle\Translation\Translator')
+    public function getTranslator($loader, $options = array(), $loaderFormat = 'loader', $translatorClass = '\Symfony\Bundle\FrameworkBundle\Translation\Translator')
     {
-        $translator = $this->createTranslator($loader, $options, $translatorClass, $loaderFomat);
+        $translator = $this->createTranslator($loader, $options, $translatorClass, $loaderFormat);
 
-        if ('loader' === $loaderFomat) {
+        if ('loader' === $loaderFormat) {
             $translator->addResource('loader', 'foo', 'fr');
             $translator->addResource('loader', 'foo', 'en');
             $translator->addResource('loader', 'foo', 'es');
@@ -260,12 +260,12 @@ public function testWarmup()
         $this->assertEquals('répertoire', $translator->trans('folder'));
     }
 
-    private function createTranslator($loader, $options, $translatorClass = '\Symfony\Bundle\FrameworkBundle\Translation\Translator', $loaderFomat = 'loader')
+    private function createTranslator($loader, $options, $translatorClass = '\Symfony\Bundle\FrameworkBundle\Translation\Translator', $loaderFormat = 'loader')
     {
         return new $translatorClass(
             $this->getContainer($loader),
             new MessageSelector(),
-            array($loaderFomat => array($loaderFomat)),
+            array($loaderFormat => array($loaderFormat)),
             $options
         );
     }

diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php b/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php
@@ -90,7 +90,7 @@ protected function normalizeToken($token)
     /**
      * Seeks to a non-whitespace token.
      */
-    private function seekToNextReleventToken(\Iterator $tokenIterator)
+    private function seekToNextRelevantToken(\Iterator $tokenIterator)
     {
         for (; $tokenIterator->valid(); $tokenIterator->next()) {
             $t = $tokenIterator->current();
@@ -153,7 +153,7 @@ protected function parseTokens($tokens, MessageCatalogue $catalog)
                 $tokenIterator->seek($key);
 
                 foreach ($sequence as $item) {
-                    $this->seekToNextReleventToken($tokenIterator);
+                    $this->seekToNextRelevantToken($tokenIterator);
 
                     if ($this->normalizeToken($tokenIterator->current()) == $item) {
                         $tokenIterator->next();

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php
@@ -90,13 +90,13 @@ public function testSetAclUser()
 
         try {
             $acl->isGranted($permissionMap->getMasks('OWNER', null), array($securityIdentity1));
-            $this->fail('NoAceFoundException not throwed');
+            $this->fail('NoAceFoundException not thrown');
         } catch (NoAceFoundException $e) {
         }
 
         try {
             $acl->isGranted($permissionMap->getMasks('OPERATOR', null), array($securityIdentity2));
-            $this->fail('NoAceFoundException not throwed');
+            $this->fail('NoAceFoundException not thrown');
         } catch (NoAceFoundException $e) {
         }
     }
@@ -133,13 +133,13 @@ public function testSetAclRole()
 
         try {
             $acl->isGranted($permissionMap->getMasks('VIEW', null), array($userSecurityIdentity));
-            $this->fail('NoAceFoundException not throwed');
+            $this->fail('NoAceFoundException not thrown');
         } catch (NoAceFoundException $e) {
         }
 
         try {
             $acl->isGranted($permissionMap->getMasks('OPERATOR', null), array($userSecurityIdentity));
-            $this->fail('NoAceFoundException not throwed');
+            $this->fail('NoAceFoundException not thrown');
         } catch (NoAceFoundException $e) {
         }
     }