IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-21 16:38:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor various code.

Browse Source
This commit is contained in:
James Cole 2023-11-04 17:26:38 +01:00
parent e41236495f
commit 1059da8a2a
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
50 changed files with 421 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/phpcs.sh
View File

@ -45,7 +45,7 @@ PHP_CS_FIXER_IGNORE_ENV=true
./vendor/bin/php-cs-fixer fix \
--config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php \
--format=$OUTPUT_FORMAT \
--allow-risky=yes $EXTRA_PARAMS \
--allow-risky=yes $EXTRA_PARAMS
EXIT_CODE=$?

5
.ci/phpstan.sh
View File

@ -31,16 +31,15 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
# Do static code analysis.
if [[ $GITHUB_ACTIONS = "" ]]
then
./vendor/bin/phpstan analyse -c .ci/phpstan.neon --no-progress --error-format=table > phpstan-report.txt
./vendor/bin/phpstan analyse -c .ci/phpstan.neon --error-format=table > phpstan-report.txt
EXIT_CODE=$?
echo 'The PHPstan report can be found in phpstan-report.txt'
fi
if [[ $GITHUB_ACTIONS = "true" ]]
then
./vendor/bin/phpstan analyse -c .ci/phpstan.neon --no-progress --error-format=github > phpstan-report.txt
./vendor/bin/phpstan analyse -c .ci/phpstan.neon --no-progress --error-format=github
EXIT_CODE=$?
cat phpstan-report.txt
fi
exit $EXIT_CODE

6
app/Api/V1/Controllers/Autocomplete/AccountController.php
View File

@ -118,10 +118,10 @@ class AccountController extends Controller
// custom order.
usort(
$return,
static function ($a, $b) {
static function (array $left, array $right) {
$order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
$posA = array_search($a['type'], $order, true);
$posB = array_search($b['type'], $order, true);
$posA = array_search($left['type'], $order, true);
$posB = array_search($right['type'], $order, true);
return $posA - $posB;
}

2
app/Models/Account.php
View File

@ -42,7 +42,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class Account
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/AccountMeta.php
View File

@ -32,7 +32,7 @@ use Carbon\Carbon;
/**
* Class AccountMeta
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property int $account_id

2
app/Models/AccountType.php
View File

@ -33,7 +33,7 @@ use Carbon\Carbon;
/**
* FireflyIII\Models\AccountType
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property string $type

2
app/Models/Attachment.php
View File

@ -38,7 +38,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\Attachment
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/AuditLogEntry.php
View File

@ -42,7 +42,7 @@ use Carbon\Carbon;
* @method static Builder|AuditLogEntry query()
* @method static \Illuminate\Database\Query\Builder|AuditLogEntry withTrashed()
* @method static \Illuminate\Database\Query\Builder|AuditLogEntry withoutTrashed()
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/AutoBudget.php
View File

@ -35,7 +35,7 @@ use Carbon\Carbon;
/**
* FireflyIII\Models\AutoBudget
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/AvailableBudget.php
View File

@ -36,7 +36,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\AvailableBudget
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/Bill.php
View File

@ -41,7 +41,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\Bill
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/Budget.php
View File

@ -39,7 +39,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\Budget
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/BudgetLimit.php
View File

@ -37,7 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\BudgetLimit
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property int $budget_id

2
app/Models/Category.php
View File

@ -38,7 +38,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\Category
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/Configuration.php
View File

@ -32,7 +32,7 @@ use Carbon\Carbon;
/**
* FireflyIII\Models\Configuration
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/CurrencyExchangeRate.php
View File

@ -35,7 +35,7 @@ use Carbon\Carbon;
/**
* Class CurrencyExchangeRate
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property string|null $deleted_at

2
app/Models/InvitedUser.php
View File

@ -39,7 +39,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* @method static Builder|InvitedUser newModelQuery()
* @method static Builder|InvitedUser newQuery()
* @method static Builder|InvitedUser query()
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property int $user_id

2
app/Models/LinkType.php
View File

@ -35,7 +35,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\LinkType
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/Location.php
View File

@ -35,7 +35,7 @@ use Carbon\Carbon;
/**
* FireflyIII\Models\Location
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/Note.php
View File

@ -33,7 +33,7 @@ use Carbon\Carbon;
/**
* FireflyIII\Models\Note
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

4
app/Models/ObjectGroup.php
View File

@ -37,8 +37,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\ObjectGroup
*
* @property int $id
* @property int $user_id
* @property int|string $id
* @property int|string $user_id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/PiggyBank.php
View File

@ -39,7 +39,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\PiggyBank
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/PiggyBankEvent.php
View File

@ -33,7 +33,7 @@ use Carbon\Carbon;
/**
* FireflyIII\Models\PiggyBankEvent
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property int $piggy_bank_id

2
app/Models/PiggyBankRepetition.php
View File

@ -33,7 +33,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
/**
* FireflyIII\Models\PiggyBankRepetition
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property int $piggy_bank_id

2
app/Models/Preference.php
View File

@ -34,7 +34,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\Preference
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property int $user_id

2
app/Models/Recurrence.php
View File

@ -38,7 +38,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\Recurrence
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/RecurrenceMeta.php
View File

@ -33,7 +33,7 @@ use Carbon\Carbon;
/**
* FireflyIII\Models\RecurrenceMeta
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/RecurrenceRepetition.php
View File

@ -33,7 +33,7 @@ use Carbon\Carbon;
/**
* FireflyIII\Models\RecurrenceRepetition
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/RecurrenceTransaction.php
View File

@ -36,7 +36,7 @@ use Carbon\Carbon;
/**
* FireflyIII\Models\RecurrenceTransaction
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/RecurrenceTransactionMeta.php
View File

@ -33,7 +33,7 @@ use Carbon\Carbon;
/**
* FireflyIII\Models\RecurrenceTransactionMeta
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/Role.php
View File

@ -34,7 +34,7 @@ use Carbon\Carbon;
/**
* FireflyIII\Models\Role
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property string $name

2
app/Models/Rule.php
View File

@ -37,7 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\Rule
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/RuleAction.php
View File

@ -32,7 +32,7 @@ use Carbon\Carbon;
/**
* FireflyIII\Models\RuleAction
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property int $rule_id

2
app/Models/RuleGroup.php
View File

@ -37,7 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\RuleGroup
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/RuleTrigger.php
View File

@ -32,7 +32,7 @@ use Carbon\Carbon;
/**
* FireflyIII\Models\RuleTrigger
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property int $rule_id

2
app/Models/Tag.php
View File

@ -38,7 +38,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\Tag
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/Transaction.php
View File

@ -37,7 +37,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
/**
* FireflyIII\Models\Transaction
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/TransactionCurrency.php
View File

@ -37,7 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\TransactionCurrency
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/TransactionGroup.php
View File

@ -37,7 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\TransactionGroup
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/TransactionJournal.php
View File

@ -41,7 +41,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\TransactionJournal
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/TransactionJournalLink.php
View File

@ -35,7 +35,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\TransactionJournalLink
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property int $link_type_id

2
app/Models/TransactionJournalMeta.php
View File

@ -33,7 +33,7 @@ use Carbon\Carbon;
/**
* FireflyIII\Models\TransactionJournalMeta
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property int $transaction_journal_id

2
app/Models/TransactionType.php
View File

@ -35,7 +35,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\TransactionType
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/UserGroup.php
View File

@ -39,7 +39,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class UserGroup
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property string|null $deleted_at

2
app/Models/UserRole.php
View File

@ -34,7 +34,7 @@ use Carbon\Carbon;
/**
* Class UserRole
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property string|null $deleted_at

2
app/Models/Webhook.php
View File

@ -40,7 +40,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\Webhook
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Carbon|null $deleted_at

2
app/Models/WebhookAttempt.php
View File

@ -35,7 +35,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class WebhookAttempt
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property string|null $deleted_at

2
app/Models/WebhookMessage.php
View File

@ -37,7 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* FireflyIII\Models\WebhookMessage
*
* @property int $id
* @property int|string $id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property string|null $deleted_at

382
composer.json
View File

@ -1,193 +1,201 @@
{
"name": "grumpydictator/firefly-iii",
"description": "Firefly III: a personal finances manager.",
"keywords": [
"finance",
"finances",
"manager",
"management",
"euro",
"dollar",
"laravel",
"money",
"currency",
"financials",
"financial",
"budgets",
"administration",
"tool",
"tooling",
"help",
"helper",
"assistant",
"planning",
"organizing",
"bills",
"personal finance",
"budgets",
"budgeting",
"budgeting tool",
"budgeting application",
"transactions",
"self hosted",
"self-hosted",
"transfers",
"management"
],
"license": "AGPL-3.0-or-later",
"homepage": "https://github.com/firefly-iii/firefly-iii",
"type": "project",
"readme": "readme.md",
"authors": [
{
"name": "James Cole",
"email": "james@firefly-iii.org",
"homepage": "https://github.com/firefly-iii",
"role": "Developer"
}
],
"support": {
"email": "james@firefly-iii.org",
"issues": "https://github.com/firefly-iii/firefly-iii/issues",
"forum": "https://gitter.im/firefly-iii/firefly-iii",
"wiki": "https://github.com/firefly-iii/help/wiki",
"source": "https://github.com/firefly-iii/firefly-iii",
"docs": "https://docs.firefly-iii.org/"
},
"funding": [
{
"type": "patreon",
"url": "https://www.patreon.com/JC5"
"name": "grumpydictator/firefly-iii",
"description": "Firefly III: a personal finances manager.",
"keywords": [
"finance",
"finances",
"manager",
"management",
"euro",
"dollar",
"laravel",
"money",
"currency",
"financials",
"financial",
"budgets",
"administration",
"tool",
"tooling",
"help",
"helper",
"assistant",
"planning",
"organizing",
"bills",
"personal finance",
"budgets",
"budgeting",
"budgeting tool",
"budgeting application",
"transactions",
"self hosted",
"self-hosted",
"transfers",
"management"
],
"license": "AGPL-3.0-or-later",
"homepage": "https://github.com/firefly-iii/firefly-iii",
"type": "project",
"readme": "readme.md",
"authors": [
{
"name": "James Cole",
"email": "james@firefly-iii.org",
"homepage": "https://github.com/firefly-iii",
"role": "Developer"
}
],
"support": {
"email": "james@firefly-iii.org",
"issues": "https://github.com/firefly-iii/firefly-iii/issues",
"forum": "https://gitter.im/firefly-iii/firefly-iii",
"wiki": "https://github.com/firefly-iii/help/wiki",
"source": "https://github.com/firefly-iii/firefly-iii",
"docs": "https://docs.firefly-iii.org/"
},
{
"type": "github",
"url": "https://github.com/sponsors/JC5"
}
],
"require": {
"php": ">=8.2",
"ext-bcmath": "*",
"ext-curl": "*",
"ext-fileinfo": "*",
"ext-iconv": "*",
"ext-intl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"ext-pdo": "*",
"ext-session": "*",
"ext-simplexml": "*",
"ext-sodium": "*",
"ext-tokenizer": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
"bacon/bacon-qr-code": "2.*",
"diglactic/laravel-breadcrumbs": "^8.1",
"doctrine/dbal": "3.*",
"gdbots/query-parser": "^3.0",
"guzzlehttp/guzzle": "^7.8",
"jc5/google2fa-laravel": "^2.0",
"jc5/recovery": "^2",
"laravel/framework": "^10",
"laravel/passport": "11.*",
"laravel/sanctum": "^3.3",
"laravel/slack-notification-channel": "^3.0",
"laravel/ui": "^4.2",
"league/commonmark": "2.*",
"league/csv": "^9.10",
"league/fractal": "0.*",
"nunomaduro/collision": "^7.7",
"pragmarx/google2fa": "^8.0",
"predis/predis": "^2.2",
"psr/log": "<4",
"ramsey/uuid": "^4.7",
"rcrowe/twigbridge": "^0.14",
"spatie/laravel-html": "^3.2",
"spatie/laravel-ignition": "^2",
"spatie/period": "^2.4",
"symfony/http-client": "^6.3",
"symfony/mailgun-mailer": "^6.3",
"therobfonz/laravel-mandrill-driver": "^5.0"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "2.*",
"ergebnis/phpstan-rules": "^2.1",
"fakerphp/faker": "1.*",
"filp/whoops": "2.*",
"mockery/mockery": "1.*",
"nunomaduro/larastan": "^2.6",
"phpstan/phpstan": "^1.10",
"phpstan/phpstan-deprecation-rules": "^1.1",
"phpstan/phpstan-strict-rules": "^1.4",
"phpunit/phpunit": "^10",
"thecodingmachine/phpstan-strict-rules": "^1.0"
},
"suggest": {
},
"autoload": {
"psr-4": {
"FireflyIII\\": "app/",
"Domain\\": "domain/",
"Database\\Factories\\": "database/factories/",
"Database\\Seeders\\": "database/seeders/"
}
},
"autoload-dev": {
"psr-4": {
"Tests\\": "tests/"
}
},
"extra": {
"laravel": {
"dont-discover": []
}
},
"scripts": {
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
"funding": [
{
"type": "patreon",
"url": "https://www.patreon.com/JC5"
},
{
"type": "github",
"url": "https://github.com/sponsors/JC5"
}
],
"post-create-project-cmd": [
"@php artisan key:generate"
],
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump"
],
"post-update-cmd": [
"@php artisan config:clear",
"@php artisan route:clear",
"@php artisan twig:clean",
"@php artisan view:clear",
"@php artisan clear-compiled",
"@php artisan cache:clear",
"@php artisan firefly-iii:upgrade-database",
"@php artisan firefly-iii:correct-database",
"@php artisan firefly-iii:report-integrity",
"@php artisan passport:install",
"@php artisan firefly:instructions update"
],
"post-install-cmd": [
"@php artisan firefly:instructions install",
"@php artisan firefly-iii:verify-security-alerts"
],
"unit-test": [
"@php vendor/bin/phpunit -c phpunit.xml --testsuite unit --no-coverage"
],
"integration-test": [
"@php vendor/bin/phpunit -c phpunit.xml --testsuite integration --no-coverage"
],
"coverage": [
"@php vendor/bin/phpunit -c phpunit.xml"
]
},
"config": {
"platform": {
"php": "8.2"
"require": {
"php": ">=8.2",
"ext-bcmath": "*",
"ext-curl": "*",
"ext-fileinfo": "*",
"ext-iconv": "*",
"ext-intl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"ext-pdo": "*",
"ext-session": "*",
"ext-simplexml": "*",
"ext-sodium": "*",
"ext-tokenizer": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
"bacon/bacon-qr-code": "2.*",
"diglactic/laravel-breadcrumbs": "^8.1",
"doctrine/dbal": "3.*",
"gdbots/query-parser": "^3.0",
"guzzlehttp/guzzle": "^7.8",
"jc5/google2fa-laravel": "^2.0",
"jc5/recovery": "^2",
"laravel/framework": "^10",
"laravel/passport": "11.*",
"laravel/sanctum": "^3.3",
"laravel/slack-notification-channel": "^3.0",
"laravel/ui": "^4.2",
"league/commonmark": "2.*",
"league/csv": "^9.10",
"league/fractal": "0.*",
"nunomaduro/collision": "^7.7",
"pragmarx/google2fa": "^8.0",
"predis/predis": "^2.2",
"psr/log": "<4",
"ramsey/uuid": "^4.7",
"rcrowe/twigbridge": "^0.14",
"spatie/laravel-html": "^3.2",
"spatie/laravel-ignition": "^2",
"spatie/period": "^2.4",
"symfony/http-client": "^6.3",
"symfony/mailgun-mailer": "^6.3",
"therobfonz/laravel-mandrill-driver": "^5.0"
},
"preferred-install": "dist",
"sort-packages": true,
"optimize-autoloader": true,
"allow-plugins": {
"composer/package-versions-deprecated": true
"require-dev": {
"barryvdh/laravel-ide-helper": "2.*",
"ergebnis/phpstan-rules": "^2.1",
"fakerphp/faker": "1.*",
"filp/whoops": "2.*",
"mockery/mockery": "1.*",
"nunomaduro/larastan": "^2.6",
"phpstan/extension-installer": "^1.3",
"phpstan/phpstan": "^1.10",
"phpstan/phpstan-deprecation-rules": "^1.1",
"phpstan/phpstan-strict-rules": "^1.4",
"phpunit/phpunit": "^10",
"symplify/phpstan-rules": "^12.4",
"thecodingmachine/phpstan-strict-rules": "^1.0"
},
"suggest": {
},
"autoload": {
"psr-4": {
"FireflyIII\\": "app/",
"Domain\\": "domain/",
"Database\\Factories\\": "database/factories/",
"Database\\Seeders\\": "database/seeders/"
}
},
"autoload-dev": {
"psr-4": {
"Tests\\": "tests/"
}
},
"extra": {
"laravel": {
"dont-discover": []
},
"phpstan": {
"includes": [
"extension.neon"
]
}
},
"scripts": {
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],
"post-create-project-cmd": [
"@php artisan key:generate"
],
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump"
],
"post-update-cmd": [
"@php artisan config:clear",
"@php artisan route:clear",
"@php artisan twig:clean",
"@php artisan view:clear",
"@php artisan clear-compiled",
"@php artisan cache:clear",
"@php artisan firefly-iii:upgrade-database",
"@php artisan firefly-iii:correct-database",
"@php artisan firefly-iii:report-integrity",
"@php artisan passport:install",
"@php artisan firefly:instructions update"
],
"post-install-cmd": [
"@php artisan firefly:instructions install",
"@php artisan firefly-iii:verify-security-alerts"
],
"unit-test": [
"@php vendor/bin/phpunit -c phpunit.xml --testsuite unit --no-coverage"
],
"integration-test": [
"@php vendor/bin/phpunit -c phpunit.xml --testsuite integration --no-coverage"
],
"coverage": [
"@php vendor/bin/phpunit -c phpunit.xml"
]
},
"config": {
"platform": {
"php": "8.2"
},
"preferred-install": "dist",
"sort-packages": true,
"optimize-autoloader": true,
"allow-plugins": {
"composer/package-versions-deprecated": true,
"phpstan/extension-installer": true
}
}
}
}

249
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "639b971ea13ea3e6ed2f57f862a195b8",
"content-hash": "68c12b4cd64c80ddda151a22622e822d",
"packages": [
{
"name": "bacon/bacon-qr-code",
@ -1073,16 +1073,16 @@
},
{
"name": "filp/whoops",
"version": "2.15.3",
"version": "2.15.4",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
"reference": "c83e88a30524f9360b11f585f71e6b17313b7187"
"reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/c83e88a30524f9360b11f585f71e6b17313b7187",
"reference": "c83e88a30524f9360b11f585f71e6b17313b7187",
"url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546",
"reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546",
"shasum": ""
},
"require": {
@ -1132,7 +1132,7 @@
],
"support": {
"issues": "https://github.com/filp/whoops/issues",
"source": "https://github.com/filp/whoops/tree/2.15.3"
"source": "https://github.com/filp/whoops/tree/2.15.4"
},
"funding": [
{
@ -1140,7 +1140,7 @@
"type": "github"
}
],
"time": "2023-07-13T12:00:00+00:00"
"time": "2023-11-03T12:00:00+00:00"
},
{
"name": "firebase/php-jwt",
@ -1939,16 +1939,16 @@
},
{
"name": "laravel/framework",
"version": "v10.29.0",
"version": "v10.30.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "2d002849a16ad131110a50cbea4d64dbb78515a3"
"reference": "7a2da50258c4d0f693b738d3f3c69b2693aea6c1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/2d002849a16ad131110a50cbea4d64dbb78515a3",
"reference": "2d002849a16ad131110a50cbea4d64dbb78515a3",
"url": "https://api.github.com/repos/laravel/framework/zipball/7a2da50258c4d0f693b738d3f3c69b2693aea6c1",
"reference": "7a2da50258c4d0f693b738d3f3c69b2693aea6c1",
"shasum": ""
},
"require": {
@ -2137,7 +2137,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2023-10-24T13:48:53+00:00"
"time": "2023-11-01T13:52:17+00:00"
},
{
"name": "laravel/passport",
@ -2219,16 +2219,16 @@
},
{
"name": "laravel/prompts",
"version": "v0.1.12",
"version": "v0.1.13",
"source": {
"type": "git",
"url": "https://github.com/laravel/prompts.git",
"reference": "b35f249028c22016e45e48626e19e5d42fd827ff"
"reference": "e1379d8ead15edd6cc4369c22274345982edc95a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/prompts/zipball/b35f249028c22016e45e48626e19e5d42fd827ff",
"reference": "b35f249028c22016e45e48626e19e5d42fd827ff",
"url": "https://api.github.com/repos/laravel/prompts/zipball/e1379d8ead15edd6cc4369c22274345982edc95a",
"reference": "e1379d8ead15edd6cc4369c22274345982edc95a",
"shasum": ""
},
"require": {
@ -2270,9 +2270,9 @@
],
"support": {
"issues": "https://github.com/laravel/prompts/issues",
"source": "https://github.com/laravel/prompts/tree/v0.1.12"
"source": "https://github.com/laravel/prompts/tree/v0.1.13"
},
"time": "2023-10-18T14:18:57+00:00"
"time": "2023-10-27T13:53:59+00:00"
},
{
"name": "laravel/sanctum",
@ -2402,16 +2402,16 @@
},
{
"name": "laravel/slack-notification-channel",
"version": "v3.0.1",
"version": "v3.1.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/slack-notification-channel.git",
"reference": "dc5742f91f10a5ec21d32541ceb509f1e8e4c94f"
"reference": "c74265319b1d0ca710771d6c708558553972e1d6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/dc5742f91f10a5ec21d32541ceb509f1e8e4c94f",
"reference": "dc5742f91f10a5ec21d32541ceb509f1e8e4c94f",
"url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/c74265319b1d0ca710771d6c708558553972e1d6",
"reference": "c74265319b1d0ca710771d6c708558553972e1d6",
"shasum": ""
},
"require": {
@ -2461,9 +2461,9 @@
],
"support": {
"issues": "https://github.com/laravel/slack-notification-channel/issues",
"source": "https://github.com/laravel/slack-notification-channel/tree/v3.0.1"
"source": "https://github.com/laravel/slack-notification-channel/tree/v3.1.0"
},
"time": "2023-07-25T21:12:45+00:00"
"time": "2023-10-30T17:52:13+00:00"
},
{
"name": "laravel/ui",
@ -2593,16 +2593,16 @@
},
{
"name": "lcobucci/jwt",
"version": "5.0.0",
"version": "5.1.0",
"source": {
"type": "git",
"url": "https://github.com/lcobucci/jwt.git",
"reference": "47bdb0e0b5d00c2f89ebe33e7e384c77e84e7c34"
"reference": "f0031c07b96db6a0ca649206e7eacddb7e9d5908"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/lcobucci/jwt/zipball/47bdb0e0b5d00c2f89ebe33e7e384c77e84e7c34",
"reference": "47bdb0e0b5d00c2f89ebe33e7e384c77e84e7c34",
"url": "https://api.github.com/repos/lcobucci/jwt/zipball/f0031c07b96db6a0ca649206e7eacddb7e9d5908",
"reference": "f0031c07b96db6a0ca649206e7eacddb7e9d5908",
"shasum": ""
},
"require": {
@ -2610,20 +2610,20 @@
"ext-json": "*",
"ext-openssl": "*",
"ext-sodium": "*",
"php": "~8.1.0 || ~8.2.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"psr/clock": "^1.0"
},
"require-dev": {
"infection/infection": "^0.26.19",
"infection/infection": "^0.27.0",
"lcobucci/clock": "^3.0",
"lcobucci/coding-standard": "^9.0",
"phpbench/phpbench": "^1.2.8",
"lcobucci/coding-standard": "^11.0",
"phpbench/phpbench": "^1.2.9",
"phpstan/extension-installer": "^1.2",
"phpstan/phpstan": "^1.10.3",
"phpstan/phpstan-deprecation-rules": "^1.1.2",
"phpstan/phpstan-phpunit": "^1.3.8",
"phpstan/phpstan": "^1.10.7",
"phpstan/phpstan-deprecation-rules": "^1.1.3",
"phpstan/phpstan-phpunit": "^1.3.10",
"phpstan/phpstan-strict-rules": "^1.5.0",
"phpunit/phpunit": "^10.0.12"
"phpunit/phpunit": "^10.2.6"
},
"suggest": {
"lcobucci/clock": ">= 3.0"
@ -2652,7 +2652,7 @@
],
"support": {
"issues": "https://github.com/lcobucci/jwt/issues",
"source": "https://github.com/lcobucci/jwt/tree/5.0.0"
"source": "https://github.com/lcobucci/jwt/tree/5.1.0"
},
"funding": [
{
@ -2664,7 +2664,7 @@
"type": "patreon"
}
],
"time": "2023-02-25T21:35:16+00:00"
"time": "2023-10-31T06:41:47+00:00"
},
{
"name": "league/commonmark",
@ -3859,16 +3859,16 @@
},
{
"name": "nette/utils",
"version": "v4.0.2",
"version": "v4.0.3",
"source": {
"type": "git",
"url": "https://github.com/nette/utils.git",
"reference": "cead6637226456b35e1175cc53797dd585d85545"
"reference": "a9d127dd6a203ce6d255b2e2db49759f7506e015"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nette/utils/zipball/cead6637226456b35e1175cc53797dd585d85545",
"reference": "cead6637226456b35e1175cc53797dd585d85545",
"url": "https://api.github.com/repos/nette/utils/zipball/a9d127dd6a203ce6d255b2e2db49759f7506e015",
"reference": "a9d127dd6a203ce6d255b2e2db49759f7506e015",
"shasum": ""
},
"require": {
@ -3939,9 +3939,9 @@
],
"support": {
"issues": "https://github.com/nette/utils/issues",
"source": "https://github.com/nette/utils/tree/v4.0.2"
"source": "https://github.com/nette/utils/tree/v4.0.3"
},
"time": "2023-09-19T11:58:07+00:00"
"time": "2023-10-29T21:02:13+00:00"
},
{
"name": "nunomaduro/collision",
@ -6636,16 +6636,16 @@
},
{
"name": "symfony/http-foundation",
"version": "v6.3.6",
"version": "v6.3.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "c186627f52febe09c6d5270b04f8462687a250a6"
"reference": "59d1837d5d992d16c2628cd0d6b76acf8d69b33e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/c186627f52febe09c6d5270b04f8462687a250a6",
"reference": "c186627f52febe09c6d5270b04f8462687a250a6",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/59d1837d5d992d16c2628cd0d6b76acf8d69b33e",
"reference": "59d1837d5d992d16c2628cd0d6b76acf8d69b33e",
"shasum": ""
},
"require": {
@ -6693,7 +6693,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-foundation/tree/v6.3.6"
"source": "https://github.com/symfony/http-foundation/tree/v6.3.7"
},
"funding": [
{
@ -6709,20 +6709,20 @@
"type": "tidelift"
}
],
"time": "2023-10-17T11:32:53+00:00"
"time": "2023-10-28T23:55:27+00:00"
},
{
"name": "symfony/http-kernel",
"version": "v6.3.6",
"version": "v6.3.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "4945f5001b06ff9080cd3d8f1f9f069094c0d156"
"reference": "6d4098095f93279d9536a0e9124439560cc764d0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/4945f5001b06ff9080cd3d8f1f9f069094c0d156",
"reference": "4945f5001b06ff9080cd3d8f1f9f069094c0d156",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/6d4098095f93279d9536a0e9124439560cc764d0",
"reference": "6d4098095f93279d9536a0e9124439560cc764d0",
"shasum": ""
},
"require": {
@ -6806,7 +6806,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-kernel/tree/v6.3.6"
"source": "https://github.com/symfony/http-kernel/tree/v6.3.7"
},
"funding": [
{
@ -6822,7 +6822,7 @@
"type": "tidelift"
}
],
"time": "2023-10-21T13:12:51+00:00"
"time": "2023-10-29T14:31:45+00:00"
},
{
"name": "symfony/mailer",
@ -8198,16 +8198,16 @@
},
{
"name": "symfony/translation",
"version": "v6.3.6",
"version": "v6.3.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "869b26c7a9d4b8a48afdd77ab36031909c87e3a2"
"reference": "30212e7c87dcb79c83f6362b00bde0e0b1213499"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/869b26c7a9d4b8a48afdd77ab36031909c87e3a2",
"reference": "869b26c7a9d4b8a48afdd77ab36031909c87e3a2",
"url": "https://api.github.com/repos/symfony/translation/zipball/30212e7c87dcb79c83f6362b00bde0e0b1213499",
"reference": "30212e7c87dcb79c83f6362b00bde0e0b1213499",
"shasum": ""
},
"require": {
@ -8273,7 +8273,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/translation/tree/v6.3.6"
"source": "https://github.com/symfony/translation/tree/v6.3.7"
},
"funding": [
{
@ -8289,7 +8289,7 @@
"type": "tidelift"
}
],
"time": "2023-10-17T11:32:53+00:00"
"time": "2023-10-28T23:11:45+00:00"
},
{
"name": "symfony/translation-contracts",
@ -10017,6 +10017,50 @@
],
"time": "2023-09-19T12:34:29+00:00"
},
{
"name": "phpstan/extension-installer",
"version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/phpstan/extension-installer.git",
"reference": "f45734bfb9984c6c56c4486b71230355f066a58a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f45734bfb9984c6c56c4486b71230355f066a58a",
"reference": "f45734bfb9984c6c56c4486b71230355f066a58a",
"shasum": ""
},
"require": {
"composer-plugin-api": "^2.0",
"php": "^7.2 || ^8.0",
"phpstan/phpstan": "^1.9.0"
},
"require-dev": {
"composer/composer": "^2.0",
"php-parallel-lint/php-parallel-lint": "^1.2.0",
"phpstan/phpstan-strict-rules": "^0.11 || ^0.12 || ^1.0"
},
"type": "composer-plugin",
"extra": {
"class": "PHPStan\\ExtensionInstaller\\Plugin"
},
"autoload": {
"psr-4": {
"PHPStan\\ExtensionInstaller\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Composer plugin for automatic installation of PHPStan extensions",
"support": {
"issues": "https://github.com/phpstan/extension-installer/issues",
"source": "https://github.com/phpstan/extension-installer/tree/1.3.1"
},
"time": "2023-05-24T08:59:17+00:00"
},
{
"name": "phpstan/phpdoc-parser",
"version": "1.24.2",
@ -10066,16 +10110,16 @@
},
{
"name": "phpstan/phpstan",
"version": "1.10.39",
"version": "1.10.40",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "d9dedb0413f678b4d03cbc2279a48f91592c97c4"
"reference": "93c84b5bf7669920d823631e39904d69b9c7dc5d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/d9dedb0413f678b4d03cbc2279a48f91592c97c4",
"reference": "d9dedb0413f678b4d03cbc2279a48f91592c97c4",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/93c84b5bf7669920d823631e39904d69b9c7dc5d",
"reference": "93c84b5bf7669920d823631e39904d69b9c7dc5d",
"shasum": ""
},
"require": {
@ -10124,7 +10168,7 @@
"type": "tidelift"
}
],
"time": "2023-10-17T15:46:26+00:00"
"time": "2023-10-30T14:48:31+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
@ -10176,21 +10220,21 @@
},
{
"name": "phpstan/phpstan-strict-rules",
"version": "1.5.1",
"version": "1.5.2",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-strict-rules.git",
"reference": "b21c03d4f6f3a446e4311155f4be9d65048218e6"
"reference": "7a50e9662ee9f3942e4aaaf3d603653f60282542"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/b21c03d4f6f3a446e4311155f4be9d65048218e6",
"reference": "b21c03d4f6f3a446e4311155f4be9d65048218e6",
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/7a50e9662ee9f3942e4aaaf3d603653f60282542",
"reference": "7a50e9662ee9f3942e4aaaf3d603653f60282542",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0",
"phpstan/phpstan": "^1.10"
"phpstan/phpstan": "^1.10.34"
},
"require-dev": {
"nikic/php-parser": "^4.13.0",
@ -10219,9 +10263,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.5.1"
"source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.5.2"
},
"time": "2023-03-29T14:47:40+00:00"
"time": "2023-10-30T14:35:06+00:00"
},
{
"name": "phpunit/php-code-coverage",
@ -11560,6 +11604,61 @@
],
"time": "2023-02-07T11:34:05+00:00"
},
{
"name": "symplify/phpstan-rules",
"version": "12.4.3",
"source": {
"type": "git",
"url": "https://github.com/symplify/phpstan-rules.git",
"reference": "54def05dea85612c8c7729933ba5457dbd3eed64"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symplify/phpstan-rules/zipball/54def05dea85612c8c7729933ba5457dbd3eed64",
"reference": "54def05dea85612c8c7729933ba5457dbd3eed64",
"shasum": ""
},
"require": {
"nette/utils": "^3.2 || ^4.0",
"nikic/php-parser": "^4.17.1",
"php": "^7.2|^8.0",
"phpstan/phpstan": "^1.10.30",
"webmozart/assert": "^1.11"
},
"type": "phpstan-extension",
"extra": {
"phpstan": {
"includes": [
"config/services/services.neon"
]
}
},
"autoload": {
"psr-4": {
"Symplify\\PHPStanRules\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Set of Symplify rules for PHPStan",
"support": {
"issues": "https://github.com/symplify/phpstan-rules/issues",
"source": "https://github.com/symplify/phpstan-rules/tree/12.4.3"
},
"funding": [
{
"url": "https://www.paypal.me/rectorphp",
"type": "custom"
},
{
"url": "https://github.com/tomasvotruba",
"type": "github"
}
],
"time": "2023-10-19T08:45:51+00:00"
},
{
"name": "thecodingmachine/phpstan-strict-rules",
"version": "v1.0.0",
@ -11693,5 +11792,5 @@
"platform-overrides": {
"php": "8.2"
},
"plugin-api-version": "2.3.0"
"plugin-api-version": "2.6.0"
}