doctrine / orm

tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
-use Doctrine\Tests\Models\CMS\CmsUser,
-    Doctrine\Tests\Models\CMS\CmsPhonenumber;
+use Doctrine\Tests\Models\CMS\CmsUser;
+use Doctrine\Tests\Models\CMS\CmsPhonenumber;
 use Doctrine\Tests\OrmFunctionalTestCase;
 
 /**

tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php

Unused Use Statements +3 added lines, -3 removed lines

@@ -2,9 +2,9 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
-use Doctrine\Tests\Models\CMS\CmsUser,
-    Doctrine\Tests\Models\CMS\CmsEmail,
-    Doctrine\Tests\Models\CMS\CmsAddress;
+use Doctrine\Tests\Models\CMS\CmsUser;
+use Doctrine\Tests\Models\CMS\CmsEmail;
+use Doctrine\Tests\Models\CMS\CmsAddress;
 use Doctrine\Tests\OrmFunctionalTestCase;
 
 /**

tests/Doctrine/Tests/ORM/Functional/QueryTest.php

Unused Use Statements +3 added lines, -4 removed lines

@@ -3,11 +3,10 @@
 namespace Doctrine\Tests\ORM\Functional;
 
 use Doctrine\Common\Collections\ArrayCollection;
-
 use Doctrine\ORM\UnexpectedResultException;
-use Doctrine\Tests\Models\CMS\CmsUser,
-    Doctrine\Tests\Models\CMS\CmsArticle,
-    Doctrine\Tests\Models\CMS\CmsPhonenumber;
+use Doctrine\Tests\Models\CMS\CmsUser;
+use Doctrine\Tests\Models\CMS\CmsArticle;
+use Doctrine\Tests\Models\CMS\CmsPhonenumber;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Parameter;

tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php

Unused Use Statements -1 removed lines

@@ -25,7 +25,6 @@
 use Doctrine\ORM\Tools\Export\ClassMetadataExporter;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\Tools\EntityGenerator;
-use Doctrine\Tests\Mocks\MetadataDriverMock;
 use Doctrine\Tests\Mocks\EntityManagerMock;
 use Doctrine\Tests\Mocks\ConnectionMock;
 use Doctrine\Tests\Mocks\DriverMock;

Doc Comments +9 added lines, -1 removed lines

@@ -68,6 +68,9 @@ 
         return EntityManagerMock::create($connection, $config, $eventManager);
     }
 
+    /**
+     * @param string $path
+     */
     protected function _createMetadataDriver($type, $path)
     {
         $mappingDriver = array(
@@ -86,6 +89,9 @@ 
         return $driver;
     }
 
+    /**
+     * @param EntityManagerMock $em
+     */
     protected function _createClassMetadataFactory($em, $type)
     {
         $factory = ($type === 'annotation')
@@ -295,7 +301,6 @@ 
 
     /**
      * @depends testOneToManyAssociationsAreExported
-     * @param ClassMetadata $metadata
      */
     public function testManyToManyAssociationsAreExported($class)
     {
@@ -388,6 +393,9 @@ 
 #        $this->_deleteDirectory(__DIR__ . '/export/'.$this->_getType());
     }
 
+    /**
+     * @param string $path
+     */
     protected function _deleteDirectory($path)
     {
         if (is_file($path)) {

lib/Doctrine/ORM/Cache/DefaultCacheFactory.php

Spacing +2 added lines, -2 removed lines

@@ -217,12 +217,12 @@
 
             if ( ! $this->fileLockRegionDirectory) {
                 throw new \LogicException(
-                    'If you want to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, ' .
+                    'If you want to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, '.
                     'The default implementation provided by doctrine is "Doctrine\ORM\Cache\Region\FileLockRegion" if you what to use it please provide a valid directory, DefaultCacheFactory#setFileLockRegionDirectory(). '
                 );
             }
 
-            $directory = $this->fileLockRegionDirectory . DIRECTORY_SEPARATOR . $cache['region'];
+            $directory = $this->fileLockRegionDirectory.DIRECTORY_SEPARATOR.$cache['region'];
             $region    = new FileLockRegion($region, $directory, $this->regionsConfig->getLockLifetime($cache['region']));
         }
 

lib/Doctrine/ORM/EntityManager.php

Spacing +4 added lines, -4 removed lines

@@ -224,8 +224,8 @@ 
      */
     public function transactional($func)
     {
-        if (!is_callable($func)) {
-            throw new \InvalidArgumentException('Expected argument of type "callable", got "' . gettype($func) . '"');
+        if ( ! is_callable($func)) {
+            throw new \InvalidArgumentException('Expected argument of type "callable", got "'.gettype($func).'"');
         }
 
         $this->conn->beginTransaction();
@@ -753,7 +753,7 @@ 
      */
     public function isOpen()
     {
-        return (!$this->closed);
+        return ( ! $this->closed);
     }
 
     /**
@@ -859,7 +859,7 @@ 
         }
 
         if ( ! $connection instanceof Connection) {
-            throw new \InvalidArgumentException("Invalid argument: " . $connection);
+            throw new \InvalidArgumentException("Invalid argument: ".$connection);
         }
 
         return $connection;

tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php

Doc Comments +7 added lines, -1 removed lines

@@ -222,6 +222,9 @@ 
         $this->assertEquals(array(), $metadata);
     }
 
+    /**
+     * @param \PHPUnit_Framework_MockObject_MockObject $conn
+     */
     protected function _createEntityManager($metadataDriver, $conn = null)
     {
         $driverMock = new DriverMock();
@@ -250,7 +253,6 @@ 
     }
 
     /**
-     * @param string $class
      * @return ClassMetadata
      */
     protected function _createValidClassMetadata()
@@ -460,6 +462,10 @@ 
         return $this->mockMetadata[$className];
     }
 
+    /**
+     * @param string $className
+     * @param ClassMetadata $metadata
+     */
     public function setMetadataForClass($className, $metadata)
     {
         $this->mockMetadata[$className] = $metadata;

tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
     }
 
     /**
-     * @return \Doctrine\ORM\EntityManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @return \PHPUnit_Framework_MockObject_MockObject
      */
     private function createEntityManager()
     {

lib/Doctrine/ORM/Mapping/ClassMetadata.php

Doc Comments +8 added lines, -8 removed lines

@@ -595,7 +595,7 @@ 
     /**
      * Gets the ReflectionProperties of the mapped class.
      *
-     * @return array An array of ReflectionProperty instances.
+     * @return \ReflectionProperty[] An array of ReflectionProperty instances.
      */
     public function getReflectionProperties()
     {
@@ -686,7 +686,7 @@ 
      *
      * @param object $entity
      * @param string $field
-     * @param mixed  $value
+     * @param integer  $value
      *
      * @return void
      */
@@ -731,7 +731,7 @@ 
      *      - reflClass (ReflectionClass)
      *      - reflFields (ReflectionProperty array)
      *
-     * @return array The names of all the fields that should be serialized.
+     * @return string[] The names of all the fields that should be serialized.
      */
     public function __sleep()
     {
@@ -1612,7 +1612,7 @@ 
      * Sets the mapped identifier/primary key fields of this class.
      * Mainly used by the ClassMetadataFactory to assign inherited identifiers.
      *
-     * @param array $identifier
+     * @param string[] $identifier
      *
      * @return void
      */
@@ -1641,7 +1641,7 @@ 
     /**
      * Gets an array containing all the column names.
      *
-     * @param array|null $fieldNames
+     * @param string[] $fieldNames
      *
      * @return array
      */
@@ -1841,7 +1841,7 @@ 
     /**
      * Sets the mapped subclasses of this class.
      *
-     * @param array $subclasses The names of all mapped subclasses.
+     * @param string[] $subclasses The names of all mapped subclasses.
      *
      * @return void
      */
@@ -1857,7 +1857,7 @@ 
      * Assumes that the class names in the passed array are in the order:
      * directParent -> directParentParent -> directParentParentParent ... -> root.
      *
-     * @param array $classNames
+     * @param string[] $classNames
      *
      * @return void
      */
@@ -2040,7 +2040,7 @@ 
      *
      * @param string $fieldName
      *
-     * @return boolean TRUE if the field is inherited, FALSE otherwise.
+     * @return boolean|null TRUE if the field is inherited, FALSE otherwise.
      */
     public function isInheritedEmbeddedClass($fieldName)
     {

Unused Use Statements -2 removed lines

@@ -21,7 +21,6 @@ 
 
 use BadMethodCallException;
 use Doctrine\Instantiator\Instantiator;
-use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Utility\PersisterHelper;
 use InvalidArgumentException;
@@ -29,7 +28,6 @@ 
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use ReflectionClass;
-use Doctrine\Common\ClassLoader;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata as ClassMetadataInterface;
 use Doctrine\ORM\Cache\CacheException;
 

Spacing +29 added lines, -29 removed lines

@@ -624,7 +624,7 @@ 
     public function getSingleIdReflectionProperty()
     {
         if ($this->isIdentifierComposite) {
-            throw new BadMethodCallException("Class " . $this->name . " has a composite identifier.");
+            throw new BadMethodCallException("Class ".$this->name." has a composite identifier.");
         }
 
         return $this->reflFields[$this->identifier[0]];
@@ -717,7 +717,7 @@ 
      */
     public function __toString()
     {
-        return __CLASS__ . '@' . spl_object_hash($this);
+        return __CLASS__.'@'.spl_object_hash($this);
     }
 
     /**
@@ -1002,7 +1002,7 @@ 
      */
     public function enableAssociationCache($fieldName, array $cache)
     {
-        $this->associationMappings[$fieldName]['cache'] = $this->getAssociationCacheDefaults ($fieldName, $cache);
+        $this->associationMappings[$fieldName]['cache'] = $this->getAssociationCacheDefaults($fieldName, $cache);
     }
 
     /**
@@ -1020,7 +1020,7 @@ 
         }
 
         if ( ! isset($cache['region'])) {
-            $cache['region'] = strtolower(str_replace('\\', '_', $this->rootEntityName)) . '__' . $fieldName;
+            $cache['region'] = strtolower(str_replace('\\', '_', $this->rootEntityName)).'__'.$fieldName;
         }
 
         return $cache;
@@ -1268,7 +1268,7 @@ 
         $mapping['isOwningSide'] = true; // assume owning side until we hit mappedBy
 
         // unset optional indexBy attribute if its empty
-        if ( ! isset($mapping['indexBy']) || !$mapping['indexBy']) {
+        if ( ! isset($mapping['indexBy']) || ! $mapping['indexBy']) {
             unset($mapping['indexBy']);
         }
 
@@ -1307,7 +1307,7 @@ 
                 $this->isIdentifierComposite = true;
             }
 
-            if ($this->cache && !isset($mapping['cache'])) {
+            if ($this->cache && ! isset($mapping['cache'])) {
                 throw CacheException::nonCacheableEntityAssociation($this->name, $mapping['fieldName']);
             }
         }
@@ -1420,7 +1420,7 @@ 
                     throw new RuntimeException("ClassMetadata::setTable() has to be called before defining a one to one relationship.");
                 }
 
-                $this->table['uniqueConstraints'][$mapping['fieldName'] . "_uniq"] = array(
+                $this->table['uniqueConstraints'][$mapping['fieldName']."_uniq"] = array(
                     'columns' => $uniqueConstraintColumns
                 );
             }
@@ -1431,14 +1431,14 @@ 
         $mapping['orphanRemoval'] = isset($mapping['orphanRemoval']) ? (bool) $mapping['orphanRemoval'] : false;
 
         if ($mapping['orphanRemoval']) {
-            if (! in_array('remove', $mapping['cascade'])) {
+            if ( ! in_array('remove', $mapping['cascade'])) {
                 $mapping['cascade'][] = 'remove';
             }
 
             unset($mapping['unique']);
         }
 
-        if (isset($mapping['id']) && $mapping['id'] === true && !$mapping['isOwningSide']) {
+        if (isset($mapping['id']) && $mapping['id'] === true && ! $mapping['isOwningSide']) {
             throw MappingException::illegalInverseIdentifierAssociation($this->name, $mapping['fieldName']);
         }
 
@@ -1499,7 +1499,7 @@ 
             }
 
             $selfReferencingEntityWithoutJoinColumns = $mapping['sourceEntity'] == $mapping['targetEntity']
-                && (! (isset($mapping['joinTable']['joinColumns']) || isset($mapping['joinTable']['inverseJoinColumns'])));
+                && ( ! (isset($mapping['joinTable']['joinColumns']) || isset($mapping['joinTable']['inverseJoinColumns'])));
 
             if ( ! isset($mapping['joinTable']['joinColumns'])) {
                 $mapping['joinTable']['joinColumns'] = array(
@@ -1831,11 +1831,11 @@ 
     {
         $schema = empty($this->getSchemaName())
             ? ''
-            : $this->getSchemaName() . '_'
+            : $this->getSchemaName().'_'
         ;
 
         // replace dots with underscores because PostgreSQL creates temporary tables in a special schema
-        return $schema . $this->getTableName() . '_id_tmp';
+        return $schema.$this->getTableName().'_id_tmp';
     }
 
     /**
@@ -2136,7 +2136,7 @@ 
         $property->setDeclaringClass($this);
         $property->setName($fieldName);
         $property->setType($type);
-        $property->setTableName(! $this->isMappedSuperclass ? $this->getTableName() : null);
+        $property->setTableName( ! $this->isMappedSuperclass ? $this->getTableName() : null);
         $property->setColumnName($mapping['columnName'] ?? $this->namingStrategy->propertyToColumnName($fieldName, $this->name));
         $property->setColumnDefinition($mapping['columnDefinition'] ?? null);
         $property->setLength($mapping['length'] ?? null);
@@ -2169,14 +2169,14 @@ 
                 throw MappingException::cannotVersionIdField($this->name, $fieldName);
             }
 
-            assert(! $type->canRequireSQLConversion(), MappingException::sqlConversionNotAllowedForPrimaryKeyProperties($property));
+            assert( ! $type->canRequireSQLConversion(), MappingException::sqlConversionNotAllowedForPrimaryKeyProperties($property));
 
-            if (! in_array($fieldName, $this->identifier)) {
+            if ( ! in_array($fieldName, $this->identifier)) {
                 $this->identifier[] = $fieldName;
             }
 
             // Check for composite key
-            if (! $this->isIdentifierComposite && count($this->identifier) > 1) {
+            if ( ! $this->isIdentifierComposite && count($this->identifier) > 1) {
                 $this->isIdentifierComposite = true;
             }
         }
@@ -2254,7 +2254,7 @@ 
      */
     public function addNamedQuery(array $queryMapping)
     {
-        if (!isset($queryMapping['name'])) {
+        if ( ! isset($queryMapping['name'])) {
             throw MappingException::nameIsMandatoryForQueryMapping($this->name);
         }
 
@@ -2262,7 +2262,7 @@ 
             throw MappingException::duplicateQueryMapping($this->name, $queryMapping['name']);
         }
 
-        if (!isset($queryMapping['query'])) {
+        if ( ! isset($queryMapping['query'])) {
             throw MappingException::emptyQueryMapping($this->name, $queryMapping['name']);
         }
 
@@ -2289,7 +2289,7 @@ 
      */
     public function addNamedNativeQuery(array $queryMapping)
     {
-        if (!isset($queryMapping['name'])) {
+        if ( ! isset($queryMapping['name'])) {
             throw MappingException::nameIsMandatoryForQueryMapping($this->name);
         }
 
@@ -2297,11 +2297,11 @@ 
             throw MappingException::duplicateQueryMapping($this->name, $queryMapping['name']);
         }
 
-        if (!isset($queryMapping['query'])) {
+        if ( ! isset($queryMapping['query'])) {
             throw MappingException::emptyQueryMapping($this->name, $queryMapping['name']);
         }
 
-        if (!isset($queryMapping['resultClass']) && !isset($queryMapping['resultSetMapping'])) {
+        if ( ! isset($queryMapping['resultClass']) && ! isset($queryMapping['resultSetMapping'])) {
             throw MappingException::missingQueryMapping($this->name, $queryMapping['name']);
         }
 
@@ -2333,7 +2333,7 @@ 
      */
     public function addSqlResultSetMapping(array $resultMapping)
     {
-        if (!isset($resultMapping['name'])) {
+        if ( ! isset($resultMapping['name'])) {
             throw MappingException::nameIsMandatoryForSqlResultSetMapping($this->name);
         }
 
@@ -2343,7 +2343,7 @@ 
 
         if (isset($resultMapping['entities'])) {
             foreach ($resultMapping['entities'] as $key => $entityResult) {
-                if (!isset($entityResult['entityClass'])) {
+                if ( ! isset($entityResult['entityClass'])) {
                     throw MappingException::missingResultSetMappingEntity($this->name, $resultMapping['name']);
                 }
 
@@ -2362,11 +2362,11 @@ 
 
                 if (isset($entityResult['fields'])) {
                     foreach ($entityResult['fields'] as $k => $field) {
-                        if (!isset($field['name'])) {
+                        if ( ! isset($field['name'])) {
                             throw MappingException::missingResultSetMappingFieldName($this->name, $resultMapping['name']);
                         }
 
-                        if (!isset($field['column'])) {
+                        if ( ! isset($field['column'])) {
                             $fieldName = $field['name'];
 
                             if (strpos($fieldName, '.')) {
@@ -2908,7 +2908,7 @@ 
     public function getAssociationTargetClass($assocName)
     {
         if ( ! isset($this->associationMappings[$assocName])) {
-            throw new InvalidArgumentException("Association name expected, '" . $assocName ."' is not an association.");
+            throw new InvalidArgumentException("Association name expected, '".$assocName."' is not an association.");
         }
 
         return $this->associationMappings[$assocName]['targetEntity'];
@@ -2979,7 +2979,7 @@ 
         $namespace = $this->reflClass->getNamespaceName();
 
         if ($className !== null && strpos($className, '\\') === false && strlen($namespace) > 0) {
-            return $namespace . '\\' . $className;
+            return $namespace.'\\'.$className;
         }
 
         return $className;
@@ -3093,10 +3093,10 @@ 
 
         // Prepend the schema name to the table name if there is one
         if ($schemaName = $this->getSchemaName()) {
-            $sequencePrefix = $schemaName . '.' . $tableName;
+            $sequencePrefix = $schemaName.'.'.$tableName;
 
             if ( ! $platform->supportsSchemas() && $platform->canEmulateSchemas()) {
-                $sequencePrefix = $schemaName . '__' . $tableName;
+                $sequencePrefix = $schemaName.'__'.$tableName;
             }
         }