doctrine / orm

lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php

Indentation +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
     public function resolve($className)
     {
         if (isset($this->instances[$className = trim($className, '\\')])) {
-           return $this->instances[$className];
+            return $this->instances[$className];
         }
 
         return $this->instances[$className] = new $className();

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

Indentation +6 added lines, -6 removed lines

@@ -41,9 +41,9 @@ 
  */
 abstract class AbstractEntityPersister implements CachedEntityPersister
 {
-     /**
-     * @var \Doctrine\ORM\UnitOfWork
-     */
+        /**
+         * @var \Doctrine\ORM\UnitOfWork
+         */
     protected $uow;
 
     /**
@@ -61,9 +61,9 @@ 
      */
     protected $class;
 
-     /**
-     * @var array
-     */
+        /**
+         * @var array
+         */
     protected $queuedCache = array();
 
     /**

lib/Doctrine/ORM/Cache/Persister/Collection/ReadOnlyCachedCollectionPersister.php

Indentation +3 added lines, -3 removed lines

@@ -715,9 +715,9 @@
         );
     }
 
-     /**
-     * {@inheritdoc}
-     */
+        /**
+         * {@inheritdoc}
+         */
     protected function getHash()
     {
         return sha1(parent::getHash(). '-'. $this->_firstResult . '-' . $this->_maxResults);

lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php

Spacing +1 added lines, -1 removed lines

@@ -220,7 +220,7 @@
             $exporter->setMetadata($metadata);
             $exporter->export();
 
-            $output->writeln(PHP_EOL . sprintf(
+            $output->writeln(PHP_EOL.sprintf(
                 'Converting Doctrine 1.X schema to "<info>%s</info>" mapping type in "<info>%s</info>"', $toType, $destPath
             ));
         } else {

lib/Doctrine/ORM/Query/Expr/GroupBy.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     /**
      * @var string
      */
-    protected $preSeparator  = '';
+    protected $preSeparator = '';
 
     /**
      * @var string

lib/Doctrine/ORM/Tools/Pagination/Paginator.php

Doc Comments +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     /**
      * Constructor.
      *
-     * @param Query|QueryBuilder $query               A Doctrine ORM query or query builder.
+     * @param Query $query               A Doctrine ORM query or query builder.
      * @param boolean            $fetchJoinCollection Whether the query joins a collection (true by default).
      */
     public function __construct($query, $fetchJoinCollection = true)

lib/Doctrine/ORM/UnitOfWork.php

Doc Comments +4 added lines, -4 removed lines

@@ -1237,7 +1237,7 @@ 
     /**
      * Schedules an entity for being updated.
      *
-     * @param object $entity The entity to schedule for being updated.
+     * @param \Doctrine\Tests\Models\Forum\ForumUser $entity The entity to schedule for being updated.
      *
      * @return void
      *
@@ -1305,7 +1305,7 @@ 
     /**
      * Checks whether an entity is registered to be checked in the unit of work.
      *
-     * @param object $entity
+     * @param \Doctrine\Tests\ORM\NotifyChangedEntity $entity
      *
      * @return boolean
      */
@@ -3121,7 +3121,7 @@ 
      *
      * @param object $entity       The entity that owns the property.
      * @param string $propertyName The name of the property that changed.
-     * @param mixed  $oldValue     The old value of the property.
+     * @param null|integer  $oldValue     The old value of the property.
      * @param mixed  $newValue     The new value of the property.
      *
      * @return void
@@ -3321,7 +3321,7 @@ 
     /**
      * Verifies if two given entities actually are the same based on identifier comparison
      *
-     * @param object $entity1
+     * @param Proxy $entity1
      * @param object $entity2
      *
      * @return bool

Unused Use Statements -3 removed lines

@@ -26,7 +26,6 @@ 
 use Exception;
 use InvalidArgumentException;
 use UnexpectedValueException;
-
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\NotifyPropertyChanged;
@@ -34,14 +33,12 @@ 
 use Doctrine\Common\Persistence\ObjectManagerAware;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Proxy\Proxy;
-
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 use Doctrine\ORM\Event\PreFlushEventArgs;
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\Event\PostFlushEventArgs;
 use Doctrine\ORM\Event\ListenersInvoker;
-
 use Doctrine\ORM\Cache\Persister\CachedPersister;
 use Doctrine\ORM\Persisters\Entity\BasicEntityPersister;
 use Doctrine\ORM\Persisters\Entity\SingleTablePersister;

Spacing +24 added lines, -24 removed lines

@@ -463,7 +463,7 @@ 
         $state = $this->getEntityState($entity);
 
         if ($state !== self::STATE_MANAGED && $state !== self::STATE_REMOVED) {
-            throw new \InvalidArgumentException("Entity has to be managed or scheduled for removal for single computation " . self::objToStr($entity));
+            throw new \InvalidArgumentException("Entity has to be managed or scheduled for removal for single computation ".self::objToStr($entity));
         }
 
         $class = $this->em->getClassMetadata(get_class($entity));
@@ -519,7 +519,7 @@ 
         $oid  = spl_object_hash($entity);
         $data = array();
 
-        if (!isset($this->entityChangeSets[$oid])) {
+        if ( ! isset($this->entityChangeSets[$oid])) {
             return $data;
         }
 
@@ -682,7 +682,7 @@ 
                     if ($owner === null) { // cloned
                         $actualValue->setOwner($entity, $assoc);
                     } else if ($owner !== $entity) { // no clone, we have to fix
-                        if (!$actualValue->isInitialized()) {
+                        if ( ! $actualValue->isInitialized()) {
                             $actualValue->initialize(); // we have to do this otherwise the cols share state
                         }
                         $newValue = clone $actualValue;
@@ -828,7 +828,7 @@ 
         $targetClass    = $this->em->getClassMetadata($assoc['targetEntity']);
 
         foreach ($unwrappedValue as $key => $entry) {
-            if (! ($entry instanceof $targetClass->name)) {
+            if ( ! ($entry instanceof $targetClass->name)) {
                 throw ORMInvalidArgumentException::invalidAssociation($targetClass, $assoc, $entry);
             }
 
@@ -1156,7 +1156,7 @@ 
 
                 $joinColumns = reset($assoc['joinColumns']);
 
-                $calc->addDependency($targetClass->name, $class->name, (int)empty($joinColumns['nullable']));
+                $calc->addDependency($targetClass->name, $class->name, (int) empty($joinColumns['nullable']));
 
                 // If the target class has mapped subclasses, these share the same dependency.
                 if ( ! $targetClass->subClasses) {
@@ -1683,7 +1683,7 @@ 
                 throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persisted");
 
             default:
-                throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
+                throw new UnexpectedValueException("Unexpected entity state: $entityState.".self::objToStr($entity));
         }
 
         $this->cascadePersist($entity, $visited);
@@ -1753,7 +1753,7 @@ 
             case self::STATE_DETACHED:
                 throw ORMInvalidArgumentException::detachedEntityCannot($entity, "removed");
             default:
-                throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
+                throw new UnexpectedValueException("Unexpected entity state: $entityState.".self::objToStr($entity));
         }
 
     }
@@ -1904,7 +1904,7 @@ 
      */
     private function isLoaded($entity)
     {
-        return !($entity instanceof Proxy) || $entity->__isInitialized();
+        return ! ($entity instanceof Proxy) || $entity->__isInitialized();
     }
 
     /**
@@ -2062,7 +2062,7 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadeRefresh']; }
+            function($assoc) { return $assoc['isCascadeRefresh']; }
         );
 
         foreach ($associationMappings as $assoc) {
@@ -2105,7 +2105,7 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadeDetach']; }
+            function($assoc) { return $assoc['isCascadeDetach']; }
         );
 
         foreach ($associationMappings as $assoc) {
@@ -2149,7 +2149,7 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadeMerge']; }
+            function($assoc) { return $assoc['isCascadeMerge']; }
         );
 
         foreach ($associationMappings as $assoc) {
@@ -2188,7 +2188,7 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadePersist']; }
+            function($assoc) { return $assoc['isCascadePersist']; }
         );
 
         foreach ($associationMappings as $assoc) {
@@ -2217,7 +2217,7 @@ 
                     break;
 
                 case ($relatedEntities !== null):
-                    if (! $relatedEntities instanceof $assoc['targetEntity']) {
+                    if ( ! $relatedEntities instanceof $assoc['targetEntity']) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($assoc['targetEntity']),
                             $assoc,
@@ -2248,13 +2248,13 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadeRemove']; }
+            function($assoc) { return $assoc['isCascadeRemove']; }
         );
 
         $entitiesToCascade = array();
 
         foreach ($associationMappings as $assoc) {
-            if ($entity instanceof Proxy && !$entity->__isInitialized__) {
+            if ($entity instanceof Proxy && ! $entity->__isInitialized__) {
                 $entity->__load();
             }
 
@@ -2318,7 +2318,7 @@ 
                     return;
                 }
 
-                if ($entity instanceof Proxy && !$entity->__isInitialized__) {
+                if ($entity instanceof Proxy && ! $entity->__isInitialized__) {
                     $entity->__load();
                 }
 
@@ -2333,7 +2333,7 @@ 
             case LockMode::NONE === $lockMode:
             case LockMode::PESSIMISTIC_READ === $lockMode:
             case LockMode::PESSIMISTIC_WRITE === $lockMode:
-                if (!$this->em->getConnection()->isTransactionActive()) {
+                if ( ! $this->em->getConnection()->isTransactionActive()) {
                     throw TransactionRequiredException::transactionRequired();
                 }
 
@@ -2369,7 +2369,7 @@ 
      */
     public function clear($entityName = null)
     {
-        if ($entityName !== null && !is_string($entityName)) {
+        if ($entityName !== null && ! is_string($entityName)) {
             throw new \InvalidArgumentException(sprintf('Argument 1 passed to %s() must be a string, %s given', __METHOD__, gettype($entityName)));
         }
 
@@ -2671,7 +2671,7 @@ 
                             // then we can append this entity for eager loading!
                             if ($hints['fetchMode'][$class->name][$field] == ClassMetadata::FETCH_EAGER &&
                                 isset($hints[self::HINT_DEFEREAGERLOAD]) &&
-                                !$targetClass->isIdentifierComposite &&
+                                ! $targetClass->isIdentifierComposite &&
                                 $newValue instanceof Proxy &&
                                 $newValue->__isInitialized__ === false) {
 
@@ -3038,7 +3038,7 @@ 
     public function getCollectionPersister(array $association)
     {
         $role = isset($association['cache'])
-            ? $association['sourceEntity'] . '::' . $association['fieldName']
+            ? $association['sourceEntity'].'::'.$association['fieldName']
             : $association['type'];
 
         if (isset($this->collectionPersisters[$role])) {
@@ -3256,7 +3256,7 @@ 
      */
     private function afterTransactionComplete()
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
             $persister->afterTransactionComplete();
         });
     }
@@ -3266,7 +3266,7 @@ 
      */
     private function afterTransactionRolledBack()
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
             $persister->afterTransactionRolledBack();
         });
     }
@@ -3365,7 +3365,7 @@ 
                     if ($other === null) {
                         $prop->setValue($managedCopy, null);
                     } else {
-                        if ($other instanceof Proxy && !$other->__isInitialized()) {
+                        if ($other instanceof Proxy && ! $other->__isInitialized()) {
                             // do not merge fields marked lazy that have not been fetched.
                             continue;
                         }
@@ -3452,7 +3452,7 @@ 
      */
     private function clearIdentityMapForEntityName($entityName)
     {
-        if (! isset($this->identityMap[$entityName])) {
+        if ( ! isset($this->identityMap[$entityName])) {
             return;
         }
 

tests/Doctrine/Tests/Mocks/ConcurrentRegionMock.php

Doc Comments -1 removed lines

@@ -38,7 +38,6 @@
      * Dequeue an exception for a specific method invocation
      *
      * @param string $method
-     * @param mixed $default
      *
      * @return mixed
      */

tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php

Doc Comments +1 added lines

@@ -28,6 +28,7 @@
 
     /**
      * {@inheritdoc}
+     * @param \Doctrine\Tests\ORM\NotifyChangedEntity $entity
      */
     public function getEntityChangeSet($entity)
     {