Merge pull request #45 from viralsolani/analysis-8md3xa

viralsolani · web-flow · commit 7f7092d0271e · 2017-11-26T10:52:14.000+05:30
Apply fixes from StyleCI
diff --git a/app/Http/Controllers/Backend/Access/User/UserController.php b/app/Http/Controllers/Backend/Access/User/UserController.php
@@ -2,19 +2,18 @@
 
 namespace App\Http\Controllers\Backend\Access\User;
 
-use App\Models\Access\User\User;
-use Illuminate\Support\Facades\DB;
 use App\Http\Controllers\Controller;
-use App\Models\Access\Permission\Permission;
-use App\Repositories\Backend\Access\Role\RoleRepository;
-use App\Repositories\Backend\Access\User\UserRepository;
-use App\Http\Requests\Backend\Access\User\EditUserRequest;
-use App\Http\Requests\Backend\Access\User\ShowUserRequest;
-use App\Http\Requests\Backend\Access\User\StoreUserRequest;
 use App\Http\Requests\Backend\Access\User\CreateUserRequest;
 use App\Http\Requests\Backend\Access\User\DeleteUserRequest;
+use App\Http\Requests\Backend\Access\User\EditUserRequest;
 use App\Http\Requests\Backend\Access\User\ManageUserRequest;
+use App\Http\Requests\Backend\Access\User\ShowUserRequest;
+use App\Http\Requests\Backend\Access\User\StoreUserRequest;
 use App\Http\Requests\Backend\Access\User\UpdateUserRequest;
+use App\Models\Access\User\User;
+use App\Repositories\Backend\Access\Role\RoleRepository;
+use App\Repositories\Backend\Access\User\UserRepository;
+use Illuminate\Support\Facades\DB;
 
 /**
  * Class UserController.
diff --git a/app/Models/Access/Permission/Permission.php b/app/Models/Access/Permission/Permission.php
@@ -4,8 +4,8 @@
 
 use App\Models\Access\Permission\Traits\Attribute\PermissionAttribute;
 use App\Models\Access\Permission\Traits\Relationship\PermissionRelationship;
-use App\Models\ModelTrait;
 use App\Models\BaseModel;
+use App\Models\ModelTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
diff --git a/app/Models/Access/Role/Role.php b/app/Models/Access/Role/Role.php
@@ -6,8 +6,8 @@
 use App\Models\Access\Role\Traits\Relationship\RoleRelationship;
 use App\Models\Access\Role\Traits\RoleAccess;
 use App\Models\Access\Role\Traits\Scope\RoleScope;
-use App\Models\ModelTrait;
 use App\Models\BaseModel;
+use App\Models\ModelTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
diff --git a/app/Models/Access/User/User.php b/app/Models/Access/User/User.php
@@ -9,7 +9,6 @@
 use App\Models\Access\User\Traits\UserSendPasswordReset;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
-use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Notifications\Notifiable;
 
 /**
diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php
@@ -1,50 +1,49 @@
-<?php namespace App\Models;
+<?php
+
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
 class BaseModel extends Model
 {
     /**
-     * Generate drop-down select data with basic IDs
+     * Generate drop-down select data with basic IDs.
      *
      * @param null $id
      * @param null $val
+     *
      * @return array
      */
     public static function getSelectData($id = null, $val = null)
     {
-
         $collection = parent::all();
+
         return self::getItems($collection);
     }
 
     /**
-     * Generate items for drop-down select data with basic IDs
+     * Generate items for drop-down select data with basic IDs.
      *
      * @param $collection
+     *
      * @return array
      */
     public static function getItems($collection)
     {
-        $items = array();
+        $items = [];
 
-        foreach($collection as $model)
-        {
+        foreach ($collection as $model) {
             $items[$model->id] = [
                 'id'    => $model->id,
                 'name'  => $model->name,
                 'model' => $model,
             ];
         }
 
-        foreach($items as $id => $item)
-        {
-            if(isset(static::$selectHTMLFormat) && static::$selectHTMLFormat !== '')
-            {
+        foreach ($items as $id => $item) {
+            if (isset(static::$selectHTMLFormat) && static::$selectHTMLFormat !== '') {
                 $items[$item['id']] = static::generateSelectName($item['model'], static::$selectHTMLFormat);
-            }
-            else
-            {
+            } else {
                 $items[$item['id']] = $item['name'];
             }
         }
diff --git a/app/Models/BlogCategories/BlogCategory.php b/app/Models/BlogCategories/BlogCategory.php
@@ -3,10 +3,10 @@
 namespace App\Models\BlogCategories;
 
 use App\Models\BaseModel;
-use App\Models\ModelTrait;
-use Illuminate\Database\Eloquent\SoftDeletes;
 use App\Models\BlogCategories\Traits\Attribute\BlogCategoryAttribute;
 use App\Models\BlogCategories\Traits\Relationship\BlogCategoryRelationship;
+use App\Models\ModelTrait;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class BlogCategory extends BaseModel
 {
diff --git a/app/Models/BlogTags/BlogTag.php b/app/Models/BlogTags/BlogTag.php
@@ -2,10 +2,10 @@
 
 namespace App\Models\BlogTags;
 
+use App\Models\BaseModel;
 use App\Models\BlogTags\Traits\Attribute\BlogTagAttribute;
 use App\Models\BlogTags\Traits\Relationship\BlogTagRelationship;
 use App\Models\ModelTrait;
-use App\Models\BaseModel;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class BlogTag extends BaseModel
diff --git a/app/Models/Blogs/Blog.php b/app/Models/Blogs/Blog.php
@@ -2,10 +2,10 @@
 
 namespace App\Models\Blogs;
 
+use App\Models\BaseModel;
 use App\Models\Blogs\Traits\Attribute\BlogAttribute;
 use App\Models\Blogs\Traits\Relationship\BlogRelationship;
 use App\Models\ModelTrait;
-use App\Models\BaseModel;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Blog extends BaseModel
diff --git a/app/Models/Cities/City.php b/app/Models/Cities/City.php
@@ -2,8 +2,8 @@
 
 namespace App\Models\Cities;
 
-use App\Models\Cities\Traits\Relationship\CityRelationship;
 use App\Models\BaseModel;
+use App\Models\Cities\Traits\Relationship\CityRelationship;
 
 class City extends BaseModel
 {
diff --git a/app/Models/EmailTemplates/EmailTemplate.php b/app/Models/EmailTemplates/EmailTemplate.php
@@ -2,9 +2,9 @@
 
 namespace App\Models\EmailTemplates;
 
+use App\Models\BaseModel;
 use App\Models\EmailTemplates\Traits\Attribute\EmailTemplateAttribute;
 use App\Models\ModelTrait;
-use App\Models\BaseModel;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class EmailTemplate extends BaseModel
diff --git a/app/Models/Faqs/Faq.php b/app/Models/Faqs/Faq.php
@@ -2,9 +2,9 @@
 
 namespace App\Models\Faqs;
 
+use App\Models\BaseModel;
 use App\Models\Faqs\Traits\Attribute\FaqAttribute;
 use App\Models\ModelTrait;
-use App\Models\BaseModel;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Faq extends BaseModel
diff --git a/app/Models/History/History.php b/app/Models/History/History.php
@@ -2,8 +2,8 @@
 
 namespace App\Models\History;
 
-use App\Models\History\Traits\Relationship\HistoryRelationship;
 use App\Models\BaseModel;
+use App\Models\History\Traits\Relationship\HistoryRelationship;
 
 /**
  * Class History
diff --git a/app/Models/Page/Page.php b/app/Models/Page/Page.php
@@ -4,8 +4,8 @@
 
 use App\Models\BaseModel;
 use App\Models\ModelTrait;
-use Illuminate\Database\Eloquent\SoftDeletes;
 use App\Models\Page\Traits\Attribute\PageAttribute;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Page extends BaseModel
 {
diff --git a/app/Models/States/State.php b/app/Models/States/State.php
@@ -2,8 +2,8 @@
 
 namespace App\Models\States;
 
-use App\Models\States\Traits\Relationship\StateRelationship;
 use App\Models\BaseModel;
+use App\Models\States\Traits\Relationship\StateRelationship;
 
 class State extends BaseModel
 {
diff --git a/app/Repositories/Api/CmsPage/CmsPageRepository.php b/app/Repositories/Api/CmsPage/CmsPageRepository.php
@@ -5,7 +5,6 @@
 use App\Exceptions\GeneralException;
 use App\Models\CMSPages\CMSPage;
 use App\Repositories\BaseRepository;
-use App\Models\BaseModel;
 
 /**
  * Class CmsPageRepository.
diff --git a/app/Repositories/Api/Role/RoleRepository.php b/app/Repositories/Api/Role/RoleRepository.php
@@ -4,7 +4,6 @@
 
 use App\Models\Access\Role\Role;
 use App\Repositories\BaseRepository;
-use App\Models\BaseModel;
 
 /**
  * Class RoleRepository.
diff --git a/app/Repositories/Api/User/PasswordResetRepository.php b/app/Repositories/Api/User/PasswordResetRepository.php
@@ -4,7 +4,6 @@
 
 use App\Models\Access\PasswordReset\PasswordReset;
 use App\Repositories\BaseRepository;
-use App\Models\BaseModel;
 
 /**
  * Class PermissionRepository.
diff --git a/app/Repositories/Api/User/UserRepository.php b/app/Repositories/Api/User/UserRepository.php
@@ -6,7 +6,6 @@
 use App\Models\Access\User\User;
 use App\Repositories\Backend\Access\Role\RoleRepository;
 use App\Repositories\BaseRepository;
-use App\Models\BaseModel;
 
 /**
  * Class PermissionRepository.
diff --git a/app/Repositories/Backend/Access/Permission/PermissionRepository.php b/app/Repositories/Backend/Access/Permission/PermissionRepository.php
@@ -9,7 +9,6 @@
 use App\Models\Access\Permission\Permission;
 use App\Repositories\BaseRepository;
 use DB;
-use App\Models\BaseModel;
 
 /**
  * Class PermissionRepository.
diff --git a/app/Repositories/Backend/Access/Role/RoleRepository.php b/app/Repositories/Backend/Access/Role/RoleRepository.php
@@ -8,7 +8,6 @@
 use App\Exceptions\GeneralException;
 use App\Models\Access\Role\Role;
 use App\Repositories\BaseRepository;
-use App\Models\BaseModel;
 use Illuminate\Support\Facades\DB;
 
 /**
diff --git a/app/Repositories/Backend/Access/User/UserRepository.php b/app/Repositories/Backend/Access/User/UserRepository.php
@@ -14,7 +14,6 @@
 use App\Models\Access\User\User;
 use App\Repositories\Backend\Access\Role\RoleRepository;
 use App\Repositories\BaseRepository;
-use App\Models\BaseModel;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 
diff --git a/app/Repositories/Backend/BlogCategories/BlogCategoriesRepository.php b/app/Repositories/Backend/BlogCategories/BlogCategoriesRepository.php
@@ -9,7 +9,6 @@
 use App\Models\BlogCategories\BlogCategory;
 use App\Repositories\BaseRepository;
 use DB;
-use App\Models\BaseModel;
 
 /**
  * Class BlogCategoriesRepository.
diff --git a/app/Repositories/Backend/BlogTags/BlogTagsRepository.php b/app/Repositories/Backend/BlogTags/BlogTagsRepository.php
@@ -9,7 +9,6 @@
 use App\Models\BlogTags\BlogTag;
 use App\Repositories\BaseRepository;
 use DB;
-use App\Models\BaseModel;
 
 /**
  * Class BlogTagsRepository.
diff --git a/app/Repositories/Backend/Blogs/BlogsRepository.php b/app/Repositories/Backend/Blogs/BlogsRepository.php
@@ -13,7 +13,6 @@
 use App\Repositories\BaseRepository;
 use Carbon\Carbon;
 use DB;
-use App\Models\BaseModel;
 
 /**
  * Class BlogsRepository.
diff --git a/app/Repositories/Backend/EmailTemplates/EmailTemplatesRepository.php b/app/Repositories/Backend/EmailTemplates/EmailTemplatesRepository.php
@@ -8,7 +8,6 @@
 use App\Models\EmailTemplates\EmailTemplate;
 use App\Repositories\BaseRepository;
 use DB;
-use App\Models\BaseModel;
 
 /**
  * Class EmailTemplatesRepository.
diff --git a/app/Repositories/Backend/Faqs/FaqsRepository.php b/app/Repositories/Backend/Faqs/FaqsRepository.php
@@ -5,7 +5,6 @@
 use App\Exceptions\GeneralException;
 use App\Models\Faqs\Faq;
 use App\Repositories\BaseRepository;
-use App\Models\BaseModel;
 
 /**
  * Class FaqsRepository.
diff --git a/app/Repositories/Backend/Pages/PagesRepository.php b/app/Repositories/Backend/Pages/PagesRepository.php
@@ -9,7 +9,6 @@
 use App\Models\Page\Page;
 use App\Repositories\BaseRepository;
 use DB;
-use App\Models\BaseModel;
 
 /**
  * Class PagesRepository.
diff --git a/app/Repositories/Backend/Settings/SettingsRepository.php b/app/Repositories/Backend/Settings/SettingsRepository.php
@@ -6,7 +6,6 @@
 use App\Models\Settings\Setting;
 use App\Repositories\BaseRepository;
 use DB;
-use App\Models\BaseModel;
 
 /**
  * Class SettingsRepository.
diff --git a/app/Repositories/Frontend/CMSPages/CMSPagesRepository.php b/app/Repositories/Frontend/CMSPages/CMSPagesRepository.php
@@ -5,7 +5,6 @@
 use App\Exceptions\GeneralException;
 use App\Models\CMSPages\CMSPage;
 use App\Repositories\BaseRepository;
-use App\Models\BaseModel;
 
 /**
  * Class CMSPagesRepository.

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace App\Models\Cities;`
`4`	`4`
`5`		`-use App\Models\Cities\Traits\Relationship\CityRelationship;`
`6`	`5`	`use App\Models\BaseModel;`
	`6`	`+use App\Models\Cities\Traits\Relationship\CityRelationship;`
`7`	`7`
`8`	`8`	`class City extends BaseModel`
`9`	`9`	`{`