CS/Typo Fixes

lib/Doctrine/ORM/Cache/DefaultCacheFactory.php

@@ -102,7 +102,7 @@ class DefaultCacheFactory implements CacheFactory
      */
     public function setRegion(Region $region)
     {
-       $this->regions[$region->getName()] = $region;
+        $this->regions[$region->getName()] = $region;
     }
 
     /**
@@ -110,7 +110,7 @@ class DefaultCacheFactory implements CacheFactory
      */
     public function setTimestampRegion(TimestampRegion $region)
     {
-       $this->timestampRegion = $region;
+        $this->timestampRegion = $region;
     }
 
     /**

lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php

@@ -94,7 +94,7 @@ class DefaultEntityHydrator implements EntityHydrator
                 : $data[$name];
 
             // @TODO - fix it !
-            // hande UnitOfWork#createEntity hash generation
+            // handle UnitOfWork#createEntity hash generation
             if ( ! is_array($targetId)) {
 
                 $data[reset($assoc['joinColumnFieldNames'])] = $targetId;

lib/Doctrine/ORM/Cache/Persister/AbstractCollectionPersister.php

@@ -90,10 +90,10 @@ abstract class AbstractCollectionPersister implements CachedCollectionPersister
     protected $cacheLogger;
 
     /**
-     * @param \Doctrine\ORM\Persisters\CollectionPersister $persister The collection persister that will be cached.
+     * @param \Doctrine\ORM\Persisters\CollectionPersister $persister   The collection persister that will be cached.
-     * @param \Doctrine\ORM\Cache\Region                   $region    The collection region.
+     * @param \Doctrine\ORM\Cache\Region                   $region      The collection region.
-     * @param \Doctrine\ORM\EntityManagerInterface         $em        The entity manager.
+     * @param \Doctrine\ORM\EntityManagerInterface         $em          The entity manager.
-     * @param array                                        $mapping   The association mapping.
+     * @param array                                        $association The association mapping.
      */
     public function __construct(CollectionPersister $persister, Region $region, EntityManagerInterface $em, array $association)
     {

lib/Doctrine/ORM/Cache/Persister/NonStrictReadWriteCachedCollectionPersister.php

@@ -85,7 +85,7 @@ class NonStrictReadWriteCachedCollectionPersister extends AbstractCollectionPers
         $ownerId = $this->uow->getEntityIdentifier($collection->getOwner());
         $key     = new CollectionCacheKey($this->sourceEntity->rootEntityName, $this->association['fieldName'], $ownerId);
 
-       // Invalidate non initialized collections OR odered collection
+       // Invalidate non initialized collections OR ordered collection
         if ($isDirty && ! $isInitialized || isset($this->association['orderBy'])) {
             $this->persister->update($collection);
 

lib/Doctrine/ORM/Cache/Persister/ReadWriteCachedCollectionPersister.php

@@ -34,10 +34,10 @@ use Doctrine\ORM\PersistentCollection;
 class ReadWriteCachedCollectionPersister extends AbstractCollectionPersister
 {
     /**
-     * @param \Doctrine\ORM\Persisters\CollectionPersister $persister The collection persister that will be cached.
+     * @param \Doctrine\ORM\Persisters\CollectionPersister $persister   The collection persister that will be cached.
-     * @param \Doctrine\ORM\Cache\ConcurrentRegion         $region    The collection region.
+     * @param \Doctrine\ORM\Cache\ConcurrentRegion         $region      The collection region.
-     * @param \Doctrine\ORM\EntityManagerInterface         $em        The entity manager.
+     * @param \Doctrine\ORM\EntityManagerInterface         $em          The entity manager.
-     * @param array                                        $mapping   The association mapping.
+     * @param array                                        $association The association mapping.
      */
     public function __construct(CollectionPersister $persister, ConcurrentRegion $region, EntityManagerInterface $em, array $association)
     {

lib/Doctrine/ORM/Cache/QueryCache.php

@@ -51,7 +51,7 @@ interface QueryCache
      * @param \Doctrine\ORM\Query\ResultSetMapping  $rsm
      * @param array                                 $hints
      *
-     * @return void
+     * @return array|null
      */
     public function get(QueryCacheKey $key, ResultSetMapping $rsm, array $hints = array());
 

lib/Doctrine/ORM/Cache/QueryCacheValidator.php

@@ -33,7 +33,7 @@ interface QueryCacheValidator
     /**
      * Checks if the query entry is valid
      *
-     * @param \Doctrine\ORM\Cache\QueryCacheEntry $key
+     * @param \Doctrine\ORM\Cache\QueryCacheKey   $key
      * @param \Doctrine\ORM\Cache\QueryCacheEntry $entry
      *
      * @return boolean

lib/Doctrine/ORM/Cache/Region/FileLockRegion.php

@@ -29,8 +29,8 @@ use Doctrine\ORM\Cache\ConcurrentRegion;
 /**
  * Very naive concurrent region, based on file locks.
  *
- * since   2.5
+ * @since   2.5
- * author  Fabio B. Silva <fabio.bat.silvagmail.com>
+ * @author  Fabio B. Silva <fabio.bat.silvagmail.com>
  */
 class FileLockRegion implements ConcurrentRegion
 {
@@ -42,7 +42,7 @@ class FileLockRegion implements ConcurrentRegion
     private $region;
 
     /**
-     * var string
+     * @var string
      */
     private $directory;
 
@@ -74,8 +74,8 @@ class FileLockRegion implements ConcurrentRegion
     }
 
     /**
-     * param \Doctrine\ORM\Cache\CacheKey $key
+     * @param \Doctrine\ORM\Cache\CacheKey $key
-     * param \Doctrine\ORM\Cache\Lock     $lock
+     * @param \Doctrine\ORM\Cache\Lock     $lock
      *
      * @return boolean
      */

lib/Doctrine/ORM/EntityManagerInterface.php

@@ -31,7 +31,7 @@ use Doctrine\ORM\Query\ResultSetMapping;
 interface EntityManagerInterface extends ObjectManager
 {
     /**
-     * Returns the cache API for managing the second level cache regions or NULL if the cache is not anabled.
+     * Returns the cache API for managing the second level cache regions or NULL if the cache is not enabled.
      *
      * @return \Doctrine\ORM\Cache|null
      */

lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php

@@ -1021,7 +1021,8 @@ class ClassMetadataInfo implements ClassMetadata
     }
 
     /**
-     * @param array $cache
+     * @param string $fieldName
+     * @param array  $cache
      *
      * @return void
      */

tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php

@@ -44,7 +44,7 @@ class DefaultCacheFactoryTest extends OrmTestCase
         ), $arguments);
     }
 
-    public function testInplementsCacheFactory()
+    public function testImplementsCacheFactory()
     {
         $this->assertInstanceOf('Doctrine\ORM\Cache\CacheFactory', $this->factory);
     }

tests/Doctrine/Tests/ORM/Cache/DefaultCacheTest.php

@@ -245,7 +245,7 @@ class DefaultCacheTest extends OrmTestCase
         $this->assertSame($fooQueryCache, $this->cache->getQueryCache('foo'));
     }
 
-    public function testToIdentifierArrayShoudLookupForEntityIdentifier()
+    public function testToIdentifierArrayShouldLookupForEntityIdentifier()
     {
         $identifier = 123;
         $entity     = new Country('Foo');

tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php

@@ -216,7 +216,7 @@ class DefaultQueryCacheTest extends OrmTestCase
         $this->assertCount(13, $this->region->calls['put']);
     }
 
-    public function testgGetBasicQueryResult()
+    public function testGetBasicQueryResult()
     {
         $rsm   = new ResultSetMappingBuilder($this->em);
         $key   = new QueryCacheKey('query.key1', 0);
@@ -480,7 +480,7 @@ class DefaultQueryCacheTest extends OrmTestCase
      * @expectedException Doctrine\ORM\Cache\CacheException
      * @expectedExceptionMessage Second level cache does not support multiple root entities.
      */
-    public function testSuportMultipleRootEntitiesException()
+    public function testSupportMultipleRootEntitiesException()
     {
         $result   = array();
         $key      = new QueryCacheKey('query.key1', 0);

tests/Doctrine/Tests/ORM/Cache/Persister/AbstractCollectionPersisterTest.php

@@ -199,7 +199,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase
         $this->assertEquals(0, $persister->count($collection));
     }
 
-    public function testInvokEslice()
+    public function testInvokeSlice()
     {
         $entity     = new State("Foo");
         $persister  = $this->createPersisterDefault();

tests/Doctrine/Tests/ORM/Cache/Persister/ReadWriteCachedEntityPersisterTest.php

@@ -153,7 +153,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
         $this->assertCount(0, $property->getValue($persister));
     }
 
-    public function testTransactionlCommitShouldClearQueue()
+    public function testTransactionCommitShouldClearQueue()
     {
         $entity    = new Country("Foo");
         $lock      = Lock::createLockRead();