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 +22 added lines, -22 removed lines

@@ -464,7 +464,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));
@@ -520,7 +520,7 @@ 
         $oid  = spl_object_hash($entity);
         $data = array();
 
-        if (!isset($this->entityChangeSets[$oid])) {
+        if ( ! isset($this->entityChangeSets[$oid])) {
             return $data;
         }
 
@@ -683,7 +683,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;
@@ -829,7 +829,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);
             }
 
@@ -1688,7 +1688,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);
@@ -1758,7 +1758,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));
         }
 
     }
@@ -1909,7 +1909,7 @@ 
      */
     private function isLoaded($entity)
     {
-        return !($entity instanceof Proxy) || $entity->__isInitialized();
+        return ! ($entity instanceof Proxy) || $entity->__isInitialized();
     }
 
     /**
@@ -2067,7 +2067,7 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadeRefresh']; }
+            function($assoc) { return $assoc['isCascadeRefresh']; }
         );
 
         foreach ($associationMappings as $assoc) {
@@ -2110,7 +2110,7 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadeDetach']; }
+            function($assoc) { return $assoc['isCascadeDetach']; }
         );
 
         foreach ($associationMappings as $assoc) {
@@ -2154,7 +2154,7 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadeMerge']; }
+            function($assoc) { return $assoc['isCascadeMerge']; }
         );
 
         foreach ($associationMappings as $assoc) {
@@ -2193,7 +2193,7 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadePersist']; }
+            function($assoc) { return $assoc['isCascadePersist']; }
         );
 
         foreach ($associationMappings as $assoc) {
@@ -2222,7 +2222,7 @@ 
                     break;
 
                 case ($relatedEntities !== null):
-                    if (! $relatedEntities instanceof $assoc['targetEntity']) {
+                    if ( ! $relatedEntities instanceof $assoc['targetEntity']) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($assoc['targetEntity']),
                             $assoc,
@@ -2253,13 +2253,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();
             }
 
@@ -2323,7 +2323,7 @@ 
                     return;
                 }
 
-                if ($entity instanceof Proxy && !$entity->__isInitialized__) {
+                if ($entity instanceof Proxy && ! $entity->__isInitialized__) {
                     $entity->__load();
                 }
 
@@ -2338,7 +2338,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();
                 }
 
@@ -2683,7 +2683,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) {
 
@@ -2995,7 +2995,7 @@ 
      */
     public function size()
     {
-        $countArray = array_map(function ($item) { return count($item); }, $this->identityMap);
+        $countArray = array_map(function($item) { return count($item); }, $this->identityMap);
 
         return array_sum($countArray);
     }
@@ -3054,7 +3054,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])) {
@@ -3272,7 +3272,7 @@ 
      */
     private function afterTransactionComplete()
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
             $persister->afterTransactionComplete();
         });
     }
@@ -3282,7 +3282,7 @@ 
      */
     private function afterTransactionRolledBack()
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
             $persister->afterTransactionRolledBack();
         });
     }
@@ -3381,7 +3381,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;
                         }

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;

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

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

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

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;

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

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;

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