@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\Cache\ArrayCache; |
6 | 6 | use Doctrine\DBAL\Driver\Connection; |
7 | -use Doctrine\DBAL\Driver\PDOSqlite\Driver as SqliteDriver; |
|
8 | 7 | use Doctrine\DBAL\Logging\DebugStack; |
9 | 8 | use Doctrine\DBAL\Types\Type; |
10 | 9 | use Doctrine\ORM\Cache\CacheConfiguration; |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | $conn->executeUpdate('DELETE FROM RoutingLocation'); |
400 | 400 | } |
401 | 401 | |
402 | - if(isset($this->_usedModelSets['navigation'])) { |
|
402 | + if (isset($this->_usedModelSets['navigation'])) { |
|
403 | 403 | $conn->executeUpdate('DELETE FROM navigation_tour_pois'); |
404 | 404 | $conn->executeUpdate('DELETE FROM navigation_photos'); |
405 | 405 | $conn->executeUpdate('DELETE FROM navigation_pois'); |
@@ -407,7 +407,7 @@ discard block |
||
407 | 407 | $conn->executeUpdate('DELETE FROM navigation_countries'); |
408 | 408 | } |
409 | 409 | if (isset($this->_usedModelSets['directorytree'])) { |
410 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("file")); |
|
410 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("file")); |
|
411 | 411 | // MySQL doesn't know deferred deletions therefore only executing the second query gives errors. |
412 | 412 | $conn->executeUpdate('DELETE FROM Directory WHERE parentDirectory_id IS NOT NULL'); |
413 | 413 | $conn->executeUpdate('DELETE FROM Directory'); |
@@ -497,12 +497,12 @@ discard block |
||
497 | 497 | ) |
498 | 498 | ); |
499 | 499 | |
500 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-users-groups')); |
|
501 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-group')); |
|
502 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-phone')); |
|
503 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-user')); |
|
504 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-address')); |
|
505 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-city')); |
|
500 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-users-groups')); |
|
501 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-group')); |
|
502 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-phone')); |
|
503 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-user')); |
|
504 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-address')); |
|
505 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-city')); |
|
506 | 506 | } |
507 | 507 | |
508 | 508 | if (isset($this->_usedModelSets['vct_onetoone'])) { |
@@ -641,9 +641,9 @@ discard block |
||
641 | 641 | |
642 | 642 | if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) { |
643 | 643 | if (in_array(static::$_sharedConn->getDatabasePlatform()->getName(), ["mysql", "postgresql"])) { |
644 | - static::$_sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/'); |
|
644 | + static::$_sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/'); |
|
645 | 645 | } else if (static::$_sharedConn->getDatabasePlatform()->getName() == "oracle") { |
646 | - static::$_sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/ FROM dual'); |
|
646 | + static::$_sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/ FROM dual'); |
|
647 | 647 | } |
648 | 648 | } |
649 | 649 | |
@@ -702,7 +702,7 @@ discard block |
||
702 | 702 | $config = new Configuration(); |
703 | 703 | $config->setMetadataCacheImpl(self::$_metadataCacheImpl); |
704 | 704 | $config->setQueryCacheImpl(self::$_queryCacheImpl); |
705 | - $config->setProxyDir(__DIR__ . '/Proxies'); |
|
705 | + $config->setProxyDir(__DIR__.'/Proxies'); |
|
706 | 706 | $config->setProxyNamespace('Doctrine\Tests\Proxies'); |
707 | 707 | |
708 | 708 | if (null !== $this->resultCacheImpl) { |
@@ -734,8 +734,8 @@ discard block |
||
734 | 734 | $config->setMetadataDriverImpl( |
735 | 735 | $config->newDefaultAnnotationDriver( |
736 | 736 | [ |
737 | - realpath(__DIR__ . '/Models/Cache'), |
|
738 | - realpath(__DIR__ . '/Models/GeoNames') |
|
737 | + realpath(__DIR__.'/Models/Cache'), |
|
738 | + realpath(__DIR__.'/Models/GeoNames') |
|
739 | 739 | ], |
740 | 740 | true |
741 | 741 | ) |
@@ -783,7 +783,7 @@ discard block |
||
783 | 783 | throw $e; |
784 | 784 | } |
785 | 785 | |
786 | - if(isset($this->_sqlLoggerStack->queries) && count($this->_sqlLoggerStack->queries)) { |
|
786 | + if (isset($this->_sqlLoggerStack->queries) && count($this->_sqlLoggerStack->queries)) { |
|
787 | 787 | $queries = ""; |
788 | 788 | $last25queries = array_slice(array_reverse($this->_sqlLoggerStack->queries, true), 0, 25, true); |
789 | 789 | foreach ($last25queries as $i => $query) { |
@@ -794,9 +794,9 @@ discard block |
||
794 | 794 | |
795 | 795 | $trace = $e->getTrace(); |
796 | 796 | $traceMsg = ""; |
797 | - foreach($trace AS $part) { |
|
798 | - if(isset($part['file'])) { |
|
799 | - if(strpos($part['file'], "PHPUnit/") !== false) { |
|
797 | + foreach ($trace AS $part) { |
|
798 | + if (isset($part['file'])) { |
|
799 | + if (strpos($part['file'], "PHPUnit/") !== false) { |
|
800 | 800 | // Beginning with PHPUnit files we don't print the trace anymore. |
801 | 801 | break; |
802 | 802 | } |
@@ -807,7 +807,7 @@ discard block |
||
807 | 807 | |
808 | 808 | $message = "[".get_class($e)."] ".$e->getMessage().PHP_EOL.PHP_EOL."With queries:".PHP_EOL.$queries.PHP_EOL."Trace:".PHP_EOL.$traceMsg; |
809 | 809 | |
810 | - throw new \Exception($message, (int)$e->getCode(), $e); |
|
810 | + throw new \Exception($message, (int) $e->getCode(), $e); |
|
811 | 811 | } |
812 | 812 | throw $e; |
813 | 813 | } |
@@ -787,7 +787,12 @@ |
||
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 | } |
@@ -25,13 +25,13 @@ |
||
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 |
@@ -21,8 +21,8 @@ discard block |
||
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 |
||
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 |
||
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 |
@@ -7,21 +7,21 @@ |
||
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 |
@@ -46,7 +46,9 @@ |
||
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 | } |
@@ -95,7 +95,7 @@ |
||
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 | } |
@@ -35,7 +35,7 @@ |
||
35 | 35 | /** |
36 | 36 | * {@inheritdoc} |
37 | 37 | */ |
38 | - public function errorInfo(){} |
|
38 | + public function errorInfo() {} |
|
39 | 39 | |
40 | 40 | /** |
41 | 41 | * {@inheritdoc} |
@@ -49,7 +49,7 @@ |
||
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 |
@@ -70,7 +70,7 @@ |
||
70 | 70 | { |
71 | 71 | if (null === $config) { |
72 | 72 | $config = new Configuration(); |
73 | - $config->setProxyDir(__DIR__ . '/../Proxies'); |
|
73 | + $config->setProxyDir(__DIR__.'/../Proxies'); |
|
74 | 74 | $config->setProxyNamespace('Doctrine\Tests\Proxies'); |
75 | 75 | $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver([], true)); |
76 | 76 | } |