Completed
Pull Request — 2.6 (#8015)
by
unknown
06:46
created
bin/doctrine-pear.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,13 +25,13 @@
 block discarded – undo
25 25
 $classLoader = new \Doctrine\Common\ClassLoader('Symfony');
26 26
 $classLoader->register();
27 27
 
28
-$configFile = getcwd() . DIRECTORY_SEPARATOR . 'cli-config.php';
28
+$configFile = getcwd().DIRECTORY_SEPARATOR.'cli-config.php';
29 29
 
30 30
 $helperSet = null;
31 31
 if (file_exists($configFile)) {
32 32
     if ( ! is_readable($configFile)) {
33 33
         trigger_error(
34
-            'Configuration file [' . $configFile . '] does not have read permission.', E_USER_ERROR
34
+            'Configuration file ['.$configFile.'] does not have read permission.', E_USER_ERROR
35 35
         );
36 36
     }
37 37
 
Please login to merge, or discard this patch.
bin/doctrine.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@  discard block
 block discarded – undo
21 21
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
22 22
 
23 23
 $autoloadFiles = [
24
-    __DIR__ . '/../vendor/autoload.php',
25
-    __DIR__ . '/../../../autoload.php'
24
+    __DIR__.'/../vendor/autoload.php',
25
+    __DIR__.'/../../../autoload.php'
26 26
 ];
27 27
 
28 28
 foreach ($autoloadFiles as $autoloadFile) {
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
     }
33 33
 }
34 34
 
35
-$directories = [getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config'];
35
+$directories = [getcwd(), getcwd().DIRECTORY_SEPARATOR.'config'];
36 36
 
37 37
 $configFile = null;
38 38
 foreach ($directories as $directory) {
39
-    $configFile = $directory . DIRECTORY_SEPARATOR . 'cli-config.php';
39
+    $configFile = $directory.DIRECTORY_SEPARATOR.'cli-config.php';
40 40
 
41 41
     if (file_exists($configFile)) {
42 42
         break;
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 }
50 50
 
51 51
 if ( ! is_readable($configFile)) {
52
-    echo 'Configuration file [' . $configFile . '] does not have read permission.' . "\n";
52
+    echo 'Configuration file ['.$configFile.'] does not have read permission.'."\n";
53 53
     exit(1);
54 54
 }
55 55
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/OrmFunctionalTestCase.php 2 patches
Braces   +6 added lines, -1 removed lines patch added patch discarded remove patch
@@ -787,7 +787,12 @@
 block discarded – undo
787 787
             $queries = "";
788 788
             $last25queries = array_slice(array_reverse($this->_sqlLoggerStack->queries, true), 0, 25, true);
789 789
             foreach ($last25queries as $i => $query) {
790
-                $params = array_map(function($p) { if (is_object($p)) return get_class($p); else return var_export($p, true); }, $query['params'] ?: []
790
+                $params = array_map(function($p) { if (is_object($p)) {
791
+                    return get_class($p);
792
+                } else {
793
+                    return var_export($p, true);
794
+                }
795
+                }, $query['params'] ?: []
791 796
                 );
792 797
                 $queries .= $i.". SQL: '".$query['sql']."' Params: ".implode(", ", $params).PHP_EOL;
793 798
             }
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
             $conn->executeUpdate('DELETE FROM RoutingLocation');
401 401
         }
402 402
 
403
-        if(isset($this->_usedModelSets['navigation'])) {
403
+        if (isset($this->_usedModelSets['navigation'])) {
404 404
             $conn->executeUpdate('DELETE FROM navigation_tour_pois');
405 405
             $conn->executeUpdate('DELETE FROM navigation_photos');
406 406
             $conn->executeUpdate('DELETE FROM navigation_pois');
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
             $conn->executeUpdate('DELETE FROM navigation_countries');
409 409
         }
410 410
         if (isset($this->_usedModelSets['directorytree'])) {
411
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("file"));
411
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("file"));
412 412
             // MySQL doesn't know deferred deletions therefore only executing the second query gives errors.
413 413
             $conn->executeUpdate('DELETE FROM Directory WHERE parentDirectory_id IS NOT NULL');
414 414
             $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'])) {
@@ -647,9 +647,9 @@  discard block
 block discarded – undo
647 647
 
648 648
         if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) {
649 649
             if (in_array(static::$_sharedConn->getDatabasePlatform()->getName(), ["mysql", "postgresql"])) {
650
-                static::$_sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/');
650
+                static::$_sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/');
651 651
             } else if (static::$_sharedConn->getDatabasePlatform()->getName() == "oracle") {
652
-                static::$_sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/ FROM dual');
652
+                static::$_sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/ FROM dual');
653 653
             }
654 654
         }
655 655
 
@@ -711,7 +711,7 @@  discard block
 block discarded – undo
711 711
         $config = new Configuration();
712 712
         $config->setMetadataCacheImpl(self::$_metadataCacheImpl);
713 713
         $config->setQueryCacheImpl(self::$_queryCacheImpl);
714
-        $config->setProxyDir(__DIR__ . '/Proxies');
714
+        $config->setProxyDir(__DIR__.'/Proxies');
715 715
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
716 716
 
717 717
         if (null !== $this->resultCacheImpl) {
@@ -743,8 +743,8 @@  discard block
 block discarded – undo
743 743
         $config->setMetadataDriverImpl(
744 744
             $mappingDriver ?? $config->newDefaultAnnotationDriver(
745 745
                 [
746
-                    realpath(__DIR__ . '/Models/Cache'),
747
-                    realpath(__DIR__ . '/Models/GeoNames')
746
+                    realpath(__DIR__.'/Models/Cache'),
747
+                    realpath(__DIR__.'/Models/GeoNames')
748 748
                 ],
749 749
                 true
750 750
             )
@@ -792,7 +792,7 @@  discard block
 block discarded – undo
792 792
             throw $e;
793 793
         }
794 794
 
795
-        if(isset($this->_sqlLoggerStack->queries) && count($this->_sqlLoggerStack->queries)) {
795
+        if (isset($this->_sqlLoggerStack->queries) && count($this->_sqlLoggerStack->queries)) {
796 796
             $queries = "";
797 797
             $last25queries = array_slice(array_reverse($this->_sqlLoggerStack->queries, true), 0, 25, true);
798 798
             foreach ($last25queries as $i => $query) {
@@ -803,9 +803,9 @@  discard block
 block discarded – undo
803 803
 
804 804
             $trace = $e->getTrace();
805 805
             $traceMsg = "";
806
-            foreach($trace AS $part) {
807
-                if(isset($part['file'])) {
808
-                    if(strpos($part['file'], "PHPUnit/") !== false) {
806
+            foreach ($trace AS $part) {
807
+                if (isset($part['file'])) {
808
+                    if (strpos($part['file'], "PHPUnit/") !== false) {
809 809
                         // Beginning with PHPUnit files we don't print the trace anymore.
810 810
                         break;
811 811
                     }
@@ -816,7 +816,7 @@  discard block
 block discarded – undo
816 816
 
817 817
             $message = "[".get_class($e)."] ".$e->getMessage().PHP_EOL.PHP_EOL."With queries:".PHP_EOL.$queries.PHP_EOL."Trace:".PHP_EOL.$traceMsg;
818 818
 
819
-            throw new \Exception($message, (int)$e->getCode(), $e);
819
+            throw new \Exception($message, (int) $e->getCode(), $e);
820 820
         }
821 821
         throw $e;
822 822
     }
Please login to merge, or discard this patch.
tests/Doctrine/Tests/TestInit.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -7,21 +7,21 @@
 block discarded – undo
7 7
 error_reporting(E_ALL | E_STRICT);
8 8
 date_default_timezone_set('UTC');
9 9
 
10
-if (file_exists(__DIR__ . '/../../../vendor/autoload.php')) {
10
+if (file_exists(__DIR__.'/../../../vendor/autoload.php')) {
11 11
     // dependencies were installed via composer - this is the main project
12
-    require __DIR__ . '/../../../vendor/autoload.php';
13
-} elseif (file_exists(__DIR__ . '/../../../../../autoload.php')) {
12
+    require __DIR__.'/../../../vendor/autoload.php';
13
+} elseif (file_exists(__DIR__.'/../../../../../autoload.php')) {
14 14
     // installed as a dependency in `vendor`
15
-    require __DIR__ . '/../../../../../autoload.php';
15
+    require __DIR__.'/../../../../../autoload.php';
16 16
 } else {
17 17
     throw new \Exception('Can\'t find autoload.php. Did you install dependencies via composer?');
18 18
 }
19 19
 
20
-if ( ! file_exists(__DIR__ . '/Proxies') && ! mkdir(__DIR__ . '/Proxies')) {
21
-    throw new \Exception("Could not create " . __DIR__."/Proxies Folder.");
20
+if ( ! file_exists(__DIR__.'/Proxies') && ! mkdir(__DIR__.'/Proxies')) {
21
+    throw new \Exception("Could not create ".__DIR__."/Proxies Folder.");
22 22
 }
23 23
 
24
-if ( ! file_exists(__DIR__ . '/ORM/Proxy/generated') &&  ! mkdir(__DIR__ . '/ORM/Proxy/generated')) {
25
-    throw new \Exception('Could not create ' . __DIR__ . '/ORM/Proxy/generated Folder.');
24
+if ( ! file_exists(__DIR__.'/ORM/Proxy/generated') && ! mkdir(__DIR__.'/ORM/Proxy/generated')) {
25
+    throw new \Exception('Could not create '.__DIR__.'/ORM/Proxy/generated Folder.');
26 26
 }
27 27
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/OrmTestCase.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
             }
97 97
         }
98 98
 
99
-        Annotations\AnnotationRegistry::registerFile(__DIR__ . "/../../../lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php");
99
+        Annotations\AnnotationRegistry::registerFile(__DIR__."/../../../lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php");
100 100
 
101 101
         return new AnnotationDriver($reader, (array) $paths);
102 102
     }
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
127 127
         $config->setMetadataCacheImpl($metadataCache);
128 128
         $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver([], true));
129 129
         $config->setQueryCacheImpl(self::getSharedQueryCacheImpl());
130
-        $config->setProxyDir(__DIR__ . '/Proxies');
130
+        $config->setProxyDir(__DIR__.'/Proxies');
131 131
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
132 132
         $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(
133 133
             [
134
-            realpath(__DIR__ . '/Models/Cache')
134
+            realpath(__DIR__.'/Models/Cache')
135 135
             ], true));
136 136
 
137 137
         if ($this->isSecondLevelCacheEnabled) {
Please login to merge, or discard this patch.
tests/Doctrine/Tests/Mocks/HydratorMockStatement.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,9 @@
 block discarded – undo
46 46
     public function fetchColumn($columnNumber = 0)
47 47
     {
48 48
         $row = current($this->_resultSet);
49
-        if ( ! is_array($row)) return false;
49
+        if ( ! is_array($row)) {
50
+            return false;
51
+        }
50 52
         $val = array_shift($row);
51 53
         return $val !== null ? $val : false;
52 54
     }
Please login to merge, or discard this patch.
tests/Doctrine/Tests/Mocks/ConnectionMock.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
     public function quote($input, $type = null)
96 96
     {
97 97
         if (is_string($input)) {
98
-            return "'" . $input . "'";
98
+            return "'".$input."'";
99 99
         }
100 100
         return $input;
101 101
     }
Please login to merge, or discard this patch.
tests/Doctrine/Tests/Mocks/StatementMock.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
     /**
36 36
      * {@inheritdoc}
37 37
      */
38
-    public function errorInfo(){}
38
+    public function errorInfo() {}
39 39
 
40 40
     /**
41 41
      * {@inheritdoc}
Please login to merge, or discard this patch.
tests/Doctrine/Tests/Mocks/DriverConnectionMock.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
     /**
50 50
      * {@inheritdoc}
51 51
      */
52
-    public function quote($input, $type=\PDO::PARAM_STR)
52
+    public function quote($input, $type = \PDO::PARAM_STR)
53 53
     {
54 54
     }
55 55
 
Please login to merge, or discard this patch.