diff --git a/app/Bootstrap/ConfigureLogging.php b/app/Bootstrap/ConfigureLogging.php index 23dc0980b8..d06e820990 100644 --- a/app/Bootstrap/ConfigureLogging.php +++ b/app/Bootstrap/ConfigureLogging.php @@ -9,9 +9,9 @@ namespace FireflyIII\Bootstrap; -use Illuminate\Log\Writer; use Illuminate\Contracts\Foundation\Application; use Illuminate\Foundation\Bootstrap\ConfigureLogging as IlluminateConfigureLogging; +use Illuminate\Log\Writer; /** * Class ConfigureLogging @@ -26,7 +26,7 @@ class ConfigureLogging extends IlluminateConfigureLogging */ protected function configureSingleHandler(Application $app, Writer $log) { - $log->useFiles($app->storagePath().'/logs/firefly-iii.log'); + $log->useFiles($app->storagePath() . '/logs/firefly-iii.log'); } /** @@ -36,7 +36,7 @@ class ConfigureLogging extends IlluminateConfigureLogging protected function configureDailyHandler(Application $app, Writer $log) { $log->useDailyFiles( - $app->storagePath().'/logs/firefly-iii.log', + $app->storagePath() . '/logs/firefly-iii.log', $app->make('config')->get('app.log_max_files', 5) ); } diff --git a/app/Export/Collector/AttachmentCollector.php b/app/Export/Collector/AttachmentCollector.php index ee361b604a..e3882d6a62 100644 --- a/app/Export/Collector/AttachmentCollector.php +++ b/app/Export/Collector/AttachmentCollector.php @@ -70,6 +70,7 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface $this->exportDisk->put($file, $this->explanationString); Log::debug('Also put explanation file "' . $file . '" in the zip.'); $this->getFiles()->push($file); + return true; } diff --git a/app/Export/Collector/UploadCollector.php b/app/Export/Collector/UploadCollector.php index dc3a741fed..c1f1062b6e 100644 --- a/app/Export/Collector/UploadCollector.php +++ b/app/Export/Collector/UploadCollector.php @@ -58,6 +58,7 @@ class UploadCollector extends BasicCollector implements CollectorInterface foreach ($files as $entry) { $this->processOldUpload($entry); } + return true; } diff --git a/app/Export/Exporter/CsvExporter.php b/app/Export/Exporter/CsvExporter.php index 6457b8609b..8b8421d766 100644 --- a/app/Export/Exporter/CsvExporter.php +++ b/app/Export/Exporter/CsvExporter.php @@ -72,6 +72,7 @@ class CsvExporter extends BasicExporter implements ExporterInterface } $writer->insertAll($rows); + return true; } diff --git a/app/Export/Processor.php b/app/Export/Processor.php index 38bc8345df..a42edbdd7c 100644 --- a/app/Export/Processor.php +++ b/app/Export/Processor.php @@ -81,6 +81,7 @@ class Processor $attachmentCollector = app('FireflyIII\Export\Collector\AttachmentCollector', [$this->job]); $attachmentCollector->run(); $this->files = $this->files->merge($attachmentCollector->getFiles()); + return true; } @@ -89,7 +90,7 @@ class Processor */ public function collectJournals(): bool { - $args = [$this->accounts, Auth::user(), $this->settings['startDate'], $this->settings['endDate']]; + $args = [$this->accounts, Auth::user(), $this->settings['startDate'], $this->settings['endDate']]; /** @var JournalCollector $journalCollector */ $journalCollector = app('FireflyIII\Repositories\Journal\JournalCollector', $args); $this->journals = $journalCollector->collect(); @@ -100,6 +101,7 @@ class Processor $this->settings['endDate']->format('Y-m-d') . ').' ); + return true; } @@ -112,6 +114,7 @@ class Processor $uploadCollector->run(); $this->files = $this->files->merge($uploadCollector->getFiles()); + return true; } @@ -127,6 +130,7 @@ class Processor $count++; } Log::debug('Converted ' . $count . ' journals to "Entry" objects.'); + return true; } @@ -137,6 +141,7 @@ class Processor { $this->configurationMaker = app('FireflyIII\Export\ConfigurationFile', [$this->job]); $this->files->push($this->configurationMaker->make()); + return true; } @@ -173,6 +178,7 @@ class Processor $disk->delete($file); } Log::debug('Done!'); + return true; } @@ -188,6 +194,7 @@ class Processor $exporter->run(); $this->files->push($exporter->getFileName()); Log::debug('Added "' . $exporter->getFileName() . '" to the list of files to include in the zip.'); + return true; } diff --git a/app/Handlers/Events/SendRegistrationMail.php b/app/Handlers/Events/SendRegistrationMail.php index 04069d8cf6..3b3d2881be 100644 --- a/app/Handlers/Events/SendRegistrationMail.php +++ b/app/Handlers/Events/SendRegistrationMail.php @@ -60,6 +60,7 @@ class SendRegistrationMail } catch (Swift_TransportException $e) { Log::error($e->getMessage()); } + return true; } } diff --git a/app/Handlers/Events/UserConfirmation.php b/app/Handlers/Events/UserConfirmation.php index 0c68908ca8..588dbd65c6 100644 --- a/app/Handlers/Events/UserConfirmation.php +++ b/app/Handlers/Events/UserConfirmation.php @@ -47,6 +47,7 @@ class UserConfirmation $user = $event->user; $ipAddress = $event->ipAddress; $this->doConfirm($user, $ipAddress); + return true; } @@ -62,6 +63,7 @@ class UserConfirmation $user = $event->user; $ipAddress = $event->ipAddress; $this->doConfirm($user, $ipAddress); + return true; } diff --git a/app/Handlers/Events/UserEventListener.php b/app/Handlers/Events/UserEventListener.php index 5f4e9b3029..a7bd41eb41 100644 --- a/app/Handlers/Events/UserEventListener.php +++ b/app/Handlers/Events/UserEventListener.php @@ -21,7 +21,7 @@ class UserEventListener { /** * Handle user logout events. - * + * * @return bool */ public function onUserLogout(): bool diff --git a/app/Helpers/Csv/Data.php b/app/Helpers/Csv/Data.php index 606ae42bbe..781d8ee5cf 100644 --- a/app/Helpers/Csv/Data.php +++ b/app/Helpers/Csv/Data.php @@ -73,6 +73,7 @@ class Data /** * FIXME may return null + * * @return string */ public function getCsvFileLocation(): string @@ -92,6 +93,7 @@ class Data /** * FIXME may return null + * * @return string */ public function getDateFormat(): string @@ -111,6 +113,7 @@ class Data /** * FIXME may return null + * * @return string */ public function getDelimiter(): string diff --git a/app/Helpers/Report/BalanceReportHelper.php b/app/Helpers/Report/BalanceReportHelper.php index 9a1687c813..5933d04954 100644 --- a/app/Helpers/Report/BalanceReportHelper.php +++ b/app/Helpers/Report/BalanceReportHelper.php @@ -95,8 +95,8 @@ class BalanceReportHelper implements BalanceReportHelperInterface { $line = new BalanceLine; $line->setBudget($budget); - $line->setStartDate($budget->startdate); // returned by getBudgetsAndLimitsInRange - $line->setEndDate($budget->enddate); // returned by getBudgetsAndLimitsInRange + $line->setStartDate($budget->startdate); // returned by getBudgetsAndLimitsInRange() + $line->setEndDate($budget->enddate); // returned by getBudgetsAndLimitsInRange() // loop accounts: foreach ($accounts as $account) { diff --git a/app/Helpers/Report/BudgetReportHelper.php b/app/Helpers/Report/BudgetReportHelper.php index 410d90ee6c..39ba0d8660 100644 --- a/app/Helpers/Report/BudgetReportHelper.php +++ b/app/Helpers/Report/BudgetReportHelper.php @@ -120,7 +120,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface $repository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface'); $budgets = $repository->getActiveBudgets(); - $set = new Collection; + $set = new Collection; /** @var Budget $budget */ foreach ($budgets as $budget) { $expenses = $repository->getExpensesPerDay($budget, $start, $end, $accounts); diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 2d644726dc..850c36671b 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -174,9 +174,9 @@ class BillController extends Controller */ public function show(BillRepositoryInterface $repository, Bill $bill) { - $page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page')); - $pageSize = Preferences::get('transactionPageSize', 50)->data; - $journals = $repository->getJournals($bill, $page, $pageSize); + $page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page')); + $pageSize = Preferences::get('transactionPageSize', 50)->data; + $journals = $repository->getJournals($bill, $page, $pageSize); $journals->setPath('/bills/show/' . $bill->id); $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill); $hideBill = true; diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index fe7e001209..c284247fa5 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -149,7 +149,6 @@ class BudgetController extends Controller $budgeted = '0'; $range = Preferences::get('viewRange', '1M')->data; $repeatFreq = Config::get('firefly.range_to_repeat_freq.' . $range); - /** @var Carbon $date */ /** @var Carbon $start */ $start = session('start', new Carbon); /** @var Carbon $end */ diff --git a/app/Http/Controllers/Chart/PiggyBankController.php b/app/Http/Controllers/Chart/PiggyBankController.php index 1eab1366f0..c0bcff2052 100644 --- a/app/Http/Controllers/Chart/PiggyBankController.php +++ b/app/Http/Controllers/Chart/PiggyBankController.php @@ -7,7 +7,6 @@ use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\PiggyBank; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Support\CacheProperties; -use Illuminate\Support\Collection; use Response; diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index a0a0055b0d..b82e96c7a5 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -100,9 +100,9 @@ class ReportController extends Controller break; case ($role === BalanceLine::ROLE_DIFFROLE): // journals no budget, not corrected by a tag. - $journals = $budgetRepository->getAllWithoutBudget($account, $attributes['accounts'], $attributes['startDate'], $attributes['endDate']); + $journals = $budgetRepository->getAllWithoutBudget($account, $attributes['accounts'], $attributes['startDate'], $attributes['endDate']); $budget->name = strval(trans('firefly.leftUnbalanced')); - $journals = $journals->filter( + $journals = $journals->filter( function (TransactionJournal $journal) { $tags = $journal->tags()->where('tagMode', 'balancingAct')->count(); if ($tags === 0) { diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index 8a04819529..c6b4f59de6 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -138,7 +138,7 @@ class PreferencesController extends Controller // save page size: $transactionPageSize = intval(Input::get('transactionPageSize')); - if($transactionPageSize > 0 && $transactionPageSize < 1337) { + if ($transactionPageSize > 0 && $transactionPageSize < 1337) { Preferences::set('transactionPageSize', $transactionPageSize); } else { Preferences::set('transactionPageSize', 50); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index c7d8e2bb63..7cb25cef58 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -36,15 +36,16 @@ class Kernel extends HttpKernel * * @var array */ - protected $bootstrappers = [ - 'Illuminate\Foundation\Bootstrap\DetectEnvironment', - 'Illuminate\Foundation\Bootstrap\LoadConfiguration', - 'FireflyIII\Bootstrap\ConfigureLogging', - 'Illuminate\Foundation\Bootstrap\HandleExceptions', - 'Illuminate\Foundation\Bootstrap\RegisterFacades', - 'Illuminate\Foundation\Bootstrap\RegisterProviders', - 'Illuminate\Foundation\Bootstrap\BootProviders', - ]; + protected $bootstrappers + = [ + 'Illuminate\Foundation\Bootstrap\DetectEnvironment', + 'Illuminate\Foundation\Bootstrap\LoadConfiguration', + 'FireflyIII\Bootstrap\ConfigureLogging', + 'Illuminate\Foundation\Bootstrap\HandleExceptions', + 'Illuminate\Foundation\Bootstrap\RegisterFacades', + 'Illuminate\Foundation\Bootstrap\RegisterProviders', + 'Illuminate\Foundation\Bootstrap\BootProviders', + ]; /** * The application's global HTTP middleware stack. @@ -144,7 +145,7 @@ class Kernel extends HttpKernel // MUST be confirmed. // MUST have owner role // (this group includes the other Firefly middleware) - 'admin' => [ + 'admin' => [ EncryptCookies::class, AddQueuedCookiesToResponse::class, StartSession::class, diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php index 19687815cf..1ee3118131 100644 --- a/app/Models/TransactionJournalMeta.php +++ b/app/Models/TransactionJournalMeta.php @@ -31,14 +31,14 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta whereName($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta whereData($value) * @mixin \Eloquent - * @property string $hash + * @property string $hash * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournalMeta whereHash($value) */ class TransactionJournalMeta extends Model { protected $dates = ['created_at', 'updated_at']; - protected $fillable = ['transaction_journal_id', 'name', 'data','hash']; + protected $fillable = ['transaction_journal_id', 'name', 'data', 'hash']; protected $table = 'journal_meta'; /** diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 4475d28529..7295f28218 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -3,9 +3,10 @@ declare(strict_types = 1); namespace FireflyIII\Providers; +use Config; use Illuminate\Support\ServiceProvider; use Log; -use Config; + /** * Class AppServiceProvider * diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index 9994b5ba36..344d9b82a3 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -81,7 +81,7 @@ class FireflyServiceProvider extends ServiceProvider } ); - + $this->app->bind('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface', 'FireflyIII\Repositories\Currency\CurrencyRepository'); $this->app->bind('FireflyIII\Support\Search\SearchInterface', 'FireflyIII\Support\Search\Search'); $this->app->bind('FireflyIII\Repositories\User\UserRepositoryInterface', 'FireflyIII\Repositories\User\UserRepository'); diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index 7eed5eb3a3..3e83e6a121 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -124,7 +124,8 @@ interface AccountRepositoryInterface /** * @param Account $account * @param int $page - * @param int $pageSize + * @param int $pageSize + * * @return LengthAwarePaginator */ public function getJournals(Account $account, int $page, int $pageSize = 50): LengthAwarePaginator; diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index 90eb42c8b4..cc891e8b5e 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -327,6 +327,7 @@ class BillRepository implements BillRepositoryInterface /** * Get all journals that were recorded on this bill between these dates. + * * @param Bill $bill * @param Carbon $start * @param Carbon $end diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php index c913972cea..ad8bc3301e 100644 --- a/app/Repositories/ExportJob/ExportJobRepository.php +++ b/app/Repositories/ExportJob/ExportJobRepository.php @@ -83,7 +83,7 @@ class ExportJobRepository implements ExportJobRepositoryInterface /** * * FIXME this may return null - * + * * @param string $key * * @return ExportJob|null diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index e2d83e1790..a719b7e654 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -119,6 +119,7 @@ class RuleRepository implements RuleRepositoryInterface $rule->order = ($rule->order + 1); $rule->save(); $this->resetRulesInGroupOrder($rule->ruleGroup); + return true; } @@ -141,6 +142,7 @@ class RuleRepository implements RuleRepositoryInterface $rule->order = ($rule->order - 1); $rule->save(); $this->resetRulesInGroupOrder($rule->ruleGroup); + return true; } @@ -342,6 +344,7 @@ class RuleRepository implements RuleRepositoryInterface $this->storeAction($rule, $actionValues); } + return true; } @@ -349,6 +352,7 @@ class RuleRepository implements RuleRepositoryInterface /** * @param Rule $rule * @param array $data + * * @return bool */ private function storeTriggers(Rule $rule, array $data): bool @@ -378,6 +382,7 @@ class RuleRepository implements RuleRepositoryInterface $this->storeTrigger($rule, $triggerValues); $order++; } + return true; } } diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php index f2e74925d8..2cd7207d49 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepository.php +++ b/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -133,6 +133,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface $ruleGroup->order = ($ruleGroup->order + 1); $ruleGroup->save(); $this->resetRuleGroupOrder(); + return true; } @@ -155,6 +156,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface $ruleGroup->order = ($ruleGroup->order - 1); $ruleGroup->save(); $this->resetRuleGroupOrder(); + return true; } diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index a9cbea562f..0ac270ae34 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -6,7 +6,6 @@ namespace FireflyIII\Repositories\Tag; use Carbon\Carbon; use DB; -use FireflyIII\Models\Account; use FireflyIII\Models\Tag; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php index d8c1d33c05..675b0bf34a 100644 --- a/app/Repositories/Tag/TagRepositoryInterface.php +++ b/app/Repositories/Tag/TagRepositoryInterface.php @@ -4,7 +4,6 @@ declare(strict_types = 1); namespace FireflyIII\Repositories\Tag; use Carbon\Carbon; -use FireflyIII\Models\Account; use FireflyIII\Models\Tag; use FireflyIII\Models\TransactionJournal; use Illuminate\Support\Collection; diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index 4b266746c9..a3e40cd4d6 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -286,7 +286,7 @@ class ExpandedForm return $html; } - + /** * @param $name diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php index 52b958816b..6815fc44d4 100644 --- a/app/Support/Preferences.php +++ b/app/Support/Preferences.php @@ -111,9 +111,10 @@ class Preferences $user = Auth::user(); if (is_null($user)) { // make new preference, return it: - $pref = new Preference; + $pref = new Preference; $pref->name = $name; $pref->data = $value; + return $pref; } diff --git a/app/User.php b/app/User.php index 7fa2a18230..af88320eb7 100644 --- a/app/User.php +++ b/app/User.php @@ -19,9 +19,9 @@ use Illuminate\Foundation\Auth\User as Authenticatable; * @property string $password * @property string $remember_token * @property string $reset - * @property bool $activated - * @property bool $isAdmin - * @property bool $has2FA + * @property bool $activated + * @property bool $isAdmin + * @property bool $has2FA * @property boolean $blocked * @property string $blocked_code * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts diff --git a/config/firefly.php b/config/firefly.php index 3c7e8b8b19..99413b8555 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -63,6 +63,7 @@ return [ '1M' => 'monthly', '3M' => 'quarterly', '6M' => 'half-year', + '1Y' => 'yearly', 'custom' => 'monthly', ], 'subTitlesByIdentifier' => diff --git a/tests/acceptance/Controllers/Chart/ChartBudgetControllerTest.php b/tests/acceptance/Controllers/Chart/ChartBudgetControllerTest.php index cb78e11ab8..becb98cdcc 100644 --- a/tests/acceptance/Controllers/Chart/ChartBudgetControllerTest.php +++ b/tests/acceptance/Controllers/Chart/ChartBudgetControllerTest.php @@ -74,19 +74,4 @@ class ChartBudgetControllerTest extends TestCase $this->assertResponseStatus(200); } - - /** - * @covers FireflyIII\Http\Controllers\Chart\BudgetController::year - */ - public function testYear() - { - $repository = $this->mock('FireflyIII\Repositories\Budget\BudgetRepositoryInterface'); - $repository->shouldReceive('getBudgetsAndExpensesPerMonth')->once()->andReturn([]); - $repository->shouldReceive('getWithoutBudgetSum')->times(12)->andReturn('0'); - - $this->be($this->user()); - $this->call('GET', '/chart/budget/year/default/20150101/20151231/1'); - $this->assertResponseStatus(200); - - } }