doctrine / orm

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

Doc Comments +3 added lines

@@ -184,6 +184,9 @@
      */
     private $products;
 
+    /**
+     * @param string $status
+     */
     public function __construct($status)
     {
         $this->status   = $status;

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 

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

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

@@ -4,9 +4,9 @@
 

 namespace Doctrine\Tests\ORM\Functional\Ticket;

 

-use Doctrine\Common\Collections\ArrayCollection;

-use Doctrine\ORM\PersistentCollection;

-use Doctrine\Tests\Models\ECommerce\ECommerceCategory;

+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\PersistentCollection;
+use Doctrine\Tests\Models\ECommerce\ECommerceCategory;
 use Doctrine\Tests\Models\ECommerce\ECommerceProduct;

 

 /**

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php

 

-declare(strict_types=1);

+declare(strict_types = 1);

 

 namespace Doctrine\Tests\ORM\Functional\Ticket;

 

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

Doc Comments +4 added lines

@@ -117,6 +117,10 @@
 	/** @ORM\Column(type = "string") */
 	private $value;
 
+    /**
+     * @param string $name
+     * @param string $value
+     */
     public function __construct($name, $value)
     {
         $this->name = $name;

Indentation +6 added lines, -6 removed lines

@@ -45,7 +45,7 @@ 
         $this->em->flush();
 
         $asset->getAttributes()
-              ->removeElement($attribute1);
+                ->removeElement($attribute1);
 
         $idToBeRemoved = $attribute1->id;
 
@@ -105,17 +105,17 @@ 
  */
 class DDC3785_Attribute
 {
-	/**
+    /**
      * @ORM\Id @ORM\Column(type="integer")
      * @ORM\GeneratedValue
      */
     public $id;
 
-	/** @ORM\Column(type = "string") */
-	private $name;
+    /** @ORM\Column(type = "string") */
+    private $name;
 
-	/** @ORM\Column(type = "string") */
-	private $value;
+    /** @ORM\Column(type = "string") */
+    private $value;
 
     public function __construct($name, $value)
     {

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
@@ -25,7 +25,7 @@ 
                     $this->em->getClassMetadata(DDC3785_Attribute::class)
                 ]
             );
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
         }
     }
 
@@ -156,7 +156,7 @@ 
      */
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
-        return (string)$value;
+        return (string) $value;
     }
 
     /**

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

Doc Comments +6 added lines

@@ -155,6 +155,9 @@ 
         $this->books = new \Doctrine\Common\Collections\ArrayCollection;
     }
 
+    /**
+     * @param string $title
+     */
     public function addBook($title)
     {
         $book = new DDC618Book($title, $this);
@@ -179,6 +182,9 @@ 
     /** @ORM\ManyToOne(targetEntity="DDC618Author", inversedBy="books") */
     public $author;
 
+    /**
+     * @param DDC618Author $author
+     */
     function __construct($title, $author)
     {
         $this->title = $title;

Indentation +4 added lines, -4 removed lines

@@ -75,7 +75,7 @@ 
     public function testIndexByJoin()
     {
         $dql = 'SELECT A, B FROM Doctrine\Tests\ORM\Functional\Ticket\DDC618Author A '.
-               'INNER JOIN A.books B INDEX BY B.title ORDER BY A.name ASC';
+                'INNER JOIN A.books B INDEX BY B.title ORDER BY A.name ASC';
         $result = $this->em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_OBJECT);
 
         self::assertEquals(3, count($result[0]->books)); // Alice, Joe doesn't appear because he has no books.
@@ -99,14 +99,14 @@ 
     public function testIndexByToOneJoinSilentlyIgnored()
     {
         $dql = 'SELECT B, A FROM Doctrine\Tests\ORM\Functional\Ticket\DDC618Book B '.
-               'INNER JOIN B.author A INDEX BY A.name ORDER BY A.name ASC';
+                'INNER JOIN B.author A INDEX BY A.name ORDER BY A.name ASC';
         $result = $this->em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_OBJECT);
 
         self::assertInstanceOf(DDC618Book::class, $result[0]);
         self::assertInstanceOf(DDC618Author::class, $result[0]->author);
 
         $dql = 'SELECT B, A FROM Doctrine\Tests\ORM\Functional\Ticket\DDC618Book B '.
-               'INNER JOIN B.author A INDEX BY A.name ORDER BY A.name ASC';
+                'INNER JOIN B.author A INDEX BY A.name ORDER BY A.name ASC';
         $result = $this->em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_ARRAY);
 
         self::assertEquals("Alice", $result[0]['author']['name']);
@@ -118,7 +118,7 @@ 
     public function testCombineIndexBy()
     {
         $dql = 'SELECT A, B FROM Doctrine\Tests\ORM\Functional\Ticket\DDC618Author A INDEX BY A.id '.
-               'INNER JOIN A.books B INDEX BY B.title ORDER BY A.name ASC';
+                'INNER JOIN A.books B INDEX BY B.title ORDER BY A.name ASC';
         $result = $this->em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_OBJECT);
 
         self::assertArrayHasKey(11, $result); // Alice

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
@@ -40,7 +40,7 @@ 
 
             $this->em->flush();
             $this->em->clear();
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
 
         }
     }
@@ -80,17 +80,17 @@ 
 
         self::assertEquals(3, count($result[0]->books)); // Alice, Joe doesn't appear because he has no books.
         self::assertEquals('Alice', $result[0]->name);
-        self::assertTrue( isset($result[0]->books["In Wonderland"] ), "Indexing by title should have books by title.");
-        self::assertTrue( isset($result[0]->books["Reloaded"] ), "Indexing by title should have books by title.");
-        self::assertTrue( isset($result[0]->books["Test"] ), "Indexing by title should have books by title.");
+        self::assertTrue(isset($result[0]->books["In Wonderland"]), "Indexing by title should have books by title.");
+        self::assertTrue(isset($result[0]->books["Reloaded"]), "Indexing by title should have books by title.");
+        self::assertTrue(isset($result[0]->books["Test"]), "Indexing by title should have books by title.");
 
         $result = $this->em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_ARRAY);
 
         self::assertEquals(3, count($result[0]['books'])); // Alice, Joe doesn't appear because he has no books.
         self::assertEquals('Alice', $result[0]['name']);
-        self::assertTrue( isset($result[0]['books']["In Wonderland"] ), "Indexing by title should have books by title.");
-        self::assertTrue( isset($result[0]['books']["Reloaded"] ), "Indexing by title should have books by title.");
-        self::assertTrue( isset($result[0]['books']["Test"] ), "Indexing by title should have books by title.");
+        self::assertTrue(isset($result[0]['books']["In Wonderland"]), "Indexing by title should have books by title.");
+        self::assertTrue(isset($result[0]['books']["Reloaded"]), "Indexing by title should have books by title.");
+        self::assertTrue(isset($result[0]['books']["Test"]), "Indexing by title should have books by title.");
     }
 
     /**
@@ -125,9 +125,9 @@ 
 
         self::assertEquals(3, count($result[11]->books)); // Alice, Joe doesn't appear because he has no books.
         self::assertEquals('Alice', $result[11]->name);
-        self::assertTrue( isset($result[11]->books["In Wonderland"] ), "Indexing by title should have books by title.");
-        self::assertTrue( isset($result[11]->books["Reloaded"] ), "Indexing by title should have books by title.");
-        self::assertTrue( isset($result[11]->books["Test"] ), "Indexing by title should have books by title.");
+        self::assertTrue(isset($result[11]->books["In Wonderland"]), "Indexing by title should have books by title.");
+        self::assertTrue(isset($result[11]->books["Reloaded"]), "Indexing by title should have books by title.");
+        self::assertTrue(isset($result[11]->books["Test"]), "Indexing by title should have books by title.");
     }
 }
 

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

Doc Comments +11 added lines

@@ -167,6 +167,9 @@ 
      */
     public $version;
 
+    /**
+     * @param string $word
+     */
     public function __construct($word)
     {
         $this->word = $word;
@@ -196,6 +199,9 @@ 
      */
     public $version;
 
+    /**
+     * @param string $name
+     */
     public function __construct($name)
     {
         $this->name = $name;
@@ -214,6 +220,11 @@ 
     /** @ORM\Column(type="integer") */
     public $rgt;
 
+    /**
+     * @param string $name
+     * @param integer $lft
+     * @param integer $rgt
+     */
     public function __construct($name, $lft, $rgt)
     {
         $this->name = $name;

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
@@ -28,7 +28,7 @@ 
                     $this->em->getClassMetadata(DDC832Like::class),
                 ]
             );
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
         }
     }
 

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

Doc Comments +11 added lines

@@ -353,6 +353,9 @@ 
     /** @ORM\Embedded(class = "DDC93Timestamps") */
     public $timestamps;
 
+    /**
+     * @param string $name
+     */
     public function __construct($name = null, DDC93Address $address = null)
     {
         $this->name = $name;
@@ -415,6 +418,9 @@ 
      */
     public $name;
 
+    /**
+     * @param string $name
+     */
     public function __construct($name = null)
     {
         $this->name = $name;
@@ -441,6 +447,11 @@ 
     /** @ORM\Embedded(class = "DDC93Country") */
     public $country;
 
+    /**
+     * @param string $street
+     * @param string $zip
+     * @param string $city
+     */
     public function __construct($street = null, $zip = null, $city = null, DDC93Country $country = null)
     {
         $this->street = $street;

Spacing +16 added lines, -16 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional;
 
@@ -32,7 +32,7 @@ 
                 $this->em->getClassMetadata(DDC3027Dog::class),
                 ]
             );
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
         }
     }
 
@@ -87,7 +87,7 @@ 
         self::assertEquals('United States of America', $person->address->country->name);
 
         // 4. check deleting works
-        $personId = $person->id;;
+        $personId = $person->id; ;
         $this->em->remove($person);
         $this->em->flush();
 
@@ -111,7 +111,7 @@ 
         $this->em->flush();
         $this->em->clear();
 
-        $dql = "SELECT p FROM " . __NAMESPACE__ . "\DDC93Person p";
+        $dql = "SELECT p FROM ".__NAMESPACE__."\DDC93Person p";
         $persons = $this->em->createQuery($dql)->getResult();
 
         self::assertCount(3, $persons);
@@ -124,7 +124,7 @@ 
             self::assertEquals('United States of America', $person->address->country->name);
         }
 
-        $dql = "SELECT p FROM " . __NAMESPACE__ . "\DDC93Person p";
+        $dql = "SELECT p FROM ".__NAMESPACE__."\DDC93Person p";
         $persons = $this->em->createQuery($dql)->getArrayResult();
 
         foreach ($persons as $person) {
@@ -149,7 +149,7 @@ 
         $this->em->flush();
 
         // SELECT
-        $selectDql = "SELECT p FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.address.city = :city AND p.address.country.name = :country";
+        $selectDql = "SELECT p FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.address.city = :city AND p.address.country.name = :country";
         $loadedPerson = $this->em->createQuery($selectDql)
             ->setParameter('city', 'Karlsruhe')
             ->setParameter('country', 'Germany')
@@ -164,7 +164,7 @@ 
         );
 
         // UPDATE
-        $updateDql = "UPDATE " . __NAMESPACE__ . "\\DDC93Person p SET p.address.street = :street, p.address.country.name = :country WHERE p.address.city = :city";
+        $updateDql = "UPDATE ".__NAMESPACE__."\\DDC93Person p SET p.address.street = :street, p.address.country.name = :country WHERE p.address.city = :city";
         $this->em->createQuery($updateDql)
             ->setParameter('street', 'Boo')
             ->setParameter('country', 'DE')
@@ -176,7 +176,7 @@ 
         self::assertEquals('DE', $person->address->country->name);
 
         // DELETE
-        $this->em->createQuery("DELETE " . __NAMESPACE__ . "\\DDC93Person p WHERE p.address.city = :city AND p.address.country.name = :country")
+        $this->em->createQuery("DELETE ".__NAMESPACE__."\\DDC93Person p WHERE p.address.city = :city AND p.address.country.name = :country")
             ->setParameter('city', 'Karlsruhe')
             ->setParameter('country', 'DE')
             ->execute();
@@ -193,7 +193,7 @@ 
         $this->em->clear();
 
         // Prove that the entity was persisted correctly.
-        $dql = "SELECT p FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name";
+        $dql = "SELECT p FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.name = :name";
 
         $person = $this->em->createQuery($dql)
             ->setParameter('name', 'Karl')
@@ -207,7 +207,7 @@ 
         // Clear the EM and prove that the embeddable can be the subject of a partial query.
         $this->em->clear();
 
-        $dql = "SELECT PARTIAL p.{id,address.city} FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name";
+        $dql = "SELECT PARTIAL p.{id,address.city} FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.name = :name";
 
         $person = $this->em->createQuery($dql)
             ->setParameter('name', 'Karl')
@@ -223,7 +223,7 @@ 
         // Clear the EM and prove that the embeddable can be the subject of a partial query regardless of attributes positions.
         $this->em->clear();
 
-        $dql = "SELECT PARTIAL p.{address.city, id} FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name";
+        $dql = "SELECT PARTIAL p.{address.city, id} FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.name = :name";
 
         $person = $this->em->createQuery($dql)
             ->setParameter('name', 'Karl')
@@ -242,7 +242,7 @@ 
         $this->expectException(QueryException::class);
         $this->expectExceptionMessage('no field or association named address.asdfasdf');
 
-        $this->em->createQuery("SELECT p FROM " . __NAMESPACE__ . "\\DDC93Person p WHERE p.address.asdfasdf IS NULL")
+        $this->em->createQuery("SELECT p FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.address.asdfasdf IS NULL")
             ->execute();
     }
 
@@ -251,7 +251,7 @@ 
         $this->expectException(QueryException::class);
         $this->expectExceptionMessage("no mapped field named 'address.asdfasdf'");
 
-        $this->em->createQuery("SELECT PARTIAL p.{id,address.asdfasdf} FROM " . __NAMESPACE__ . "\\DDC93Person p")
+        $this->em->createQuery("SELECT PARTIAL p.{id,address.asdfasdf} FROM ".__NAMESPACE__."\\DDC93Person p")
             ->execute();
     }
 
@@ -313,15 +313,15 @@ 
         $this->expectException(MappingException::class);
         $this->expectExceptionMessage(
             sprintf(
-                'Infinite nesting detected for embedded property %s::nested. ' .
+                'Infinite nesting detected for embedded property %s::nested. '.
                 'You cannot embed an embeddable from the same type inside an embeddable.',
-                __NAMESPACE__ . '\\' . $declaredEmbeddableClassName
+                __NAMESPACE__.'\\'.$declaredEmbeddableClassName
             )
         );
 
         $this->schemaTool->createSchema(
             [
-            $this->em->getClassMetadata(__NAMESPACE__ . '\\' . $embeddableClassName),
+            $this->em->getClassMetadata(__NAMESPACE__.'\\'.$embeddableClassName),
             ]
         );
     }

tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 namespace Doctrine\Tests\ORM\Hydration;
 
 use Doctrine\DBAL\Types\Type;
-use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\FetchMode;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\Proxy\ProxyFactory;

Indentation +27 added lines, -27 removed lines

@@ -1024,14 +1024,14 @@ 
 
         // mocking the proxy factory
         $proxyFactory = $this->getMockBuilder(ProxyFactory::class)
-                             ->setMethods(['getProxy'])
-                             ->disableOriginalConstructor()
-                             ->getMock();
+                                ->setMethods(['getProxy'])
+                                ->disableOriginalConstructor()
+                                ->getMock();
 
         $proxyFactory->expects($this->once())
-                     ->method('getProxy')
-                     ->with($this->equalTo(ECommerceShipping::class), ['id' => 42])
-                     ->will($this->returnValue($proxyInstance));
+                        ->method('getProxy')
+                        ->with($this->equalTo(ECommerceShipping::class), ['id' => 42])
+                        ->will($this->returnValue($proxyInstance));
 
         $this->em->setProxyFactory($proxyFactory);
 
@@ -1073,14 +1073,14 @@ 
 
         // mocking the proxy factory
         $proxyFactory = $this->getMockBuilder(ProxyFactory::class)
-                             ->setMethods(['getProxy'])
-                             ->disableOriginalConstructor()
-                             ->getMock();
+                                ->setMethods(['getProxy'])
+                                ->disableOriginalConstructor()
+                                ->getMock();
 
         $proxyFactory->expects($this->once())
-                     ->method('getProxy')
-                     ->with($this->equalTo(ECommerceShipping::class), ['id' => 42])
-                     ->will($this->returnValue($proxyInstance));
+                        ->method('getProxy')
+                        ->with($this->equalTo(ECommerceShipping::class), ['id' => 42])
+                        ->will($this->returnValue($proxyInstance));
 
         $this->em->setProxyFactory($proxyFactory);
 
@@ -1906,10 +1906,10 @@ 
         $rsm->setDiscriminatorColumn('c', 'c_discr');
 
         $resultSet = [
-              [
-                  'c__id'   => '1',
-                  'c_discr' => 'fix',
-              ],
+                [
+                    'c__id'   => '1',
+                    'c_discr' => 'fix',
+                ],
         ];
 
         $stmt     = new HydratorMockStatement($resultSet);
@@ -1938,12 +1938,12 @@ 
         $rsm->setDiscriminatorColumn('e', 'e_discr');
 
         $resultSet = [
-              [
-                  'c__id'   => '1',
-                  'c_discr' => 'fix',
-                  'e__id'   => '1',
-                  'e__name' => 'Fabio B. Silva'
-              ],
+                [
+                    'c__id'   => '1',
+                    'c_discr' => 'fix',
+                    'e__id'   => '1',
+                    'e__name' => 'Fabio B. Silva'
+                ],
         ];
 
         $stmt     = new HydratorMockStatement($resultSet);
@@ -1968,11 +1968,11 @@ 
         $rsm->setDiscriminatorColumn('p', 'discr');
 
         $resultSet = [
-              [
-                  'p__id'   => '1',
-                  'p__name' => 'Fabio B. Silva',
-                  'discr'   => 'subworker'
-              ],
+                [
+                    'p__id'   => '1',
+                    'p__name' => 'Fabio B. Silva',
+                    'discr'   => 'subworker'
+                ],
         ];
 
         $stmt       = new HydratorMockStatement($resultSet);

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Hydration;
 

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

Doc Comments -3 removed lines

@@ -56,7 +56,6 @@ 
     }
 
     /**
-     * @param \Doctrine\ORM\EntityManager $entityClassName
      * @return \Doctrine\ORM\Mapping\ClassMetadataFactory
      */
     protected function createClassMetadataFactory(EntityManager $em = null)
@@ -73,7 +72,6 @@ 
     }
 
     /**
-     * @param ClassMetadata $class
      */
     public function testEntityTableNameAndInheritance()
     {
@@ -87,7 +85,6 @@ 
 
     /**
      *
-     * @param ClassMetadata $class
      */
     public function testEntityIndexes()
     {

Indentation +1 added lines, -1 removed lines

@@ -811,7 +811,7 @@
         self::assertEquals($guestGroups->getFetchMode(), $adminGroups->getFetchMode());
         self::assertEquals($guestGroups->getCascade(), $adminGroups->getCascade());
 
-         // assert not override attributes
+            // assert not override attributes
         $guestGroupsJoinTable          = $guestGroups->getJoinTable();
         $guestGroupsJoinColumns        = $guestGroupsJoinTable->getJoinColumns();
         $guestGroupsJoinColumn         = reset($guestGroupsJoinColumns);

Spacing +40 added lines, -40 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Mapping;
 
@@ -668,13 +668,13 @@ 
 
         $findByIdQuery = $class->getNamedNativeQuery('find-by-id');
 
-        self::assertEquals(CmsAddress::class,$findByIdQuery['resultClass']);
-        self::assertEquals('SELECT * FROM cms_addresses WHERE id = ?',  $findByIdQuery['query']);
+        self::assertEquals(CmsAddress::class, $findByIdQuery['resultClass']);
+        self::assertEquals('SELECT * FROM cms_addresses WHERE id = ?', $findByIdQuery['query']);
 
         $countQuery = $class->getNamedNativeQuery('count');
 
         self::assertEquals('mapping-count', $countQuery['resultSetMapping']);
-        self::assertEquals('SELECT COUNT(*) AS count FROM cms_addresses',  $countQuery['query']);
+        self::assertEquals('SELECT COUNT(*) AS count FROM cms_addresses', $countQuery['query']);
 
         // result set mapping
         self::assertCount(3, $class->sqlResultSetMappings);
@@ -685,9 +685,9 @@ 
         $findAllMapping = $class->getSqlResultSetMapping('mapping-find-all');
 
         self::assertEquals(CmsAddress::class, $findAllMapping['entities'][0]['entityClass']);
-        self::assertEquals(['name'=>'id','column'=>'id'], $findAllMapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'city','column'=>'city'], $findAllMapping['entities'][0]['fields'][1]);
-        self::assertEquals(['name'=>'country','column'=>'country'], $findAllMapping['entities'][0]['fields'][2]);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $findAllMapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'city', 'column'=>'city'], $findAllMapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'country', 'column'=>'country'], $findAllMapping['entities'][0]['fields'][2]);
 
         $withoutFieldsMapping = $class->getSqlResultSetMapping('mapping-without-fields');
 
@@ -713,63 +713,63 @@ 
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedAddress');
 
-        self::assertEquals([],$mapping['columns']);
+        self::assertEquals([], $mapping['columns']);
         self::assertEquals('mappingJoinedAddress', $mapping['name']);
 
         self::assertNull($mapping['entities'][0]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'id'],                   $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'name'],               $mapping['entities'][0]['fields'][1]);
-        self::assertEquals(['name'=>'status','column'=>'status'],           $mapping['entities'][0]['fields'][2]);
-        self::assertEquals(['name'=>'address.zip','column'=>'zip'],         $mapping['entities'][0]['fields'][3]);
-        self::assertEquals(['name'=>'address.city','column'=>'city'],       $mapping['entities'][0]['fields'][4]);
-        self::assertEquals(['name'=>'address.country','column'=>'country'], $mapping['entities'][0]['fields'][5]);
-        self::assertEquals(['name'=>'address.id','column'=>'a_id'],         $mapping['entities'][0]['fields'][6]);
-        self::assertEquals('__CLASS__',                            $mapping['entities'][0]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
+        self::assertEquals(['name'=>'address.zip', 'column'=>'zip'], $mapping['entities'][0]['fields'][3]);
+        self::assertEquals(['name'=>'address.city', 'column'=>'city'], $mapping['entities'][0]['fields'][4]);
+        self::assertEquals(['name'=>'address.country', 'column'=>'country'], $mapping['entities'][0]['fields'][5]);
+        self::assertEquals(['name'=>'address.id', 'column'=>'a_id'], $mapping['entities'][0]['fields'][6]);
+        self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']);
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedPhonenumber');
 
-        self::assertEquals([],$mapping['columns']);
+        self::assertEquals([], $mapping['columns']);
         self::assertEquals('mappingJoinedPhonenumber', $mapping['name']);
 
         self::assertNull($mapping['entities'][0]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'id'],                             $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'name'],                         $mapping['entities'][0]['fields'][1]);
-        self::assertEquals(['name'=>'status','column'=>'status'],                     $mapping['entities'][0]['fields'][2]);
-        self::assertEquals(['name'=>'phonenumbers.phonenumber','column'=>'number'],   $mapping['entities'][0]['fields'][3]);
-        self::assertEquals($userMetadata->getClassName(),                             $mapping['entities'][0]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
+        self::assertEquals(['name'=>'phonenumbers.phonenumber', 'column'=>'number'], $mapping['entities'][0]['fields'][3]);
+        self::assertEquals($userMetadata->getClassName(), $mapping['entities'][0]['entityClass']);
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingUserPhonenumberCount');
 
-        self::assertEquals(['name'=>'numphones'],$mapping['columns'][0]);
+        self::assertEquals(['name'=>'numphones'], $mapping['columns'][0]);
         self::assertEquals('mappingUserPhonenumberCount', $mapping['name']);
 
         self::assertNull($mapping['entities'][0]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'id'],         $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'name'],     $mapping['entities'][0]['fields'][1]);
-        self::assertEquals(['name'=>'status','column'=>'status'], $mapping['entities'][0]['fields'][2]);
-        self::assertEquals($userMetadata->getClassName(),         $mapping['entities'][0]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
+        self::assertEquals($userMetadata->getClassName(), $mapping['entities'][0]['entityClass']);
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingMultipleJoinsEntityResults');
 
-        self::assertEquals(['name'=>'numphones'],$mapping['columns'][0]);
+        self::assertEquals(['name'=>'numphones'], $mapping['columns'][0]);
         self::assertEquals('mappingMultipleJoinsEntityResults', $mapping['name']);
 
         self::assertNull($mapping['entities'][0]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'u_id'],           $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'u_name'],       $mapping['entities'][0]['fields'][1]);
-        self::assertEquals(['name'=>'status','column'=>'u_status'],   $mapping['entities'][0]['fields'][2]);
-        self::assertEquals('__CLASS__',                      $mapping['entities'][0]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'u_id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'u_name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'status', 'column'=>'u_status'], $mapping['entities'][0]['fields'][2]);
+        self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']);
 
         self::assertNull($mapping['entities'][1]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'a_id'],           $mapping['entities'][1]['fields'][0]);
-        self::assertEquals(['name'=>'zip','column'=>'a_zip'],         $mapping['entities'][1]['fields'][1]);
-        self::assertEquals(['name'=>'country','column'=>'a_country'], $mapping['entities'][1]['fields'][2]);
-        self::assertEquals(CmsAddress::class,                $mapping['entities'][1]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'a_id'], $mapping['entities'][1]['fields'][0]);
+        self::assertEquals(['name'=>'zip', 'column'=>'a_zip'], $mapping['entities'][1]['fields'][1]);
+        self::assertEquals(['name'=>'country', 'column'=>'a_country'], $mapping['entities'][1]['fields'][2]);
+        self::assertEquals(CmsAddress::class, $mapping['entities'][1]['entityClass']);
 
         //person asserts
         self::assertCount(1, $personMetadata->getSqlResultSetMappings());
@@ -781,9 +781,9 @@ 
 
         self::assertEquals('discriminator', $mapping['entities'][0]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'id'],     $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]);
-        self::assertEquals('__CLASS__',              $mapping['entities'][0]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']);
     }
 
     /*
@@ -1309,7 +1309,7 @@ 
         $metadata->addLifecycleCallback('doOtherStuffOnPrePersistToo', 'prePersist');
         $metadata->addLifecycleCallback('doStuffOnPostPersist', 'postPersist');
 
-        $metadata->addNamedQuery('all',  'SELECT u FROM __CLASS__ u');
+        $metadata->addNamedQuery('all', 'SELECT u FROM __CLASS__ u');
 
         $fieldMetadata = new Mapping\FieldMetadata('id');
         $fieldMetadata->setType(Type::getType('integer'));

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

Doc Comments +7 added lines, -1 removed lines

@@ -225,6 +225,9 @@ 
         self::assertEquals([], $metadata);
     }
 
+    /**
+     * @param \PHPUnit_Framework_MockObject_MockObject $conn
+     */
     protected function createEntityManager($metadataDriver, $conn = null)
     {
         $driverMock = new DriverMock();
@@ -257,7 +260,6 @@ 
     }
 
     /**
-     * @param string $class
      * @return ClassMetadata
      */
     protected function createValidClassMetadata()
@@ -498,6 +500,10 @@ 
         return $this->mockMetadata[$className];
     }
 
+    /**
+     * @param string $className
+     * @param ClassMetadata $metadata
+     */
     public function setMetadataForClass($className, $metadata)
     {
         $this->mockMetadata[$className] = $metadata;

Indentation +14 added lines, -14 removed lines

@@ -129,13 +129,13 @@ 
         $cmf = new ClassMetadataFactory();
         $driver = $this->createMock(MappingDriver::class);
         $driver->expects($this->at(0))
-               ->method('isTransient')
-               ->with($this->equalTo(CmsUser::class))
-               ->will($this->returnValue(true));
+                ->method('isTransient')
+                ->with($this->equalTo(CmsUser::class))
+                ->will($this->returnValue(true));
         $driver->expects($this->at(1))
-               ->method('isTransient')
-               ->with($this->equalTo(CmsArticle::class))
-               ->will($this->returnValue(false));
+                ->method('isTransient')
+                ->with($this->equalTo(CmsArticle::class))
+                ->will($this->returnValue(false));
 
         $em = $this->createEntityManager($driver);
 
@@ -151,13 +151,13 @@ 
         $cmf = new ClassMetadataFactory();
         $driver = $this->createMock(MappingDriver::class);
         $driver->expects($this->at(0))
-               ->method('isTransient')
-               ->with($this->equalTo(CmsUser::class))
-               ->will($this->returnValue(true));
+                ->method('isTransient')
+                ->with($this->equalTo(CmsUser::class))
+                ->will($this->returnValue(true));
         $driver->expects($this->at(1))
-               ->method('isTransient')
-               ->with($this->equalTo(CmsArticle::class))
-               ->will($this->returnValue(false));
+                ->method('isTransient')
+                ->with($this->equalTo(CmsArticle::class))
+                ->will($this->returnValue(false));
 
         $em = $this->createEntityManager($driver);
         $em->getConfiguration()->addEntityNamespace('CMS', 'Doctrine\Tests\Models\CMS');
@@ -316,8 +316,8 @@ 
     }
 
     /**
-    * @group DDC-1845
-    */
+     * @group DDC-1845
+     */
     public function testQuoteMetadata()
     {
         $cmf    = new ClassMetadataFactory();

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Mapping;
 
@@ -106,15 +106,15 @@ 
     {
         require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php";
 
-        $metadataDriver = $this->createAnnotationDriver([__DIR__ . '/../../Models/Global/']);
+        $metadataDriver = $this->createAnnotationDriver([__DIR__.'/../../Models/Global/']);
 
         $entityManager = $this->createEntityManager($metadataDriver);
 
         $mf = $entityManager->getMetadataFactory();
         $m1 = $mf->getMetadataFor(DoctrineGlobal_Article::class);
         $h1 = $mf->hasMetadataFor(DoctrineGlobal_Article::class);
-        $h2 = $mf->hasMetadataFor('\\' . DoctrineGlobal_Article::class);
-        $m2 = $mf->getMetadataFor('\\' . DoctrineGlobal_Article::class);
+        $h2 = $mf->hasMetadataFor('\\'.DoctrineGlobal_Article::class);
+        $m2 = $mf->getMetadataFor('\\'.DoctrineGlobal_Article::class);
 
         self::assertNotSame($m1, $m2);
         self::assertFalse($h2);
@@ -169,7 +169,7 @@ 
     public function testAddDefaultDiscriminatorMap()
     {
         $cmf = new ClassMetadataFactory();
-        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/JoinedInheritanceType/']);
+        $driver = $this->createAnnotationDriver([__DIR__.'/../../Models/JoinedInheritanceType/']);
         $em = $this->createEntityManager($driver);
         $cmf->setEntityManager($em);
 
@@ -209,7 +209,7 @@ 
     {
         // DDC-3551
         $conn = $this->createMock(Connection::class);
-        $mockDriver    = new MetadataDriverMock();
+        $mockDriver = new MetadataDriverMock();
         $em = $this->createEntityManager($mockDriver, $conn);
 
         $conn->expects($this->any())
@@ -230,12 +230,12 @@ 
         $driverMock = new DriverMock();
         $config = new Configuration();
 
-        $config->setProxyDir(__DIR__ . '/../../Proxies');
+        $config->setProxyDir(__DIR__.'/../../Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
 
         $eventManager = new EventManager();
 
-        if (!$conn) {
+        if ( ! $conn) {
             $conn = new ConnectionMock([], $driverMock, $config, $eventManager);
         }
 
@@ -321,7 +321,7 @@ 
     public function testQuoteMetadata()
     {
         $cmf    = new ClassMetadataFactory();
-        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/Quote/']);
+        $driver = $this->createAnnotationDriver([__DIR__.'/../../Models/Quote/']);
         $em     = $this->createEntityManager($driver);
         $cmf->setEntityManager($em);
 
@@ -410,7 +410,7 @@ 
         $listener
             ->expects($this->any())
             ->method('onClassMetadataNotFound')
-            ->will($this->returnCallback(function (OnClassMetadataNotFoundEventArgs $args) use ($metadata, $em, $test) {
+            ->will($this->returnCallback(function(OnClassMetadataNotFoundEventArgs $args) use ($metadata, $em, $test) {
                 $test->assertNull($args->getFoundMetadata());
                 $test->assertSame('Foo', $args->getClassName());
                 $test->assertSame($em, $args->getObjectManager());
@@ -472,7 +472,7 @@ 
     public function testInheritsIdGeneratorMappingFromEmbeddable()
     {
         $cmf = new ClassMetadataFactory();
-        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/DDC4006/']);
+        $driver = $this->createAnnotationDriver([__DIR__.'/../../Models/DDC4006/']);
         $em = $this->createEntityManager($driver);
         $cmf->setEntityManager($em);