diff --git a/app/Console/Commands/Upgrade/UpgradeDatabase.php b/app/Console/Commands/Upgrade/UpgradeDatabase.php index bedfc555fb..2954e2fa7c 100644 --- a/app/Console/Commands/Upgrade/UpgradeDatabase.php +++ b/app/Console/Commands/Upgrade/UpgradeDatabase.php @@ -75,7 +75,7 @@ class UpgradeDatabase extends Command 'firefly-iii:migrate-recurrence-type', 'firefly-iii:upgrade-liabilities', 'firefly-iii:create-group-memberships', - 'firefly-iii:liabilities-580', + 'firefly-iii:liabilities-600', // there are 16 verify commands. 'firefly-iii:fix-piggies', diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php index b7e4dddab0..49ec160f0d 100644 --- a/app/Http/Controllers/System/InstallController.php +++ b/app/Http/Controllers/System/InstallController.php @@ -86,7 +86,7 @@ class InstallController extends Controller 'firefly-iii:migrate-recurrence-type' => [], 'firefly-iii:upgrade-liabilities' => [], 'firefly-iii:create-group-memberships' => [], - 'firefly-iii:liabilities-580' => [], + 'firefly-iii:liabilities-600' => [], // verify commands 'firefly-iii:fix-piggies' => [], diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 31b05f4f04..179a9ba51d 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -89,11 +89,11 @@ class Authenticate { Log::debug(sprintf('Now in %s', __METHOD__)); if (0 === count($guards)) { - Log::debug('No guards present.'); + Log::debug('No guards present.'); // go for default guard: /** @noinspection PhpUndefinedMethodInspection */ if ($this->auth->check()) { - Log::debug('Default guard says user is authenticated.'); + Log::debug('Default guard says user is authenticated.'); // do an extra check on user object. /** @noinspection PhpUndefinedMethodInspection */ /** @var User $user */ @@ -103,7 +103,7 @@ class Authenticate return $this->auth->authenticate(); // @phpstan-ignore-line (thinks function returns void) } - Log::debug('Guard array is not empty.'); + Log::debug('Guard array is not empty.'); foreach ($guards as $guard) { Log::debug(sprintf('Now in guard loop, guard is "%s"', $guard)); diff --git a/composer.json b/composer.json index c15d53d27f..c3275a8599 100644 --- a/composer.json +++ b/composer.json @@ -175,7 +175,7 @@ "@php artisan firefly-iii:migrate-recurrence-type", "@php artisan firefly-iii:upgrade-liabilities", "@php artisan firefly-iii:create-group-memberships", - "@php artisan firefly-iii firefly-iii:liabilities-580", + "@php artisan firefly-iii:liabilities-600", "@php artisan firefly-iii:fix-piggies", "@php artisan firefly-iii:create-link-types", "@php artisan firefly-iii:create-access-tokens", diff --git a/composer.lock b/composer.lock index 697a99f3c0..3e6286b765 100644 --- a/composer.lock +++ b/composer.lock @@ -470,16 +470,16 @@ }, { "name": "doctrine/dbal", - "version": "3.5.2", + "version": "3.5.3", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "63e513cebbbaf96a6795e5c5ee34d205831bfc85" + "reference": "88fa7e5189fd5ec6682477044264dc0ed4e3aa1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/63e513cebbbaf96a6795e5c5ee34d205831bfc85", - "reference": "63e513cebbbaf96a6795e5c5ee34d205831bfc85", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/88fa7e5189fd5ec6682477044264dc0ed4e3aa1e", + "reference": "88fa7e5189fd5ec6682477044264dc0ed4e3aa1e", "shasum": "" }, "require": { @@ -494,7 +494,7 @@ "require-dev": { "doctrine/coding-standard": "11.0.0", "jetbrains/phpstorm-stubs": "2022.3", - "phpstan/phpstan": "1.9.2", + "phpstan/phpstan": "1.9.4", "phpstan/phpstan-strict-rules": "^1.4", "phpunit/phpunit": "9.5.27", "psalm/plugin-phpunit": "0.18.4", @@ -561,7 +561,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.5.2" + "source": "https://github.com/doctrine/dbal/tree/3.5.3" }, "funding": [ { @@ -577,7 +577,7 @@ "type": "tidelift" } ], - "time": "2022-12-19T08:17:34+00:00" + "time": "2023-01-12T10:21:44+00:00" }, { "name": "doctrine/deprecations", @@ -2245,21 +2245,21 @@ }, { "name": "laravel/slack-notification-channel", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/laravel/slack-notification-channel.git", - "reference": "060617a31562c88656c95c5971a36989122d4b53" + "reference": "e0d4be5e01d443a69fa89f0a4cac6bd2eda2be8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/060617a31562c88656c95c5971a36989122d4b53", - "reference": "060617a31562c88656c95c5971a36989122d4b53", + "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/e0d4be5e01d443a69fa89f0a4cac6bd2eda2be8f", + "reference": "e0d4be5e01d443a69fa89f0a4cac6bd2eda2be8f", "shasum": "" }, "require": { "guzzlehttp/guzzle": "^6.0|^7.0", - "illuminate/notifications": "~5.8.0|^6.0|^7.0|^8.0|^9.0", + "illuminate/notifications": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0", "php": "^7.1.3|^8.0" }, "require-dev": { @@ -2300,9 +2300,9 @@ ], "support": { "issues": "https://github.com/laravel/slack-notification-channel/issues", - "source": "https://github.com/laravel/slack-notification-channel/tree/v2.4.0" + "source": "https://github.com/laravel/slack-notification-channel/tree/v2.5.0" }, - "time": "2022-01-12T18:07:54+00:00" + "time": "2023-01-12T16:21:26+00:00" }, { "name": "laravel/ui", @@ -5183,16 +5183,16 @@ }, { "name": "ramsey/uuid", - "version": "4.7.1", + "version": "4.7.3", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "a1acf96007170234a8399586a6e2ab8feba109d1" + "reference": "433b2014e3979047db08a17a205f410ba3869cf2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/a1acf96007170234a8399586a6e2ab8feba109d1", - "reference": "a1acf96007170234a8399586a6e2ab8feba109d1", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/433b2014e3979047db08a17a205f410ba3869cf2", + "reference": "433b2014e3979047db08a17a205f410ba3869cf2", "shasum": "" }, "require": { @@ -5259,7 +5259,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.7.1" + "source": "https://github.com/ramsey/uuid/tree/4.7.3" }, "funding": [ { @@ -5271,7 +5271,7 @@ "type": "tidelift" } ], - "time": "2022-12-31T22:20:34+00:00" + "time": "2023-01-12T18:13:24+00:00" }, { "name": "rcrowe/twigbridge", @@ -8789,30 +8789,30 @@ }, { "name": "doctrine/instantiator", - "version": "1.5.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^8.1" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^11", + "doctrine/coding-standard": "^11", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.16 || ^1", - "phpstan/phpstan": "^1.4", - "phpstan/phpstan-phpunit": "^1", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.30 || ^5.4" + "phpbench/phpbench": "^1.2", + "phpstan/phpstan": "^1.9.4", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5.27", + "vimeo/psalm": "^5.4" }, "type": "library", "autoload": { @@ -8839,7 +8839,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.5.0" + "source": "https://github.com/doctrine/instantiator/tree/2.0.0" }, "funding": [ { @@ -8855,7 +8855,7 @@ "type": "tidelift" } ], - "time": "2022-12-30T00:15:36+00:00" + "time": "2022-12-30T00:23:10+00:00" }, { "name": "ergebnis/phpstan-rules", @@ -9243,35 +9243,35 @@ }, { "name": "nunomaduro/larastan", - "version": "2.3.5", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/larastan.git", - "reference": "e118a53a41dddd20948292a7b5e1aad20874eb5c" + "reference": "14f631348ead3e245651606931863b4f218d1f78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/larastan/zipball/e118a53a41dddd20948292a7b5e1aad20874eb5c", - "reference": "e118a53a41dddd20948292a7b5e1aad20874eb5c", + "url": "https://api.github.com/repos/nunomaduro/larastan/zipball/14f631348ead3e245651606931863b4f218d1f78", + "reference": "14f631348ead3e245651606931863b4f218d1f78", "shasum": "" }, "require": { "ext-json": "*", - "illuminate/console": "^9", - "illuminate/container": "^9", - "illuminate/contracts": "^9", - "illuminate/database": "^9", - "illuminate/http": "^9", - "illuminate/pipeline": "^9", - "illuminate/support": "^9", + "illuminate/console": "^9.47.0 || ^10.0.0", + "illuminate/container": "^9.47.0 || ^10.0.0", + "illuminate/contracts": "^9.47.0 || ^10.0.0", + "illuminate/database": "^9.47.0 || ^10.0.0", + "illuminate/http": "^9.47.0 || ^10.0.0", + "illuminate/pipeline": "^9.47.0 || ^10.0.0", + "illuminate/support": "^9.47.0 || ^10.0.0", "php": "^8.0.2", - "phpmyadmin/sql-parser": "^5.6", + "phpmyadmin/sql-parser": "^5.6.0", "phpstan/phpstan": "^1.9.8" }, "require-dev": { - "nikic/php-parser": "^4.13.2", - "orchestra/testbench": "^7.0.0", - "phpunit/phpunit": "^9.5.11" + "nikic/php-parser": "^4.15.2", + "orchestra/testbench": "^7.19.0|^8.0.0", + "phpunit/phpunit": "^9.5.27" }, "suggest": { "orchestra/testbench": "Using Larastan for analysing a package needs Testbench" @@ -9315,7 +9315,7 @@ ], "support": { "issues": "https://github.com/nunomaduro/larastan/issues", - "source": "https://github.com/nunomaduro/larastan/tree/2.3.5" + "source": "https://github.com/nunomaduro/larastan/tree/2.4.0" }, "funding": [ { @@ -9335,7 +9335,7 @@ "type": "patreon" } ], - "time": "2023-01-10T10:42:37+00:00" + "time": "2023-01-11T11:57:44+00:00" }, { "name": "phar-io/manifest", @@ -9644,16 +9644,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.9.8", + "version": "1.9.11", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "45411d15bf85a33b4a8ee9b75a6e82998c9adb97" + "reference": "60f3d68481eef216199eae7a2603cd5fe124d464" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/45411d15bf85a33b4a8ee9b75a6e82998c9adb97", - "reference": "45411d15bf85a33b4a8ee9b75a6e82998c9adb97", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/60f3d68481eef216199eae7a2603cd5fe124d464", + "reference": "60f3d68481eef216199eae7a2603cd5fe124d464", "shasum": "" }, "require": { @@ -9683,7 +9683,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.9.8" + "source": "https://github.com/phpstan/phpstan/tree/1.9.11" }, "funding": [ { @@ -9699,7 +9699,7 @@ "type": "tidelift" } ], - "time": "2023-01-08T21:26:18+00:00" + "time": "2023-01-12T14:04:13+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -9751,21 +9751,21 @@ }, { "name": "phpstan/phpstan-strict-rules", - "version": "1.4.4", + "version": "1.4.5", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-strict-rules.git", - "reference": "23e5f377ee6395a1a04842d3d6ed4bd25e7b44a6" + "reference": "361f75b06066f3fdaba87c1f57bdb1ffc28d6f1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/23e5f377ee6395a1a04842d3d6ed4bd25e7b44a6", - "reference": "23e5f377ee6395a1a04842d3d6ed4bd25e7b44a6", + "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/361f75b06066f3fdaba87c1f57bdb1ffc28d6f1d", + "reference": "361f75b06066f3fdaba87c1f57bdb1ffc28d6f1d", "shasum": "" }, "require": { "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.8.6" + "phpstan/phpstan": "^1.9.7" }, "require-dev": { "nikic/php-parser": "^4.13.0", @@ -9793,9 +9793,9 @@ "description": "Extra strict and opinionated rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-strict-rules/issues", - "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.4.4" + "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.4.5" }, - "time": "2022-09-21T11:38:17+00:00" + "time": "2023-01-11T14:16:29+00:00" }, { "name": "phpunit/php-code-coverage", @@ -10117,20 +10117,20 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.27", + "version": "9.5.28", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38" + "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38", - "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e", + "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", + "doctrine/instantiator": "^1.3.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -10199,7 +10199,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28" }, "funding": [ { @@ -10215,7 +10215,7 @@ "type": "tidelift" } ], - "time": "2022-12-09T07:31:23+00:00" + "time": "2023-01-14T12:32:24+00:00" }, { "name": "sebastian/cli-parser",