diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php index 1b393e7291..6c9e8a19eb 100644 --- a/app/Http/Controllers/Account/IndexController.php +++ b/app/Http/Controllers/Account/IndexController.php @@ -121,7 +121,4 @@ class IndexController extends Controller } - - - } diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index f1703a1884..cf37c7f2a9 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -28,10 +28,8 @@ use FireflyIII\Http\Controllers\Controller; use FireflyIII\Support\Http\Controllers\RequestInformation; use FireflyIII\User; use Illuminate\Auth\Events\Registered; -use Illuminate\Contracts\Validation\Validator as ValidatorContract; use Illuminate\Foundation\Auth\RegistersUsers; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Validator; /** * Class RegisterController diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 8b6e7e8a9c..9c8ee4fb29 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -29,7 +29,6 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Routing\Controller as BaseController; -use Log; use Route; /** diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index 7d66276b23..79809ef843 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -245,5 +245,4 @@ class DebugController extends Controller } - } diff --git a/app/Http/Controllers/HelpController.php b/app/Http/Controllers/HelpController.php index 7ca1e7909a..a3b8f55a14 100644 --- a/app/Http/Controllers/HelpController.php +++ b/app/Http/Controllers/HelpController.php @@ -22,10 +22,8 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; -use FireflyIII\Helpers\Help\HelpInterface; use FireflyIII\Support\Http\Controllers\RequestInformation; use Illuminate\Http\JsonResponse; -use Log; /** * Class HelpController. diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index b1204fb5f1..5d71f272fc 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -22,19 +22,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Popup; -use Carbon\Carbon; use FireflyIII\Helpers\Collection\BalanceLine; use FireflyIII\Helpers\Report\PopupReportInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; -use FireflyIII\Support\Binder\AccountList; use FireflyIII\Support\Http\Controllers\RequestInformation; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Route; -use InvalidArgumentException; use Log; use Throwable; diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 2d4c9ad0db..35939c90fd 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -56,6 +56,7 @@ use phpseclib\Crypt\RSA; class ProfileController extends Controller { use RequestInformation; + /** * ProfileController constructor. */ diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index 7f6b27707a..2f8ecf1b15 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -25,21 +25,15 @@ namespace FireflyIII\Http\Controllers\Transaction; use FireflyIII\Events\UpdatedTransactionJournal; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\SplitJournalFormRequest; -use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Support\Http\Controllers\ModelInformation; use FireflyIII\Support\Http\Controllers\RequestInformation; -use FireflyIII\Transformers\TransactionTransformer; use Illuminate\Http\Request; -use Illuminate\Support\Collection; -use Symfony\Component\HttpFoundation\ParameterBag; use View; /** @@ -178,7 +172,6 @@ class SplitController extends Controller } - /** * Get info from old input. * diff --git a/app/Support/Http/Controllers/RequestInformation.php b/app/Support/Http/Controllers/RequestInformation.php index 93caf0b424..0eaa36216b 100644 --- a/app/Support/Http/Controllers/RequestInformation.php +++ b/app/Support/Http/Controllers/RequestInformation.php @@ -39,13 +39,13 @@ use FireflyIII\User; use Hash; use Illuminate\Contracts\Validation\Validator as ValidatorContract; use Illuminate\Http\Request; +use Illuminate\Routing\Route; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Validator; use InvalidArgumentException; use Log; -use Route; use Symfony\Component\HttpFoundation\ParameterBag; - +use Route as RouteFacade; /** * Trait RequestInformation * @@ -193,7 +193,7 @@ trait RequestInformation */ protected function getPageName(): string // get request info { - return str_replace('.', '_', Route::currentRouteName()); + return str_replace('.', '_', RouteFacade::currentRouteName()); } /** @@ -203,7 +203,7 @@ trait RequestInformation */ protected function getSpecificPageName(): string // get request info { - return null === Route::current()->parameter('what') ? '' : '_' . Route::current()->parameter('what'); + return null === RouteFacade::current()->parameter('what') ? '' : '_' . RouteFacade::current()->parameter('what'); } /** diff --git a/tests/Feature/Controllers/Account/ShowControllerTest.php b/tests/Feature/Controllers/Account/ShowControllerTest.php index 355e3973b4..288eed03a5 100644 --- a/tests/Feature/Controllers/Account/ShowControllerTest.php +++ b/tests/Feature/Controllers/Account/ShowControllerTest.php @@ -166,7 +166,6 @@ class ShowControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Account\ShowController - * @expectedExceptionMessage Expected a transaction */ public function testShowBrokenInitial(): void { @@ -180,7 +179,9 @@ class ShowControllerTest extends TestCase $this->be($this->user()); $account = $this->user()->accounts()->where('account_type_id', 6)->orderBy('id', 'ASC')->whereNull('deleted_at')->first(); $response = $this->get(route('accounts.show', [$account->id])); - $response->assertStatus(500); + $response->assertStatus(302); + $response->assertRedirect(route('index')); + $response->assertSessionHas('error'); } /** diff --git a/tests/Feature/Controllers/Budget/IndexControllerTest.php b/tests/Feature/Controllers/Budget/IndexControllerTest.php index 3ab7a3f11f..e5cb82a19e 100644 --- a/tests/Feature/Controllers/Budget/IndexControllerTest.php +++ b/tests/Feature/Controllers/Budget/IndexControllerTest.php @@ -220,18 +220,10 @@ class IndexControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); $repository->shouldReceive('cleanupBudgets'); - $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection([$budget])); - $repository->shouldReceive('getInactiveBudgets')->andReturn(new Collection); - $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); - $repository->shouldReceive('spentInPeriod')->andReturn('-1'); - $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection([$budgetLimit])); - $repository->shouldReceive('collectBudgetInformation')->andReturn($budgetInfo); $this->be($this->user()); $this->changeDateRange($this->user(), $range); $response = $this->get(route('budgets.index', ['Hello-there'])); - $response->assertStatus(200); - // has bread crumb - $response->assertSee('
    '); + $response->assertStatus(404); } } diff --git a/tests/Feature/Controllers/ExportControllerTest.php b/tests/Feature/Controllers/ExportControllerTest.php index 74792cbc04..bcd4acb5ce 100644 --- a/tests/Feature/Controllers/ExportControllerTest.php +++ b/tests/Feature/Controllers/ExportControllerTest.php @@ -61,6 +61,8 @@ class ExportControllerTest extends TestCase $repository = $this->mock(ExportJobRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('changeStatus')->once(); + $repository->shouldReceive('exists')->once()->andReturn(true); $repository->shouldReceive('getContent')->once()->andReturn('Some content beep boop'); diff --git a/tests/Feature/Controllers/Rule/CreateControllerTest.php b/tests/Feature/Controllers/Rule/CreateControllerTest.php index 6d29c4db2e..220ec7c5fa 100644 --- a/tests/Feature/Controllers/Rule/CreateControllerTest.php +++ b/tests/Feature/Controllers/Rule/CreateControllerTest.php @@ -100,7 +100,7 @@ class CreateControllerTest extends TestCase $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('store')->andReturn(new Rule); - $repository->shouldReceive('find')->withArgs([0])->andReturn(new Rule)->once(); + //$repository->shouldReceive('find')->withArgs([0])->andReturn(new Rule)->once(); $this->session(['rules.create.uri' => 'http://localhost']); $data = [ diff --git a/tests/Feature/Controllers/Rule/EditControllerTest.php b/tests/Feature/Controllers/Rule/EditControllerTest.php index 39ef002eff..919e8bc454 100644 --- a/tests/Feature/Controllers/Rule/EditControllerTest.php +++ b/tests/Feature/Controllers/Rule/EditControllerTest.php @@ -106,7 +106,6 @@ class EditControllerTest extends TestCase $journalRepos = $this->mock(JournalRepositoryInterface::class); $rule = Rule::find(1); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('find')->withArgs([1])->andReturn($rule)->once(); $repository->shouldReceive('update'); $data = [ diff --git a/tests/Feature/Controllers/Transaction/SingleControllerTest.php b/tests/Feature/Controllers/Transaction/SingleControllerTest.php index fcb0189be7..a1587dc6ba 100644 --- a/tests/Feature/Controllers/Transaction/SingleControllerTest.php +++ b/tests/Feature/Controllers/Transaction/SingleControllerTest.php @@ -229,6 +229,7 @@ class SingleControllerTest extends TestCase $attRepos = $this->mock(AttachmentHelperInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('setUser')->once(); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $account = $this->user()->accounts()->first(); @@ -272,6 +273,7 @@ class SingleControllerTest extends TestCase $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); + $journalRepos->shouldReceive('setUser')->once(); $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection)->once(); @@ -318,6 +320,7 @@ class SingleControllerTest extends TestCase $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); + $journalRepos->shouldReceive('setUser')->once(); $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection)->once(); @@ -390,6 +393,7 @@ class SingleControllerTest extends TestCase $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); + $journalRepos->shouldReceive('setUser')->once(); $this->be($this->user()); $withdrawal = TransactionJournal::where('transaction_type_id', 1) @@ -439,6 +443,7 @@ class SingleControllerTest extends TestCase $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); + $journalRepos->shouldReceive('setUser')->once(); $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection)->once(); @@ -487,6 +492,7 @@ class SingleControllerTest extends TestCase $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $journalRepos->shouldReceive('setUser')->once(); $account = $this->user()->accounts()->first(); $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection)->once(); @@ -528,6 +534,7 @@ class SingleControllerTest extends TestCase $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); + $journalRepos->shouldReceive('setUser')->once(); $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection)->once();