kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Route fixes and fix tests.

Browse Source
This commit is contained in:
James Cole
2018-08-09 19:44:36 +02:00
parent 2ed433c96d
commit 5908b4b000
15 changed files with 19 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Support/Http/Controllers/RequestInformation.php
View File

@@ -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');
}
/**