Skip to content

Commit 9e3c935

Browse files
author
kodiakhq
committed
deploy: 32e9fbc
1 parent 0f7ac39 commit 9e3c935

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

classes/rex-console-application.html

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,13 @@ <h4 id="toc-methods">
200200
<dt class="phpdocumentor-table-of-contents__entry -method -public">
201201
<a href="classes/rex-console-application.html#method_doRun">doRun()</a>
202202
<span>
203-
&nbsp;: mixed </span>
203+
&nbsp;: int </span>
204204
</dt>
205205

206206
<dt class="phpdocumentor-table-of-contents__entry -method -protected">
207207
<a href="classes/rex-console-application.html#method_doRunCommand">doRunCommand()</a>
208208
<span>
209-
&nbsp;: mixed </span>
209+
&nbsp;: int </span>
210210
</dt>
211211

212212
</dl>
@@ -278,7 +278,7 @@ <h4 class="phpdocumentor-element__name" id="method_doRun">
278278

279279
<code class="phpdocumentor-code phpdocumentor-signature ">
280280
<span class="phpdocumentor-signature__visibility">public</span>
281-
<span class="phpdocumentor-signature__name">doRun</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Symfony\Component\Console\Input\InputInterface">InputInterface</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$input</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Symfony\Component\Console\Output\OutputInterface">OutputInterface</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$output</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
281+
<span class="phpdocumentor-signature__name">doRun</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Symfony\Component\Console\Input\InputInterface">InputInterface</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$input</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Symfony\Component\Console\Output\OutputInterface">OutputInterface</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$output</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">int</span></code>
282282

283283
<div class="phpdocumentor-label-line">
284284
</div>
@@ -303,7 +303,11 @@ <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
303303

304304

305305

306-
306+
<section>
307+
<h5 class="phpdocumentor-return-value__heading">Return values</h5>
308+
<span class="phpdocumentor-signature__response_type">int</span>
309+
</section>
310+
307311
</article>
308312
<article
309313
class="phpdocumentor-element
@@ -327,7 +331,7 @@ <h4 class="phpdocumentor-element__name" id="method_doRunCommand">
327331

328332
<code class="phpdocumentor-code phpdocumentor-signature ">
329333
<span class="phpdocumentor-signature__visibility">protected</span>
330-
<span class="phpdocumentor-signature__name">doRunCommand</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Symfony\Component\Console\Command\Command">Command</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$command</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Symfony\Component\Console\Input\InputInterface">InputInterface</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$input</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Symfony\Component\Console\Output\OutputInterface">OutputInterface</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$output</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
334+
<span class="phpdocumentor-signature__name">doRunCommand</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Symfony\Component\Console\Command\Command">Command</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$command</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Symfony\Component\Console\Input\InputInterface">InputInterface</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$input</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Symfony\Component\Console\Output\OutputInterface">OutputInterface</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$output</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">int</span></code>
331335

332336
<div class="phpdocumentor-label-line">
333337
</div>
@@ -359,7 +363,11 @@ <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
359363

360364

361365

362-
366+
<section>
367+
<h5 class="phpdocumentor-return-value__heading">Return values</h5>
368+
<span class="phpdocumentor-signature__response_type">int</span>
369+
</section>
370+
363371
</article>
364372
</section>
365373

files/redaxo-main/redaxo/src/core/lib/console/application.php.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class rex_console_application extends Application
1616
parent::__construct('REDAXO', rex::getVersion());
1717
}
1818

19-
public function doRun(InputInterface $input, OutputInterface $output)
19+
public function doRun(InputInterface $input, OutputInterface $output): int
2020
{
2121
try {
2222
$this->checkConsoleUser($input, $output);
@@ -42,7 +42,7 @@ class rex_console_application extends Application
4242
}
4343
}
4444

45-
protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output)
45+
protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output): int
4646
{
4747
if ($command instanceof rex_console_command) {
4848
$this->loadPackages($command);

files/redaxo-main/redaxo/src/core/pages/setup.step3.php.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ $n['field'] = $httpsRedirectSel->get();
128128
$formElements[] = $n;
129129

130130
$n = [];
131-
$n['field'] = '<p>' . rex_i18n::msg('hsts_more_information') . '</p>';
131+
$n['field'] = '<p>' . rex_i18n::rawMsg('hsts_more_information') . '</p>';
132132
$formElements[] = $n;
133133

134134
$fragment = new rex_fragment();

files/redaxo-main/redaxo/src/core/pages/system.settings.php.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ if ($func && !$csrfToken->isValid()) {
3939

4040
$config['debug']['enabled'] = !rex::isDebugMode();
4141
rex::setProperty('debug', $config['debug']);
42-
if (rex_file::putConfig($configFile, $config) > 0) {
42+
if (rex_file::putConfig($configFile, $config)) {
4343
// reload the page so that debug mode is immediately visible
4444
rex_response::sendRedirect(rex_url::currentBackendPage(['rex_debug_updated' => true], false));
4545
}
@@ -75,7 +75,7 @@ if ($func && !$csrfToken->isValid()) {
7575
}
7676

7777
if (empty($error)) {
78-
if (rex_file::putConfig($configFile, $config) > 0) {
78+
if (rex_file::putConfig($configFile, $config)) {
7979
$success = rex_i18n::msg('info_updated');
8080
}
8181
}

0 commit comments

Comments
 (0)