doctrine / orm

tests/Doctrine/Performance/Mock/NonProxyLoadingEntityManager.php

Unused Use Statements -2 removed lines

@@ -4,9 +4,7 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Proxy\ProxyFactory;
-use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\ResultSetMapping;
-use Doctrine\Tests\ORM\Performance\MockUnitOfWork;
 
 /**
  * An entity manager mock that prevents lazy-loading of proxies

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

Doc Comments +2 added lines, -2 removed lines

@@ -127,7 +127,7 @@ 
     }
 
     /**
-     * @param field_type $fooTitle
+     * @param string $fooTitle
      */
     public function setFooTitle($fooTitle)
     {
@@ -205,7 +205,7 @@ 
     }
 
     /**
-     * @param field_type $barTitle
+     * @param string $barTitle
      */
     public function setBarTitle($barTitle)
     {

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)

Indentation +79 added lines, -79 removed lines

@@ -739,7 +739,7 @@ 
         $this->assertEquals($guestGroups['isCascadeMerge'], $adminGroups['isCascadeMerge']);
         $this->assertEquals($guestGroups['isCascadeDetach'], $adminGroups['isCascadeDetach']);
 
-         // assert not override attributes
+            // assert not override attributes
         $this->assertEquals('ddc964_users_groups', $guestGroups['joinTable']['name']);
         $this->assertEquals('user_id', $guestGroups['joinTable']['joinColumns'][0]['name']);
         $this->assertEquals('group_id', $guestGroups['joinTable']['inverseJoinColumns'][0]['name']);
@@ -1166,8 +1166,8 @@ 
         $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE);
         $metadata->setPrimaryTable(
             [
-           'name' => 'cms_users',
-           'options' => ['foo' => 'bar', 'baz' => ['key' => 'val']],
+            'name' => 'cms_users',
+            'options' => ['foo' => 'bar', 'baz' => ['key' => 'val']],
             ]
         );
         $metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT);
@@ -1176,30 +1176,30 @@ 
         $metadata->addLifecycleCallback('doStuffOnPostPersist', 'postPersist');
         $metadata->mapField(
             [
-           'id' => true,
-           'fieldName' => 'id',
-           'type' => 'integer',
-           'columnName' => 'id',
-           'options' => ['foo' => 'bar', 'unsigned' => false],
+            'id' => true,
+            'fieldName' => 'id',
+            'type' => 'integer',
+            'columnName' => 'id',
+            'options' => ['foo' => 'bar', 'unsigned' => false],
             ]
         );
         $metadata->mapField(
             [
-           'fieldName' => 'name',
-           'type' => 'string',
-           'length' => 50,
-           'unique' => true,
-           'nullable' => true,
-           'columnName' => 'name',
-           'options' => ['foo' => 'bar', 'baz' => ['key' => 'val'], 'fixed' => false],
+            'fieldName' => 'name',
+            'type' => 'string',
+            'length' => 50,
+            'unique' => true,
+            'nullable' => true,
+            'columnName' => 'name',
+            'options' => ['foo' => 'bar', 'baz' => ['key' => 'val'], 'fixed' => false],
             ]
         );
         $metadata->mapField(
             [
-           'fieldName' => 'email',
-           'type' => 'string',
-           'columnName' => 'user_email',
-           'columnDefinition' => 'CHAR(32) NOT NULL',
+            'fieldName' => 'email',
+            'type' => 'string',
+            'columnName' => 'user_email',
+            'columnDefinition' => 'CHAR(32) NOT NULL',
             ]
         );
         $mapping = ['fieldName' => 'version', 'type' => 'integer'];
@@ -1208,60 +1208,60 @@ 
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
         $metadata->mapOneToOne(
             [
-           'fieldName' => 'address',
-           'targetEntity' => Address::class,
-           'cascade' =>
-           [
-           0 => 'remove',
-           ],
-           'mappedBy' => NULL,
-           'inversedBy' => 'user',
-           'joinColumns' =>
-           [
-           0 =>
-           [
+            'fieldName' => 'address',
+            'targetEntity' => Address::class,
+            'cascade' =>
+            [
+            0 => 'remove',
+            ],
+            'mappedBy' => NULL,
+            'inversedBy' => 'user',
+            'joinColumns' =>
+            [
+            0 =>
+            [
             'name' => 'address_id',
             'referencedColumnName' => 'id',
             'onDelete' => 'CASCADE',
-           ],
-           ],
-           'orphanRemoval' => false,
+            ],
+            ],
+            'orphanRemoval' => false,
             ]
         );
         $metadata->mapOneToMany(
             [
-           'fieldName' => 'phonenumbers',
-           'targetEntity' => Phonenumber::class,
-           'cascade' =>
-           [
-           1 => 'persist',
-           ],
-           'mappedBy' => 'user',
-           'orphanRemoval' => true,
-           'orderBy' =>
-           [
-           'number' => 'ASC',
-           ],
+            'fieldName' => 'phonenumbers',
+            'targetEntity' => Phonenumber::class,
+            'cascade' =>
+            [
+            1 => 'persist',
+            ],
+            'mappedBy' => 'user',
+            'orphanRemoval' => true,
+            'orderBy' =>
+            [
+            'number' => 'ASC',
+            ],
             ]
         );
         $metadata->mapManyToMany(
             [
-           'fieldName' => 'groups',
-           'targetEntity' => Group::class,
-           'cascade' =>
-           [
-           0 => 'remove',
-           1 => 'persist',
-           2 => 'refresh',
-           3 => 'merge',
-           4 => 'detach',
-           ],
-           'mappedBy' => NULL,
-           'joinTable' =>
-           [
-           'name' => 'cms_users_groups',
-           'joinColumns' =>
-           [
+            'fieldName' => 'groups',
+            'targetEntity' => Group::class,
+            'cascade' =>
+            [
+            0 => 'remove',
+            1 => 'persist',
+            2 => 'refresh',
+            3 => 'merge',
+            4 => 'detach',
+            ],
+            'mappedBy' => NULL,
+            'joinTable' =>
+            [
+            'name' => 'cms_users_groups',
+            'joinColumns' =>
+            [
             0 =>
             [
             'name' => 'user_id',
@@ -1269,18 +1269,18 @@ 
             'unique' => false,
             'nullable' => false,
             ],
-           ],
-           'inverseJoinColumns' =>
-           [
+            ],
+            'inverseJoinColumns' =>
+            [
             0 =>
             [
             'name' => 'group_id',
             'referencedColumnName' => 'id',
             'columnDefinition' => 'INT NULL',
             ],
-           ],
-           ],
-           'orderBy' => NULL,
+            ],
+            ],
+            'orderBy' => NULL,
             ]
         );
         $metadata->table['uniqueConstraints'] = [
@@ -1391,9 +1391,9 @@ 
     {
         $metadata->mapField(
             [
-           'id'                 => true,
-           'fieldName'          => 'id',
-           'columnDefinition'   => 'INT unsigned NOT NULL',
+            'id'                 => true,
+            'fieldName'          => 'id',
+            'columnDefinition'   => 'INT unsigned NOT NULL',
             ]
         );
 
@@ -1422,16 +1422,16 @@ 
      * @Column(type="integer")
      * @GeneratedValue(strategy="NONE")
      **/
-   public $id;
+    public $id;
 
-   public static function loadMetadata(ClassMetadataInfo $metadata)
+    public static function loadMetadata(ClassMetadataInfo $metadata)
     {
-         $metadata->mapField(
-             [
-           'id'                 => true,
-           'fieldName'          => 'id',
-             ]
-         );
+            $metadata->mapField(
+                [
+            'id'                 => true,
+            'fieldName'          => 'id',
+                ]
+            );
 
         $metadata->setDiscriminatorColumn(
             [

Spacing +46 added lines, -46 removed lines

@@ -605,13 +605,13 @@ 
 
         $findByIdQuery = $class->getNamedNativeQuery('find-by-id');
         $this->assertEquals('find-by-id', $findByIdQuery['name']);
-        $this->assertEquals(CmsAddress::class,$findByIdQuery['resultClass']);
-        $this->assertEquals('SELECT * FROM cms_addresses WHERE id = ?',  $findByIdQuery['query']);
+        $this->assertEquals(CmsAddress::class, $findByIdQuery['resultClass']);
+        $this->assertEquals('SELECT * FROM cms_addresses WHERE id = ?', $findByIdQuery['query']);
 
         $countQuery = $class->getNamedNativeQuery('count');
         $this->assertEquals('count', $countQuery['name']);
         $this->assertEquals('mapping-count', $countQuery['resultSetMapping']);
-        $this->assertEquals('SELECT COUNT(*) AS count FROM cms_addresses',  $countQuery['query']);
+        $this->assertEquals('SELECT COUNT(*) AS count FROM cms_addresses', $countQuery['query']);
 
         // result set mapping
         $this->assertCount(3, $class->sqlResultSetMappings);
@@ -622,9 +622,9 @@ 
         $findAllMapping = $class->getSqlResultSetMapping('mapping-find-all');
         $this->assertEquals('mapping-find-all', $findAllMapping['name']);
         $this->assertEquals(CmsAddress::class, $findAllMapping['entities'][0]['entityClass']);
-        $this->assertEquals(['name'=>'id','column'=>'id'], $findAllMapping['entities'][0]['fields'][0]);
-        $this->assertEquals(['name'=>'city','column'=>'city'], $findAllMapping['entities'][0]['fields'][1]);
-        $this->assertEquals(['name'=>'country','column'=>'country'], $findAllMapping['entities'][0]['fields'][2]);
+        $this->assertEquals(['name'=>'id', 'column'=>'id'], $findAllMapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'city', 'column'=>'city'], $findAllMapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'country', 'column'=>'country'], $findAllMapping['entities'][0]['fields'][2]);
 
         $withoutFieldsMapping = $class->getSqlResultSetMapping('mapping-without-fields');
         $this->assertEquals('mapping-without-fields', $withoutFieldsMapping['name']);
@@ -650,62 +650,62 @@ 
         $this->assertCount(4, $userMetadata->getSqlResultSetMappings());
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedAddress');
-        $this->assertEquals([],$mapping['columns']);
+        $this->assertEquals([], $mapping['columns']);
         $this->assertEquals('mappingJoinedAddress', $mapping['name']);
         $this->assertNull($mapping['entities'][0]['discriminatorColumn']);
-        $this->assertEquals(['name'=>'id','column'=>'id'],                     $mapping['entities'][0]['fields'][0]);
-        $this->assertEquals(['name'=>'name','column'=>'name'],                 $mapping['entities'][0]['fields'][1]);
-        $this->assertEquals(['name'=>'status','column'=>'status'],             $mapping['entities'][0]['fields'][2]);
-        $this->assertEquals(['name'=>'address.zip','column'=>'zip'],           $mapping['entities'][0]['fields'][3]);
-        $this->assertEquals(['name'=>'address.city','column'=>'city'],         $mapping['entities'][0]['fields'][4]);
-        $this->assertEquals(['name'=>'address.country','column'=>'country'],   $mapping['entities'][0]['fields'][5]);
-        $this->assertEquals(['name'=>'address.id','column'=>'a_id'],           $mapping['entities'][0]['fields'][6]);
-        $this->assertEquals($userMetadata->name,                                    $mapping['entities'][0]['entityClass']);
+        $this->assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
+        $this->assertEquals(['name'=>'address.zip', 'column'=>'zip'], $mapping['entities'][0]['fields'][3]);
+        $this->assertEquals(['name'=>'address.city', 'column'=>'city'], $mapping['entities'][0]['fields'][4]);
+        $this->assertEquals(['name'=>'address.country', 'column'=>'country'], $mapping['entities'][0]['fields'][5]);
+        $this->assertEquals(['name'=>'address.id', 'column'=>'a_id'], $mapping['entities'][0]['fields'][6]);
+        $this->assertEquals($userMetadata->name, $mapping['entities'][0]['entityClass']);
 
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedPhonenumber');
-        $this->assertEquals([],$mapping['columns']);
+        $this->assertEquals([], $mapping['columns']);
         $this->assertEquals('mappingJoinedPhonenumber', $mapping['name']);
         $this->assertNull($mapping['entities'][0]['discriminatorColumn']);
-        $this->assertEquals(['name'=>'id','column'=>'id'],                             $mapping['entities'][0]['fields'][0]);
-        $this->assertEquals(['name'=>'name','column'=>'name'],                         $mapping['entities'][0]['fields'][1]);
-        $this->assertEquals(['name'=>'status','column'=>'status'],                     $mapping['entities'][0]['fields'][2]);
-        $this->assertEquals(['name'=>'phonenumbers.phonenumber','column'=>'number'],   $mapping['entities'][0]['fields'][3]);
-        $this->assertEquals($userMetadata->name,                                            $mapping['entities'][0]['entityClass']);
+        $this->assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
+        $this->assertEquals(['name'=>'phonenumbers.phonenumber', 'column'=>'number'], $mapping['entities'][0]['fields'][3]);
+        $this->assertEquals($userMetadata->name, $mapping['entities'][0]['entityClass']);
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingUserPhonenumberCount');
-        $this->assertEquals(['name'=>'numphones'],$mapping['columns'][0]);
+        $this->assertEquals(['name'=>'numphones'], $mapping['columns'][0]);
         $this->assertEquals('mappingUserPhonenumberCount', $mapping['name']);
         $this->assertNull($mapping['entities'][0]['discriminatorColumn']);
-        $this->assertEquals(['name'=>'id','column'=>'id'],         $mapping['entities'][0]['fields'][0]);
-        $this->assertEquals(['name'=>'name','column'=>'name'],     $mapping['entities'][0]['fields'][1]);
-        $this->assertEquals(['name'=>'status','column'=>'status'], $mapping['entities'][0]['fields'][2]);
-        $this->assertEquals($userMetadata->name,                        $mapping['entities'][0]['entityClass']);
+        $this->assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
+        $this->assertEquals($userMetadata->name, $mapping['entities'][0]['entityClass']);
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingMultipleJoinsEntityResults');
-        $this->assertEquals(['name'=>'numphones'],$mapping['columns'][0]);
+        $this->assertEquals(['name'=>'numphones'], $mapping['columns'][0]);
         $this->assertEquals('mappingMultipleJoinsEntityResults', $mapping['name']);
         $this->assertNull($mapping['entities'][0]['discriminatorColumn']);
-        $this->assertEquals(['name'=>'id','column'=>'u_id'],           $mapping['entities'][0]['fields'][0]);
-        $this->assertEquals(['name'=>'name','column'=>'u_name'],       $mapping['entities'][0]['fields'][1]);
-        $this->assertEquals(['name'=>'status','column'=>'u_status'],   $mapping['entities'][0]['fields'][2]);
-        $this->assertEquals($userMetadata->name,                            $mapping['entities'][0]['entityClass']);
+        $this->assertEquals(['name'=>'id', 'column'=>'u_id'], $mapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'name', 'column'=>'u_name'], $mapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'status', 'column'=>'u_status'], $mapping['entities'][0]['fields'][2]);
+        $this->assertEquals($userMetadata->name, $mapping['entities'][0]['entityClass']);
         $this->assertNull($mapping['entities'][1]['discriminatorColumn']);
-        $this->assertEquals(['name'=>'id','column'=>'a_id'],           $mapping['entities'][1]['fields'][0]);
-        $this->assertEquals(['name'=>'zip','column'=>'a_zip'],         $mapping['entities'][1]['fields'][1]);
-        $this->assertEquals(['name'=>'country','column'=>'a_country'], $mapping['entities'][1]['fields'][2]);
-        $this->assertEquals(CmsAddress::class,         $mapping['entities'][1]['entityClass']);
+        $this->assertEquals(['name'=>'id', 'column'=>'a_id'], $mapping['entities'][1]['fields'][0]);
+        $this->assertEquals(['name'=>'zip', 'column'=>'a_zip'], $mapping['entities'][1]['fields'][1]);
+        $this->assertEquals(['name'=>'country', 'column'=>'a_country'], $mapping['entities'][1]['fields'][2]);
+        $this->assertEquals(CmsAddress::class, $mapping['entities'][1]['entityClass']);
 
         //person asserts
         $this->assertCount(1, $personMetadata->getSqlResultSetMappings());
 
         $mapping = $personMetadata->getSqlResultSetMapping('mappingFetchAll');
-        $this->assertEquals([],$mapping['columns']);
+        $this->assertEquals([], $mapping['columns']);
         $this->assertEquals('mappingFetchAll', $mapping['name']);
-        $this->assertEquals('discriminator',                            $mapping['entities'][0]['discriminatorColumn']);
-        $this->assertEquals(['name'=>'id','column'=>'id'],         $mapping['entities'][0]['fields'][0]);
-        $this->assertEquals(['name'=>'name','column'=>'name'],     $mapping['entities'][0]['fields'][1]);
-        $this->assertEquals($personMetadata->name,                      $mapping['entities'][0]['entityClass']);
+        $this->assertEquals('discriminator', $mapping['entities'][0]['discriminatorColumn']);
+        $this->assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        $this->assertEquals($personMetadata->name, $mapping['entities'][0]['entityClass']);
     }
 
     /*
@@ -746,7 +746,7 @@ 
 
         $this->assertEquals(['user_id'=>'id'], $guestGroups['relationToSourceKeyColumns']);
         $this->assertEquals(['group_id'=>'id'], $guestGroups['relationToTargetKeyColumns']);
-        $this->assertEquals(['user_id','group_id'], $guestGroups['joinTableColumns']);
+        $this->assertEquals(['user_id', 'group_id'], $guestGroups['joinTableColumns']);
 
 
         $this->assertEquals('ddc964_users_admingroups', $adminGroups['joinTable']['name']);
@@ -755,7 +755,7 @@ 
 
         $this->assertEquals(['adminuser_id'=>'id'], $adminGroups['relationToSourceKeyColumns']);
         $this->assertEquals(['admingroup_id'=>'id'], $adminGroups['relationToTargetKeyColumns']);
-        $this->assertEquals(['adminuser_id','admingroup_id'], $adminGroups['joinTableColumns']);
+        $this->assertEquals(['adminuser_id', 'admingroup_id'], $adminGroups['joinTableColumns']);
 
 
         // assert address association mappings
@@ -833,8 +833,8 @@ 
         $this->assertTrue($adminMetadata->fieldMappings['id']['id']);
         $this->assertEquals('id', $adminMetadata->fieldMappings['id']['fieldName']);
         $this->assertEquals('user_id', $adminMetadata->fieldMappings['id']['columnName']);
-        $this->assertEquals(['user_id'=>'id','user_name'=>'name'], $adminMetadata->fieldNames);
-        $this->assertEquals(['id'=>'user_id','name'=>'user_name'], $adminMetadata->columnNames);
+        $this->assertEquals(['user_id'=>'id', 'user_name'=>'name'], $adminMetadata->fieldNames);
+        $this->assertEquals(['id'=>'user_id', 'name'=>'user_name'], $adminMetadata->columnNames);
         $this->assertEquals(150, $adminMetadata->fieldMappings['id']['length']);
 
 
@@ -848,8 +848,8 @@ 
         $this->assertTrue($guestMetadata->fieldMappings['id']['id']);
         $this->assertEquals('guest_id', $guestMetadata->fieldMappings['id']['columnName']);
         $this->assertEquals('id', $guestMetadata->fieldMappings['id']['fieldName']);
-        $this->assertEquals(['guest_id'=>'id','guest_name'=>'name'], $guestMetadata->fieldNames);
-        $this->assertEquals(['id'=>'guest_id','name'=>'guest_name'], $guestMetadata->columnNames);
+        $this->assertEquals(['guest_id'=>'id', 'guest_name'=>'name'], $guestMetadata->fieldNames);
+        $this->assertEquals(['id'=>'guest_id', 'name'=>'guest_name'], $guestMetadata->columnNames);
         $this->assertEquals(140, $guestMetadata->fieldMappings['id']['length']);
 
         $this->assertEquals('name', $guestMetadata->fieldMappings['name']['fieldName']);

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.'"'
                 )
             );
         }

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
      */

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;

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);
         }
 
@@ -1625,7 +1625,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
                 ];
             }
@@ -1640,7 +1640,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']);
         }
 
@@ -1694,7 +1694,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'] = [
@@ -1887,7 +1887,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);
         }
@@ -2068,7 +2068,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');
     }
 
     /**
@@ -2405,7 +2405,7 @@ 
      */
     public function addNamedQuery(array $queryMapping)
     {
-        if (!isset($queryMapping['name'])) {
+        if ( ! isset($queryMapping['name'])) {
             throw MappingException::nameIsMandatoryForQueryMapping($this->name);
         }
 
@@ -2413,7 +2413,7 @@ 
             throw MappingException::duplicateQueryMapping($this->name, $queryMapping['name']);
         }
 
-        if (!isset($queryMapping['query'])) {
+        if ( ! isset($queryMapping['query'])) {
             throw MappingException::emptyQueryMapping($this->name, $queryMapping['name']);
         }
 
@@ -2440,7 +2440,7 @@ 
      */
     public function addNamedNativeQuery(array $queryMapping)
     {
-        if (!isset($queryMapping['name'])) {
+        if ( ! isset($queryMapping['name'])) {
             throw MappingException::nameIsMandatoryForQueryMapping($this->name);
         }
 
@@ -2448,11 +2448,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']);
         }
 
@@ -2484,7 +2484,7 @@ 
      */
     public function addSqlResultSetMapping(array $resultMapping)
     {
-        if (!isset($resultMapping['name'])) {
+        if ( ! isset($resultMapping['name'])) {
             throw MappingException::nameIsMandatoryForSqlResultSetMapping($this->name);
         }
 
@@ -2494,7 +2494,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']);
                 }
 
@@ -2513,11 +2513,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);
@@ -3008,7 +3008,7 @@ 
         }
 
         if ($definition['sequenceName'][0] == '`') {
-            $definition['sequenceName']   = trim($definition['sequenceName'], '`');
+            $definition['sequenceName'] = trim($definition['sequenceName'], '`');
             $definition['quoted'] = true;
         }
 
@@ -3100,7 +3100,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'];
@@ -3139,7 +3139,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'];
@@ -3250,7 +3250,7 @@ 
         }
 
         if ($className !== null && strpos($className, '\\') === false && $this->namespace) {
-            return $this->namespace . '\\' . $className;
+            return $this->namespace.'\\'.$className;
         }
 
         return $className;
@@ -3302,13 +3302,13 @@ 
         foreach ($embeddable->fieldMappings as $fieldMapping) {
             $fieldMapping['originalClass'] = $fieldMapping['originalClass'] ?? $embeddable->name;
             $fieldMapping['declaredField'] = isset($fieldMapping['declaredField'])
-                ? $property . '.' . $fieldMapping['declaredField']
+                ? $property.'.'.$fieldMapping['declaredField']
                 : $property;
             $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(
@@ -3349,7 +3349,7 @@ 
     {
         $sequencePrefix = $this->getSequencePrefix($platform);
         $columnName     = $this->getSingleIdentifierColumnName();
-        $sequenceName   = $sequencePrefix . '_' . $columnName . '_seq';
+        $sequenceName   = $sequencePrefix.'_'.$columnName.'_seq';
 
         return $sequenceName;
     }
@@ -3369,10 +3369,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;
             }
         }
 
@@ -3384,8 +3384,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']));
         }
     }
 }

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(

Spacing +5 added lines, -5 removed lines

@@ -17,7 +17,7 @@ 
 
     protected function setUp()
     {
-        if (!class_exists('GearmanClient', false)) {
+        if ( ! class_exists('GearmanClient', false)) {
             $this->markTestSkipped('pecl/gearman is required for this test to run.');
         }
 
@@ -133,11 +133,11 @@ 
         $this->gearman->runTasks();
 
         $this->assertTrue($this->maxRunTime > $forTime,
-            "Because of locking this tests should have run at least " . $forTime . " seconds, ".
-            "but only did for " . $this->maxRunTime . " seconds.");
+            "Because of locking this tests should have run at least ".$forTime." seconds, ".
+            "but only did for ".$this->maxRunTime." seconds.");
         $this->assertTrue($this->maxRunTime < $notLongerThan,
-            "The longest task should not run longer than " . $notLongerThan . " seconds, ".
-            "but did for " . $this->maxRunTime . " seconds."
+            "The longest task should not run longer than ".$notLongerThan." seconds, ".
+            "but did for ".$this->maxRunTime." seconds."
         );
     }
 

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

Spacing +12 added lines, -12 removed lines

@@ -568,11 +568,11 @@ 
         $user = $this->_em->find(CmsUser::class, $this->userId);
 
         $this->assertFalse($user->articles->isInitialized());
-        $this->assertEquals(2, count($user->articles->slice(0,10)));
+        $this->assertEquals(2, count($user->articles->slice(0, 10)));
 
         $this->useCMSArticleTopicFilter();
 
-        $this->assertEquals(1, count($user->articles->slice(0,10)));
+        $this->assertEquals(1, count($user->articles->slice(0, 10)));
     }
 
     private function useCMSGroupPrefixFilter()
@@ -616,11 +616,11 @@ 
         $user = $this->_em->find(CmsUser::class, $this->userId2);
 
         $this->assertFalse($user->groups->isInitialized());
-        $this->assertEquals(2, count($user->groups->slice(0,10)));
+        $this->assertEquals(2, count($user->groups->slice(0, 10)));
 
         $this->useCMSGroupPrefixFilter();
 
-        $this->assertEquals(1, count($user->groups->slice(0,10)));
+        $this->assertEquals(1, count($user->groups->slice(0, 10)));
     }
 
     private function loadFixtureData()
@@ -1106,11 +1106,11 @@ 
 {
     public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias)
     {
-        if (!in_array("LocaleAware", $targetEntity->reflClass->getInterfaceNames())) {
+        if ( ! in_array("LocaleAware", $targetEntity->reflClass->getInterfaceNames())) {
             return "";
         }
 
-        return $targetTableAlias.'.locale = ' . $this->getParameter('locale'); // getParam uses connection to quote the value.
+        return $targetTableAlias.'.locale = '.$this->getParameter('locale'); // getParam uses connection to quote the value.
     }
 }
 
@@ -1122,7 +1122,7 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.country = ' . $this->getParameter('country'); // getParam uses connection to quote the value.
+        return $targetTableAlias.'.country = '.$this->getParameter('country'); // getParam uses connection to quote the value.
     }
 }
 
@@ -1134,7 +1134,7 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.name LIKE ' . $this->getParameter('prefix'); // getParam uses connection to quote the value.
+        return $targetTableAlias.'.name LIKE '.$this->getParameter('prefix'); // getParam uses connection to quote the value.
     }
 }
 
@@ -1146,7 +1146,7 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.topic = ' . $this->getParameter('topic'); // getParam uses connection to quote the value.
+        return $targetTableAlias.'.topic = '.$this->getParameter('topic'); // getParam uses connection to quote the value.
     }
 }
 
@@ -1158,7 +1158,7 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.name LIKE ' . $this->getParameter('name');
+        return $targetTableAlias.'.name LIKE '.$this->getParameter('name');
     }
 }
 
@@ -1170,7 +1170,7 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.completed = ' . $this->getParameter('completed');
+        return $targetTableAlias.'.completed = '.$this->getParameter('completed');
     }
 }
 
@@ -1182,6 +1182,6 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.id = ' . $this->getParameter('id');
+        return $targetTableAlias.'.id = '.$this->getParameter('id');
     }
 }

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