Merge pull request #236 from fenos/analysis-8Q0nRO

Apply fixes from StyleCI [ci skip] [skip ci]
fenos · Dec 15, 2016 · 17a8c70 · 17a8c70
2 parents ce6b1e7 + 5a880da
commit 17a8c70
Show file tree

Hide file tree

Showing 19 changed files with 47 additions and 48 deletions.
diff --git a/src/Notifynder/Builder/Builder.php b/src/Notifynder/Builder/Builder.php
@@ -2,13 +2,13 @@
 
 namespace Fenos\Notifynder\Builder;
 
+use Closure;
 use ArrayAccess;
 use Carbon\Carbon;
-use Closure;
-use Fenos\Notifynder\Exceptions\UnvalidNotificationException;
+use Illuminate\Database\Eloquent\Model;
 use Fenos\Notifynder\Helpers\TypeChecker;
 use Fenos\Notifynder\Models\NotificationCategory;
-use Illuminate\Database\Eloquent\Model;
+use Fenos\Notifynder\Exceptions\UnvalidNotificationException;
 
 /**
  * Class Builder.

diff --git a/src/Notifynder/Builder/Notification.php b/src/Notifynder/Builder/Notification.php
@@ -3,11 +3,11 @@
 namespace Fenos\Notifynder\Builder;
 
 use ArrayAccess;
-use Fenos\Notifynder\Parsers\NotificationParser;
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Contracts\Support\Jsonable;
-use Illuminate\Support\Arr;
 use JsonSerializable;
+use Illuminate\Support\Arr;
+use Illuminate\Contracts\Support\Jsonable;
+use Illuminate\Contracts\Support\Arrayable;
+use Fenos\Notifynder\Parsers\NotificationParser;
 use Fenos\Notifynder\Models\Notification as ModelNotification;
 
 /**

diff --git a/src/Notifynder/Collections/Config.php b/src/Notifynder/Collections/Config.php
@@ -2,10 +2,10 @@
 
 namespace Fenos\Notifynder\Collections;
 
-use Fenos\Notifynder\Contracts\ConfigContract;
-use Fenos\Notifynder\Models\Notification;
 use Illuminate\Support\Arr;
 use InvalidArgumentException;
+use Fenos\Notifynder\Models\Notification;
+use Fenos\Notifynder\Contracts\ConfigContract;
 
 /**
  * Class Config.

diff --git a/src/Notifynder/Helpers/TypeChecker.php b/src/Notifynder/Helpers/TypeChecker.php
@@ -2,10 +2,10 @@
 
 namespace Fenos\Notifynder\Helpers;
 
-use Carbon\Carbon;
 use DateTime;
-use InvalidArgumentException;
 use Traversable;
+use Carbon\Carbon;
+use InvalidArgumentException;
 
 /**
  * Class TypeChecker.

diff --git a/src/Notifynder/Managers/NotifynderManager.php b/src/Notifynder/Managers/NotifynderManager.php
@@ -2,12 +2,12 @@
 
 namespace Fenos\Notifynder\Managers;
 
-use BadMethodCallException;
 use Closure;
+use BadMethodCallException;
+use Illuminate\Support\Str;
 use Fenos\Notifynder\Builder\Builder;
-use Fenos\Notifynder\Contracts\NotifynderManagerContract;
 use Fenos\Notifynder\Contracts\SenderManagerContract;
-use Illuminate\Support\Str;
+use Fenos\Notifynder\Contracts\NotifynderManagerContract;
 
 /**
  * Class NotifynderManager.

diff --git a/src/Notifynder/Managers/SenderManager.php b/src/Notifynder/Managers/SenderManager.php
@@ -2,13 +2,13 @@
 
 namespace Fenos\Notifynder\Managers;
 
-use BadFunctionCallException;
-use BadMethodCallException;
 use Closure;
-use Fenos\Notifynder\Contracts\SenderContract;
-use Fenos\Notifynder\Contracts\SenderManagerContract;
+use BadMethodCallException;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
+use BadFunctionCallException;
+use Fenos\Notifynder\Contracts\SenderContract;
+use Fenos\Notifynder\Contracts\SenderManagerContract;
 
 /**
  * Class SenderManager.

diff --git a/src/Notifynder/Models/Notification.php b/src/Notifynder/Models/Notification.php
@@ -2,10 +2,10 @@
 
 namespace Fenos\Notifynder\Models;
 
-use Fenos\Notifynder\Builder\Notification as BuilderNotification;
-use Fenos\Notifynder\Parsers\NotificationParser;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Builder;
+use Fenos\Notifynder\Parsers\NotificationParser;
+use Fenos\Notifynder\Builder\Notification as BuilderNotification;
 
 /**
  * Class Notification.

diff --git a/src/Notifynder/Models/NotificationCategory.php b/src/Notifynder/Models/NotificationCategory.php
@@ -2,9 +2,9 @@
 
 namespace Fenos\Notifynder\Models;
 
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Builder;
 
 /**
  * Class NotificationCategory.

diff --git a/src/Notifynder/NotifynderServiceProvider.php b/src/Notifynder/NotifynderServiceProvider.php
@@ -2,16 +2,16 @@
 
 namespace Fenos\Notifynder;
 
+use Illuminate\Support\ServiceProvider;
 use Fenos\Notifynder\Collections\Config;
-use Fenos\Notifynder\Contracts\ConfigContract;
-use Fenos\Notifynder\Contracts\NotifynderManagerContract;
-use Fenos\Notifynder\Contracts\SenderManagerContract;
-use Fenos\Notifynder\Managers\NotifynderManager;
-use Fenos\Notifynder\Managers\SenderManager;
-use Fenos\Notifynder\Senders\MultipleSender;
 use Fenos\Notifynder\Senders\OnceSender;
 use Fenos\Notifynder\Senders\SingleSender;
-use Illuminate\Support\ServiceProvider;
+use Fenos\Notifynder\Managers\SenderManager;
+use Fenos\Notifynder\Senders\MultipleSender;
+use Fenos\Notifynder\Contracts\ConfigContract;
+use Fenos\Notifynder\Managers\NotifynderManager;
+use Fenos\Notifynder\Contracts\SenderManagerContract;
+use Fenos\Notifynder\Contracts\NotifynderManagerContract;
 
 /**
  * Class NotifynderServiceProvider.

diff --git a/src/Notifynder/Parsers/NotificationParser.php b/src/Notifynder/Parsers/NotificationParser.php
@@ -2,10 +2,10 @@
 
 namespace Fenos\Notifynder\Parsers;
 
-use Fenos\Notifynder\Builder\Notification as BuilderNotification;
+use Fenos\Notifynder\Models\NotificationCategory;
 use Fenos\Notifynder\Exceptions\ExtraParamsException;
 use Fenos\Notifynder\Models\Notification as ModelNotification;
-use Fenos\Notifynder\Models\NotificationCategory;
+use Fenos\Notifynder\Builder\Notification as BuilderNotification;
 
 /**
  * Class NotificationParser.

diff --git a/src/Notifynder/Senders/SingleSender.php b/src/Notifynder/Senders/SingleSender.php
@@ -2,9 +2,9 @@
 
 namespace Fenos\Notifynder\Senders;
 
+use Fenos\Notifynder\Models\Notification;
 use Fenos\Notifynder\Contracts\SenderContract;
 use Fenos\Notifynder\Contracts\SenderManagerContract;
-use Fenos\Notifynder\Models\Notification;
 
 /**
  * Class SingleSender.

diff --git a/src/migrations/2014_08_01_210813_create_notification_groups_table.php b/src/migrations/2014_08_01_210813_create_notification_groups_table.php
@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class CreateNotificationGroupsTable extends Migration
 {

diff --git a/src/migrations/2014_08_01_211045_create_notification_category_notification_group_table.php b/src/migrations/2014_08_01_211045_create_notification_category_notification_group_table.php
@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class CreateNotificationCategoryNotificationGroupTable extends Migration
 {

diff --git a/tests/NotifynderTestCase.php b/tests/NotifynderTestCase.php
@@ -1,14 +1,14 @@
 <?php
 
-use Orchestra\Testbench\TestCase as OrchestraTestCase;
-use Fenos\Tests\Models\User;
-use Fenos\Tests\Models\UserL53;
 use Fenos\Tests\Models\Car;
+use Fenos\Tests\Models\User;
 use Fenos\Tests\Models\CarL53;
-use Fenos\Notifynder\NotifynderServiceProvider;
-use Fenos\Notifynder\Facades\Notifynder as NotifynderFacade;
+use Fenos\Tests\Models\UserL53;
 use Illuminate\Database\Eloquent\Model;
+use Fenos\Notifynder\NotifynderServiceProvider;
 use Fenos\Notifynder\Models\NotificationCategory;
+use Orchestra\Testbench\TestCase as OrchestraTestCase;
+use Fenos\Notifynder\Facades\Notifynder as NotifynderFacade;
 
 abstract class NotifynderTestCase extends OrchestraTestCase
 {

diff --git a/tests/integration/Collections/ConfigTest.php b/tests/integration/Collections/ConfigTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Fenos\Notifynder\Models\Notification;
 use Fenos\Tests\Models\User;
+use Fenos\Notifynder\Models\Notification;
 
 class ConfigTest extends NotifynderTestCase
 {

diff --git a/tests/integration/Managers/NotifynderManagerTest.php b/tests/integration/Managers/NotifynderManagerTest.php
@@ -1,11 +1,11 @@
 <?php
 
-use Fenos\Notifynder\Models\Notification;
 use Fenos\Notifynder\Builder\Builder;
-use Fenos\Notifynder\Builder\Notification as BuilderNotification;
+use Fenos\Notifynder\Models\Notification;
+use Fenos\Notifynder\Managers\SenderManager;
 use Fenos\Notifynder\Models\Notification as ModelNotification;
+use Fenos\Notifynder\Builder\Notification as BuilderNotification;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
-use Fenos\Notifynder\Managers\SenderManager;
 
 class NotifynderManagerTest extends NotifynderTestCase
 {

diff --git a/tests/integration/Traits/NotifableTest.php b/tests/integration/Traits/NotifableTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use Fenos\Notifynder\Managers\NotifynderManager;
 use Fenos\Notifynder\Builder\Builder;
 use Fenos\Notifynder\Builder\Notification;
+use Fenos\Notifynder\Managers\NotifynderManager;
 
 class NotifableTest extends NotifynderTestCase
 {
@@ -100,7 +100,6 @@ public function testReadStatusRelatedMethods()
         $this->assertTrue($user->unreadNotification($notification->getKey()));
         $this->assertSame(25, $user->countUnreadNotifications());
 
-
         $user2 = $this->createUser();
         $this->sendNotificationsTo($user2, 5);
         $this->assertFalse($user->readNotification($user2->getNotificationRelation->first()));

diff --git a/tests/models/CarL53.php b/tests/models/CarL53.php
@@ -2,8 +2,8 @@
 
 namespace Fenos\Tests\Models;
 
-use Fenos\Notifynder\Traits\NotifableLaravel53;
 use Illuminate\Database\Eloquent\Model;
+use Fenos\Notifynder\Traits\NotifableLaravel53;
 
 class CarL53 extends Model
 {

diff --git a/tests/models/UserL53.php b/tests/models/UserL53.php
@@ -2,8 +2,8 @@
 
 namespace Fenos\Tests\Models;
 
-use Fenos\Notifynder\Traits\NotifableLaravel53;
 use Illuminate\Database\Eloquent\Model;
+use Fenos\Notifynder\Traits\NotifableLaravel53;
 
 class UserL53 extends Model
 {