diff --git a/app/Http/Controllers/Recurring/ShowController.php b/app/Http/Controllers/Recurring/ShowController.php index 0fbc9155e7..34277619dd 100644 --- a/app/Http/Controllers/Recurring/ShowController.php +++ b/app/Http/Controllers/Recurring/ShowController.php @@ -115,11 +115,11 @@ class ShowController extends Controller $array['attachments'][] = $item; } - if(null !== $array['nr_of_repetitions']) { + if (null !== $array['nr_of_repetitions']) { $left = $array['nr_of_repetitions'] - $array['journal_count']; $left = max(0, $left); // limit each repetition to X occurrences: - foreach($array['repetitions'] as $index => $repetition) { + foreach ($array['repetitions'] as $index => $repetition) { $array['repetitions'][$index]['occurrences'] = array_slice($repetition['occurrences'], 0, $left); } } diff --git a/composer.lock b/composer.lock index 2a319dc185..ceaee30fc4 100644 --- a/composer.lock +++ b/composer.lock @@ -4367,20 +4367,20 @@ }, { "name": "nesbot/carbon", - "version": "3.8.0", + "version": "3.8.1", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f" + "reference": "10ac0aa86b8062219ce21e8189123d611ca3ecd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bbd3eef89af8ba66a3aa7952b5439168fbcc529f", - "reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/10ac0aa86b8062219ce21e8189123d611ca3ecd9", + "reference": "10ac0aa86b8062219ce21e8189123d611ca3ecd9", "shasum": "" }, "require": { - "carbonphp/carbon-doctrine-types": "*", + "carbonphp/carbon-doctrine-types": "<100.0", "ext-json": "*", "php": "^8.1", "psr/clock": "^1.0", @@ -4469,7 +4469,7 @@ "type": "tidelift" } ], - "time": "2024-08-19T06:22:39+00:00" + "time": "2024-11-03T16:02:24+00:00" }, { "name": "nette/schema", @@ -11722,23 +11722,23 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.8.2", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "153ae662783729388a584b4361f2545e4d841e3c" + "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", - "reference": "153ae662783729388a584b4361f2545e4d841e3c", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/1fb5ba8d045f5dd984ebded5b1cc66f29459422d", + "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.13" + "phpstan/phpdoc-parser": "^1.18" }, "require-dev": { "ext-tokenizer": "*", @@ -11774,9 +11774,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.9.0" }, - "time": "2024-02-23T11:10:43+00:00" + "time": "2024-11-03T20:11:34+00:00" }, { "name": "phpmyadmin/sql-parser", diff --git a/config/firefly.php b/config/firefly.php index d9e3fef897..ef5d30a2a9 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -110,7 +110,7 @@ return [ 'running_balance_column' => env('USE_RUNNING_BALANCE', false), // see cer.php for exchange rates feature flag. ], - 'version' => 'develop/2024-11-03', + 'version' => 'develop/2024-11-04', 'api_version' => '2.1.0', 'db_version' => 24,