diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php index bb85b88a08..d8153ba008 100644 --- a/app/Http/Controllers/System/InstallController.php +++ b/app/Http/Controllers/System/InstallController.php @@ -36,7 +36,6 @@ use Illuminate\Http\Request; use Illuminate\View\View; use Laravel\Passport\Passport; use Log; -use phpseclib\Crypt\RSA as LegacyRSA; use phpseclib3\Crypt\RSA; /** @@ -228,18 +227,8 @@ class InstallController extends Controller // switch on PHP version. $keys = []; // switch on class existence. - Log::info(sprintf('PHP version is %s', phpversion())); - if (class_exists(LegacyRSA::class)) { - // PHP 7 - Log::info('Will run PHP7 code.'); - $keys = (new LegacyRSA())->createKey(4096); - } - - if (!class_exists(LegacyRSA::class)) { - // PHP 8 - Log::info('Will run PHP8 code.'); - $keys = RSA::createKey(4096); - } + Log::info('Will run PHP8 code.'); + $keys = RSA::createKey(4096); [$publicKey, $privateKey] = [ Passport::keyPath('oauth-public.key'), diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index c44bf69cd5..a6763bb3f9 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -136,6 +136,7 @@ class TagRepository implements TagRepositoryInterface */ public function findByTag(string $tag): ?Tag { + /** @var Tag|null */ return $this->user->tags()->where('tag', $tag)->first(); } @@ -146,12 +147,8 @@ class TagRepository implements TagRepositoryInterface */ public function firstUseDate(Tag $tag): ?Carbon { - $journal = $tag->transactionJournals()->orderBy('date', 'ASC')->first(); - if (null !== $journal) { - return $journal->date; - } - - return null; + /** @var Carbon|null */ + return $tag->transactionJournals()->orderBy('date', 'ASC')->first()?->date; } /** @@ -236,12 +233,8 @@ class TagRepository implements TagRepositoryInterface */ public function lastUseDate(Tag $tag): ?Carbon { - $journal = $tag->transactionJournals()->orderBy('date', 'DESC')->first(); - if (null !== $journal) { - return $journal->date; - } - - return null; + /** @var Carbon|null */ + return $tag->transactionJournals()->orderBy('date', 'DESC')->first()?->date; } /** @@ -251,6 +244,7 @@ class TagRepository implements TagRepositoryInterface */ public function newestTag(): ?Tag { + /** @var Tag|null */ return $this->user->tags()->whereNotNull('date')->orderBy('date', 'DESC')->first(); } @@ -259,6 +253,7 @@ class TagRepository implements TagRepositoryInterface */ public function oldestTag(): ?Tag { + /** @var Tag|null */ return $this->user->tags()->whereNotNull('date')->orderBy('date', 'ASC')->first(); } @@ -370,7 +365,6 @@ class TagRepository implements TagRepositoryInterface ]; // add foreign amount to correct type: $amount = app('steam')->positive((string)$journal['foreign_amount']); - $type = $journal['transaction_type_type']; if (TransactionType::WITHDRAWAL === $type) { $amount = bcmul($amount, '-1'); } @@ -458,6 +452,7 @@ class TagRepository implements TagRepositoryInterface */ public function getLocation(Tag $tag): ?Location { + /** @var Location|null */ return $tag->locations()->first(); } } diff --git a/app/Support/Http/Controllers/CreateStuff.php b/app/Support/Http/Controllers/CreateStuff.php index 368b57ea1e..df8cdf4af0 100644 --- a/app/Support/Http/Controllers/CreateStuff.php +++ b/app/Support/Http/Controllers/CreateStuff.php @@ -30,7 +30,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\User; use Laravel\Passport\Passport; use Log; -use phpseclib\Crypt\RSA as LegacyRSA; use phpseclib3\Crypt\RSA; /** @@ -113,21 +112,7 @@ trait CreateStuff return; } - // switch on class existence. - $keys = []; - Log::info(sprintf('PHP version is %s', phpversion())); - if (class_exists(LegacyRSA::class)) { - // PHP 7 - Log::info('Will run PHP7 code.'); - $keys = (new LegacyRSA())->createKey(4096); - } - - if (!class_exists(LegacyRSA::class)) { - // PHP 8 - Log::info('Will run PHP8 code.'); - $keys = RSA::createKey(4096); - } - + $keys = RSA::createKey(4096); Log::alert('NO OAuth keys were found. They have been created.'); diff --git a/public/v1/css/firefly.css b/public/v1/css/firefly.css index 70c5658c13..2c93945e76 100644 --- a/public/v1/css/firefly.css +++ b/public/v1/css/firefly.css @@ -26,7 +26,7 @@ input.ti-new-tag-input { font-size: 14px !important; line-height: 1.42857143; - color:red; /* color: #555;*/ + color: #555; font-family:"Source Sans Pro", "Helvetica Neue",Helvetica,Arial,sans-serif !important; } diff --git a/resources/assets/js/components/transactions/CustomTransactionFields.vue b/resources/assets/js/components/transactions/CustomTransactionFields.vue index 7dbfdc11ed..e55fcf0014 100644 --- a/resources/assets/js/components/transactions/CustomTransactionFields.vue +++ b/resources/assets/js/components/transactions/CustomTransactionFields.vue @@ -20,7 +20,7 @@