@@ -63,8 +63,7 @@ discard block |
||
| 63 | 63 | try |
| 64 | 64 | { |
| 65 | 65 | $this->analytics->sendPageview(); |
| 66 | - } |
|
| 67 | - catch (\Exception $e) |
|
| 66 | + } catch (\Exception $e) |
|
| 68 | 67 | { |
| 69 | 68 | // Log the error for reference |
| 70 | 69 | $this->getLogger()->error( |
@@ -77,8 +76,7 @@ discard block |
||
| 77 | 76 | try |
| 78 | 77 | { |
| 79 | 78 | $this->router->getController($this->get('uri.route'))->execute(); |
| 80 | - } |
|
| 81 | - catch (\Throwable $e) |
|
| 79 | + } catch (\Throwable $e) |
|
| 82 | 80 | { |
| 83 | 81 | // Log the error for reference |
| 84 | 82 | $this->getLogger()->error( |
@@ -89,11 +89,11 @@ |
||
| 89 | 89 | public function outputTitle(string $title, string $subTitle = '', int $width = 60) : CliApplication |
| 90 | 90 | { |
| 91 | 91 | $this->out(str_repeat('-', $width)); |
| 92 | - $this->out(str_repeat(' ', $width / 2 - (strlen($title) / 2)) . '<title>' . $title . '</title>'); |
|
| 92 | + $this->out(str_repeat(' ', $width / 2 - (strlen($title) / 2)).'<title>'.$title.'</title>'); |
|
| 93 | 93 | |
| 94 | 94 | if ($subTitle) |
| 95 | 95 | { |
| 96 | - $this->out(str_repeat(' ', $width / 2 - (strlen($subTitle) / 2)) . '<b>' . $subTitle . '</b>'); |
|
| 96 | + $this->out(str_repeat(' ', $width / 2 - (strlen($subTitle) / 2)).'<b>'.$subTitle.'</b>'); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | $this->out(str_repeat('-', $width)); |
@@ -33,10 +33,10 @@ |
||
| 33 | 33 | /** |
| 34 | 34 | * CliApplication constructor. |
| 35 | 35 | * |
| 36 | - * @param Input\Cli $input The application's input object. |
|
| 36 | + * @param Cli $input The application's input object. |
|
| 37 | 37 | * @param Registry $config The application's configuration. |
| 38 | - * @param CliOutput $output The application's output object. |
|
| 39 | - * @param CliInput $cliInput The application's CLI input handler. |
|
| 38 | + * @param \Joomla\Application\Cli\CliOutput $output The application's output object. |
|
| 39 | + * @param \Joomla\Application\Cli\CliInput $cliInput The application's CLI input handler. |
|
| 40 | 40 | * @param Console $console The application's console object. |
| 41 | 41 | */ |
| 42 | 42 | public function __construct(Cli $input, Registry $config, CliOutput $output, CliInput $cliInput, Console $console) |
@@ -161,7 +161,7 @@ |
||
| 161 | 161 | */ |
| 162 | 162 | private function doMigration(string $version) |
| 163 | 163 | { |
| 164 | - $sqlFile = 'migrations/' . $version . '.sql'; |
|
| 164 | + $sqlFile = 'migrations/'.$version.'.sql'; |
|
| 165 | 165 | |
| 166 | 166 | if (!$this->filesystem->has($sqlFile)) |
| 167 | 167 | { |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | ->out('1) Yes') |
| 78 | 78 | ->out('2) No') |
| 79 | 79 | ->out() |
| 80 | - ->out('<question>' . g11n3t('Select:') . '</question>', false); |
|
| 80 | + ->out('<question>'.g11n3t('Select:').'</question>', false); |
|
| 81 | 81 | |
| 82 | 82 | $in = trim($this->getApplication()->in()); |
| 83 | 83 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $this->getApplication()->out('No database found.') |
| 100 | 100 | ->out('Creating the database...', false); |
| 101 | 101 | |
| 102 | - $this->db->setQuery('CREATE DATABASE ' . $this->db->quoteName($this->getApplication()->get('database.name'))) |
|
| 102 | + $this->db->setQuery('CREATE DATABASE '.$this->db->quoteName($this->getApplication()->get('database.name'))) |
|
| 103 | 103 | ->execute(); |
| 104 | 104 | |
| 105 | 105 | $this->db->select($this->getApplication()->get('database.name')); |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | */ |
| 163 | 163 | private function processSql() : InstallCommand |
| 164 | 164 | { |
| 165 | - $fName = APPROOT . '/etc/mysql.sql'; |
|
| 165 | + $fName = APPROOT.'/etc/mysql.sql'; |
|
| 166 | 166 | |
| 167 | 167 | if (!file_exists($fName)) |
| 168 | 168 | { |
@@ -90,8 +90,7 @@ discard block |
||
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | $this->cleanDatabase($tables); |
| 93 | - } |
|
| 94 | - catch (\RuntimeException $e) |
|
| 93 | + } catch (\RuntimeException $e) |
|
| 95 | 94 | { |
| 96 | 95 | // Check if the message is "Could not connect to database." Odds are, this means the DB isn't there or the server is down. |
| 97 | 96 | if (strpos($e->getMessage(), 'Could not connect to database.') !== false) |
@@ -105,8 +104,7 @@ discard block |
||
| 105 | 104 | $this->db->select($this->getApplication()->get('database.name')); |
| 106 | 105 | |
| 107 | 106 | $this->getApplication()->out('<info>Database created.</info>'); |
| 108 | - } |
|
| 109 | - else |
|
| 107 | + } else |
|
| 110 | 108 | { |
| 111 | 109 | throw $e; |
| 112 | 110 | } |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | /** |
| 47 | 47 | * Registers the service provider with a DI container. |
| 48 | 48 | * |
| 49 | - * @param Container $container The DI container. |
|
| 49 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 50 | 50 | * |
| 51 | 51 | * @return void |
| 52 | 52 | */ |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | /** |
| 59 | 59 | * Get the `config` service |
| 60 | 60 | * |
| 61 | - * @param Container $container The DI container. |
|
| 61 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 62 | 62 | * |
| 63 | 63 | * @return Registry |
| 64 | 64 | */ |
@@ -101,17 +101,17 @@ |
||
| 101 | 101 | $explodedVersion = explode('.', $version); |
| 102 | 102 | |
| 103 | 103 | $nextPatch = $explodedVersion[2] + 1; |
| 104 | - $versions[] = $explodedVersion[0] . '.' . $explodedVersion[1] . '.' . $nextPatch; |
|
| 104 | + $versions[] = $explodedVersion[0].'.'.$explodedVersion[1].'.'.$nextPatch; |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | // Use $branch from the previous loop to allow the next minor version (PHP's master branch) |
| 108 | 108 | $explodedVersion = explode('.', $branch); |
| 109 | 109 | |
| 110 | 110 | $nextMinor = $explodedVersion[1] + 1; |
| 111 | - $versions[] = $explodedVersion[0] . '.' . $nextMinor . '.0'; |
|
| 111 | + $versions[] = $explodedVersion[0].'.'.$nextMinor.'.0'; |
|
| 112 | 112 | |
| 113 | 113 | // Store the version data now |
| 114 | - $path = APPROOT . '/versions/php.json'; |
|
| 114 | + $path = APPROOT.'/versions/php.json'; |
|
| 115 | 115 | |
| 116 | 116 | if (file_put_contents($path, json_encode($versions)) === false) |
| 117 | 117 | { |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | * @param string $column An optional column name. Instead of the whole row, only this column value will be in |
| 28 | 28 | * the result array. |
| 29 | 29 | * |
| 30 | - * @return \Generator|null A Generator with the result set or null if the query failed. |
|
| 30 | + * @return \Generator A Generator with the result set or null if the query failed. |
|
| 31 | 31 | * |
| 32 | 32 | * @since 1.0 |
| 33 | 33 | * @throws \RuntimeException |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | /** |
| 40 | 40 | * Registers the service provider with a DI container. |
| 41 | 41 | * |
| 42 | - * @param Container $container The DI container. |
|
| 42 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 43 | 43 | * |
| 44 | 44 | * @return void |
| 45 | 45 | */ |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | /** |
| 105 | 105 | * Get the Analytics class service |
| 106 | 106 | * |
| 107 | - * @param Container $container The DI container. |
|
| 107 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 108 | 108 | * |
| 109 | 109 | * @return Analytics |
| 110 | 110 | */ |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | /** |
| 117 | 117 | * Get the Cache\ClearCommand class service |
| 118 | 118 | * |
| 119 | - * @param Container $container The DI container. |
|
| 119 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 120 | 120 | * |
| 121 | 121 | * @return AppCommands\Cache\ClearCommand |
| 122 | 122 | */ |
@@ -133,9 +133,9 @@ discard block |
||
| 133 | 133 | /** |
| 134 | 134 | * Get the CLI application service |
| 135 | 135 | * |
| 136 | - * @param Container $container The DI container. |
|
| 136 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 137 | 137 | * |
| 138 | - * @return CliApplication |
|
| 138 | + * @return \Joomla\StatsServer\CliApplication |
|
| 139 | 139 | */ |
| 140 | 140 | public function getCliApplicationService(Container $container) : CliApplication |
| 141 | 141 | { |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | /** |
| 157 | 157 | * Get the CliInput class service |
| 158 | 158 | * |
| 159 | - * @param Container $container The DI container. |
|
| 159 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 160 | 160 | * |
| 161 | 161 | * @return JoomlaApplication\Cli\CliInput |
| 162 | 162 | */ |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | /** |
| 169 | 169 | * Get the CliOutput class service |
| 170 | 170 | * |
| 171 | - * @param Container $container The DI container. |
|
| 171 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 172 | 172 | * |
| 173 | 173 | * @return JoomlaApplication\Cli\CliOutput |
| 174 | 174 | */ |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | /** |
| 181 | 181 | * Get the ColorProcessor class service |
| 182 | 182 | * |
| 183 | - * @param Container $container The DI container. |
|
| 183 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 184 | 184 | * |
| 185 | 185 | * @return JoomlaApplication\Cli\Output\Processor\ColorProcessor |
| 186 | 186 | */ |
@@ -205,9 +205,9 @@ discard block |
||
| 205 | 205 | /** |
| 206 | 206 | * Get the console service |
| 207 | 207 | * |
| 208 | - * @param Container $container The DI container. |
|
| 208 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 209 | 209 | * |
| 210 | - * @return Console |
|
| 210 | + * @return \Joomla\StatsServer\Console |
|
| 211 | 211 | */ |
| 212 | 212 | public function getConsoleService(Container $container) : Console |
| 213 | 213 | { |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | /** |
| 221 | 221 | * Get the Database\MigrateCommand class service |
| 222 | 222 | * |
| 223 | - * @param Container $container The DI container. |
|
| 223 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 224 | 224 | * |
| 225 | 225 | * @return AppCommands\Database\MigrateCommand |
| 226 | 226 | */ |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | /** |
| 239 | 239 | * Get the Database\StatusCommand class service |
| 240 | 240 | * |
| 241 | - * @param Container $container The DI container. |
|
| 241 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 242 | 242 | * |
| 243 | 243 | * @return AppCommands\Database\StatusCommand |
| 244 | 244 | */ |
@@ -255,9 +255,9 @@ discard block |
||
| 255 | 255 | /** |
| 256 | 256 | * Get the DisplayControllerCreate class service |
| 257 | 257 | * |
| 258 | - * @param Container $container The DI container. |
|
| 258 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 259 | 259 | * |
| 260 | - * @return DisplayControllerCreate |
|
| 260 | + * @return \Joomla\StatsServer\Controllers\DisplayControllerCreate |
|
| 261 | 261 | */ |
| 262 | 262 | public function getDisplayControllerCreateService(Container $container) : DisplayControllerCreate |
| 263 | 263 | { |
@@ -272,9 +272,9 @@ discard block |
||
| 272 | 272 | /** |
| 273 | 273 | * Get the DisplayControllerGet class service |
| 274 | 274 | * |
| 275 | - * @param Container $container The DI container. |
|
| 275 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 276 | 276 | * |
| 277 | - * @return DisplayControllerGet |
|
| 277 | + * @return \Joomla\StatsServer\Controllers\DisplayControllerGet |
|
| 278 | 278 | */ |
| 279 | 279 | public function getDisplayControllerGetService(Container $container) : DisplayControllerGet |
| 280 | 280 | { |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | /** |
| 293 | 293 | * Get the HelpCommand class service |
| 294 | 294 | * |
| 295 | - * @param Container $container The DI container. |
|
| 295 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 296 | 296 | * |
| 297 | 297 | * @return AppCommands\HelpCommand |
| 298 | 298 | */ |
@@ -309,9 +309,9 @@ discard block |
||
| 309 | 309 | /** |
| 310 | 310 | * Get the Input\Cli class service |
| 311 | 311 | * |
| 312 | - * @param Container $container The DI container. |
|
| 312 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 313 | 313 | * |
| 314 | - * @return Cli |
|
| 314 | + * @return \Joomla\Input\Cli |
|
| 315 | 315 | */ |
| 316 | 316 | public function getInputCliService(Container $container) : Cli |
| 317 | 317 | { |
@@ -321,9 +321,9 @@ discard block |
||
| 321 | 321 | /** |
| 322 | 322 | * Get the Input class service |
| 323 | 323 | * |
| 324 | - * @param Container $container The DI container. |
|
| 324 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 325 | 325 | * |
| 326 | - * @return Input |
|
| 326 | + * @return \Joomla\Input\Input |
|
| 327 | 327 | */ |
| 328 | 328 | public function getInputService(Container $container) : Input |
| 329 | 329 | { |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | /** |
| 334 | 334 | * Get the InstallCommand class service |
| 335 | 335 | * |
| 336 | - * @param Container $container The DI container. |
|
| 336 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 337 | 337 | * |
| 338 | 338 | * @return AppCommands\InstallCommand |
| 339 | 339 | */ |
@@ -350,9 +350,9 @@ discard block |
||
| 350 | 350 | /** |
| 351 | 351 | * Get the router service |
| 352 | 352 | * |
| 353 | - * @param Container $container The DI container. |
|
| 353 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 354 | 354 | * |
| 355 | - * @return Router |
|
| 355 | + * @return \Joomla\StatsServer\Router |
|
| 356 | 356 | */ |
| 357 | 357 | public function getRouterService(Container $container) : Router |
| 358 | 358 | { |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | /** |
| 371 | 371 | * Get the SnapshotCommand class service |
| 372 | 372 | * |
| 373 | - * @param Container $container The DI container. |
|
| 373 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 374 | 374 | * |
| 375 | 375 | * @return AppCommands\SnapshotCommand |
| 376 | 376 | */ |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | /** |
| 388 | 388 | * Get the StatsJsonView class service |
| 389 | 389 | * |
| 390 | - * @param Container $container The DI container. |
|
| 390 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 391 | 391 | * |
| 392 | 392 | * @return StatsJsonView |
| 393 | 393 | */ |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | /** |
| 402 | 402 | * Get the StatsModel class service |
| 403 | 403 | * |
| 404 | - * @param Container $container The DI container. |
|
| 404 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 405 | 405 | * |
| 406 | 406 | * @return StatsModel |
| 407 | 407 | */ |
@@ -415,9 +415,9 @@ discard block |
||
| 415 | 415 | /** |
| 416 | 416 | * Get the SubmitControllerCreate class service |
| 417 | 417 | * |
| 418 | - * @param Container $container The DI container. |
|
| 418 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 419 | 419 | * |
| 420 | - * @return SubmitControllerCreate |
|
| 420 | + * @return \Joomla\StatsServer\Controllers\SubmitControllerCreate |
|
| 421 | 421 | */ |
| 422 | 422 | public function getSubmitControllerCreateService(Container $container) : SubmitControllerCreate |
| 423 | 423 | { |
@@ -434,9 +434,9 @@ discard block |
||
| 434 | 434 | /** |
| 435 | 435 | * Get the SubmitControllerGet class service |
| 436 | 436 | * |
| 437 | - * @param Container $container The DI container. |
|
| 437 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 438 | 438 | * |
| 439 | - * @return SubmitControllerGet |
|
| 439 | + * @return \Joomla\StatsServer\Controllers\SubmitControllerGet |
|
| 440 | 440 | */ |
| 441 | 441 | public function getSubmitControllerGetService(Container $container) : SubmitControllerGet |
| 442 | 442 | { |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | /** |
| 452 | 452 | * Get the Tags\JoomlaCommand class service |
| 453 | 453 | * |
| 454 | - * @param Container $container The DI container. |
|
| 454 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 455 | 455 | * |
| 456 | 456 | * @return AppCommands\Tags\JoomlaCommand |
| 457 | 457 | */ |
@@ -468,7 +468,7 @@ discard block |
||
| 468 | 468 | /** |
| 469 | 469 | * Get the Tags\PhpCommand class service |
| 470 | 470 | * |
| 471 | - * @param Container $container The DI container. |
|
| 471 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 472 | 472 | * |
| 473 | 473 | * @return AppCommands\Tags\PhpCommand |
| 474 | 474 | */ |
@@ -485,7 +485,7 @@ discard block |
||
| 485 | 485 | /** |
| 486 | 486 | * Get the UpdateCommand class service |
| 487 | 487 | * |
| 488 | - * @param Container $container The DI container. |
|
| 488 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 489 | 489 | * |
| 490 | 490 | * @return AppCommands\UpdateCommand |
| 491 | 491 | */ |
@@ -502,9 +502,9 @@ discard block |
||
| 502 | 502 | /** |
| 503 | 503 | * Get the web application service |
| 504 | 504 | * |
| 505 | - * @param Container $container The DI container. |
|
| 505 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 506 | 506 | * |
| 507 | - * @return WebApplication |
|
| 507 | + * @return \Joomla\StatsServer\WebApplication |
|
| 508 | 508 | */ |
| 509 | 509 | public function getWebApplicationService(Container $container) : WebApplication |
| 510 | 510 | { |