Code clean up.

This commit is contained in:
James Cole
2017-11-15 12:25:49 +01:00
parent 57dcdfa0c4
commit ffca858b8d
476 changed files with 2055 additions and 4181 deletions

View File

@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Http\Middleware;
@@ -28,17 +27,15 @@ use Illuminate\Http\Request;
use Illuminate\Session\Middleware\StartSession;
/**
* Class StartFireflySession
*
* @package FireflyIII\Http\Middleware
* Class StartFireflySession.
*/
class StartFireflySession extends StartSession
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param Closure $next
* @param \Illuminate\Http\Request $request
* @param Closure $next
*
* @return mixed
*/
@@ -50,16 +47,14 @@ class StartFireflySession extends StartSession
/**
* Store the current URL for the request if necessary.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Contracts\Session\Session $session
*
* @return void
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Contracts\Session\Session $session
*/
protected function storeCurrentUrl(Request $request, $session)
{
$uri = $request->fullUrl();
$strpos = strpos($uri, 'jscript');
if ($request->method() === 'GET' && $request->route() && !$request->ajax() && $strpos === false) {
if ('GET' === $request->method() && $request->route() && !$request->ajax() && false === $strpos) {
$session->setPreviousUrl($uri);
}
}