From 22f4d2979ad70eb991e4802cfacc97b58c1cd3bb Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 11 May 2015 22:12:53 +0200 Subject: [PATCH] Added some more ignores, edited some middleware. --- app/Helpers/Help/Help.php | 4 ++++ app/Http/Middleware/PiggyBanks.php | 2 +- app/Http/Middleware/Range.php | 2 +- app/Http/Middleware/Reminders.php | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Helpers/Help/Help.php b/app/Helpers/Help/Help.php index eddad2614f..edb1093e85 100644 --- a/app/Helpers/Help/Help.php +++ b/app/Helpers/Help/Help.php @@ -17,6 +17,7 @@ class Help implements HelpInterface { /** + * @codeCoverageIgnore * @param $key * * @return string @@ -54,6 +55,7 @@ class Help implements HelpInterface } /** + * @codeCoverageIgnore * @param $route * * @return bool @@ -64,6 +66,7 @@ class Help implements HelpInterface } /** + * @codeCoverageIgnore * @param $route * @param array $content * @@ -76,6 +79,7 @@ class Help implements HelpInterface } /** + * @codeCoverageIgnore * @param $route * * @return bool diff --git a/app/Http/Middleware/PiggyBanks.php b/app/Http/Middleware/PiggyBanks.php index 8c00cf2376..810f396fce 100644 --- a/app/Http/Middleware/PiggyBanks.php +++ b/app/Http/Middleware/PiggyBanks.php @@ -46,7 +46,7 @@ class PiggyBanks */ public function handle(Request $request, Closure $next) { - if ($this->auth->check() && !$request->isXmlHttpRequest() && App::environment() != 'testing') { + if ($this->auth->check() && !$request->isXmlHttpRequest()) { // get piggy banks without a repetition: /** @var Collection $set */ $set = $this->auth->user()->piggybanks() diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php index 7407e4a7d2..aa7fd7a98b 100644 --- a/app/Http/Middleware/Range.php +++ b/app/Http/Middleware/Range.php @@ -48,7 +48,7 @@ class Range */ public function handle(Request $request, Closure $theNext) { - if ($this->auth->check() && App::environment() != 'testing') { + if ($this->auth->check()) { // ignore preference. set the range to be the current month: if (!Session::has('start') && !Session::has('end')) { diff --git a/app/Http/Middleware/Reminders.php b/app/Http/Middleware/Reminders.php index 457e4e2543..55c555aec0 100644 --- a/app/Http/Middleware/Reminders.php +++ b/app/Http/Middleware/Reminders.php @@ -46,7 +46,7 @@ class Reminders */ public function handle(Request $request, Closure $next) { - if ($this->auth->check() && !$request->isXmlHttpRequest() && App::environment() != 'testing') { + if ($this->auth->check() && !$request->isXmlHttpRequest()) { // do reminders stuff. $piggyBanks = $this->auth->user()->piggyBanks()->where('remind_me', 1)->get(); $today = new Carbon;