doctrine / orm

lib/Doctrine/ORM/ORMInvalidArgumentException.php

Spacing +18 added lines, -18 removed lines

@@ -34,7 +34,7 @@ 
      */
     static public function scheduleInsertForManagedEntity($entity)
     {
-        return new self("A managed+dirty entity " . self::objToStr($entity) . " can not be scheduled for insertion.");
+        return new self("A managed+dirty entity ".self::objToStr($entity)." can not be scheduled for insertion.");
     }
 
     /**
@@ -44,7 +44,7 @@ 
      */
     static public function scheduleInsertForRemovedEntity($entity)
     {
-        return new self("Removed entity " . self::objToStr($entity) . " can not be scheduled for insertion.");
+        return new self("Removed entity ".self::objToStr($entity)." can not be scheduled for insertion.");
     }
 
     /**
@@ -54,7 +54,7 @@ 
      */
     static public function scheduleInsertTwice($entity)
     {
-        return new self("Entity " . self::objToStr($entity) . " can not be scheduled for insertion twice.");
+        return new self("Entity ".self::objToStr($entity)." can not be scheduled for insertion twice.");
     }
 
     /**
@@ -66,7 +66,7 @@ 
     static public function entityWithoutIdentity($className, $entity)
     {
         return new self(
-            "The given entity of type '" . $className . "' (".self::objToStr($entity).") has no identity/no " .
+            "The given entity of type '".$className."' (".self::objToStr($entity).") has no identity/no ".
             "id values set. It cannot be added to the identity map."
         );
     }
@@ -78,7 +78,7 @@ 
      */
     static public function readOnlyRequiresManagedEntity($entity)
     {
-        return new self("Only managed entities can be marked or checked as read only. But " . self::objToStr($entity) . " is not");
+        return new self("Only managed entities can be marked or checked as read only. But ".self::objToStr($entity)." is not");
     }
 
     /**
@@ -90,13 +90,13 @@ 
     static public function newEntityFoundThroughRelationship(array $assoc, $entry)
     {
         return new self("A new entity was found through the relationship '"
-            . $assoc['sourceEntity'] . "#" . $assoc['fieldName'] . "' that was not"
-            . " configured to cascade persist operations for entity: " . self::objToStr($entry) . "."
+            . $assoc['sourceEntity']."#".$assoc['fieldName']."' that was not"
+            . " configured to cascade persist operations for entity: ".self::objToStr($entry)."."
             . " To solve this issue: Either explicitly call EntityManager#persist()"
             . " on this unknown entity or configure cascade persist "
             . " this association in the mapping for example @ManyToOne(..,cascade={\"persist\"})."
-            . (method_exists($entry, '__toString') ? "": " If you cannot find out which entity causes the problem"
-            . " implement '" . $assoc['targetEntity'] . "#__toString()' to get a clue."));
+            . (method_exists($entry, '__toString') ? "" : " If you cannot find out which entity causes the problem"
+            . " implement '".$assoc['targetEntity']."#__toString()' to get a clue."));
     }
 
     /**
@@ -107,8 +107,8 @@ 
      */
     static public function detachedEntityFoundThroughRelationship(array $assoc, $entry)
     {
-        return new self("A detached entity of type " . $assoc['targetEntity'] . " (" . self::objToStr($entry) . ") "
-            . " was found through the relationship '" . $assoc['sourceEntity'] . "#" . $assoc['fieldName'] . "' "
+        return new self("A detached entity of type ".$assoc['targetEntity']." (".self::objToStr($entry).") "
+            . " was found through the relationship '".$assoc['sourceEntity']."#".$assoc['fieldName']."' "
             . "during cascading a persist operation.");
     }
 
@@ -119,7 +119,7 @@ 
      */
     static public function entityNotManaged($entity)
     {
-        return new self("Entity " . self::objToStr($entity) . " is not managed. An entity is managed if its fetched " .
+        return new self("Entity ".self::objToStr($entity)." is not managed. An entity is managed if its fetched ".
             "from the database or registered as new through EntityManager#persist");
     }
 
@@ -131,7 +131,7 @@ 
      */
     static public function entityHasNoIdentity($entity, $operation)
     {
-        return new self("Entity has no identity, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
+        return new self("Entity has no identity, therefore ".$operation." cannot be performed. ".self::objToStr($entity));
     }
 
     /**
@@ -142,7 +142,7 @@ 
      */
     static public function entityIsRemoved($entity, $operation)
     {
-        return new self("Entity is removed, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
+        return new self("Entity is removed, therefore ".$operation." cannot be performed. ".self::objToStr($entity));
     }
 
     /**
@@ -153,7 +153,7 @@ 
      */
     static public function detachedEntityCannot($entity, $operation)
     {
-        return new self("Detached entity " . self::objToStr($entity) . " cannot be " . $operation);
+        return new self("Detached entity ".self::objToStr($entity)." cannot be ".$operation);
     }
 
     /**
@@ -165,8 +165,8 @@ 
      */
     public static function invalidObject($context, $given, $parameterIndex = 1)
     {
-        return new self($context . ' expects parameter ' . $parameterIndex .
-            ' to be an entity object, '. gettype($given) . ' given.');
+        return new self($context.' expects parameter '.$parameterIndex.
+            ' to be an entity object, '.gettype($given).' given.');
     }
 
     /**
@@ -174,7 +174,7 @@ 
      */
     public static function invalidCompositeIdentifier()
     {
-        return new self("Binding an entity with a composite primary key to a query is not supported. " .
+        return new self("Binding an entity with a composite primary key to a query is not supported. ".
             "You should split the parameter into the explicit fields and bind them separately.");
     }
 

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;

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));
     }
 }

Doc Comments +1 added lines, -1 removed lines

@@ -1044,7 +1044,7 @@
      * Will return the configured id if it exists otherwise a hash will be
      * automatically generated for you.
      *
-     * @return array ($key, $hash)
+     * @return string[] ($key, $hash)
      */
     protected function getHydrationCacheId()
     {

Unused Use Statements -2 removed lines

@@ -22,11 +22,9 @@
 use Doctrine\Common\Util\ClassUtils;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
-
 use Doctrine\ORM\Query\Parameter;
 use Doctrine\ORM\Cache\QueryCacheKey;
 use Doctrine\DBAL\Cache\QueryCacheProfile;
-
 use Doctrine\ORM\Cache;
 use Doctrine\ORM\Query\ResultSetMapping;
 

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 +1 added lines, -2 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])) {

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) {

lib/Doctrine/ORM/Cache/DefaultQueryCache.php

Indentation +3 added lines, -3 removed lines

@@ -38,9 +38,9 @@
  */
 class DefaultQueryCache implements QueryCache
 {
-     /**
-     * @var \Doctrine\ORM\EntityManagerInterface
-     */
+        /**
+         * @var \Doctrine\ORM\EntityManagerInterface
+         */
     private $em;
 
     /**

Spacing +4 added lines, -4 removed lines

@@ -113,7 +113,7 @@ 
 
         $cm = $this->em->getClassMetadata($entityName);
 
-        $generateKeys = function (array $entry) use ($cm): EntityCacheKey {
+        $generateKeys = function(array $entry) use ($cm): EntityCacheKey {
             return new EntityCacheKey($cm->rootEntityName, $entry['identifier']);
         };
 
@@ -140,7 +140,7 @@ 
 
             if ( ! $hasRelation) {
 
-                $result[$index]  = $this->uow->createEntity($entityEntry->class, $entityEntry->resolveAssociationEntries($this->em), self::$hints);
+                $result[$index] = $this->uow->createEntity($entityEntry->class, $entityEntry->resolveAssociationEntries($this->em), self::$hints);
 
                 continue;
             }
@@ -178,7 +178,7 @@ 
                     continue;
                 }
 
-                $collection  = new PersistentCollection($this->em, $assocMetadata, new ArrayCollection());
+                $collection = new PersistentCollection($this->em, $assocMetadata, new ArrayCollection());
 
                 foreach ($assoc['list'] as $assocIndex => $assocId) {
 
@@ -284,7 +284,7 @@ 
                 // root entity association
                 if ($rootAlias === $parentAlias) {
                     // Cancel put result if association put fail
-                    if ( ($assocInfo = $this->storeAssociationCache($key, $assoc, $assocValue)) === null) {
+                    if (($assocInfo = $this->storeAssociationCache($key, $assoc, $assocValue)) === null) {
                         return false;
                     }