Inspection of "[WIP][CS] Start to fix CS for v3 in tests" - doctrine/orm - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#7046)

by Gabriel

created 2018-02-06 15:51 UTC

Status

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -36,37 +36,37 @@
 block discarded – undo
         $dql = "SELECT u FROM Doctrine\Tests\Models\Cms\CmsUser u";
 
         $users = $this->em->createQuery($dql)
-                      ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
-                      ->getResult();
+                        ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
+                        ->getResult();
 
         $c = $this->getCurrentQueryCount();
         $users = $this->em->createQuery($dql)
-                      ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
-                      ->getResult();
+                        ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
+                        ->getResult();
 
         self::assertEquals($c, $this->getCurrentQueryCount(), 'Should not execute query. Its cached!');
 
         $users = $this->em->createQuery($dql)
-                      ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
-                      ->getArrayResult();
+                        ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
+                        ->getArrayResult();
 
         self::assertEquals($c + 1, $this->getCurrentQueryCount(), 'Hydration is part of cache key.');
 
         $users = $this->em->createQuery($dql)
-                      ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
-                      ->getArrayResult();
+                        ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
+                        ->getArrayResult();
 
         self::assertEquals($c + 1, $this->getCurrentQueryCount(), 'Hydration now cached');
 
         $users = $this->em->createQuery($dql)
-                      ->setHydrationCacheProfile(new QueryCacheProfile(null, 'cachekey', $cache))
-                      ->getArrayResult();
+                        ->setHydrationCacheProfile(new QueryCacheProfile(null, 'cachekey', $cache))
+                        ->getArrayResult();
 
         self::assertTrue($cache->contains('cachekey'), 'Explicit cache key');
 
         $users = $this->em->createQuery($dql)
-                      ->setHydrationCacheProfile(new QueryCacheProfile(null, 'cachekey', $cache))
-                      ->getArrayResult();
+                        ->setHydrationCacheProfile(new QueryCacheProfile(null, 'cachekey', $cache))
+                        ->getArrayResult();
         self::assertEquals($c + 2, $this->getCurrentQueryCount(), 'Hydration now cached');
     }
 

Please login to merge, or discard this patch.

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -26,8 +26,8 @@
 block discarded – undo
     {
         $qb = $this->em->createQueryBuilder();
         $qb->select('p', 'r')
-		   ->from(__NAMESPACE__ . '\DDC698Privilege', 'p')
-		   ->leftJoin('p.roles', 'r');
+            ->from(__NAMESPACE__ . '\DDC698Privilege', 'p')
+            ->leftJoin('p.roles', 'r');
 
         self::assertSQLEquals(
             'SELECT t0."privilegeID" AS c0, t0."name" AS c1, t1."roleID" AS c2, t1."name" AS c3, t1."shortName" AS c4 FROM "Privileges" t0 LEFT JOIN "RolePrivileges" t2 ON t0."privilegeID" = t2."privilegeID" LEFT JOIN "Roles" t1 ON t1."roleID" = t2."roleID"',

Please login to merge, or discard this patch.

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

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -74,7 +74,7 @@  discard block
 block discarded – undo
     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::assertCount(3, $result[0]->books); // Alice, Joe doesn't appear because he has no books.
@@ -98,14 +98,14 @@  discard block
 block discarded – undo
     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']);
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
     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

Please login to merge, or discard this patch.

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php 1 patch

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -150,9 +150,9 @@  discard block
 block discarded – undo
 
         $dql = "DELETE Doctrine\Tests\Models\DDC117\DDC117Reference r WHERE r.source = ?1 AND r.target = ?2";
         $this->em->createQuery($dql)
-                  ->setParameter(1, $this->article1->id())
-                  ->setParameter(2, $this->article2->id())
-                  ->execute();
+                    ->setParameter(1, $this->article1->id())
+                    ->setParameter(2, $this->article2->id())
+                    ->execute();
 
         self::assertNull($this->em->find(DDC117Reference::class, $idCriteria));
     }
@@ -202,9 +202,9 @@  discard block
 block discarded – undo
 
         $dql = 'SELECT t, a FROM Doctrine\Tests\Models\DDC117\DDC117Translation t JOIN t.article a WHERE t.article = ?1 AND t.language = ?2';
         $dqlTrans = $this->em->createQuery($dql)
-                              ->setParameter(1, $this->article1->id())
-                              ->setParameter(2, 'en')
-                              ->getSingleResult();
+                                ->setParameter(1, $this->article1->id())
+                                ->setParameter(2, 'en')
+                                ->getSingleResult();
 
         self::assertInstanceOf(DDC117Translation::class, $this->translation);
     }
@@ -369,11 +369,11 @@  discard block
 block discarded – undo
         $this->em->clear();
 
         $dql = "SELECT t, e FROM Doctrine\Tests\Models\DDC117\DDC117Translation t " .
-               'JOIN t.reviewedByEditors e WHERE t.article = ?1 AND t.language = ?2';
+                'JOIN t.reviewedByEditors e WHERE t.article = ?1 AND t.language = ?2';
         $trans = $this->em->createQuery($dql)
-                           ->setParameter(1, $this->translation->getArticleId())
-                           ->setParameter(2, $this->translation->getLanguage())
-                           ->getSingleResult();
+                            ->setParameter(1, $this->translation->getArticleId())
+                            ->setParameter(2, $this->translation->getLanguage())
+                            ->getSingleResult();
 
         self::assertInstanceOf(DDC117Translation::class, $trans);
         self::assertContainsOnly(DDC117Editor::class, $trans->reviewedByEditors);

Please login to merge, or discard this patch.

tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -104,8 +104,8 @@
 block discarded – undo
         $routeId = $this->createPersistedRouteWithLegs();
 
         $route = $this->em->createQuery("SELECT r, l FROM Doctrine\Tests\Models\Routing\RoutingRoute r JOIN r.legs l WHERE r.id = ?1")
-                           ->setParameter(1, $routeId)
-                           ->getSingleResult();
+                            ->setParameter(1, $routeId)
+                            ->getSingleResult();
 
         self::assertCount(2, $route->legs);
         self::assertEquals('Berlin', $route->legs[0]->fromLocation->getName());

Please login to merge, or discard this patch.

tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php 1 patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -27,8 +27,8 @@  discard block
 block discarded – undo
     public function testAggregateWithHavingClause()
     {
         $dql = 'SELECT p.department, AVG(p.salary) AS avgSalary ' .
-               'FROM Doctrine\Tests\Models\Company\CompanyEmployee p ' .
-               'GROUP BY p.department HAVING SUM(p.salary) > 200000 ORDER BY p.department';
+                'FROM Doctrine\Tests\Models\Company\CompanyEmployee p ' .
+                'GROUP BY p.department HAVING SUM(p.salary) > 200000 ORDER BY p.department';
 
         $result = $this->em->createQuery($dql)->getScalarResult();
 
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
     public function testUnnamedScalarResultsAreOneBased()
     {
         $dql = 'SELECT p.department, AVG(p.salary) ' .
-               'FROM Doctrine\Tests\Models\Company\CompanyEmployee p ' .
-               'GROUP BY p.department HAVING SUM(p.salary) > 200000 ORDER BY p.department';
+                'FROM Doctrine\Tests\Models\Company\CompanyEmployee p ' .
+                'GROUP BY p.department HAVING SUM(p.salary) > 200000 ORDER BY p.department';
 
         $result = $this->em->createQuery($dql)->getScalarResult();
 
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
     public function testOrderByResultVariableCollectionSize()
     {
         $dql = 'SELECT p.name, size(p.friends) AS friends ' .
-               'FROM Doctrine\Tests\Models\Company\CompanyPerson p ' .
-               'WHERE p.friends IS NOT EMPTY ' .
-               'ORDER BY friends DESC, p.name DESC';
+                'FROM Doctrine\Tests\Models\Company\CompanyPerson p ' .
+                'WHERE p.friends IS NOT EMPTY ' .
+                'ORDER BY friends DESC, p.name DESC';
 
         $result = $this->em->createQuery($dql)->getScalarResult();
 
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
     public function testIsNullAssociation()
     {
         $dql = 'SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p ' .
-               'WHERE p.spouse IS NULL';
+                'WHERE p.spouse IS NULL';
         $result = $this->em->createQuery($dql)->getResult();
 
         self::assertCount(2, $result);
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
     public function testSelectSubselect()
     {
         $dql = 'SELECT p, (SELECT c.brand FROM Doctrine\Tests\Models\Company\CompanyCar c WHERE p.car = c) brandName ' .
-               'FROM Doctrine\Tests\Models\Company\CompanyManager p';
+                'FROM Doctrine\Tests\Models\Company\CompanyManager p';
         $result = $this->em->createQuery($dql)->getArrayResult();
 
         self::assertCount(1, $result);
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
     public function testInSubselect()
     {
         $dql = "SELECT p.name FROM Doctrine\Tests\Models\Company\CompanyPerson p " .
-               "WHERE p.name IN (SELECT n.name FROM Doctrine\Tests\Models\Company\CompanyPerson n WHERE n.name = 'Roman B.')";
+                "WHERE p.name IN (SELECT n.name FROM Doctrine\Tests\Models\Company\CompanyPerson n WHERE n.name = 'Roman B.')";
         $result = $this->em->createQuery($dql)->getScalarResult();
 
         self::assertCount(1, $result);
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
     public function testGroupByMultipleFields()
     {
         $dql = 'SELECT p.department, p.name, count(p.id) FROM Doctrine\Tests\Models\Company\CompanyEmployee p ' .
-               'GROUP BY p.department, p.name';
+                'GROUP BY p.department, p.name';
         $result = $this->em->createQuery($dql)->getResult();
 
         self::assertCount(4, $result);

Please login to merge, or discard this patch.

tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php 1 patch

Indentation +19 added lines, -19 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@  discard block
 block discarded – undo
     public function testAggregateSum()
     {
         $salarySum = $this->em->createQuery('SELECT SUM(m.salary) AS salary FROM Doctrine\Tests\Models\Company\CompanyManager m')
-                               ->getSingleResult();
+                                ->getSingleResult();
 
         self::assertEquals(1500000, $salarySum['salary']);
     }
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
     public function testAggregateAvg()
     {
         $salaryAvg = $this->em->createQuery('SELECT AVG(m.salary) AS salary FROM Doctrine\Tests\Models\Company\CompanyManager m')
-                               ->getSingleResult();
+                                ->getSingleResult();
 
         self::assertEquals(375000, round($salaryAvg['salary'], 0));
     }
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
     public function testAggregateMin()
     {
         $salary = $this->em->createQuery('SELECT MIN(m.salary) AS salary FROM Doctrine\Tests\Models\Company\CompanyManager m')
-                               ->getSingleResult();
+                                ->getSingleResult();
 
         self::assertEquals(100000, $salary['salary']);
     }
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
     public function testAggregateMax()
     {
         $salary = $this->em->createQuery('SELECT MAX(m.salary) AS salary FROM Doctrine\Tests\Models\Company\CompanyManager m')
-                               ->getSingleResult();
+                                ->getSingleResult();
 
         self::assertEquals(800000, $salary['salary']);
     }
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
     public function testAggregateCount()
     {
         $managerCount = $this->em->createQuery('SELECT COUNT(m.id) AS managers FROM Doctrine\Tests\Models\Company\CompanyManager m')
-                               ->getSingleResult();
+                                ->getSingleResult();
 
         self::assertEquals(4, $managerCount['managers']);
     }
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
     public function testFunctionAbs()
     {
         $result = $this->em->createQuery('SELECT m, ABS(m.salary * -1) AS abs FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC')
-                         ->getResult();
+                            ->getResult();
 
         self::assertCount(4, $result);
         self::assertEquals(100000, $result[0]['abs']);
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
     public function testFunctionConcat()
     {
         $arg = $this->em->createQuery('SELECT m, CONCAT(m.name, m.department) AS namedep FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC')
-                         ->getArrayResult();
+                            ->getArrayResult();
 
         self::assertCount(4, $arg);
         self::assertEquals('Roman B.IT', $arg[0]['namedep']);
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
     public function testFunctionLength()
     {
         $result = $this->em->createQuery('SELECT m, LENGTH(CONCAT(m.name, m.department)) AS namedeplength FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC')
-                         ->getArrayResult();
+                            ->getArrayResult();
 
         self::assertCount(4, $result);
         self::assertEquals(10, $result[0]['namedeplength']);
@@ -101,10 +101,10 @@  discard block
 block discarded – undo
     public function testFunctionLocate()
     {
         $dql = "SELECT m, LOCATE('e', LOWER(m.name)) AS loc, LOCATE('e', LOWER(m.name), 7) AS loc2 " .
-               "FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC";
+                "FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC";
 
         $result = $this->em->createQuery($dql)
-                         ->getArrayResult();
+                            ->getArrayResult();
 
         self::assertCount(4, $result);
         self::assertEquals(0, $result[0]['loc']);
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
     public function testFunctionLower()
     {
         $result = $this->em->createQuery("SELECT m, LOWER(m.name) AS lowername FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC")
-                         ->getArrayResult();
+                            ->getArrayResult();
 
         self::assertCount(4, $result);
         self::assertEquals('roman b.', $result[0]['lowername']);
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
     public function testFunctionMod()
     {
         $result = $this->em->createQuery("SELECT m, MOD(m.salary, 3500) AS amod FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC")
-                         ->getArrayResult();
+                            ->getArrayResult();
 
         self::assertCount(4, $result);
         self::assertEquals(2000, $result[0]['amod']);
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
     public function testFunctionSqrt()
     {
         $result = $this->em->createQuery("SELECT m, SQRT(m.salary) AS sqrtsalary FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC")
-                         ->getArrayResult();
+                            ->getArrayResult();
 
         self::assertCount(4, $result);
         self::assertEquals(316, round($result[0]['sqrtsalary']));
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
     public function testFunctionUpper()
     {
         $result = $this->em->createQuery("SELECT m, UPPER(m.name) AS uppername FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC")
-                         ->getArrayResult();
+                            ->getArrayResult();
 
         self::assertCount(4, $result);
         self::assertEquals('ROMAN B.', $result[0]['uppername']);
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
                 "FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.name";
 
         $result = $this->em->createQuery($dql)
-                         ->getArrayResult();
+                            ->getArrayResult();
 
         self::assertCount(4, $result);
         self::assertEquals('Ben', $result[0]['str1']);
@@ -188,8 +188,8 @@  discard block
 block discarded – undo
     public function testFunctionTrim()
     {
         $dql = "SELECT m, TRIM(TRAILING '.' FROM m.name) AS str1, " .
-               " TRIM(LEADING '.' FROM m.name) AS str2, TRIM(CONCAT(' ', CONCAT(m.name, ' '))) AS str3 " .
-               "FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC";
+                " TRIM(LEADING '.' FROM m.name) AS str2, TRIM(CONCAT(' ', CONCAT(m.name, ' '))) AS str3 " .
+                "FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC";
 
         $result = $this->em->createQuery($dql)->getArrayResult();
 
@@ -330,8 +330,8 @@  discard block
 block discarded – undo
         );
 
         $result = $this->em->createQuery($query)
-                           ->setMaxResults(1)
-                           ->getSingleResult(AbstractQuery::HYDRATE_ARRAY);
+                            ->setMaxResults(1)
+                            ->getSingleResult(AbstractQuery::HYDRATE_ARRAY);
 
         self::assertArrayHasKey('now', $result);
         self::assertArrayHasKey('sub', $result);

Please login to merge, or discard this patch.

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

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -1918,10 +1918,10 @@  discard block
 block discarded – undo
         $rsm->setDiscriminatorColumn('c', 'c_discr');
 
         $resultSet = [
-              [
-                  'c__id'   => '1',
-                  'c_discr' => 'fix',
-              ],
+                [
+                    'c__id'   => '1',
+                    'c_discr' => 'fix',
+                ],
         ];
 
         $stmt     = new HydratorMockStatement($resultSet);
@@ -1950,12 +1950,12 @@  discard block
 block discarded – undo
         $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);
@@ -1980,11 +1980,11 @@  discard block
 block discarded – undo
         $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);

Please login to merge, or discard this patch.

tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php 1 patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -33,10 +33,10 @@  discard block
 block discarded – undo
         $rsm->setDiscriminatorColumn('p', 'discr');
 
         $resultSet = [
-              [
-                  'u__id'   => '1',
-                  'u__name' => 'Fabio B. Silva',
-              ],
+                [
+                    'u__id'   => '1',
+                    'u__name' => 'Fabio B. Silva',
+                ],
         ];
 
         $stmt     = new HydratorMockStatement($resultSet);
@@ -89,11 +89,11 @@  discard block
 block discarded – undo
         $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);

Please login to merge, or discard this patch.

		@@ -150,9 +150,9 @@ discard block
		block discarded – undo
150	150
151	151	$dql = "DELETE Doctrine\Tests\Models\DDC117\DDC117Reference r WHERE r.source = ?1 AND r.target = ?2";
152	152	$this->em->createQuery($dql)
153		- ->setParameter(1, $this->article1->id())
154		- ->setParameter(2, $this->article2->id())
155		- ->execute();
	153	+ ->setParameter(1, $this->article1->id())
	154	+ ->setParameter(2, $this->article2->id())
	155	+ ->execute();
156	156
157	157	self::assertNull($this->em->find(DDC117Reference::class, $idCriteria));
158	158	}
		@@ -202,9 +202,9 @@ discard block
		block discarded – undo
202	202
203	203	$dql = 'SELECT t, a FROM Doctrine\Tests\Models\DDC117\DDC117Translation t JOIN t.article a WHERE t.article = ?1 AND t.language = ?2';
204	204	$dqlTrans = $this->em->createQuery($dql)
205		- ->setParameter(1, $this->article1->id())
206		- ->setParameter(2, 'en')
207		- ->getSingleResult();
	205	+ ->setParameter(1, $this->article1->id())
	206	+ ->setParameter(2, 'en')
	207	+ ->getSingleResult();
208	208
209	209	self::assertInstanceOf(DDC117Translation::class, $this->translation);
210	210	}
		@@ -369,11 +369,11 @@ discard block
		block discarded – undo
369	369	$this->em->clear();
370	370
371	371	$dql = "SELECT t, e FROM Doctrine\Tests\Models\DDC117\DDC117Translation t " .
372		- 'JOIN t.reviewedByEditors e WHERE t.article = ?1 AND t.language = ?2';
	372	+ 'JOIN t.reviewedByEditors e WHERE t.article = ?1 AND t.language = ?2';
373	373	$trans = $this->em->createQuery($dql)
374		- ->setParameter(1, $this->translation->getArticleId())
375		- ->setParameter(2, $this->translation->getLanguage())
376		- ->getSingleResult();
	374	+ ->setParameter(1, $this->translation->getArticleId())
	375	+ ->setParameter(2, $this->translation->getLanguage())
	376	+ ->getSingleResult();
377	377
378	378	self::assertInstanceOf(DDC117Translation::class, $trans);
379	379	self::assertContainsOnly(DDC117Editor::class, $trans->reviewedByEditors);

		@@ -104,8 +104,8 @@
		block discarded – undo
104	104	$routeId = $this->createPersistedRouteWithLegs();
105	105
106	106	$route = $this->em->createQuery("SELECT r, l FROM Doctrine\Tests\Models\Routing\RoutingRoute r JOIN r.legs l WHERE r.id = ?1")
107		- ->setParameter(1, $routeId)
108		- ->getSingleResult();
	107	+ ->setParameter(1, $routeId)
	108	+ ->getSingleResult();
109	109
110	110	self::assertCount(2, $route->legs);
111	111	self::assertEquals('Berlin', $route->legs[0]->fromLocation->getName());

		@@ -1918,10 +1918,10 @@ discard block
		block discarded – undo
1918	1918	$rsm->setDiscriminatorColumn('c', 'c_discr');
1919	1919
1920	1920	$resultSet = [
1921		- [
1922		- 'c__id' => '1',
1923		- 'c_discr' => 'fix',
1924		- ],
	1921	+ [
	1922	+ 'c__id' => '1',
	1923	+ 'c_discr' => 'fix',
	1924	+ ],
1925	1925	];
1926	1926
1927	1927	$stmt = new HydratorMockStatement($resultSet);
		@@ -1950,12 +1950,12 @@ discard block
		block discarded – undo
1950	1950	$rsm->setDiscriminatorColumn('e', 'e_discr');
1951	1951
1952	1952	$resultSet = [
1953		- [
1954		- 'c__id' => '1',
1955		- 'c_discr' => 'fix',
1956		- 'e__id' => '1',
1957		- 'e__name' => 'Fabio B. Silva',
1958		- ],
	1953	+ [
	1954	+ 'c__id' => '1',
	1955	+ 'c_discr' => 'fix',
	1956	+ 'e__id' => '1',
	1957	+ 'e__name' => 'Fabio B. Silva',
	1958	+ ],
1959	1959	];
1960	1960
1961	1961	$stmt = new HydratorMockStatement($resultSet);
		@@ -1980,11 +1980,11 @@ discard block
		block discarded – undo
1980	1980	$rsm->setDiscriminatorColumn('p', 'discr');
1981	1981
1982	1982	$resultSet = [
1983		- [
1984		- 'p__id' => '1',
1985		- 'p__name' => 'Fabio B. Silva',
1986		- 'discr' => 'subworker',
1987		- ],
	1983	+ [
	1984	+ 'p__id' => '1',
	1985	+ 'p__name' => 'Fabio B. Silva',
	1986	+ 'discr' => 'subworker',
	1987	+ ],
1988	1988	];
1989	1989
1990	1990	$stmt = new HydratorMockStatement($resultSet);

		@@ -36,37 +36,37 @@
		block discarded – undo
36	36	$dql = "SELECT u FROM Doctrine\Tests\Models\Cms\CmsUser u";
37	37
38	38	$users = $this->em->createQuery($dql)
39		- ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
40		- ->getResult();
	39	+ ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
	40	+ ->getResult();
41	41
42	42	$c = $this->getCurrentQueryCount();
43	43	$users = $this->em->createQuery($dql)
44		- ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
45		- ->getResult();
	44	+ ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
	45	+ ->getResult();
46	46
47	47	self::assertEquals($c, $this->getCurrentQueryCount(), 'Should not execute query. Its cached!');
48	48
49	49	$users = $this->em->createQuery($dql)
50		- ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
51		- ->getArrayResult();
	50	+ ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
	51	+ ->getArrayResult();
52	52
53	53	self::assertEquals($c + 1, $this->getCurrentQueryCount(), 'Hydration is part of cache key.');
54	54
55	55	$users = $this->em->createQuery($dql)
56		- ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
57		- ->getArrayResult();
	56	+ ->setHydrationCacheProfile(new QueryCacheProfile(null, null, $cache))
	57	+ ->getArrayResult();
58	58
59	59	self::assertEquals($c + 1, $this->getCurrentQueryCount(), 'Hydration now cached');
60	60
61	61	$users = $this->em->createQuery($dql)
62		- ->setHydrationCacheProfile(new QueryCacheProfile(null, 'cachekey', $cache))
63		- ->getArrayResult();
	62	+ ->setHydrationCacheProfile(new QueryCacheProfile(null, 'cachekey', $cache))
	63	+ ->getArrayResult();
64	64
65	65	self::assertTrue($cache->contains('cachekey'), 'Explicit cache key');
66	66
67	67	$users = $this->em->createQuery($dql)
68		- ->setHydrationCacheProfile(new QueryCacheProfile(null, 'cachekey', $cache))
69		- ->getArrayResult();
	68	+ ->setHydrationCacheProfile(new QueryCacheProfile(null, 'cachekey', $cache))
	69	+ ->getArrayResult();
70	70	self::assertEquals($c + 2, $this->getCurrentQueryCount(), 'Hydration now cached');
71	71	}
72	72

		@@ -26,8 +26,8 @@
		block discarded – undo
26	26	{
27	27	$qb = $this->em->createQueryBuilder();
28	28	$qb->select('p', 'r')
29		- ->from(__NAMESPACE__ . '\DDC698Privilege', 'p')
30		- ->leftJoin('p.roles', 'r');
	29	+ ->from(__NAMESPACE__ . '\DDC698Privilege', 'p')
	30	+ ->leftJoin('p.roles', 'r');
31	31
32	32	self::assertSQLEquals(
33	33	'SELECT t0."privilegeID" AS c0, t0."name" AS c1, t1."roleID" AS c2, t1."name" AS c3, t1."shortName" AS c4 FROM "Privileges" t0 LEFT JOIN "RolePrivileges" t2 ON t0."privilegeID" = t2."privilegeID" LEFT JOIN "Roles" t1 ON t1."roleID" = t2."roleID"',

		@@ -74,7 +74,7 @@ discard block
		block discarded – undo
74	74	public function testIndexByJoin()
75	75	{
76	76	$dql = 'SELECT A, B FROM Doctrine\Tests\ORM\Functional\Ticket\DDC618Author A ' .
77		- 'INNER JOIN A.books B INDEX BY B.title ORDER BY A.name ASC';
	77	+ 'INNER JOIN A.books B INDEX BY B.title ORDER BY A.name ASC';
78	78	$result = $this->em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_OBJECT);
79	79
80	80	self::assertCount(3, $result[0]->books); // Alice, Joe doesn't appear because he has no books.
		@@ -98,14 +98,14 @@ discard block
		block discarded – undo
98	98	public function testIndexByToOneJoinSilentlyIgnored()
99	99	{
100	100	$dql = 'SELECT B, A FROM Doctrine\Tests\ORM\Functional\Ticket\DDC618Book B ' .
101		- 'INNER JOIN B.author A INDEX BY A.name ORDER BY A.name ASC';
	101	+ 'INNER JOIN B.author A INDEX BY A.name ORDER BY A.name ASC';
102	102	$result = $this->em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_OBJECT);
103	103
104	104	self::assertInstanceOf(DDC618Book::class, $result[0]);
105	105	self::assertInstanceOf(DDC618Author::class, $result[0]->author);
106	106
107	107	$dql = 'SELECT B, A FROM Doctrine\Tests\ORM\Functional\Ticket\DDC618Book B ' .
108		- 'INNER JOIN B.author A INDEX BY A.name ORDER BY A.name ASC';
	108	+ 'INNER JOIN B.author A INDEX BY A.name ORDER BY A.name ASC';
109	109	$result = $this->em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_ARRAY);
110	110
111	111	self::assertEquals('Alice', $result[0]['author']['name']);
		@@ -117,7 +117,7 @@ discard block
		block discarded – undo
117	117	public function testCombineIndexBy()
118	118	{
119	119	$dql = 'SELECT A, B FROM Doctrine\Tests\ORM\Functional\Ticket\DDC618Author A INDEX BY A.id ' .
120		- 'INNER JOIN A.books B INDEX BY B.title ORDER BY A.name ASC';
	120	+ 'INNER JOIN A.books B INDEX BY B.title ORDER BY A.name ASC';
121	121	$result = $this->em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_OBJECT);
122	122
123	123	self::assertArrayHasKey(11, $result); // Alice

		@@ -27,8 +27,8 @@ discard block
		block discarded – undo
27	27	public function testAggregateWithHavingClause()
28	28	{
29	29	$dql = 'SELECT p.department, AVG(p.salary) AS avgSalary ' .
30		- 'FROM Doctrine\Tests\Models\Company\CompanyEmployee p ' .
31		- 'GROUP BY p.department HAVING SUM(p.salary) > 200000 ORDER BY p.department';
	30	+ 'FROM Doctrine\Tests\Models\Company\CompanyEmployee p ' .
	31	+ 'GROUP BY p.department HAVING SUM(p.salary) > 200000 ORDER BY p.department';
32	32
33	33	$result = $this->em->createQuery($dql)->getScalarResult();
34	34
		@@ -42,8 +42,8 @@ discard block
		block discarded – undo
42	42	public function testUnnamedScalarResultsAreOneBased()
43	43	{
44	44	$dql = 'SELECT p.department, AVG(p.salary) ' .
45		- 'FROM Doctrine\Tests\Models\Company\CompanyEmployee p ' .
46		- 'GROUP BY p.department HAVING SUM(p.salary) > 200000 ORDER BY p.department';
	45	+ 'FROM Doctrine\Tests\Models\Company\CompanyEmployee p ' .
	46	+ 'GROUP BY p.department HAVING SUM(p.salary) > 200000 ORDER BY p.department';
47	47
48	48	$result = $this->em->createQuery($dql)->getScalarResult();
49	49
		@@ -55,9 +55,9 @@ discard block
		block discarded – undo
55	55	public function testOrderByResultVariableCollectionSize()
56	56	{
57	57	$dql = 'SELECT p.name, size(p.friends) AS friends ' .
58		- 'FROM Doctrine\Tests\Models\Company\CompanyPerson p ' .
59		- 'WHERE p.friends IS NOT EMPTY ' .
60		- 'ORDER BY friends DESC, p.name DESC';
	58	+ 'FROM Doctrine\Tests\Models\Company\CompanyPerson p ' .
	59	+ 'WHERE p.friends IS NOT EMPTY ' .
	60	+ 'ORDER BY friends DESC, p.name DESC';
61	61
62	62	$result = $this->em->createQuery($dql)->getScalarResult();
63	63
		@@ -79,7 +79,7 @@ discard block
		block discarded – undo
79	79	public function testIsNullAssociation()
80	80	{
81	81	$dql = 'SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p ' .
82		- 'WHERE p.spouse IS NULL';
	82	+ 'WHERE p.spouse IS NULL';
83	83	$result = $this->em->createQuery($dql)->getResult();
84	84
85	85	self::assertCount(2, $result);
		@@ -93,7 +93,7 @@ discard block
		block discarded – undo
93	93	public function testSelectSubselect()
94	94	{
95	95	$dql = 'SELECT p, (SELECT c.brand FROM Doctrine\Tests\Models\Company\CompanyCar c WHERE p.car = c) brandName ' .
96		- 'FROM Doctrine\Tests\Models\Company\CompanyManager p';
	96	+ 'FROM Doctrine\Tests\Models\Company\CompanyManager p';
97	97	$result = $this->em->createQuery($dql)->getArrayResult();
98	98
99	99	self::assertCount(1, $result);
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	public function testInSubselect()
104	104	{
105	105	$dql = "SELECT p.name FROM Doctrine\Tests\Models\Company\CompanyPerson p " .
106		- "WHERE p.name IN (SELECT n.name FROM Doctrine\Tests\Models\Company\CompanyPerson n WHERE n.name = 'Roman B.')";
	106	+ "WHERE p.name IN (SELECT n.name FROM Doctrine\Tests\Models\Company\CompanyPerson n WHERE n.name = 'Roman B.')";
107	107	$result = $this->em->createQuery($dql)->getScalarResult();
108	108
109	109	self::assertCount(1, $result);
		@@ -113,7 +113,7 @@ discard block
		block discarded – undo
113	113	public function testGroupByMultipleFields()
114	114	{
115	115	$dql = 'SELECT p.department, p.name, count(p.id) FROM Doctrine\Tests\Models\Company\CompanyEmployee p ' .
116		- 'GROUP BY p.department, p.name';
	116	+ 'GROUP BY p.department, p.name';
117	117	$result = $this->em->createQuery($dql)->getResult();
118	118
119	119	self::assertCount(4, $result);

		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25	public function testAggregateSum()
26	26	{
27	27	$salarySum = $this->em->createQuery('SELECT SUM(m.salary) AS salary FROM Doctrine\Tests\Models\Company\CompanyManager m')
28		- ->getSingleResult();
	28	+ ->getSingleResult();
29	29
30	30	self::assertEquals(1500000, $salarySum['salary']);
31	31	}
		@@ -33,7 +33,7 @@ discard block
		block discarded – undo
33	33	public function testAggregateAvg()
34	34	{
35	35	$salaryAvg = $this->em->createQuery('SELECT AVG(m.salary) AS salary FROM Doctrine\Tests\Models\Company\CompanyManager m')
36		- ->getSingleResult();
	36	+ ->getSingleResult();
37	37
38	38	self::assertEquals(375000, round($salaryAvg['salary'], 0));
39	39	}
		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	public function testAggregateMin()
42	42	{
43	43	$salary = $this->em->createQuery('SELECT MIN(m.salary) AS salary FROM Doctrine\Tests\Models\Company\CompanyManager m')
44		- ->getSingleResult();
	44	+ ->getSingleResult();
45	45
46	46	self::assertEquals(100000, $salary['salary']);
47	47	}
		@@ -49,7 +49,7 @@ discard block
		block discarded – undo
49	49	public function testAggregateMax()
50	50	{
51	51	$salary = $this->em->createQuery('SELECT MAX(m.salary) AS salary FROM Doctrine\Tests\Models\Company\CompanyManager m')
52		- ->getSingleResult();
	52	+ ->getSingleResult();
53	53
54	54	self::assertEquals(800000, $salary['salary']);
55	55	}
		@@ -57,7 +57,7 @@ discard block
		block discarded – undo
57	57	public function testAggregateCount()
58	58	{
59	59	$managerCount = $this->em->createQuery('SELECT COUNT(m.id) AS managers FROM Doctrine\Tests\Models\Company\CompanyManager m')
60		- ->getSingleResult();
	60	+ ->getSingleResult();
61	61
62	62	self::assertEquals(4, $managerCount['managers']);
63	63	}
		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65	public function testFunctionAbs()
66	66	{
67	67	$result = $this->em->createQuery('SELECT m, ABS(m.salary * -1) AS abs FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC')
68		- ->getResult();
	68	+ ->getResult();
69	69
70	70	self::assertCount(4, $result);
71	71	self::assertEquals(100000, $result[0]['abs']);
		@@ -77,7 +77,7 @@ discard block
		block discarded – undo
77	77	public function testFunctionConcat()
78	78	{
79	79	$arg = $this->em->createQuery('SELECT m, CONCAT(m.name, m.department) AS namedep FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC')
80		- ->getArrayResult();
	80	+ ->getArrayResult();
81	81
82	82	self::assertCount(4, $arg);
83	83	self::assertEquals('Roman B.IT', $arg[0]['namedep']);
		@@ -89,7 +89,7 @@ discard block
		block discarded – undo
89	89	public function testFunctionLength()
90	90	{
91	91	$result = $this->em->createQuery('SELECT m, LENGTH(CONCAT(m.name, m.department)) AS namedeplength FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC')
92		- ->getArrayResult();
	92	+ ->getArrayResult();
93	93
94	94	self::assertCount(4, $result);
95	95	self::assertEquals(10, $result[0]['namedeplength']);
		@@ -101,10 +101,10 @@ discard block
		block discarded – undo
101	101	public function testFunctionLocate()
102	102	{
103	103	$dql = "SELECT m, LOCATE('e', LOWER(m.name)) AS loc, LOCATE('e', LOWER(m.name), 7) AS loc2 " .
104		- "FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC";
	104	+ "FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC";
105	105
106	106	$result = $this->em->createQuery($dql)
107		- ->getArrayResult();
	107	+ ->getArrayResult();
108	108
109	109	self::assertCount(4, $result);
110	110	self::assertEquals(0, $result[0]['loc']);
		@@ -120,7 +120,7 @@ discard block
		block discarded – undo
120	120	public function testFunctionLower()
121	121	{
122	122	$result = $this->em->createQuery("SELECT m, LOWER(m.name) AS lowername FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC")
123		- ->getArrayResult();
	123	+ ->getArrayResult();
124	124
125	125	self::assertCount(4, $result);
126	126	self::assertEquals('roman b.', $result[0]['lowername']);
		@@ -132,7 +132,7 @@ discard block
		block discarded – undo
132	132	public function testFunctionMod()
133	133	{
134	134	$result = $this->em->createQuery("SELECT m, MOD(m.salary, 3500) AS amod FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC")
135		- ->getArrayResult();
	135	+ ->getArrayResult();
136	136
137	137	self::assertCount(4, $result);
138	138	self::assertEquals(2000, $result[0]['amod']);
		@@ -144,7 +144,7 @@ discard block
		block discarded – undo
144	144	public function testFunctionSqrt()
145	145	{
146	146	$result = $this->em->createQuery("SELECT m, SQRT(m.salary) AS sqrtsalary FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC")
147		- ->getArrayResult();
	147	+ ->getArrayResult();
148	148
149	149	self::assertCount(4, $result);
150	150	self::assertEquals(316, round($result[0]['sqrtsalary']));
		@@ -156,7 +156,7 @@ discard block
		block discarded – undo
156	156	public function testFunctionUpper()
157	157	{
158	158	$result = $this->em->createQuery("SELECT m, UPPER(m.name) AS uppername FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC")
159		- ->getArrayResult();
	159	+ ->getArrayResult();
160	160
161	161	self::assertCount(4, $result);
162	162	self::assertEquals('ROMAN B.', $result[0]['uppername']);
		@@ -171,7 +171,7 @@ discard block
		block discarded – undo
171	171	"FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.name";
172	172
173	173	$result = $this->em->createQuery($dql)
174		- ->getArrayResult();
	174	+ ->getArrayResult();
175	175
176	176	self::assertCount(4, $result);
177	177	self::assertEquals('Ben', $result[0]['str1']);
		@@ -188,8 +188,8 @@ discard block
		block discarded – undo
188	188	public function testFunctionTrim()
189	189	{
190	190	$dql = "SELECT m, TRIM(TRAILING '.' FROM m.name) AS str1, " .
191		- " TRIM(LEADING '.' FROM m.name) AS str2, TRIM(CONCAT(' ', CONCAT(m.name, ' '))) AS str3 " .
192		- "FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC";
	191	+ " TRIM(LEADING '.' FROM m.name) AS str2, TRIM(CONCAT(' ', CONCAT(m.name, ' '))) AS str3 " .
	192	+ "FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC";
193	193
194	194	$result = $this->em->createQuery($dql)->getArrayResult();
195	195
		@@ -330,8 +330,8 @@ discard block
		block discarded – undo
330	330	);
331	331
332	332	$result = $this->em->createQuery($query)
333		- ->setMaxResults(1)
334		- ->getSingleResult(AbstractQuery::HYDRATE_ARRAY);
	333	+ ->setMaxResults(1)
	334	+ ->getSingleResult(AbstractQuery::HYDRATE_ARRAY);
335	335
336	336	self::assertArrayHasKey('now', $result);
337	337	self::assertArrayHasKey('sub', $result);

		@@ -33,10 +33,10 @@ discard block
		block discarded – undo
33	33	$rsm->setDiscriminatorColumn('p', 'discr');
34	34
35	35	$resultSet = [
36		- [
37		- 'u__id' => '1',
38		- 'u__name' => 'Fabio B. Silva',
39		- ],
	36	+ [
	37	+ 'u__id' => '1',
	38	+ 'u__name' => 'Fabio B. Silva',
	39	+ ],
40	40	];
41	41
42	42	$stmt = new HydratorMockStatement($resultSet);
		@@ -89,11 +89,11 @@ discard block
		block discarded – undo
89	89	$rsm->setDiscriminatorColumn('p', 'discr');
90	90
91	91	$resultSet = [
92		- [
93		- 'p__id' => '1',
94		- 'p__name' => 'Fabio B. Silva',
95		- 'discr' => 'subworker',
96		- ],
	92	+ [
	93	+ 'p__id' => '1',
	94	+ 'p__name' => 'Fabio B. Silva',
	95	+ 'discr' => 'subworker',
	96	+ ],
97	97	];
98	98
99	99	$stmt = new HydratorMockStatement($resultSet);

doctrine / orm

Pull Request — master (#7046)

Status

Category

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +19 added lines, -19 removed lines patch added patch discarded remove patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch