@@ -226,6 +226,7 @@ |
||
| 226 | 226 | |
| 227 | 227 | /** |
| 228 | 228 | * {@inheritdoc} |
| 229 | + * @param string $msg |
|
| 229 | 230 | */ |
| 230 | 231 | public function log($msg, $level = LogLevel::INFO, $context = ['saito.install']) |
| 231 | 232 | { |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types = 1); |
|
| 3 | +declare(strict_types=1); |
|
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * Saito - The Threaded Web Forum |
@@ -242,6 +242,6 @@ discard block |
||
| 242 | 242 | { |
| 243 | 243 | InstallerState::set($action); |
| 244 | 244 | |
| 245 | - return $this->redirect('/install/' . $action); |
|
| 245 | + return $this->redirect('/install/'.$action); |
|
| 246 | 246 | } |
| 247 | 247 | } |
@@ -15,9 +15,6 @@ |
||
| 15 | 15 | use Cake\Core\Configure; |
| 16 | 16 | use Cake\Event\Event; |
| 17 | 17 | use Cake\Filesystem\File; |
| 18 | -use Cake\I18n\I18n; |
|
| 19 | -use Cake\ORM\Table; |
|
| 20 | -use Cake\ORM\TableRegistry; |
|
| 21 | 18 | use Installer\Form\UpdaterStartForm; |
| 22 | 19 | use Installer\Lib\DbVersion; |
| 23 | 20 | use Psr\Log\LogLevel; |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types = 1); |
|
| 3 | +declare(strict_types=1); |
|
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * Saito - The Threaded Web Forum |
@@ -71,6 +71,6 @@ discard block |
||
| 71 | 71 | throw new \RuntimeException('TMP directory not available.', 1560524787); |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - return (new File(TMP . 'installer.state')); |
|
| 74 | + return (new File(TMP.'installer.state')); |
|
| 75 | 75 | } |
| 76 | 76 | } |
@@ -176,7 +176,7 @@ |
||
| 176 | 176 | */ |
| 177 | 177 | public function findAssocUsers(Query $query) |
| 178 | 178 | { |
| 179 | - $callback = function (Query $query) { |
|
| 179 | + $callback = function(Query $query) { |
|
| 180 | 180 | return $query->select(['id', 'username']); |
| 181 | 181 | }; |
| 182 | 182 | $query->contain(['BlockedBy' => $callback, 'Users' => $callback]); |
@@ -125,6 +125,7 @@ |
||
| 125 | 125 | |
| 126 | 126 | /** |
| 127 | 127 | * {@inheritdoc} |
| 128 | + * @param string $key |
|
| 128 | 129 | */ |
| 129 | 130 | public function getConfig($key = null, $default = null) |
| 130 | 131 | { |
@@ -129,7 +129,7 @@ |
||
| 129 | 129 | public function getConfig($key = null, $default = null) |
| 130 | 130 | { |
| 131 | 131 | if (is_string($key)) { |
| 132 | - $setting = Configure::read('Saito.Settings.' . $key); |
|
| 132 | + $setting = Configure::read('Saito.Settings.'.$key); |
|
| 133 | 133 | if ($setting !== null) { |
| 134 | 134 | return $setting; |
| 135 | 135 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types = 1); |
|
| 3 | +declare(strict_types=1); |
|
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * Saito - The Threaded Web Forum |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | ]; |
| 62 | 62 | |
| 63 | 63 | foreach ($actions as $action) { |
| 64 | - $this->get('install/' . $action); |
|
| 64 | + $this->get('install/'.$action); |
|
| 65 | 65 | $this->assertRedirect('/'); |
| 66 | 66 | } |
| 67 | 67 | } |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | $this->createSettings(); |
| 103 | 103 | (new DbVersion(TableRegistry::get('Settings')))->set('4.10.0'); |
| 104 | 104 | |
| 105 | - $token = new File(CONFIG . 'installer'); |
|
| 105 | + $token = new File(CONFIG.'installer'); |
|
| 106 | 106 | $this->assertTrue($token->exists()); |
| 107 | 107 | |
| 108 | 108 | $this->get('install/connected'); |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | |
| 113 | 113 | private function createInstallerToken() |
| 114 | 114 | { |
| 115 | - (new File(CONFIG . 'installer'))->create(); |
|
| 115 | + (new File(CONFIG.'installer'))->create(); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | private function createSettings() |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | $validator->add('url', ['url' => ['rule' => 'url']]); |
| 68 | 68 | $errors = $validator->errors(['url' => $url]); |
| 69 | 69 | if (empty($errors)) { |
| 70 | - $url = 'http://' . $url; |
|
| 70 | + $url = 'http://'.$url; |
|
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | if (!empty($url) && preg_match('/\<img\s*?src=/', $text) !== 1) { |
| 84 | 84 | $host = DomainParser::domainAndTld($url); |
| 85 | 85 | if ($host !== null && $host !== env('SERVER_NAME')) { |
| 86 | - $out .= ' <span class=\'richtext-linkInfo\'>[' . $host . ']</span>'; |
|
| 86 | + $out .= ' <span class=\'richtext-linkInfo\'>['.$host.']</span>'; |
|
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | } |
@@ -116,10 +116,10 @@ discard block |
||
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | $_placeholder = ' … '; |
| 119 | - $leftMargin = (int)floor($_textWordMaxLength / 2); |
|
| 120 | - $rightMargin = (int)(-1 * ($_textWordMaxLength - $leftMargin - mb_strlen($_placeholder))); |
|
| 119 | + $leftMargin = (int) floor($_textWordMaxLength / 2); |
|
| 120 | + $rightMargin = (int) (-1 * ($_textWordMaxLength - $leftMargin - mb_strlen($_placeholder))); |
|
| 121 | 121 | |
| 122 | - $string = mb_substr($string, 0, $leftMargin) . $_placeholder . |
|
| 122 | + $string = mb_substr($string, 0, $leftMargin).$_placeholder. |
|
| 123 | 123 | mb_substr($string, $rightMargin); |
| 124 | 124 | |
| 125 | 125 | return $string; |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | */ |
| 135 | 135 | protected function _decorateTarget($string) |
| 136 | 136 | { |
| 137 | - $decorator = function ($matches) { |
|
| 137 | + $decorator = function($matches) { |
|
| 138 | 138 | $out = ''; |
| 139 | 139 | $url = $matches[1]; |
| 140 | 140 | |
@@ -145,12 +145,12 @@ discard block |
||
| 145 | 145 | $parsedUrl = parse_url($url); |
| 146 | 146 | |
| 147 | 147 | if (isset($parsedUrl['host'])) { |
| 148 | - if ($parsedUrl['host'] !== env('SERVER_NAME') && $parsedUrl['host'] !== "www." . env('SERVER_NAME')) { |
|
| 148 | + if ($parsedUrl['host'] !== env('SERVER_NAME') && $parsedUrl['host'] !== "www.".env('SERVER_NAME')) { |
|
| 149 | 149 | $out = " rel='external' target='_blank'"; |
| 150 | 150 | } |
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - return $matches[0] . $out; |
|
| 153 | + return $matches[0].$out; |
|
| 154 | 154 | }; |
| 155 | 155 | |
| 156 | 156 | return preg_replace_callback( |