doctrine / orm

lib/Doctrine/ORM/EntityNotFoundException.php

Spacing +2 added lines, -2 removed lines

@@ -40,12 +40,12 @@
         $ids = array();
 
         foreach ($id as $key => $value) {
-            $ids[] = $key . '(' . $value . ')';
+            $ids[] = $key.'('.$value.')';
         }
 
 
         return new self(
-            'Entity of type \'' . $className . '\'' . ($ids ? ' for IDs ' . implode(', ', $ids) : '') . ' was not found'
+            'Entity of type \''.$className.'\''.($ids ? ' for IDs '.implode(', ', $ids) : '').' was not found'
         );
     }
 }

lib/Doctrine/ORM/OptimisticLockException.php

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
         $expectedLockVersion = ($expectedLockVersion instanceof \DateTime) ? $expectedLockVersion->getTimestamp() : $expectedLockVersion;
         $actualLockVersion = ($actualLockVersion instanceof \DateTime) ? $actualLockVersion->getTimestamp() : $actualLockVersion;
 
-        return new self("The optimistic lock failed, version " . $expectedLockVersion . " was expected, but is actually ".$actualLockVersion, $entity);
+        return new self("The optimistic lock failed, version ".$expectedLockVersion." was expected, but is actually ".$actualLockVersion, $entity);
     }
 
     /**
@@ -86,6 +86,6 @@ 
      */
     public static function notVersioned($entityName)
     {
-        return new self("Cannot obtain optimistic lock on unversioned entity " . $entityName, null);
+        return new self("Cannot obtain optimistic lock on unversioned entity ".$entityName, null);
     }
 }

lib/Doctrine/ORM/Utility/PersisterHelper.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
         $assoc = $class->associationMappings[$fieldName];
 
-        if (! $assoc['isOwningSide']) {
+        if ( ! $assoc['isOwningSide']) {
             return self::getTypeOfField($assoc['mappedBy'], $em->getClassMetadata($assoc['targetEntity']), $em);
         }
 

lib/Doctrine/ORM/Proxy/ProxyFactory.php

Spacing +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
     {
         $wakeupProxy = $classMetadata->getReflectionClass()->hasMethod('__wakeup');
 
-        return function (BaseProxy $proxy) use ($entityPersister, $classMetadata, $wakeupProxy) {
+        return function(BaseProxy $proxy) use ($entityPersister, $classMetadata, $wakeupProxy) {
             $initializer = $proxy->__getInitializer();
             $cloner      = $proxy->__getCloner();
 
@@ -177,7 +177,7 @@ 
      */
     private function createCloner(ClassMetadata $classMetadata, EntityPersister $entityPersister)
     {
-        return function (BaseProxy $proxy) use ($entityPersister, $classMetadata) {
+        return function(BaseProxy $proxy) use ($entityPersister, $classMetadata) {
             if ($proxy->__isInitialized()) {
                 return;
             }

lib/Doctrine/ORM/AbstractQuery.php

Indentation +4 added lines, -4 removed lines

@@ -212,10 +212,10 @@
     }
 
     /**
-    * Obtain the name of the second level query cache region in which query results will be stored
-    *
-    * @return string|null The cache region name; NULL indicates the default region.
-    */
+     * Obtain the name of the second level query cache region in which query results will be stored
+     *
+     * @return string|null The cache region name; NULL indicates the default region.
+     */
     public function getCacheRegion()
     {
         return $this->cacheRegion;

Unused Use Statements -2 removed lines

@@ -3,12 +3,10 @@
 namespace Doctrine\Tests\ORM\Cache\Persister\Entity;
 
 use Doctrine\Tests\OrmTestCase;
-
 use Doctrine\ORM\Cache\Region;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Persisters\Entity\EntityPersister;
-
 use Doctrine\Tests\Models\Cache\Country;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\Common\Collections\ArrayCollection;

Spacing +5 added lines, -5 removed lines

@@ -324,7 +324,7 @@ 
     public function getParameter($key)
     {
         $filteredParameters = $this->parameters->filter(
-            function ($parameter) use ($key)
+            function($parameter) use ($key)
             {
                 // Must not be identical because of string to integer conversion
                 return ($key == $parameter->getName());
@@ -373,7 +373,7 @@ 
     public function setParameter($key, $value, $type = null)
     {
         $filteredParameters = $this->parameters->filter(
-            function ($parameter) use ($key)
+            function($parameter) use ($key)
             {
                 // Must not be identical because of string to integer conversion
                 return ($key == $parameter->getName());
@@ -469,7 +469,7 @@ 
      */
     private function translateNamespaces(Query\ResultSetMapping $rsm)
     {
-        $translate = function ($alias) {
+        $translate = function($alias) {
             return $this->_em->getClassMetadata($alias)->getName();
         };
 
@@ -1000,7 +1000,7 @@ 
             $this->getTimestampKey()
         );
 
-        $result     = $queryCache->get($queryKey, $rsm, $this->_hints);
+        $result = $queryCache->get($queryKey, $rsm, $this->_hints);
 
         if ($result !== null) {
             if ($this->cacheLogger) {
@@ -1136,6 +1136,6 @@ 
 
         ksort($hints);
 
-        return sha1($query . '-' . serialize($params) . '-' . serialize($hints));
+        return sha1($query.'-'.serialize($params).'-'.serialize($hints));
     }
 }

lib/Doctrine/ORM/Cache/DefaultCache.php

Indentation +9 added lines, -9 removed lines

@@ -45,9 +45,9 @@ 
      */
     private $uow;
 
-     /**
-     * @var \Doctrine\ORM\Cache\CacheFactory
-     */
+        /**
+         * @var \Doctrine\ORM\Cache\CacheFactory
+         */
     private $cacheFactory;
 
     /**
@@ -289,12 +289,12 @@ 
         return $this->queryCaches[$regionName];
     }
 
-     /**
-     * @param \Doctrine\ORM\Mapping\ClassMetadata $metadata   The entity metadata.
-     * @param mixed                               $identifier The entity identifier.
-     *
-     * @return \Doctrine\ORM\Cache\EntityCacheKey
-     */
+        /**
+         * @param \Doctrine\ORM\Mapping\ClassMetadata $metadata   The entity metadata.
+         * @param mixed                               $identifier The entity identifier.
+         *
+         * @return \Doctrine\ORM\Cache\EntityCacheKey
+         */
     private function buildEntityCacheKey(ClassMetadata $metadata, $identifier)
     {
         if ( ! is_array($identifier)) {

Spacing +2 added lines, -3 removed lines

@@ -278,8 +278,7 @@ 
     public function getQueryCache($regionName = null)
     {
         if ($regionName === null) {
-            return $this->defaultQueryCache ?:
-                $this->defaultQueryCache = $this->cacheFactory->buildQueryCache($this->em);
+            return $this->defaultQueryCache ?: $this->defaultQueryCache = $this->cacheFactory->buildQueryCache($this->em);
         }
 
         if ( ! isset($this->queryCaches[$regionName])) {
@@ -314,7 +313,7 @@ 
     private function buildCollectionCacheKey(ClassMetadata $metadata, $association, $ownerIdentifier)
     {
         if ( ! is_array($ownerIdentifier)) {
-            $ownerIdentifier = $this->toIdentifierArray($metadata, $ownerIdentifier);;
+            $ownerIdentifier = $this->toIdentifierArray($metadata, $ownerIdentifier); ;
         }
 
         return new CollectionCacheKey($metadata->rootEntityName, $association, $ownerIdentifier);

lib/Doctrine/ORM/Cache/CacheConfiguration.php

Indentation +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
      */
     public function getCacheLogger()
     {
-         return $this->cacheLogger;
+            return $this->cacheLogger;
     }
 
     /**
@@ -113,7 +113,7 @@ 
             $this->queryValidator = new TimestampQueryCacheValidator();
         }
 
-         return $this->queryValidator;
+            return $this->queryValidator;
     }
 
     /**

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

Spacing +2 added lines, -2 removed lines

@@ -124,7 +124,7 @@ 
      */
     protected function getCacheEntryKey(CacheKey $key)
     {
-        return $this->name . self::REGION_KEY_SEPARATOR . $key->hash;
+        return $this->name.self::REGION_KEY_SEPARATOR.$key->hash;
     }
 
     /**
@@ -148,7 +148,7 @@ 
      */
     public function evictAll()
     {
-        if (! $this->cache instanceof ClearableCache) {
+        if ( ! $this->cache instanceof ClearableCache) {
             throw new \BadMethodCallException(sprintf(
                 'Clearing all cache entries is not supported by the supplied cache adapter of type %s',
                 get_class($this->cache)

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

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
      */
     private function getLockFileName(CacheKey $key)
     {
-        return $this->directory . DIRECTORY_SEPARATOR . $key->hash . '.' . self::LOCK_EXTENSION;
+        return $this->directory.DIRECTORY_SEPARATOR.$key->hash.'.'.self::LOCK_EXTENSION;
     }
 
     /**
@@ -216,7 +216,7 @@ 
     {
         // The check below is necessary because on some platforms glob returns false
         // when nothing matched (even though no errors occurred)
-        $filenames = glob(sprintf("%s/*.%s" , $this->directory, self::LOCK_EXTENSION));
+        $filenames = glob(sprintf("%s/*.%s", $this->directory, self::LOCK_EXTENSION));
 
         if ($filenames) {
             foreach ($filenames as $filename) {