kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-19 02:52:44 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2025-05-04

Browse Source
This commit is contained in:
JC5
2025-05-04 13:55:42 +02:00
parent 2c96729d76
commit 1001e04b63
136 changed files with 987 additions and 1149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Json/IntroController.php
View File

@@ -41,7 +41,7 @@ class IntroController extends Controller
public function getIntroSteps(string $route, ?string $specificPage = null): JsonResponse
{
app('log')->debug(sprintf('getIntroSteps for route "%s" and page "%s"', $route, $specificPage));
$specificPage ??= '';
$specificPage ??= '';
$steps = $this->getBasicSteps($route);
$specificSteps = $this->getSpecificSteps($route, $specificPage);
if (0 === count($specificSteps)) {
@@ -55,8 +55,8 @@ class IntroController extends Controller
// remove last step:
array_pop($steps);
// merge arrays and add last step again
$steps = array_merge($steps, $specificSteps);
$steps[] = $lastStep;
$steps = array_merge($steps, $specificSteps);
$steps[] = $lastStep;
}
if (!$this->hasOutroStep($route)) {
$steps = array_merge($steps, $specificSteps);
@@ -77,7 +77,7 @@ class IntroController extends Controller
return false;
}
$hasStep = array_key_exists('outro', $elements);
$hasStep = array_key_exists('outro', $elements);
app('log')->debug('Elements is array', $elements);
app('log')->debug('Keys is', array_keys($elements));
@@ -94,8 +94,8 @@ class IntroController extends Controller
public function postEnable(string $route, ?string $specialPage = null): JsonResponse
{
$specialPage ??= '';
$route = str_replace('.', '_', $route);
$key = sprintf('shown_demo_%s', $route);
$route = str_replace('.', '_', $route);
$key = sprintf('shown_demo_%s', $route);
if ('' !== $specialPage) {
$key = sprintf('%s_%s', $key, $specialPage);
}
@@ -114,7 +114,7 @@ class IntroController extends Controller
public function postFinished(string $route, ?string $specialPage = null): JsonResponse
{
$specialPage ??= '';
$key = sprintf('shown_demo_%s', $route);
$key = sprintf('shown_demo_%s', $route);
if ('' !== $specialPage) {
$key = sprintf('%s_%s', $key, $specialPage);
}