doctrine / orm

lib/Doctrine/ORM/EntityRepository.php

Spacing +4 added lines, -4 removed lines

@@ -301,14 +301,14 @@
      */
     private function resolveMagicCall($method, $by, array $arguments)
     {
-        if (! $arguments) {
-            throw ORMException::findByRequiresParameter($method . $by);
+        if ( ! $arguments) {
+            throw ORMException::findByRequiresParameter($method.$by);
         }
 
         $fieldName = lcfirst(Inflector::classify($by));
 
-        if (! ($this->_class->hasField($fieldName) || $this->_class->hasAssociation($fieldName))) {
-            throw ORMException::invalidMagicCall($this->_entityName, $fieldName, $method . $by);
+        if ( ! ($this->_class->hasField($fieldName) || $this->_class->hasAssociation($fieldName))) {
+            throw ORMException::invalidMagicCall($this->_entityName, $fieldName, $method.$by);
         }
 
         return $this->$method([$fieldName => $arguments[0]], ...array_slice($arguments, 1));

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

Doc Comments -1 removed lines

@@ -33,7 +33,6 @@
     }
 
     /**
-     * @param \Doctrine\ORM\EntityManager $entityClassName
      * @return \Doctrine\ORM\Mapping\ClassMetadataFactory
      */
     protected function createClassMetadataFactory(EntityManager $em = null)

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);
     }
 
     /**
@@ -864,7 +864,7 @@ 
                 sprintf(
                     'Invalid $connection argument of type %s given%s.',
                     is_object($connection) ? get_class($connection) : gettype($connection),
-                    is_object($connection) ? '' : ': "' . $connection . '"'
+                    is_object($connection) ? '' : ': "'.$connection.'"'
                 )
             );
         }

tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -1104,7 +1104,7 @@
 
     /**
      * @param string $type
-     * @param \ReflectionProperty $method
+     * @param \ReflectionMethod $method
      */
     private function assertPhpDocParamType($type, \ReflectionMethod $method)
     {

lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php

Doc Comments +8 added lines, -8 removed lines

@@ -667,7 +667,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()
     {
@@ -805,7 +805,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()
     {
@@ -1825,7 +1825,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
      */
@@ -1854,7 +1854,7 @@ 
     /**
      * Gets an array containing all the column names.
      *
-     * @param array|null $fieldNames
+     * @param string[] $fieldNames
      *
      * @return array
      */
@@ -2012,7 +2012,7 @@ 
      *
      * @param string $fieldName
      *
-     * @return \Doctrine\DBAL\Types\Type|string|null
+     * @return string
      *
      * @todo 3.0 Remove this. PersisterHelper should fix it somehow
      */
@@ -2072,7 +2072,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
      */
@@ -2088,7 +2088,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
      */
@@ -2625,7 +2625,7 @@ 
      * @deprecated Deprecated since version 2.4 in favor of \Doctrine\ORM\Event\ListenersInvoker
      *
      * @param string $lifecycleEvent The lifecycle event.
-     * @param object $entity         The Entity on which the event occurred.
+     * @param \Doctrine\Tests\ORM\Functional\Ticket\DDC1707Child $entity         The Entity on which the event occurred.
      *
      * @return void
      */

Spacing +34 added lines, -34 removed lines

@@ -696,7 +696,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]];
@@ -791,7 +791,7 @@ 
      */
     public function __toString()
     {
-        return __CLASS__ . '@' . spl_object_hash($this);
+        return __CLASS__.'@'.spl_object_hash($this);
     }
 
     /**
@@ -1025,7 +1025,7 @@ 
     public function validateAssociations()
     {
         foreach ($this->associationMappings as $mapping) {
-            if ( ! ClassLoader::classExists($mapping['targetEntity']) ) {
+            if ( ! ClassLoader::classExists($mapping['targetEntity'])) {
                 throw MappingException::invalidTargetEntityClass($mapping['targetEntity'], $this->name, $mapping['fieldName']);
             }
         }
@@ -1103,7 +1103,7 @@ 
         }
 
         if ( ! isset($cache['region'])) {
-            $cache['region'] = strtolower(str_replace('\\', '_', $this->rootEntityName)) . '__' . $fieldName;
+            $cache['region'] = strtolower(str_replace('\\', '_', $this->rootEntityName)).'__'.$fieldName;
         }
 
         return $cache;
@@ -1383,7 +1383,7 @@ 
     protected function _validateAndCompleteFieldMapping(array &$mapping)
     {
         // Check mandatory fields
-        if ( ! isset($mapping['fieldName']) || !$mapping['fieldName']) {
+        if ( ! isset($mapping['fieldName']) || ! $mapping['fieldName']) {
             throw MappingException::missingFieldName($this->name);
         }
 
@@ -1496,14 +1496,14 @@ 
                 $this->isIdentifierComposite = true;
             }
 
-            if ($this->cache && !isset($mapping['cache'])) {
+            if ($this->cache && ! isset($mapping['cache'])) {
                 throw CacheException::nonCacheableEntityAssociation($this->name, $mapping['fieldName']);
             }
         }
 
         // Mandatory attributes for both sides
         // Mandatory: fieldName, targetEntity
-        if ( ! isset($mapping['fieldName']) || !$mapping['fieldName']) {
+        if ( ! isset($mapping['fieldName']) || ! $mapping['fieldName']) {
             throw MappingException::missingFieldName($this->name);
         }
 
@@ -1627,7 +1627,7 @@ 
                     throw new RuntimeException("ClassMetadataInfo::setTable() has to be called before defining a one to one relationship.");
                 }
 
-                $this->table['uniqueConstraints'][$mapping['fieldName'] . "_uniq"] = [
+                $this->table['uniqueConstraints'][$mapping['fieldName']."_uniq"] = [
                     'columns' => $uniqueConstraintColumns
                 ];
             }
@@ -1642,7 +1642,7 @@ 
             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']);
         }
 
@@ -1696,7 +1696,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'] = [
@@ -1885,7 +1885,7 @@ 
 
             // Association defined as Id field
             $joinColumns      = $this->associationMappings[$idProperty]['joinColumns'];
-            $assocColumnNames = array_map(function ($joinColumn) { return $joinColumn['name']; }, $joinColumns);
+            $assocColumnNames = array_map(function($joinColumn) { return $joinColumn['name']; }, $joinColumns);
 
             $columnNames = array_merge($columnNames, $assocColumnNames);
         }
@@ -2066,7 +2066,7 @@ 
     public function getTemporaryIdTableName()
     {
         // replace dots with underscores because PostgreSQL creates temporary tables in a special schema
-        return str_replace('.', '_', $this->getTableName() . '_id_tmp');
+        return str_replace('.', '_', $this->getTableName().'_id_tmp');
     }
 
     /**
@@ -2395,7 +2395,7 @@ 
      */
     public function addNamedQuery(array $queryMapping)
     {
-        if (!isset($queryMapping['name'])) {
+        if ( ! isset($queryMapping['name'])) {
             throw MappingException::nameIsMandatoryForQueryMapping($this->name);
         }
 
@@ -2403,7 +2403,7 @@ 
             throw MappingException::duplicateQueryMapping($this->name, $queryMapping['name']);
         }
 
-        if (!isset($queryMapping['query'])) {
+        if ( ! isset($queryMapping['query'])) {
             throw MappingException::emptyQueryMapping($this->name, $queryMapping['name']);
         }
 
@@ -2430,7 +2430,7 @@ 
      */
     public function addNamedNativeQuery(array $queryMapping)
     {
-        if (!isset($queryMapping['name'])) {
+        if ( ! isset($queryMapping['name'])) {
             throw MappingException::nameIsMandatoryForQueryMapping($this->name);
         }
 
@@ -2438,11 +2438,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']);
         }
 
@@ -2474,7 +2474,7 @@ 
      */
     public function addSqlResultSetMapping(array $resultMapping)
     {
-        if (!isset($resultMapping['name'])) {
+        if ( ! isset($resultMapping['name'])) {
             throw MappingException::nameIsMandatoryForSqlResultSetMapping($this->name);
         }
 
@@ -2484,7 +2484,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']);
                 }
 
@@ -2503,11 +2503,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, '.')) {
                                 list(, $fieldName) = explode('.', $fieldName);
@@ -2998,7 +2998,7 @@ 
         }
 
         if ($definition['sequenceName'][0] == '`') {
-            $definition['sequenceName']   = trim($definition['sequenceName'], '`');
+            $definition['sequenceName'] = trim($definition['sequenceName'], '`');
             $definition['quoted'] = true;
         }
 
@@ -3090,7 +3090,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'];
@@ -3129,7 +3129,7 @@ 
             // Association defined as Id field
             $joinColumns            = $this->associationMappings[$idProperty]['joinColumns'];
             $assocQuotedColumnNames = array_map(
-                function ($joinColumn) use ($platform) {
+                function($joinColumn) use ($platform) {
                     return isset($joinColumn['quoted'])
                         ? $platform->quoteIdentifier($joinColumn['name'])
                         : $joinColumn['name'];
@@ -3240,7 +3240,7 @@ 
         }
 
         if ($className !== null && strpos($className, '\\') === false && $this->namespace) {
-            return $this->namespace . '\\' . $className;
+            return $this->namespace.'\\'.$className;
         }
 
         return $className;
@@ -3294,15 +3294,15 @@ 
                 ? $fieldMapping['originalClass']
                 : $embeddable->name;
             $fieldMapping['declaredField'] = isset($fieldMapping['declaredField'])
-                ? $property . '.' . $fieldMapping['declaredField']
+                ? $property.'.'.$fieldMapping['declaredField']
                 : $property;
             $fieldMapping['originalField'] = isset($fieldMapping['originalField'])
                 ? $fieldMapping['originalField']
                 : $fieldMapping['fieldName'];
-            $fieldMapping['fieldName'] = $property . "." . $fieldMapping['fieldName'];
+            $fieldMapping['fieldName'] = $property.".".$fieldMapping['fieldName'];
 
-            if (! empty($this->embeddedClasses[$property]['columnPrefix'])) {
-                $fieldMapping['columnName'] = $this->embeddedClasses[$property]['columnPrefix'] . $fieldMapping['columnName'];
+            if ( ! empty($this->embeddedClasses[$property]['columnPrefix'])) {
+                $fieldMapping['columnName'] = $this->embeddedClasses[$property]['columnPrefix'].$fieldMapping['columnName'];
             } elseif ($this->embeddedClasses[$property]['columnPrefix'] !== false) {
                 $fieldMapping['columnName'] = $this->namingStrategy
                     ->embeddedFieldToColumnName(
@@ -3343,7 +3343,7 @@ 
     {
         $sequencePrefix = $this->getSequencePrefix($platform);
         $columnName     = $this->getSingleIdentifierColumnName();
-        $sequenceName   = $sequencePrefix . '_' . $columnName . '_seq';
+        $sequenceName   = $sequencePrefix.'_'.$columnName.'_seq';
 
         return $sequenceName;
     }
@@ -3363,10 +3363,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;
             }
         }
 
@@ -3378,8 +3378,8 @@ 
      */
     private function assertMappingOrderBy(array $mapping)
     {
-        if (isset($mapping['orderBy']) && !is_array($mapping['orderBy'])) {
-            throw new InvalidArgumentException("'orderBy' is expected to be an array, not " . gettype($mapping['orderBy']));
+        if (isset($mapping['orderBy']) && ! is_array($mapping['orderBy'])) {
+            throw new InvalidArgumentException("'orderBy' is expected to be an array, not ".gettype($mapping['orderBy']));
         }
     }
 }

Indentation +1 added lines, -1 removed lines

@@ -1428,7 +1428,7 @@
 
         if (Type::hasType($mapping['type']) && Type::getType($mapping['type'])->canRequireSQLConversion()) {
             if (isset($mapping['id']) && true === $mapping['id']) {
-                 throw MappingException::sqlConversionNotAllowedForIdentifiers($this->name, $mapping['fieldName'], $mapping['type']);
+                    throw MappingException::sqlConversionNotAllowedForIdentifiers($this->name, $mapping['fieldName'], $mapping['type']);
             }
 
             $mapping['requireSQLConversion'] = true;

tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php

Doc Comments +6 added lines

@@ -148,6 +148,9 @@ 
         );
     }
 
+    /**
+     * @param string $dql
+     */
     protected function asyncDqlWithLock($dql, $params, $lockMode)
     {
         $this->startJob('dqlWithLock', [
@@ -168,6 +171,9 @@ 
         );
     }
 
+    /**
+     * @param string $fn
+     */
     protected function startJob($fn, $fixture)
     {
         $this->gearman->addTask($fn, serialize(

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

Doc Comments +6 added lines

@@ -176,6 +176,9 @@ 
         $this->assertFalse($em->getFilters()->isEnabled("foo_filter"));
     }
 
+    /**
+     * @param EntityManager $em
+     */
     protected function configureFilters($em)
     {
         // Add filters to the configuration of the EM
@@ -889,6 +892,9 @@ 
         $this->assertEquals(2, count($manager->managedContracts->slice(0, 10)));
     }
 
+    /**
+     * @param string $name
+     */
     private function usePersonNameFilter($name)
     {
         // Enable the filter

tools/sandbox/bootstrap.php

Spacing +4 added lines, -4 removed lines

@@ -5,8 +5,8 @@ 
 
 // Path to composer autoloader. You can use different provided by your favorite framework,
 // if you want to.
-$loaderPath = __DIR__ . '/../../vendor/autoload.php';
-if(!is_readable($loaderPath)){
+$loaderPath = __DIR__.'/../../vendor/autoload.php';
+if ( ! is_readable($loaderPath)) {
     throw new LogicException('Run php composer.phar install at first');
 }
 $loader = require $loaderPath;
@@ -19,7 +19,7 @@ 
 $config = new \Doctrine\ORM\Configuration();
 
 // Set up Metadata Drivers
-$driverImpl = $config->newDefaultAnnotationDriver([__DIR__ . "/Entities"]);
+$driverImpl = $config->newDefaultAnnotationDriver([__DIR__."/Entities"]);
 $config->setMetadataDriverImpl($driverImpl);
 
 // Set up caches, depending on $debug variable.
@@ -29,7 +29,7 @@ 
 $config->setQueryCacheImpl($cache);
 
 // Proxy configuration
-$config->setProxyDir(__DIR__ . '/Proxies');
+$config->setProxyDir(__DIR__.'/Proxies');
 $config->setProxyNamespace('Proxies');
 
 // Database connection information

lib/Doctrine/ORM/Query/AST/Functions/ConcatFunction.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
             $args[] = $sqlWalker->walkStringPrimary($expression);
         }
 
-        return call_user_func_array([$platform,'getConcatExpression'], $args);
+        return call_user_func_array([$platform, 'getConcatExpression'], $args);
     }
 
     /**