@@ -57,8 +57,7 @@ |
||
57 | 57 | try |
58 | 58 | { |
59 | 59 | $this->migrations->migrateDatabase($version); |
60 | - } |
|
61 | - catch (\Exception $exception) |
|
60 | + } catch (\Exception $exception) |
|
62 | 61 | { |
63 | 62 | $this->logger->critical( |
64 | 63 | 'Error migrating database', |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | $commands = []; |
56 | 56 | |
57 | 57 | /** @var \DirectoryIterator $fileInfo */ |
58 | - foreach (new \DirectoryIterator(__DIR__ . '/Commands') as $fileInfo) |
|
58 | + foreach (new \DirectoryIterator(__DIR__.'/Commands') as $fileInfo) |
|
59 | 59 | { |
60 | 60 | if ($fileInfo->isDot()) |
61 | 61 | { |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | $command = $subFileInfo->getBasename('.php'); |
78 | - $className = __NAMESPACE__ . "\\Commands\\$namespace\\$command"; |
|
78 | + $className = __NAMESPACE__."\\Commands\\$namespace\\$command"; |
|
79 | 79 | |
80 | 80 | if (!class_exists($className)) |
81 | 81 | { |
@@ -85,14 +85,14 @@ discard block |
||
85 | 85 | // If the class isn't instantiable, it isn't a valid command |
86 | 86 | if ((new \ReflectionClass($className))->isInstantiable()) |
87 | 87 | { |
88 | - $commands[strtolower("$namespace:" . str_replace('Command', '', $command))] = $this->getContainer()->get($className); |
|
88 | + $commands[strtolower("$namespace:".str_replace('Command', '', $command))] = $this->getContainer()->get($className); |
|
89 | 89 | } |
90 | 90 | } |
91 | 91 | } |
92 | 92 | else |
93 | 93 | { |
94 | 94 | $command = $fileInfo->getBasename('.php'); |
95 | - $className = __NAMESPACE__ . "\\Commands\\$command"; |
|
95 | + $className = __NAMESPACE__."\\Commands\\$command"; |
|
96 | 96 | |
97 | 97 | if (!class_exists($className)) |
98 | 98 | { |
@@ -85,8 +85,7 @@ |
||
85 | 85 | $commands[strtolower("$namespace:" . str_replace('Command', '', $command))] = $this->getContainer()->get($className); |
86 | 86 | } |
87 | 87 | } |
88 | - } |
|
89 | - else |
|
88 | + } else |
|
90 | 89 | { |
91 | 90 | $command = $fileInfo->getBasename('.php'); |
92 | 91 | $className = __NAMESPACE__ . "\\Commands\\$command"; |
@@ -87,15 +87,15 @@ |
||
87 | 87 | |
88 | 88 | // Allow the next patch release after this one |
89 | 89 | $nextPatch = $explodedVersion[2] + 1; |
90 | - $versions[] = $explodedVersion[0] . '.' . $explodedVersion[1] . '.' . $nextPatch; |
|
90 | + $versions[] = $explodedVersion[0].'.'.$explodedVersion[1].'.'.$nextPatch; |
|
91 | 91 | |
92 | 92 | // And allow the next minor release after this one |
93 | 93 | $nextMinor = $explodedVersion[1] + 1; |
94 | - $versions[] = $explodedVersion[0] . '.' . $nextMinor . '.0'; |
|
94 | + $versions[] = $explodedVersion[0].'.'.$nextMinor.'.0'; |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | // Store the version data now |
98 | - $path = APPROOT . '/versions/joomla.json'; |
|
98 | + $path = APPROOT.'/versions/joomla.json'; |
|
99 | 99 | |
100 | 100 | if (file_put_contents($path, json_encode($versions)) === false) |
101 | 101 | { |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | } |
156 | 156 | |
157 | 157 | // Import the valid release listing |
158 | - $path = APPROOT . '/versions/joomla.json'; |
|
158 | + $path = APPROOT.'/versions/joomla.json'; |
|
159 | 159 | |
160 | 160 | if (!file_exists($path)) |
161 | 161 | { |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | } |
221 | 221 | |
222 | 222 | // Import the valid release listing |
223 | - $path = APPROOT . '/versions/php.json'; |
|
223 | + $path = APPROOT.'/versions/php.json'; |
|
224 | 224 | |
225 | 225 | if (!file_exists($path)) |
226 | 226 | { |
@@ -68,7 +68,7 @@ |
||
68 | 68 | { |
69 | 69 | return new Migrations( |
70 | 70 | $container->get('db'), |
71 | - new Filesystem(new Local(APPROOT . '/etc')) |
|
71 | + new Filesystem(new Local(APPROOT.'/etc')) |
|
72 | 72 | ); |
73 | 73 | } |
74 | 74 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | |
94 | 94 | $level = strtoupper($config->get('log.application', $config->get('log.level', 'error'))); |
95 | 95 | |
96 | - return new StreamHandler(APPROOT . '/logs/stats.log', constant('\\Monolog\\Logger::' . $level)); |
|
96 | + return new StreamHandler(APPROOT.'/logs/stats.log', constant('\\Monolog\\Logger::'.$level)); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | /** |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | // If database debugging is enabled then force the logger's error level to DEBUG, otherwise use the level defined in the app config |
114 | 114 | $level = $config->get('database.debug', false) ? 'DEBUG' : strtoupper($config->get('log.database', $config->get('log.level', 'error'))); |
115 | 115 | |
116 | - return new StreamHandler(APPROOT . '/logs/stats.log', constant('\\Monolog\\Logger::' . $level)); |
|
116 | + return new StreamHandler(APPROOT.'/logs/stats.log', constant('\\Monolog\\Logger::'.$level)); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | /** |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | /** |
26 | 26 | * Registers the service provider with a DI container. |
27 | 27 | * |
28 | - * @param Container $container The DI container. |
|
28 | + * @param \Joomla\DI\Container $container The DI container. |
|
29 | 29 | * |
30 | 30 | * @return void |
31 | 31 | */ |
@@ -56,9 +56,9 @@ discard block |
||
56 | 56 | /** |
57 | 57 | * Get the `monolog.processor.psr3` service |
58 | 58 | * |
59 | - * @param Container $container The DI container. |
|
59 | + * @param \Joomla\DI\Container $container The DI container. |
|
60 | 60 | * |
61 | - * @return PsrLogMessageProcessor |
|
61 | + * @return \Monolog\Processor\PsrLogMessageProcessor |
|
62 | 62 | */ |
63 | 63 | public function getMonologProcessorPsr3Service(Container $container) : PsrLogMessageProcessor |
64 | 64 | { |
@@ -68,9 +68,9 @@ discard block |
||
68 | 68 | /** |
69 | 69 | * Get the `monolog.processor.web` service |
70 | 70 | * |
71 | - * @param Container $container The DI container. |
|
71 | + * @param \Joomla\DI\Container $container The DI container. |
|
72 | 72 | * |
73 | - * @return WebProcessor |
|
73 | + * @return \Monolog\Processor\WebProcessor |
|
74 | 74 | */ |
75 | 75 | public function getMonologProcessorWebService(Container $container) : WebProcessor |
76 | 76 | { |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | /** |
81 | 81 | * Get the `monolog.handler.application` service |
82 | 82 | * |
83 | - * @param Container $container The DI container. |
|
83 | + * @param \Joomla\DI\Container $container The DI container. |
|
84 | 84 | * |
85 | 85 | * @return StreamHandler |
86 | 86 | */ |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | /** |
98 | 98 | * Get the `monolog.handler.database` service |
99 | 99 | * |
100 | - * @param Container $container The DI container. |
|
100 | + * @param \Joomla\DI\Container $container The DI container. |
|
101 | 101 | * |
102 | 102 | * @return StreamHandler |
103 | 103 | */ |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | /** |
116 | 116 | * Get the `monolog.logger.application` service |
117 | 117 | * |
118 | - * @param Container $container The DI container. |
|
118 | + * @param \Joomla\DI\Container $container The DI container. |
|
119 | 119 | * |
120 | 120 | * @return Logger |
121 | 121 | */ |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | /** |
136 | 136 | * Get the `monolog.logger.cli` service |
137 | 137 | * |
138 | - * @param Container $container The DI container. |
|
138 | + * @param \Joomla\DI\Container $container The DI container. |
|
139 | 139 | * |
140 | 140 | * @return Logger |
141 | 141 | */ |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | /** |
153 | 153 | * Get the `monolog.logger.database` service |
154 | 154 | * |
155 | - * @param Container $container The DI container. |
|
155 | + * @param \Joomla\DI\Container $container The DI container. |
|
156 | 156 | * |
157 | 157 | * @return Logger |
158 | 158 | */ |
@@ -39,8 +39,7 @@ |
||
39 | 39 | try |
40 | 40 | { |
41 | 41 | $container->get(WebApplication::class)->execute(); |
42 | -} |
|
43 | -catch (\Throwable $e) |
|
42 | +} catch (\Throwable $e) |
|
44 | 43 | { |
45 | 44 | if (!headers_sent()) |
46 | 45 | { |
@@ -6,7 +6,7 @@ discard block |
||
6 | 6 | * @license http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License Version 2 or Later |
7 | 7 | */ |
8 | 8 | |
9 | -require dirname(__DIR__) . '/boot.php'; |
|
9 | +require dirname(__DIR__).'/boot.php'; |
|
10 | 10 | |
11 | 11 | use Joomla\Application\{ |
12 | 12 | AbstractApplication, AbstractWebApplication |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | |
24 | 24 | $container = (new Container) |
25 | 25 | ->registerServiceProvider(new ApplicationServiceProvider) |
26 | - ->registerServiceProvider(new ConfigServiceProvider(APPROOT . '/etc/config.json')) |
|
26 | + ->registerServiceProvider(new ConfigServiceProvider(APPROOT.'/etc/config.json')) |
|
27 | 27 | ->registerServiceProvider(new DatabaseServiceProvider) |
28 | 28 | ->registerServiceProvider(new GitHubServiceProvider) |
29 | 29 | ->registerServiceProvider(new MonologServiceProvider); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | |
59 | 59 | $response = [ |
60 | 60 | 'error' => true, |
61 | - 'message' => 'An error occurred while executing the application: ' . $e->getMessage() |
|
61 | + 'message' => 'An error occurred while executing the application: '.$e->getMessage() |
|
62 | 62 | ]; |
63 | 63 | |
64 | 64 | echo json_encode($response); |
@@ -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) |