Merge pull request #511 from viralsolani/develop

Upgrade to Laravel 6.0
FTXInfotech · Oct 19, 2019 · 4e9222e · 4e9222e
2 parents eb64611 + a3f1852
commit 4e9222e
Show file tree

Hide file tree

Showing 41 changed files with 897 additions and 646 deletions.
diff --git a/.env.example b/.env.example
@@ -1,5 +1,5 @@
 APP_DEMO=false
-APP_NAME="Laravel 5.8 AdminPanel"
+APP_NAME="Laravel 6.0 AdminPanel"
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true

diff --git a/README.md b/README.md
@@ -94,7 +94,6 @@ Start the local development server
     php artisan serve
 
 
-
 You can now access the server at http://localhost:8000
 
 **Command list**
@@ -154,6 +153,7 @@ Feel free to create any pull requests for the project. For proposing any new cha
     (1) Viral Solani - [email protected]
     (2) Vipul Basapati - [email protected]
     (3) Vallabh Kansagara - [email protected]
+    (4) Kamlesh Gupta - [email protected]
 
 ## License
 

diff --git a/app/Console/Commands/InstallAppCommand.php b/app/Console/Commands/InstallAppCommand.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\File;
+use Illuminate\Support\Str;
 use PDOException;
 use Symfony\Component\Console\Helper\SymfonyQuestionHelper;
 use Symfony\Component\Console\Question\Question;
@@ -217,7 +218,7 @@ protected function guessDatabaseName()
             $segments = array_reverse(explode(DIRECTORY_SEPARATOR, app_path()));
             $name = explode('.', $segments[1])[0];
 
-            return str_replace('-', '_', str_slug($name));
+            return str_replace('-', '_', Str::slug($name));
         } catch (Exception $e) {
             return '';
         }

diff --git a/app/Http/Requests/Backend/Notification/MarkNotificationRequest.php b/app/Http/Requests/Backend/Notification/MarkNotificationRequest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Requests\Backend\Notification;
+
+use App\Http\Requests\Request;
+
+/**
+ * Class MarkNotificationRequest.
+ */
+class MarkNotificationRequest extends Request
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return '';
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+        ];
+    }
+}
diff --git a/app/Http/Responses/Backend/Blog/CreateResponse.php b/app/Http/Responses/Backend/Blog/CreateResponse.php
@@ -7,7 +7,9 @@
 class CreateResponse implements Responsable
 {
     protected $status;
+
     protected $blogTags;
+
     protected $blogCategories;
 
     public function __construct($status, $blogCategories, $blogTags)

diff --git a/app/Http/Responses/Backend/Blog/EditResponse.php b/app/Http/Responses/Backend/Blog/EditResponse.php
@@ -7,8 +7,11 @@
 class EditResponse implements Responsable
 {
     protected $blog;
+
     protected $status;
+
     protected $blogTags;
+
     protected $blogCategories;
 
     public function __construct($blog, $status, $blogCategories, $blogTags)

diff --git a/app/Http/Responses/RedirectResponse.php b/app/Http/Responses/RedirectResponse.php
@@ -7,6 +7,7 @@
 class RedirectResponse implements Responsable
 {
     protected $route;
+
     protected $message;
 
     public function __construct($route, $message)

diff --git a/app/Http/Utilities/Notification.php b/app/Http/Utilities/Notification.php
@@ -18,9 +18,13 @@
 abstract class Notification
 {
     protected $_message = null;
+
     protected $_devices = null;
+
     protected $_response = null;
+
     protected $_body = null;
+
     protected static $_url = null;
 
     /*

diff --git a/app/Http/Utilities/NotificationIos.php b/app/Http/Utilities/NotificationIos.php
@@ -7,11 +7,15 @@ class NotificationIos extends Notification
     const BADGE_ID = 0;
 
     protected $_passPhrase = null;            // for authentication of .pem file or password of .pem file
+
     protected $_pemFile = null;            // for send notificetion .pem file is must add in that code
+
     protected static $_url = 'ssl://gateway.sandbox.push.apple.com:2195';                                           // url for send push message
 
     const ERROR_PEM_NOTACCESSIBLE = 1;          // exception error for file not get
+
     const ERROR_PASSPHRASE_EMPTY = 2;          // exception error for passphrese empty
+
     const ERROR_CONNECTION_FAILED = 3;          // exception error for connection failed
 
     protected $sendNotification = 1;          // exception error for connection failed

diff --git a/app/Http/Utilities/PushNotification.php b/app/Http/Utilities/PushNotification.php
@@ -28,10 +28,12 @@ public function _pushNotification($msg, $type, $devicetoken)
                     return $this->_pushToIos($devicetoken, $msg);
 
                     return true;
+
                     break;
 
                 case 'android':
                     return $this->_pushToAndroid($devicetoken, $msg);
+
                     break;
 
                 default:

diff --git a/app/Models/Access/PasswordReset/PasswordReset.php b/app/Models/Access/PasswordReset/PasswordReset.php
@@ -10,7 +10,9 @@
 class PasswordReset extends BaseModel
 {
     public $timestamps = false;
+
     protected $table = 'password_resets';
+
     protected $fillable = [
                             'email',
                             'token',

diff --git a/app/Models/Access/User/Traits/Attribute/UserAttribute.php b/app/Models/Access/User/Traits/Attribute/UserAttribute.php
@@ -151,6 +151,7 @@ public function getStatusButtonAttribute($class)
 
                         return '<a class="'.$class.'" href="'.route('admin.access.user.mark', [$this, 1]).'"><i class="fa fa-check-square" data-toggle="tooltip" data-placement="top" title="'.trans('buttons.backend.access.users.activate').'"></i>'.$name.'</a>';
                     }
+
                     break;
 
                 case 1:
@@ -159,6 +160,7 @@ public function getStatusButtonAttribute($class)
 
                         return '<a class="'.$class.'" href="'.route('admin.access.user.mark', [$this, 0]).'"><i class="fa fa-square" data-toggle="tooltip" data-placement="top" title="'.trans('buttons.backend.access.users.deactivate').'"></i>'.$name.'</a>';
                     }
+
                     break;
 
                 default:
@@ -313,6 +315,7 @@ public function getActionButtonsByPermissionName($permissionName, $counter)
                 $button = ($counter <= 3) ? $this->getShowButtonAttribute($class) : '<li>'
                     .$this->getShowButtonAttribute($class).
                     '</li>';
+
                 break;
             case 'edit-user':
                 $button = ($counter <= 3) ? $this->getEditButtonAttribute($class) : '<li>'
@@ -321,6 +324,7 @@ public function getActionButtonsByPermissionName($permissionName, $counter)
                 $button .= ($counter <= 3) ? $this->getChangePasswordButtonAttribute($class) : '<li>'
                     .$this->getChangePasswordButtonAttribute($class).
                     '</li>';
+
                 break;
             case 'activate-user':
                 if (\Route::currentRouteName() == 'admin.access.user.deactivated.get') {
@@ -330,6 +334,7 @@ public function getActionButtonsByPermissionName($permissionName, $counter)
                 } else {
                     $button = '';
                 }
+
                 break;
             case 'deactivate-user':
                 if (\Route::currentRouteName() == 'admin.access.user.get') {
@@ -339,6 +344,7 @@ public function getActionButtonsByPermissionName($permissionName, $counter)
                 } else {
                     $button = '';
                 }
+
                 break;
             case 'delete-user':
                 if (access()->user()->id != $this->id) {
@@ -348,6 +354,7 @@ public function getActionButtonsByPermissionName($permissionName, $counter)
                 } else {
                     $button = '';
                 }
+
                 break;
             case 'login-as-user':
                 if (access()->user()->id != $this->id) {
@@ -357,6 +364,7 @@ public function getActionButtonsByPermissionName($permissionName, $counter)
                 } else {
                     $button = '';
                 }
+
                 break;
             case 'clear-user-session':
                 if (access()->user()->id != $this->id) {
@@ -366,9 +374,11 @@ public function getActionButtonsByPermissionName($permissionName, $counter)
                 } else {
                     $button = '';
                 }
+
                 break;
             default:
                 $button = '';
+
                 break;
         }
 

diff --git a/app/Models/Access/User/User.php b/app/Models/Access/User/User.php
@@ -25,6 +25,7 @@ class User extends Authenticatable
         UserRelationship,
         UserSendPasswordReset,
         HasApiTokens;
+
     /**
      * The database table used by the model.
      *

diff --git a/app/Notifications/Frontend/Auth/UserNeedsPasswordReset.php b/app/Notifications/Frontend/Auth/UserNeedsPasswordReset.php
@@ -12,6 +12,7 @@
 class UserNeedsPasswordReset extends Notification
 {
     use Queueable;
+
     /**
      * The password reset token.
      *

diff --git a/app/Notifications/PasswordReset.php b/app/Notifications/PasswordReset.php
@@ -16,6 +16,7 @@ class PasswordReset extends Notification
      * @return void
      */
     protected $user;
+
     protected $token;
 
     public function __construct($user, $token)

diff --git a/app/Repositories/Backend/Access/User/UserRepository.php b/app/Repositories/Backend/Access/User/UserRepository.php
@@ -306,10 +306,12 @@ public function mark($user, $status)
         switch ($status) {
             case 0:
                 event(new UserDeactivated($user));
+
             break;
 
             case 1:
                 event(new UserReactivated($user));
+
             break;
         }
 

diff --git a/app/Repositories/Backend/Blogs/BlogsRepository.php b/app/Repositories/Backend/Blogs/BlogsRepository.php
@@ -15,6 +15,7 @@
 use Carbon\Carbon;
 use DB;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 
 /**
  * Class BlogsRepository.
@@ -73,7 +74,7 @@ public function create(array $input)
         unset($input['tags'], $input['categories']);
 
         DB::transaction(function () use ($input, $tagsArray, $categoriesArray) {
-            $input['slug'] = str_slug($input['name']);
+            $input['slug'] = Str::slug($input['name']);
             $input['publish_datetime'] = Carbon::parse($input['publish_datetime']);
             $input = $this->uploadImage($input);
             $input['created_by'] = access()->user()->id;
@@ -110,7 +111,7 @@ public function update(Blog $blog, array $input)
         $categoriesArray = $this->createCategories($input['categories']);
         unset($input['tags'], $input['categories']);
 
-        $input['slug'] = str_slug($input['name']);
+        $input['slug'] = Str::slug($input['name']);
         $input['publish_datetime'] = Carbon::parse($input['publish_datetime']);
         $input['updated_by'] = access()->user()->id;
 

diff --git a/app/Repositories/Backend/History/EloquentHistoryRepository.php b/app/Repositories/Backend/History/EloquentHistoryRepository.php
@@ -243,18 +243,22 @@ public function renderDescription($text, $assets = false)
                             switch (count($values)) {
                                 case 1:
                                     $text = str_replace('{'.$key.'}', link_to_route($values[0], $values[0]), $text);
+
                                 break;
 
                                 case 2:
                                     $text = str_replace('{'.$key.'}', link_to_route($values[0], $values[1]), $text);
+
                                 break;
 
                                 case 3:
                                     $text = str_replace('{'.$key.'}', link_to_route($values[0], $values[1], $values[2]), $text);
+
                                 break;
 
                                 case 4:
                                     $text = str_replace('{'.$key.'}', link_to_route($values[0], $values[1], $values[2], $values[3]), $text);
+
                                 break;
                             }
                         } else {
@@ -266,6 +270,7 @@ public function renderDescription($text, $assets = false)
 
                     case 'string':
                         $text = str_replace('{'.$key.'}', $values, $text);
+
                     break;
                 }
 

diff --git a/app/Repositories/Backend/Notification/NotificationRepository.php b/app/Repositories/Backend/Notification/NotificationRepository.php
@@ -18,6 +18,7 @@ class NotificationRepository extends BaseRepository
      * @var object
      */
     public $model;
+
     public $timestamps = false;
 
     public function __construct(Notification $model)

diff --git a/app/Repositories/Backend/Pages/PagesRepository.php b/app/Repositories/Backend/Pages/PagesRepository.php
@@ -8,6 +8,7 @@
 use App\Exceptions\GeneralException;
 use App\Models\Page\Page;
 use App\Repositories\BaseRepository;
+use Illuminate\Support\Str;
 
 /**
  * Class PagesRepository.
@@ -51,7 +52,7 @@ public function create(array $input)
         }
 
         // Making extra fields
-        $input['page_slug'] = str_slug($input['title']);
+        $input['page_slug'] = Str::slug($input['title']);
         $input['status'] = isset($input['status']) ? 1 : 0;
         $input['created_by'] = auth()->id();
 
@@ -79,7 +80,7 @@ public function update($page, array $input)
         }
 
         // Making extra fields
-        $input['page_slug'] = str_slug($input['title']);
+        $input['page_slug'] = Str::slug($input['title']);
         $input['status'] = isset($input['status']) ? 1 : 0;
         $input['updated_by'] = access()->user()->id;
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ @@
     class UserNeedsPasswordReset extends Notification
     {
         use Queueable;
         /**
          * The password reset token.
          *
@@ Expand Down @@