doctrine / orm

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

Spacing +42 added lines, -42 removed lines

@@ -17,7 +17,7 @@ 
  * <http://www.doctrine-project.org>.
  */
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -467,7 +467,7 @@ 
         $oid  = spl_object_hash($entity);
         $data = [];
 
-        if (!isset($this->entityChangeSets[$oid])) {
+        if ( ! isset($this->entityChangeSets[$oid])) {
             return $data;
         }
 
@@ -550,7 +550,7 @@ 
                     || ! $class->getProperty($name) instanceof FieldMetadata
                     || ! $class->getProperty($name)->hasValueGenerator()
                     || $class->getProperty($name)->getValueGenerator()->getType() !== GeneratorType::IDENTITY
-                ) && (! $class->isVersioned() || $name !== $class->versionProperty->getName())) {
+                ) && ( ! $class->isVersioned() || $name !== $class->versionProperty->getName())) {
                 $actualData[$name] = $value;
             }
         }
@@ -604,7 +604,7 @@ 
                     if ($owner === null) { // cloned
                         $actualValue->setOwner($entity, $property);
                     } 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
                         }
 
@@ -644,7 +644,7 @@ 
                             // A PersistentCollection was de-referenced, so delete it.
                             $coid = spl_object_hash($orgValue);
 
-                            if (!isset($this->collectionDeletions[$coid])) {
+                            if ( ! isset($this->collectionDeletions[$coid])) {
                                 $this->collectionDeletions[$coid] = $orgValue;
                                 $changeSet[$propName] = $orgValue; // Signal changeset, to-many associations will be ignored
                             }
@@ -666,7 +666,7 @@ 
 
         // Look for changes in associations of the entity
         foreach ($class->getProperties() as $property) {
-            if (! ($property instanceof AssociationMetadata) || ($value = $property->getValue($entity)) === null) {
+            if ( ! ($property instanceof AssociationMetadata) || ($value = $property->getValue($entity)) === null) {
                 continue;
             }
 
@@ -770,13 +770,13 @@ 
         $targetClass    = $this->em->getClassMetadata($targetEntity);
 
         foreach ($unwrappedValue as $key => $entry) {
-            if (! ($entry instanceof $targetEntity)) {
+            if ( ! ($entry instanceof $targetEntity)) {
                 throw ORMInvalidArgumentException::invalidAssociation($targetClass, $association, $entry);
             }
 
             $state = $this->getEntityState($entry, self::STATE_NEW);
 
-            if (! ($entry instanceof $targetEntity)) {
+            if ( ! ($entry instanceof $targetEntity)) {
                 throw ORMException::unexpectedAssociationValue(
                     $association->getSourceEntity(),
                     $association->getName(),
@@ -835,7 +835,7 @@ 
         $persister = $this->getEntityPersister($class->getClassName());
         $generationPlan->executeImmediate($this->em, $entity);
 
-        if (! $generationPlan->containsDeferred()) {
+        if ( ! $generationPlan->containsDeferred()) {
             $id = $this->em->getIdentifierFlattener()->flattenIdentifier($class, $persister->getIdentifier($entity));
             $this->entityIdentifiers[$oid] = $id;
         }
@@ -889,7 +889,7 @@ 
                     break;
 
                 case ($property instanceof FieldMetadata):
-                    if (! $property->isPrimaryKey()
+                    if ( ! $property->isPrimaryKey()
                         || ! $property->getValueGenerator()
                         || $property->getValueGenerator()->getType() !== GeneratorType::IDENTITY) {
                         $actualData[$name] = $property->getValue($entity);
@@ -1042,7 +1042,7 @@ 
             // Entity with this $oid after deletion treated as NEW, even if the $oid
             // is obtained by a new entity because the old one went out of scope.
             //$this->entityStates[$oid] = self::STATE_NEW;
-            if (! $class->isIdentifierComposite()) {
+            if ( ! $class->isIdentifierComposite()) {
                 $property = $class->getProperty($class->getSingleIdentifierFieldName());
 
                 if ($property instanceof FieldMetadata && $property->hasValueGenerator()) {
@@ -1095,7 +1095,7 @@ 
         // Calculate dependencies for new nodes
         while ($class = array_pop($newNodes)) {
             foreach ($class->getProperties() as $property) {
-                if (! ($property instanceof ToOneAssociationMetadata && $property->isOwningSide())) {
+                if ( ! ($property instanceof ToOneAssociationMetadata && $property->isOwningSide())) {
                     continue;
                 }
 
@@ -1110,7 +1110,7 @@ 
                 $weight = count(
                     array_filter(
                         $property->getJoinColumns(),
-                        function (JoinColumnMetadata $joinColumn) { return $joinColumn->isNullable(); }
+                        function(JoinColumnMetadata $joinColumn) { return $joinColumn->isNullable(); }
                     )
                 ) === 0;
 
@@ -1405,7 +1405,7 @@ 
         $persister = $this->getEntityPersister($class->getClassName());
         $id        = $persister->getIdentifier($entity);
 
-        if (! $id) {
+        if ( ! $id) {
             return self::STATE_NEW;
         }
 
@@ -1640,7 +1640,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);
@@ -1710,7 +1710,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));
         }
 
     }
@@ -1799,7 +1799,7 @@ 
                 if ($managedCopy === null) {
                     // If the identifier is ASSIGNED, it is NEW, otherwise an error
                     // since the managed entity was not found.
-                    if (! $class->isIdentifierComposite()
+                    if ( ! $class->isIdentifierComposite()
                         && $class->getProperty($class->getSingleIdentifierFieldName()) instanceof FieldMetadata
                         && $class->getProperty($class->getSingleIdentifierFieldName())->hasValueGenerator()) {
                         throw EntityNotFoundException::fromClassNameAndIdentifier(
@@ -1850,7 +1850,7 @@ 
      */
     private function ensureVersionMatch(ClassMetadata $class, $entity, $managedCopy)
     {
-        if (! ($class->isVersioned() && $this->isLoaded($managedCopy) && $this->isLoaded($entity))) {
+        if ( ! ($class->isVersioned() && $this->isLoaded($managedCopy) && $this->isLoaded($entity))) {
             return;
         }
 
@@ -1874,7 +1874,7 @@ 
      */
     private function isLoaded($entity)
     {
-        return !($entity instanceof Proxy) || $entity->__isInitialized();
+        return ! ($entity instanceof Proxy) || $entity->__isInitialized();
     }
 
     /**
@@ -2036,7 +2036,7 @@ 
         $class        = $this->em->getClassMetadata(get_class($entity));
         $associations = array_filter(
             $class->getProperties(),
-            function (Property $property) {
+            function(Property $property) {
                 return $property instanceof AssociationMetadata && in_array('refresh', $property->getCascade());
             }
         );
@@ -2080,7 +2080,7 @@ 
         $class        = $this->em->getClassMetadata(get_class($entity));
         $associations = array_filter(
             $class->getProperties(),
-            function (Property $property) {
+            function(Property $property) {
                 return $property instanceof AssociationMetadata && in_array('detach', $property->getCascade());
             }
         );
@@ -2125,7 +2125,7 @@ 
         $class        = $this->em->getClassMetadata(get_class($entity));
         $associations = array_filter(
             $class->getProperties(),
-            function (Property $property) {
+            function(Property $property) {
                 return $property instanceof AssociationMetadata && in_array('merge', $property->getCascade());
             }
         );
@@ -2166,7 +2166,7 @@ 
         $class        = $this->em->getClassMetadata(get_class($entity));
         $associations = array_filter(
             $class->getProperties(),
-            function (Property $property) {
+            function(Property $property) {
                 return $property instanceof AssociationMetadata && in_array('persist', $property->getCascade());
             }
         );
@@ -2184,7 +2184,7 @@ 
 
                 case ($relatedEntities instanceof Collection):
                 case (is_array($relatedEntities)):
-                    if (! ($association instanceof ToManyAssociationMetadata)) {
+                    if ( ! ($association instanceof ToManyAssociationMetadata)) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($targetEntity),
                             $association,
@@ -2199,7 +2199,7 @@ 
                     break;
 
                 case ($relatedEntities !== null):
-                    if (! $relatedEntities instanceof $targetEntity) {
+                    if ( ! $relatedEntities instanceof $targetEntity) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($targetEntity),
                             $association,
@@ -2230,7 +2230,7 @@ 
         $class             = $this->em->getClassMetadata(get_class($entity));
         $associations      = array_filter(
             $class->getProperties(),
-            function (Property $property) {
+            function(Property $property) {
                 return $property instanceof AssociationMetadata && in_array('remove', $property->getCascade());
             }
         );
@@ -2315,7 +2315,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();
                 }
 
@@ -2559,7 +2559,7 @@ 
         }
 
         foreach ($class->getProperties() as $field => $association) {
-            if (! ($association instanceof AssociationMetadata)) {
+            if ( ! ($association instanceof AssociationMetadata)) {
                 continue;
             }
 
@@ -2608,7 +2608,7 @@ 
                 continue;
             }
 
-            if (! $association->isOwningSide()) {
+            if ( ! $association->isOwningSide()) {
                 // use the given entity association
                 if (isset($data[$field]) && is_object($data[$field]) &&
                     isset($this->entityStates[spl_object_hash($data[$field])])) {
@@ -2657,7 +2657,7 @@ 
                 $associatedId[$targetField] = $joinColumnValue;
             }
 
-            if (!$associatedId) {
+            if ( ! $associatedId) {
                 // Foreign key is NULL
                 $association->setValue($entity, null);
                 $this->originalEntityData[$oid][$field] = null;
@@ -2666,7 +2666,7 @@ 
             }
 
             // @todo guilhermeblanco Can we remove the need of this somehow?
-            if (!isset($hints['fetchMode'][$class->getClassName()][$field])) {
+            if ( ! isset($hints['fetchMode'][$class->getClassName()][$field])) {
                 $hints['fetchMode'][$class->getClassName()][$field] = $association->getFetchMode();
             }
 
@@ -2683,7 +2683,7 @@ 
                     // If this is an uninitialized proxy, we are deferring eager loads,
                     // this association is marked as eager fetch, and its an uninitialized proxy (wtf!)
                     // then we can append this entity for eager loading!
-                    if (!$targetClass->isIdentifierComposite() &&
+                    if ( ! $targetClass->isIdentifierComposite() &&
                         $newValue instanceof Proxy &&
                         isset($hints[self::HINT_DEFEREAGERLOAD]) &&
                         $hints['fetchMode'][$class->getClassName()][$field] === FetchMode::EAGER &&
@@ -2714,7 +2714,7 @@ 
                             break;
 
                         // Deferred eager load only works for single identifier classes
-                        case (isset($hints[self::HINT_DEFEREAGERLOAD]) && !$targetClass->isIdentifierComposite()):
+                        case (isset($hints[self::HINT_DEFEREAGERLOAD]) && ! $targetClass->isIdentifierComposite()):
                             // TODO: Is there a faster approach?
                             $this->eagerLoadingEntities[$targetClass->getRootClassName()][$relatedIdHash] = current($associatedId);
 
@@ -3086,7 +3086,7 @@ 
     {
         $class = $this->em->getClassMetadata(get_class($entity));
 
-        if (! $class->getProperty($propertyName)) {
+        if ( ! $class->getProperty($propertyName)) {
             return; // ignore non-persistent fields
         }
 
@@ -3226,7 +3226,7 @@ 
      */
     private function afterTransactionComplete()
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
             $persister->afterTransactionComplete();
         });
     }
@@ -3236,7 +3236,7 @@ 
      */
     private function afterTransactionRolledBack()
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
             $persister->afterTransactionRolledBack();
         });
     }
@@ -3319,11 +3319,11 @@ 
      */
     private function mergeEntityStateIntoManagedCopy($entity, $managedCopy)
     {
-        if (! $this->isLoaded($entity)) {
+        if ( ! $this->isLoaded($entity)) {
             return;
         }
 
-        if (! $this->isLoaded($managedCopy)) {
+        if ( ! $this->isLoaded($managedCopy)) {
             $managedCopy->__load();
         }
 
@@ -3332,7 +3332,7 @@ 
         foreach ($class->getProperties() as $property) {
             switch (true) {
                 case ($property instanceof FieldMetadata):
-                    if (! $property->isPrimaryKey()) {
+                    if ( ! $property->isPrimaryKey()) {
                         $property->setValue($managedCopy, $property->getValue($entity));
                     }
 
@@ -3354,7 +3354,7 @@ 
                         continue 2;
                     }
 
-                    if (! in_array('merge', $property->getCascade())) {
+                    if ( ! in_array('merge', $property->getCascade())) {
                         if ($this->getEntityState($other) === self::STATE_DETACHED) {
                             $targetEntity    = $property->getTargetEntity();
                             $targetClass     = $this->em->getClassMetadata($targetEntity);
@@ -3386,7 +3386,7 @@ 
 
                     $managedCol = $property->getValue($managedCopy);
 
-                    if (! $managedCol) {
+                    if ( ! $managedCol) {
                         $managedCol = $property->wrap($managedCopy, [], $this->em);
 
                         $property->setValue($managedCopy, $managedCol);
@@ -3396,7 +3396,7 @@ 
                         $managedCol->initialize();
 
                         // clear and set dirty a managed collection if its not also the same collection to merge from.
-                        if (! $managedCol->isEmpty() && $managedCol !== $mergeCol) {
+                        if ( ! $managedCol->isEmpty() && $managedCol !== $mergeCol) {
                             $managedCol->unwrap()->clear();
                             $managedCol->setDirty(true);
 

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
      */

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\Mocks;
 

tests/Doctrine/Tests/Models/Cache/Action.php

Doc Comments +3 added lines

@@ -29,6 +29,9 @@
      */
     public $tokens;
 
+    /**
+     * @param string $name
+     */
     public function __construct($name)
     {
         $this->name = $name;

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\Models\Cache;
 

tests/Doctrine/Tests/Models/Cache/Token.php

Doc Comments +3 added lines

@@ -51,6 +51,9 @@
      */
     public $complexAction;
 
+    /**
+     * @param string $token
+     */
     public function __construct($token, Client $client = null)
     {
         $this->logins    = new ArrayCollection();

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\Models\Cache;
 

tests/Doctrine/Tests/Models/Company/CompanyCar.php

Doc Comments +3 added lines

@@ -19,6 +19,9 @@
      */
     private $brand;
 
+    /**
+     * @param string $brand
+     */
     public function __construct($brand = null) {
         $this->brand = $brand;
     }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\Models\Company;
 

tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php

Doc Comments +6 added lines

@@ -79,6 +79,9 @@ 
         return $this->hoursWorked;
     }
 
+    /**
+     * @param integer $hoursWorked
+     */
     public function setHoursWorked($hoursWorked)
     {
         $this->hoursWorked = $hoursWorked;
@@ -89,6 +92,9 @@ 
         return $this->pricePerHour;
     }
 
+    /**
+     * @param integer $pricePerHour
+     */
     public function setPricePerHour($pricePerHour)
     {
         $this->pricePerHour = $pricePerHour;

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\Models\Company;
 

tests/Doctrine/Tests/Models/DDC117/DDC117Article.php

Doc Comments +7 added lines

@@ -33,6 +33,9 @@ 
      */
     private $links;
 
+    /**
+     * @param string $title
+     */
     public function __construct($title)
     {
         $this->title = $title;
@@ -60,6 +63,10 @@ 
         return $this->references;
     }
 
+    /**
+     * @param string $language
+     * @param string $title
+     */
     public function addTranslation($language, $title)
     {
         $this->translations[] = new DDC117Translation($this, $language, $title);

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\Models\DDC117;
 

tests/Doctrine/Tests/Models/DDC117/DDC117Link.php

Doc Comments +5 added lines

@@ -23,6 +23,11 @@
      */
     public $target;
 
+    /**
+     * @param DDC117Article $source
+     * @param DDC117Article $target
+     * @param string $description
+     */
     public function __construct($source, $target, $description)
     {
         $this->source = $source;

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\Models\DDC117;
 

tests/Doctrine/Tests/Models/DDC3579/DDC3579Group.php

Doc Comments +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
     }
 
     /**
-     * @return ArrayCollection
+     * @return DDC3579Admin[]
      */
     public function getAdmins()
     {

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\Models\DDC3579;