Completed
Pull Request — master (#7046)
by Gabriel
13:08
created
Hydration/MixedQueryFetchJoinFullObjectHydrationPerformanceBench.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Performance\Hydration;
6 6
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
                 'u__status'      => 'developer',
55 55
                 'u__username'    => 'jwage',
56 56
                 'u__name'        => 'Jonathan',
57
-                'sclr0'          => 'JWAGE' . $i,
57
+                'sclr0'          => 'JWAGE'.$i,
58 58
                 'p__phonenumber' => '91',
59 59
                 'a__id'          => $i,
60 60
             ];
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\ORM\Mapping;
6 6
 
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 {
20 20
     protected function loadDriver()
21 21
     {
22
-        return new XmlDriver(__DIR__ . DIRECTORY_SEPARATOR . 'xml');
22
+        return new XmlDriver(__DIR__.DIRECTORY_SEPARATOR.'xml');
23 23
     }
24 24
 
25 25
     public function testClassTableInheritanceDiscriminatorMap()
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
      */
163 163
     public function testValidateXmlSchema($xmlMappingFile)
164 164
     {
165
-        $xsdSchemaFile  = __DIR__ . '/../../../../../doctrine-mapping.xsd';
165
+        $xsdSchemaFile  = __DIR__.'/../../../../../doctrine-mapping.xsd';
166 166
         $dom            = new \DOMDocument('UTF-8');
167 167
 
168 168
         $dom->load($xmlMappingFile);
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 
173 173
     public static function dataValidSchema()
174 174
     {
175
-        $list    = glob(__DIR__ . '/xml/*.xml');
175
+        $list    = glob(__DIR__.'/xml/*.xml');
176 176
         $invalid = ['Doctrine.Tests.Models.DDC889.DDC889Class.dcm'];
177 177
 
178 178
         $list = array_filter($list, function($item) use ($invalid) {
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -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"',
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\ORM\Functional\Ticket;
6 6
 
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
     {
27 27
         $qb = $this->em->createQueryBuilder();
28 28
         $qb->select('p', 'r')
29
-           ->from(__NAMESPACE__ . '\DDC698Privilege', 'p')
29
+           ->from(__NAMESPACE__.'\DDC698Privilege', 'p')
30 30
            ->leftJoin('p.roles', 'r');
31 31
 
32 32
         self::assertSQLEquals(
Please login to merge, or discard this patch.
tests/Doctrine/Tests/Models/ManyToManyPersister/OtherParentClass.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\Models\ManyToManyPersister;
6 6
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/Models/ManyToManyPersister/ChildClass.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\Models\ManyToManyPersister;
6 6
 
Please login to merge, or discard this patch.
Performance/Hydration/MixedQueryFetchJoinArrayHydrationPerformanceBench.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Performance\Hydration;
6 6
 
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
                 'u__status'      => 'developer',
70 70
                 'u__username'    => 'jwage',
71 71
                 'u__name'        => 'Jonathan',
72
-                'sclr0'          => 'JWAGE' . $i,
72
+                'sclr0'          => 'JWAGE'.$i,
73 73
                 'p__phonenumber' => '91',
74 74
             ];
75 75
         }
Please login to merge, or discard this patch.
tests/Doctrine/Tests/Models/DDC3597/Embeddable/DDC3597Dimension.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\Models\DDC3597\Embeddable;
6 6
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/TestInit.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -3,27 +3,27 @@
 block discarded – undo
3 3
 /*
4 4
  * This file bootstraps the test environment.
5 5
  */
6
-declare(strict_types=1);
6
+declare(strict_types = 1);
7 7
 
8 8
 namespace Doctrine\Tests;
9 9
 
10 10
 error_reporting(E_ALL | E_STRICT);
11 11
 date_default_timezone_set('UTC');
12 12
 
13
-if (file_exists(__DIR__ . '/../../../vendor/autoload.php')) {
13
+if (file_exists(__DIR__.'/../../../vendor/autoload.php')) {
14 14
     // dependencies were installed via composer - this is the main project
15
-    require __DIR__ . '/../../../vendor/autoload.php';
16
-} elseif (file_exists(__DIR__ . '/../../../../../autoload.php')) {
15
+    require __DIR__.'/../../../vendor/autoload.php';
16
+} elseif (file_exists(__DIR__.'/../../../../../autoload.php')) {
17 17
     // installed as a dependency in `vendor`
18
-    require __DIR__ . '/../../../../../autoload.php';
18
+    require __DIR__.'/../../../../../autoload.php';
19 19
 } else {
20 20
     throw new \Exception('Can\'t find autoload.php. Did you install dependencies via composer?');
21 21
 }
22 22
 
23
-if (! file_exists(__DIR__ . '/Proxies') && ! mkdir(__DIR__ . '/Proxies')) {
24
-    throw new \Exception('Could not create ' . __DIR__ . '/Proxies Folder.');
23
+if ( ! file_exists(__DIR__.'/Proxies') && ! mkdir(__DIR__.'/Proxies')) {
24
+    throw new \Exception('Could not create '.__DIR__.'/Proxies Folder.');
25 25
 }
26 26
 
27
-if (! file_exists(__DIR__ . '/ORM/Proxy/generated') && ! mkdir(__DIR__ . '/ORM/Proxy/generated')) {
28
-    throw new \Exception('Could not create ' . __DIR__ . '/ORM/Proxy/generated Folder.');
27
+if ( ! file_exists(__DIR__.'/ORM/Proxy/generated') && ! mkdir(__DIR__.'/ORM/Proxy/generated')) {
28
+    throw new \Exception('Could not create '.__DIR__.'/ORM/Proxy/generated Folder.');
29 29
 }
Please login to merge, or discard this patch.
tests/Doctrine/Tests/OrmFunctionalTestCase.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests;
6 6
 
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
         $conn = static::$sharedConn;
337 337
 
338 338
         // In case test is skipped, tearDown is called, but no setup may have run
339
-        if (! $conn) {
339
+        if ( ! $conn) {
340 340
             return;
341 341
         }
342 342
 
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
         }
411 411
 
412 412
         if (isset($this->usedModelSets['directorytree'])) {
413
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('file'));
413
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('file'));
414 414
             // MySQL doesn't know deferred deletions therefore only executing the second query gives errors.
415 415
             $conn->executeUpdate('DELETE FROM Directory WHERE parentDirectory_id IS NOT NULL');
416 416
             $conn->executeUpdate('DELETE FROM Directory');
@@ -503,12 +503,12 @@  discard block
 block discarded – undo
503 503
                 )
504 504
             );
505 505
 
506
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-users-groups'));
507
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-group'));
508
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-phone'));
509
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-user'));
510
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-address'));
511
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-city'));
506
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-users-groups'));
507
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-group'));
508
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-phone'));
509
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-user'));
510
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-address'));
511
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-city'));
512 512
         }
513 513
 
514 514
         if (isset($this->usedModelSets['vct_onetoone'])) {
@@ -622,7 +622,7 @@  discard block
 block discarded – undo
622 622
         $classes = [];
623 623
 
624 624
         foreach ($classNames as $className) {
625
-            if (! isset(static::$entityTablesCreated[$className])) {
625
+            if ( ! isset(static::$entityTablesCreated[$className])) {
626 626
                 static::$entityTablesCreated[$className] = true;
627 627
                 $classes[] = $this->em->getClassMetadata($className);
628 628
             }
@@ -643,25 +643,25 @@  discard block
 block discarded – undo
643 643
     {
644 644
         $this->setUpDBALTypes();
645 645
 
646
-        if (! isset(static::$sharedConn)) {
646
+        if ( ! isset(static::$sharedConn)) {
647 647
             static::$sharedConn = TestUtil::getConnection();
648 648
         }
649 649
 
650 650
         if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) {
651 651
             if (in_array(static::$sharedConn->getDatabasePlatform()->getName(), ['mysql', 'postgresql'], true)) {
652
-                static::$sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/');
652
+                static::$sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/');
653 653
             } elseif (static::$sharedConn->getDatabasePlatform()->getName() === 'oracle') {
654
-                static::$sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/ FROM dual');
654
+                static::$sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/ FROM dual');
655 655
             }
656 656
         }
657 657
 
658
-        if (! $this->em) {
658
+        if ( ! $this->em) {
659 659
             $this->em = $this->getEntityManager();
660 660
             $this->schemaTool = new SchemaTool($this->em);
661 661
         }
662 662
 
663 663
         foreach ($this->usedModelSets as $setName => $bool) {
664
-            if (! isset(static::$tablesCreated[$setName])) {
664
+            if ( ! isset(static::$tablesCreated[$setName])) {
665 665
                 $this->setUpEntitySchema(static::$modelSets[$setName]);
666 666
 
667 667
                 static::$tablesCreated[$setName] = true;
@@ -736,8 +736,8 @@  discard block
 block discarded – undo
736 736
 
737 737
         $config->setMetadataDriverImpl(
738 738
             $mappingDriver ?? $config->newDefaultAnnotationDriver([
739
-                realpath(__DIR__ . '/Models/Cache'),
740
-                realpath(__DIR__ . '/Models/GeoNames'),
739
+                realpath(__DIR__.'/Models/Cache'),
740
+                realpath(__DIR__.'/Models/GeoNames'),
741 741
             ])
742 742
         );
743 743
 
@@ -795,7 +795,7 @@  discard block
 block discarded – undo
795 795
                     $query['params'] ?: []
796 796
                 );
797 797
 
798
-                $queries .= $i . ". SQL: '" . $query['sql'] . "' Params: " . implode(', ', $params) . PHP_EOL;
798
+                $queries .= $i.". SQL: '".$query['sql']."' Params: ".implode(', ', $params).PHP_EOL;
799 799
             }
800 800
 
801 801
             $trace = $e->getTrace();
@@ -808,11 +808,11 @@  discard block
 block discarded – undo
808 808
                         break;
809 809
                     }
810 810
 
811
-                    $traceMsg .= $part['file'] . ':' . $part['line'] . PHP_EOL;
811
+                    $traceMsg .= $part['file'].':'.$part['line'].PHP_EOL;
812 812
                 }
813 813
             }
814 814
 
815
-            $message = '[' . get_class($e) . '] ' . $e->getMessage() . PHP_EOL . PHP_EOL . 'With queries:' . PHP_EOL . $queries . PHP_EOL . 'Trace:' . PHP_EOL . $traceMsg;
815
+            $message = '['.get_class($e).'] '.$e->getMessage().PHP_EOL.PHP_EOL.'With queries:'.PHP_EOL.$queries.PHP_EOL.'Trace:'.PHP_EOL.$traceMsg;
816 816
 
817 817
             throw new \Exception($message, (int) $e->getCode(), $e);
818 818
         }
Please login to merge, or discard this patch.