doctrine / orm

lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php

Unused Use Statements -2 removed lines

@@ -19,13 +19,11 @@
 
 namespace Doctrine\ORM\Tools;
 
-use Doctrine\Common\Persistence\Proxy;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\UnitOfWork;
-use Doctrine\ORM\EntityManager;
 use ProxyManager\Proxy\GhostObjectInterface;
 
 /**

Spacing +10 added lines, -10 removed lines

@@ -89,42 +89,42 @@
 
         fwrite($fh, "Flush Operation [".$this->context."] - Dumping identity map:\n");
         foreach ($identityMap as $className => $map) {
-            fwrite($fh, "Class: ". $className . "\n");
+            fwrite($fh, "Class: ".$className."\n");
 
             foreach ($map as $entity) {
-                fwrite($fh, " Entity: " . $this->getIdString($entity, $uow) . " " . spl_object_hash($entity)."\n");
+                fwrite($fh, " Entity: ".$this->getIdString($entity, $uow)." ".spl_object_hash($entity)."\n");
                 fwrite($fh, "  Associations:\n");
 
                 $cm = $em->getClassMetadata($className);
 
                 foreach ($cm->associationMappings as $field => $assoc) {
-                    fwrite($fh, "   " . $field . " ");
+                    fwrite($fh, "   ".$field." ");
                     $value = $cm->getFieldValue($entity, $field);
 
                     if ($assoc['type'] & ClassMetadata::TO_ONE) {
                         if ($value === null) {
                             fwrite($fh, " NULL\n");
                         } else {
-                            if ($value instanceof GhostObjectInterface && !$value->isProxyInitialized()) {
+                            if ($value instanceof GhostObjectInterface && ! $value->isProxyInitialized()) {
                                 fwrite($fh, "[PROXY] ");
                             }
 
-                            fwrite($fh, $this->getIdString($value, $uow) . " " . spl_object_hash($value) . "\n");
+                            fwrite($fh, $this->getIdString($value, $uow)." ".spl_object_hash($value)."\n");
                         }
                     } else {
-                        $initialized = !($value instanceof PersistentCollection) || $value->isInitialized();
+                        $initialized = ! ($value instanceof PersistentCollection) || $value->isInitialized();
                         if ($value === null) {
                             fwrite($fh, " NULL\n");
                         } elseif ($initialized) {
-                            fwrite($fh, "[INITIALIZED] " . $this->getType($value). " " . count($value) . " elements\n");
+                            fwrite($fh, "[INITIALIZED] ".$this->getType($value)." ".count($value)." elements\n");
 
                             foreach ($value as $obj) {
-                                fwrite($fh, "    " . $this->getIdString($obj, $uow) . " " . spl_object_hash($obj)."\n");
+                                fwrite($fh, "    ".$this->getIdString($obj, $uow)." ".spl_object_hash($obj)."\n");
                             }
                         } else {
-                            fwrite($fh, "[PROXY] " . $this->getType($value) . " unknown element size\n");
+                            fwrite($fh, "[PROXY] ".$this->getType($value)." unknown element size\n");
                             foreach ($value->unwrap() as $obj) {
-                                fwrite($fh, "    " . $this->getIdString($obj, $uow) . " " . spl_object_hash($obj)."\n");
+                                fwrite($fh, "    ".$this->getIdString($obj, $uow)." ".spl_object_hash($obj)."\n");
                             }
                         }
                     }

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
      */
@@ -3130,7 +3130,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
@@ -3330,7 +3330,7 @@ 
     /**
      * Verifies if two given entities actually are the same based on identifier comparison
      *
-     * @param object $entity1
+     * @param GhostObjectInterface $entity1
      * @param object $entity2
      *
      * @return bool

Spacing +21 added lines, -21 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));
@@ -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);
             }
 
@@ -1687,7 +1687,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);
@@ -1757,7 +1757,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));
         }
 
     }
@@ -1917,7 +1917,7 @@ 
      */
     private function isLoaded($entity)
     {
-        return !($entity instanceof GhostObjectInterface) || $entity->isProxyInitialized();
+        return ! ($entity instanceof GhostObjectInterface) || $entity->isProxyInitialized();
     }
 
     /**
@@ -2075,7 +2075,7 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadeRefresh']; }
+            function($assoc) { return $assoc['isCascadeRefresh']; }
         );
 
         foreach ($associationMappings as $assoc) {
@@ -2118,7 +2118,7 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadeDetach']; }
+            function($assoc) { return $assoc['isCascadeDetach']; }
         );
 
         foreach ($associationMappings as $assoc) {
@@ -2162,7 +2162,7 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadeMerge']; }
+            function($assoc) { return $assoc['isCascadeMerge']; }
         );
 
         foreach ($associationMappings as $assoc) {
@@ -2201,7 +2201,7 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadePersist']; }
+            function($assoc) { return $assoc['isCascadePersist']; }
         );
 
         foreach ($associationMappings as $assoc) {
@@ -2230,7 +2230,7 @@ 
                     break;
 
                 case ($relatedEntities !== null):
-                    if (! $relatedEntities instanceof $assoc['targetEntity']) {
+                    if ( ! $relatedEntities instanceof $assoc['targetEntity']) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($assoc['targetEntity']),
                             $assoc,
@@ -2261,13 +2261,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 GhostObjectInterface && !$entity->isProxyInitialized()) {
+            if ($entity instanceof GhostObjectInterface && ! $entity->isProxyInitialized()) {
                 $entity->initializeProxy();
             }
 
@@ -2331,7 +2331,7 @@ 
                     return;
                 }
 
-                if ($entity instanceof Proxy && !$entity->__isInitialized__) {
+                if ($entity instanceof Proxy && ! $entity->__isInitialized__) {
                     $entity->__load();
                 }
 
@@ -2346,7 +2346,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();
                 }
 
@@ -2691,7 +2691,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 GhostObjectInterface &&
                                 $newValue->isProxyInitialized() === false) {
 
@@ -3003,7 +3003,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);
     }
@@ -3062,7 +3062,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])) {
@@ -3280,7 +3280,7 @@ 
      */
     private function afterTransactionComplete()
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
             $persister->afterTransactionComplete();
         });
     }
@@ -3290,7 +3290,7 @@ 
      */
     private function afterTransactionRolledBack()
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
             $persister->afterTransactionRolledBack();
         });
     }
@@ -3389,7 +3389,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;
                         }

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-use Doctrine\Tests\Models\Company\CompanyPerson;
 use ProxyManager\Proxy\GhostObjectInterface;
 
 /**

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-use DateTime;
 use ProxyManager\Proxy\GhostObjectInterface;
 
 class DDC633Test extends \Doctrine\Tests\OrmFunctionalTestCase

lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php

Spacing +13 added lines, -13 removed lines

@@ -202,7 +202,7 @@ 
             $class->reflFields[$fieldName]->setValue($entity, $value);
             $this->_uow->setOriginalEntityProperty($oid, $fieldName, $value);
 
-            $this->initializedCollections[$oid . $fieldName] = $value;
+            $this->initializedCollections[$oid.$fieldName] = $value;
         } else if (
             isset($this->_hints[Query::HINT_REFRESH]) ||
             isset($this->_hints['fetched'][$parentDqlAlias][$fieldName]) &&
@@ -213,10 +213,10 @@ 
             $value->setInitialized(true);
             $value->unwrap()->clear();
 
-            $this->initializedCollections[$oid . $fieldName] = $value;
+            $this->initializedCollections[$oid.$fieldName] = $value;
         } else {
             // Is already PersistentCollection, and DON'T REFRESH or FETCH-JOIN!
-            $this->existingCollections[$oid . $fieldName] = $value;
+            $this->existingCollections[$oid.$fieldName] = $value;
         }
 
         return $value;
@@ -289,7 +289,7 @@ 
             $idHash = '';
 
             foreach ($class->identifier as $fieldName) {
-                $idHash .= ' ' . (isset($class->associationMappings[$fieldName])
+                $idHash .= ' '.(isset($class->associationMappings[$fieldName])
                     ? $data[$class->associationMappings[$fieldName]['joinColumns'][0]['name']]
                     : $data[$fieldName]);
             }
@@ -342,7 +342,7 @@ 
                 $parentAlias = $this->_rsm->parentAliasMap[$dqlAlias];
                 // we need the $path to save into the identifier map which entities were already
                 // seen for this parent-child relationship
-                $path = $parentAlias . '.' . $dqlAlias;
+                $path = $parentAlias.'.'.$dqlAlias;
 
                 // We have a RIGHT JOIN result here. Doctrine cannot hydrate RIGHT JOIN Object-Graphs
                 if ( ! isset($nonemptyComponents[$parentAlias])) {
@@ -382,7 +382,7 @@ 
                     $reflFieldValue = $reflField->getValue($parentObject);
 
                     if (isset($nonemptyComponents[$dqlAlias])) {
-                        $collKey = $oid . $relationField;
+                        $collKey = $oid.$relationField;
                         if (isset($this->initializedCollections[$collKey])) {
                             $reflFieldValue = $this->initializedCollections[$collKey];
                         } else if ( ! isset($this->existingCollections[$collKey])) {
@@ -430,7 +430,7 @@ 
                     // PATH B: Single-valued association
                     $reflFieldValue = $reflField->getValue($parentObject);
 
-                    if ( ! $reflFieldValue || isset($this->_hints[Query::HINT_REFRESH]) || ($reflFieldValue instanceof GhostObjectInterface && !$reflFieldValue->isProxyInitialized())) {
+                    if ( ! $reflFieldValue || isset($this->_hints[Query::HINT_REFRESH]) || ($reflFieldValue instanceof GhostObjectInterface && ! $reflFieldValue->isProxyInitialized())) {
                         // we only need to take action if this value is null,
                         // we refresh the entity or its an unitialized proxy.
                         if (isset($nonemptyComponents[$dqlAlias])) {
@@ -475,7 +475,7 @@ 
                 $entityKey = $this->_rsm->entityMappings[$dqlAlias] ?: 0;
 
                 // if this row has a NULL value for the root result id then make it a null result.
-                if ( ! isset($nonemptyComponents[$dqlAlias]) ) {
+                if ( ! isset($nonemptyComponents[$dqlAlias])) {
                     if ($this->_rsm->isMixed) {
                         $result[] = array($entityKey => null);
                     } else {
@@ -531,13 +531,13 @@ 
             }
         }
 
-        if ( ! isset($resultKey) ) {
+        if ( ! isset($resultKey)) {
             $this->resultCounter++;
         }
 
         // Append scalar values to mixed result sets
         if (isset($rowData['scalars'])) {
-            if ( ! isset($resultKey) ) {
+            if ( ! isset($resultKey)) {
                 $resultKey = (isset($this->_rsm->indexByMap['scalars']))
                     ? $row[$this->_rsm->indexByMap['scalars']]
                     : $this->resultCounter - 1;
@@ -550,19 +550,19 @@ 
 
         // Append new object to mixed result sets
         if (isset($rowData['newObjects'])) {
-            if ( ! isset($resultKey) ) {
+            if ( ! isset($resultKey)) {
                 $resultKey = $this->resultCounter - 1;
             }
 
 
-            $scalarCount = (isset($rowData['scalars'])? count($rowData['scalars']): 0);
+            $scalarCount = (isset($rowData['scalars']) ? count($rowData['scalars']) : 0);
 
             foreach ($rowData['newObjects'] as $objIndex => $newObject) {
                 $class  = $newObject['class'];
                 $args   = $newObject['args'];
                 $obj    = $class->newInstanceArgs($args);
 
-                if ($scalarCount == 0 && count($rowData['newObjects']) == 1 ) {
+                if ($scalarCount == 0 && count($rowData['newObjects']) == 1) {
                     $result[$resultKey] = $obj;
 
                     continue;

lib/Doctrine/ORM/Proxy/ProxyFactory.php

Spacing +10 added lines, -10 removed lines

@@ -103,16 +103,16 @@ 
         $definition = $this->createProxyDefinition($className);
         $fqcn       = $definition->proxyClassName;
 
-        if (! class_exists($fqcn, false)) {
+        if ( ! class_exists($fqcn, false)) {
             $generatorStrategy    = new EvaluatingGeneratorStrategy();
             $proxyGenerator       = new ClassGenerator();
             $skippedProperties    = array_filter(
                 Properties::fromReflectionClass(new ReflectionClass($className))->getInstanceProperties(),
-                function (ReflectionProperty $property) use ($definition) {
+                function(ReflectionProperty $property) use ($definition) {
                     return ! in_array(
                             $property->getName(),
                             array_map(
-                                function (ReflectionProperty $property) {
+                                function(ReflectionProperty $property) {
                                     return $property->getName();
                                 },
                                 $definition->reflectionFields
@@ -138,7 +138,7 @@ 
         $proxy = $fqcn::staticProxyConstructor($definition->initializer/*, $definition->cloner*/);
 
         foreach ($definition->identifierFields as $idField) {
-            if (! isset($identifier[$idField])) {
+            if ( ! isset($identifier[$idField])) {
                 throw OutOfBoundsException::missingPrimaryKeyValue($className, $idField);
             }
 
@@ -211,7 +211,7 @@ 
      */
     private function createInitializer(ClassMetadata $classMetadata, EntityPersister $entityPersister, \Closure $cloner)
     {
-        return function (
+        return function(
             GhostObjectInterface $proxy,
             $method,
             $parameters,
@@ -221,7 +221,7 @@ 
             $classMetadata,
             $cloner
         ) {
-            if (! $initializer) {
+            if ( ! $initializer) {
                 return false;
             }
 
@@ -256,7 +256,7 @@ 
      */
     private function createCloner(ClassMetadata $classMetadata, EntityPersister $entityPersister)
     {
-        return function (GhostObjectInterface $proxy, & $initializer) use ($entityPersister, $classMetadata) {
+        return function(GhostObjectInterface $proxy, & $initializer) use ($entityPersister, $classMetadata) {
             if ($proxy->isProxyInitialized()) {
                 return;
             }
@@ -293,12 +293,12 @@ 
     private function getInternalReflectionPropertyName(ReflectionProperty $reflectionProperty)
     {
         if ($reflectionProperty->isProtected()) {
-            return "\0*\0" . $reflectionProperty->getName();
+            return "\0*\0".$reflectionProperty->getName();
         }
 
         if ($reflectionProperty->isPrivate()) {
-            return "\0" . $reflectionProperty->getDeclaringClass()->getName()
-            . "\0" . $reflectionProperty->getName();
+            return "\0".$reflectionProperty->getDeclaringClass()->getName()
+            . "\0".$reflectionProperty->getName();
         }
 
         return $reflectionProperty->getName();