doctrine / orm

lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php

Unused Use Statements -1 removed lines

@@ -21,7 +21,6 @@
 namespace Doctrine\ORM\Cache;
 
 use Doctrine\Common\Util\ClassUtils;
-
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\EntityManagerInterface;

Spacing +5 added lines, -5 removed lines

@@ -81,7 +81,7 @@ 
                 continue;
             }
 
-            if (! ($assoc['type'] & ClassMetadata::TO_ONE)) {
+            if ( ! ($assoc['type'] & ClassMetadata::TO_ONE)) {
                 unset($data[$name]);
                 continue;
             }
@@ -93,16 +93,16 @@ 
 
                 foreach ($associationIds as $fieldName => $fieldValue) {
 
-                    if (isset($targetClassMetadata->associationMappings[$fieldName])){
+                    if (isset($targetClassMetadata->associationMappings[$fieldName])) {
                         $targetAssoc = $targetClassMetadata->associationMappings[$fieldName];
 
-                        foreach($assoc['targetToSourceKeyColumns'] as $referencedColumn => $localColumn) {
+                        foreach ($assoc['targetToSourceKeyColumns'] as $referencedColumn => $localColumn) {
 
                             if (isset($targetAssoc['sourceToTargetKeyColumns'][$referencedColumn])) {
                                 $data[$localColumn] = $fieldValue;
                             }
                         }
-                    }else{
+                    } else {
                         $data[$assoc['targetToSourceKeyColumns'][$targetClassMetadata->columnNames[$fieldName]]] = $fieldValue;
                     }
                 }
@@ -153,7 +153,7 @@ 
         }
 
         foreach ($metadata->associationMappings as $name => $assoc) {
-            if ( ! isset($assoc['cache']) ||  ! isset($data[$name])) {
+            if ( ! isset($assoc['cache']) || ! isset($data[$name])) {
                 continue;
             }
 

Braces +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
                                 $data[$localColumn] = $fieldValue;
                             }
                         }
-                    }else{
+                    } else{
                         $data[$assoc['targetToSourceKeyColumns'][$targetClassMetadata->columnNames[$fieldName]]] = $fieldValue;
                     }
                 }

lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php

Unused Use Statements -1 removed lines

@@ -31,7 +31,6 @@
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Persisters\Entity\EntityPersister;
-
 use Doctrine\Common\Util\ClassUtils;
 use Doctrine\Common\Collections\Criteria;
 

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

Doc Comments +1 added lines, -1 removed lines

@@ -291,7 +291,7 @@
     /**
      * Generates a string of currently query
      *
-     * @param array $query
+     * @param string $query
      * @param string $criteria
      * @param array $orderBy
      * @param integer $limit

Spacing +2 added lines, -2 removed lines

@@ -236,7 +236,7 @@ 
 
         if ($class->containsForeignIdentifier) {
             foreach ($class->associationMappings as $name => $assoc) {
-                if (!empty($assoc['id']) && !isset($assoc['cache'])) {
+                if ( ! empty($assoc['id']) && ! isset($assoc['cache'])) {
                     throw CacheException::nonCacheableEntityAssociation($class->name, $name);
                 }
             }
@@ -305,7 +305,7 @@ 
             ? $this->persister->expandCriteriaParameters($criteria)
             : $this->persister->expandParameters($criteria);
 
-        return sha1($query . serialize($params) . serialize($orderBy) . $limit . $offset);
+        return sha1($query.serialize($params).serialize($orderBy).$limit.$offset);
     }
 
     /**

lib/Doctrine/ORM/Configuration.php

Doc Comments +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
     /**
      * Sets the strategy for automatically generating proxy classes.
      *
-     * @param boolean|int $autoGenerate Possible values are constants of Doctrine\Common\Proxy\AbstractProxyFactory.
+     * @param boolean $autoGenerate Possible values are constants of Doctrine\Common\Proxy\AbstractProxyFactory.
      *                                  True is converted to AUTOGENERATE_ALWAYS, false to AUTOGENERATE_NEVER.
      *
      * @return void

Spacing +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
      */
     public function setAutoGenerateProxyClasses($autoGenerate)
     {
-        $this->_attributes['autoGenerateProxyClasses'] = (int)$autoGenerate;
+        $this->_attributes['autoGenerateProxyClasses'] = (int) $autoGenerate;
     }
 
     /**
@@ -151,7 +151,7 @@ 
      */
     public function newDefaultAnnotationDriver($paths = array(), $useSimpleAnnotationReader = true)
     {
-        AnnotationRegistry::registerFile(__DIR__ . '/Mapping/Driver/DoctrineAnnotations.php');
+        AnnotationRegistry::registerFile(__DIR__.'/Mapping/Driver/DoctrineAnnotations.php');
 
         if ($useSimpleAnnotationReader) {
             // Register the ORM Annotations in the AnnotationRegistry

lib/Doctrine/ORM/EntityRepository.php

Unused Use Statements -1 removed lines

@@ -24,7 +24,6 @@
 use Doctrine\Common\Persistence\ObjectRepository;
 use Doctrine\Common\Collections\Selectable;
 use Doctrine\Common\Collections\Criteria;
-use Doctrine\Common\Collections\ArrayCollection;
 
 /**
  * An EntityRepository serves as a repository for entities with generic as well as

Spacing +1 added lines, -1 removed lines

@@ -231,7 +231,7 @@
         }
 
         if (empty($arguments)) {
-            throw ORMException::findByRequiresParameter($method . $by);
+            throw ORMException::findByRequiresParameter($method.$by);
         }
 
         $fieldName = lcfirst(\Doctrine\Common\Util\Inflector::classify($by));

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

Unused Use Statements -3 removed lines

@@ -24,9 +24,6 @@
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\Query;
-use Doctrine\ORM\Events;
-use Doctrine\ORM\Event\LifecycleEventArgs;
-use Doctrine\ORM\Event\PostLoadEventDispatcher;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Proxy\Proxy;
 

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 Proxy && !$reflFieldValue->__isInitialized__)) {
+                    if ( ! $reflFieldValue || isset($this->_hints[Query::HINT_REFRESH]) || ($reflFieldValue instanceof Proxy && ! $reflFieldValue->__isInitialized__)) {
                         // 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/Internal/Hydration/SimpleObjectHydrator.php

Unused Use Statements -1 removed lines

@@ -20,7 +20,6 @@
 namespace Doctrine\ORM\Internal\Hydration;
 
 use PDO;
-use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query;
 

lib/Doctrine/ORM/Mapping/NamingStrategy.php

Doc Comments -2 removed lines

@@ -70,8 +70,6 @@
      * Returns a join column name for a property.
      *
      * @param string $propertyName A property name.
-     * @param string|null $className    The fully-qualified class name.
-     *                                  This parameter is omitted from the signature due to BC
      *
      * @return string A join column name.
      */

lib/Doctrine/ORM/NativeQuery.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     /**
      * Gets the SQL query.
      *
-     * @return mixed The built SQL query or an array of all SQL queries.
+     * @return string The built SQL query or an array of all SQL queries.
      *
      * @override
      */

lib/Doctrine/ORM/PersistentCollection.php

Doc Comments +1 added lines, -1 removed lines

@@ -579,7 +579,7 @@
      * Internal note: Tried to implement Serializable first but that did not work well
      *                with circular references. This solution seems simpler and works well.
      *
-     * @return array
+     * @return string[]
      */
     public function __sleep()
     {

Spacing +2 added lines, -2 removed lines

@@ -400,7 +400,7 @@ 
      */
     public function containsKey($key)
     {
-        if (! $this->initialized && $this->association['fetch'] === Mapping\ClassMetadataInfo::FETCH_EXTRA_LAZY
+        if ( ! $this->initialized && $this->association['fetch'] === Mapping\ClassMetadataInfo::FETCH_EXTRA_LAZY
             && isset($this->association['indexBy'])) {
             $persister = $this->em->getUnitOfWork()->getCollectionPersister($this->association);
 
@@ -433,7 +433,7 @@ 
             && $this->association['fetch'] === Mapping\ClassMetadataInfo::FETCH_EXTRA_LAZY
             && isset($this->association['indexBy'])
         ) {
-            if (!$this->typeClass->isIdentifierComposite && $this->typeClass->isIdentifier($this->association['indexBy'])) {
+            if ( ! $this->typeClass->isIdentifierComposite && $this->typeClass->isIdentifier($this->association['indexBy'])) {
                 return $this->em->find($this->typeClass->name, $key);
             }