@@ -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 | } |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | $this->_em->flush(); |
| 174 | 174 | $this->_em->detach($user); |
| 175 | 175 | |
| 176 | - $dql = 'SELECT u FROM ' . CmsUser::class . ' u WHERE u.id = ?1'; |
|
| 176 | + $dql = 'SELECT u FROM '.CmsUser::class.' u WHERE u.id = ?1'; |
|
| 177 | 177 | $query = $this->_em->createQuery($dql); |
| 178 | 178 | $query->setParameter(1, $user); |
| 179 | 179 | |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | |
| 217 | 217 | $this->_em->detach($article); |
| 218 | 218 | |
| 219 | - $sql = 'UPDATE cms_articles SET version = version + 1 WHERE id = ' . $article->id; |
|
| 219 | + $sql = 'UPDATE cms_articles SET version = version + 1 WHERE id = '.$article->id; |
|
| 220 | 220 | $this->_em->getConnection()->executeUpdate($sql); |
| 221 | 221 | |
| 222 | 222 | $this->expectException(OptimisticLockException::class); |