@@ -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 | { |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | /** |
| 39 | 39 | * Registers the service provider with a DI container. |
| 40 | 40 | * |
| 41 | - * @param Container $container The DI container. |
|
| 41 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 42 | 42 | * |
| 43 | 43 | * @return void |
| 44 | 44 | */ |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | /** |
| 103 | 103 | * Get the Analytics class service |
| 104 | 104 | * |
| 105 | - * @param Container $container The DI container. |
|
| 105 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 106 | 106 | * |
| 107 | 107 | * @return Analytics |
| 108 | 108 | */ |
@@ -114,9 +114,9 @@ discard block |
||
| 114 | 114 | /** |
| 115 | 115 | * Get the CLI application service |
| 116 | 116 | * |
| 117 | - * @param Container $container The DI container. |
|
| 117 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 118 | 118 | * |
| 119 | - * @return CliApplication |
|
| 119 | + * @return \Joomla\StatsServer\CliApplication |
|
| 120 | 120 | */ |
| 121 | 121 | public function getCliApplicationService(Container $container) : CliApplication |
| 122 | 122 | { |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | /** |
| 138 | 138 | * Get the CliInput class service |
| 139 | 139 | * |
| 140 | - * @param Container $container The DI container. |
|
| 140 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 141 | 141 | * |
| 142 | 142 | * @return JoomlaApplication\Cli\CliInput |
| 143 | 143 | */ |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | /** |
| 150 | 150 | * Get the CliOutput class service |
| 151 | 151 | * |
| 152 | - * @param Container $container The DI container. |
|
| 152 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 153 | 153 | * |
| 154 | 154 | * @return JoomlaApplication\Cli\CliOutput |
| 155 | 155 | */ |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | /** |
| 162 | 162 | * Get the ColorProcessor class service |
| 163 | 163 | * |
| 164 | - * @param Container $container The DI container. |
|
| 164 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 165 | 165 | * |
| 166 | 166 | * @return JoomlaApplication\Cli\Output\Processor\ColorProcessor |
| 167 | 167 | */ |
@@ -186,9 +186,9 @@ discard block |
||
| 186 | 186 | /** |
| 187 | 187 | * Get the console service |
| 188 | 188 | * |
| 189 | - * @param Container $container The DI container. |
|
| 189 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 190 | 190 | * |
| 191 | - * @return Console |
|
| 191 | + * @return \Joomla\StatsServer\Console |
|
| 192 | 192 | */ |
| 193 | 193 | public function getConsoleService(Container $container) : Console |
| 194 | 194 | { |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | /** |
| 202 | 202 | * Get the Database\MigrateCommand class service |
| 203 | 203 | * |
| 204 | - * @param Container $container The DI container. |
|
| 204 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 205 | 205 | * |
| 206 | 206 | * @return AppCommands\Database\MigrateCommand |
| 207 | 207 | */ |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | /** |
| 220 | 220 | * Get the Database\StatusCommand class service |
| 221 | 221 | * |
| 222 | - * @param Container $container The DI container. |
|
| 222 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 223 | 223 | * |
| 224 | 224 | * @return AppCommands\Database\StatusCommand |
| 225 | 225 | */ |
@@ -236,9 +236,9 @@ discard block |
||
| 236 | 236 | /** |
| 237 | 237 | * Get the DisplayControllerCreate class service |
| 238 | 238 | * |
| 239 | - * @param Container $container The DI container. |
|
| 239 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 240 | 240 | * |
| 241 | - * @return DisplayControllerCreate |
|
| 241 | + * @return \Joomla\StatsServer\Controllers\DisplayControllerCreate |
|
| 242 | 242 | */ |
| 243 | 243 | public function getDisplayControllerCreateService(Container $container) : DisplayControllerCreate |
| 244 | 244 | { |
@@ -253,9 +253,9 @@ discard block |
||
| 253 | 253 | /** |
| 254 | 254 | * Get the DisplayControllerGet class service |
| 255 | 255 | * |
| 256 | - * @param Container $container The DI container. |
|
| 256 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 257 | 257 | * |
| 258 | - * @return DisplayControllerGet |
|
| 258 | + * @return \Joomla\StatsServer\Controllers\DisplayControllerGet |
|
| 259 | 259 | */ |
| 260 | 260 | public function getDisplayControllerGetService(Container $container) : DisplayControllerGet |
| 261 | 261 | { |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | /** |
| 273 | 273 | * Get the HelpCommand class service |
| 274 | 274 | * |
| 275 | - * @param Container $container The DI container. |
|
| 275 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 276 | 276 | * |
| 277 | 277 | * @return AppCommands\HelpCommand |
| 278 | 278 | */ |
@@ -289,9 +289,9 @@ discard block |
||
| 289 | 289 | /** |
| 290 | 290 | * Get the Input\Cli class service |
| 291 | 291 | * |
| 292 | - * @param Container $container The DI container. |
|
| 292 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 293 | 293 | * |
| 294 | - * @return Cli |
|
| 294 | + * @return \Joomla\Input\Cli |
|
| 295 | 295 | */ |
| 296 | 296 | public function getInputCliService(Container $container) : Cli |
| 297 | 297 | { |
@@ -301,9 +301,9 @@ discard block |
||
| 301 | 301 | /** |
| 302 | 302 | * Get the Input class service |
| 303 | 303 | * |
| 304 | - * @param Container $container The DI container. |
|
| 304 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 305 | 305 | * |
| 306 | - * @return Input |
|
| 306 | + * @return \Joomla\Input\Input |
|
| 307 | 307 | */ |
| 308 | 308 | public function getInputService(Container $container) : Input |
| 309 | 309 | { |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | /** |
| 314 | 314 | * Get the InstallCommand class service |
| 315 | 315 | * |
| 316 | - * @param Container $container The DI container. |
|
| 316 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 317 | 317 | * |
| 318 | 318 | * @return AppCommands\InstallCommand |
| 319 | 319 | */ |
@@ -330,9 +330,9 @@ discard block |
||
| 330 | 330 | /** |
| 331 | 331 | * Get the router service |
| 332 | 332 | * |
| 333 | - * @param Container $container The DI container. |
|
| 333 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 334 | 334 | * |
| 335 | - * @return Router |
|
| 335 | + * @return \Joomla\StatsServer\Router |
|
| 336 | 336 | */ |
| 337 | 337 | public function getRouterService(Container $container) : Router |
| 338 | 338 | { |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | /** |
| 351 | 351 | * Get the SnapshotCommand class service |
| 352 | 352 | * |
| 353 | - * @param Container $container The DI container. |
|
| 353 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 354 | 354 | * |
| 355 | 355 | * @return AppCommands\SnapshotCommand |
| 356 | 356 | */ |
@@ -367,7 +367,7 @@ discard block |
||
| 367 | 367 | /** |
| 368 | 368 | * Get the StatsJsonView class service |
| 369 | 369 | * |
| 370 | - * @param Container $container The DI container. |
|
| 370 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 371 | 371 | * |
| 372 | 372 | * @return StatsJsonView |
| 373 | 373 | */ |
@@ -381,7 +381,7 @@ discard block |
||
| 381 | 381 | /** |
| 382 | 382 | * Get the StatsModel class service |
| 383 | 383 | * |
| 384 | - * @param Container $container The DI container. |
|
| 384 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 385 | 385 | * |
| 386 | 386 | * @return StatsModel |
| 387 | 387 | */ |
@@ -395,9 +395,9 @@ discard block |
||
| 395 | 395 | /** |
| 396 | 396 | * Get the SubmitControllerCreate class service |
| 397 | 397 | * |
| 398 | - * @param Container $container The DI container. |
|
| 398 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 399 | 399 | * |
| 400 | - * @return SubmitControllerCreate |
|
| 400 | + * @return \Joomla\StatsServer\Controllers\SubmitControllerCreate |
|
| 401 | 401 | */ |
| 402 | 402 | public function getSubmitControllerCreateService(Container $container) : SubmitControllerCreate |
| 403 | 403 | { |
@@ -414,9 +414,9 @@ discard block |
||
| 414 | 414 | /** |
| 415 | 415 | * Get the SubmitControllerGet class service |
| 416 | 416 | * |
| 417 | - * @param Container $container The DI container. |
|
| 417 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 418 | 418 | * |
| 419 | - * @return SubmitControllerGet |
|
| 419 | + * @return \Joomla\StatsServer\Controllers\SubmitControllerGet |
|
| 420 | 420 | */ |
| 421 | 421 | public function getSubmitControllerGetService(Container $container) : SubmitControllerGet |
| 422 | 422 | { |
@@ -431,7 +431,7 @@ discard block |
||
| 431 | 431 | /** |
| 432 | 432 | * Get the Tags\JoomlaCommand class service |
| 433 | 433 | * |
| 434 | - * @param Container $container The DI container. |
|
| 434 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 435 | 435 | * |
| 436 | 436 | * @return AppCommands\Tags\JoomlaCommand |
| 437 | 437 | */ |
@@ -448,7 +448,7 @@ discard block |
||
| 448 | 448 | /** |
| 449 | 449 | * Get the Tags\PhpCommand class service |
| 450 | 450 | * |
| 451 | - * @param Container $container The DI container. |
|
| 451 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 452 | 452 | * |
| 453 | 453 | * @return AppCommands\Tags\PhpCommand |
| 454 | 454 | */ |
@@ -465,7 +465,7 @@ discard block |
||
| 465 | 465 | /** |
| 466 | 466 | * Get the UpdateCommand class service |
| 467 | 467 | * |
| 468 | - * @param Container $container The DI container. |
|
| 468 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 469 | 469 | * |
| 470 | 470 | * @return AppCommands\UpdateCommand |
| 471 | 471 | */ |
@@ -482,9 +482,9 @@ discard block |
||
| 482 | 482 | /** |
| 483 | 483 | * Get the web application service |
| 484 | 484 | * |
| 485 | - * @param Container $container The DI container. |
|
| 485 | + * @param \Joomla\DI\Container $container The DI container. |
|
| 486 | 486 | * |
| 487 | - * @return WebApplication |
|
| 487 | + * @return \Joomla\StatsServer\WebApplication |
|
| 488 | 488 | */ |
| 489 | 489 | public function getWebApplicationService(Container $container) : WebApplication |
| 490 | 490 | { |