Merge pull request #369 from jeremykenedy/shift-34004

Namespace Models
jeremykenedy · Sep 29, 2020 · 66d408a · 66d408a
2 parents d1122eb + 8e62c3f
commit 66d408a
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/app/Http/Middleware/CheckIsUserActivated.php b/app/Http/Middleware/CheckIsUserActivated.php
@@ -39,7 +39,7 @@ public function handle($request, Closure $next)
                 'welcome',
             ];
 
-            if (!in_array($currentRoute, $routesAllowed)) {
+            if (! in_array($currentRoute, $routesAllowed)) {
                 if ($user && $user->activated != 1) {
                     Log::info('Non-activated user attempted to visit '.$currentRoute.'. ', [$user]);
 
@@ -72,7 +72,7 @@ public function handle($request, Closure $next)
                     return redirect('home');
                 }
 
-                if (!$user) {
+                if (! $user) {
                     Log::info('Non registered visit to '.$currentRoute.'. ');
 
                     return redirect()->route('welcome');

diff --git a/app/Logic/Macros/HtmlMacros.php b/app/Logic/Macros/HtmlMacros.php
@@ -23,7 +23,7 @@
     return $link;
 });
 
-/**
+/*
  * Render an icon with an anchor tag around it.
  *
  * @var string url
@@ -44,7 +44,7 @@
     return $link;
 });
 
-/**
+/*
  * Render an button with an icon with an anchor tag around it.
  *
  * @var string url
@@ -65,7 +65,7 @@
     return $link;
 });
 
-/**
+/*
  * Show Username.
  *
  * @return string

diff --git a/app/Models/Activation.php b/app/Models/Activation.php
@@ -78,6 +78,6 @@ class Activation extends Model
      */
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo(\App\Models\User::class);
     }
 }
diff --git a/app/Models/Profile.php b/app/Models/Profile.php
@@ -49,7 +49,7 @@ class Profile extends Model
      */
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo(\App\Models\User::class);
     }
 
     /**
@@ -59,6 +59,6 @@ public function user()
      */
     public function theme()
     {
-        return $this->hasOne('App\Models\Theme');
+        return $this->hasOne(\App\Models\Theme::class);
     }
 }
diff --git a/app/Models/Social.php b/app/Models/Social.php
@@ -74,6 +74,6 @@ class Social extends Model
      */
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo(\App\Models\User::class);
     }
 }
diff --git a/app/Models/Theme.php b/app/Models/Theme.php
@@ -106,6 +106,6 @@ public static function rules($id = 0, $merge = [])
      */
     public function profile()
     {
-        return $this->hasMany('App\Models\Profile');
+        return $this->hasMany(\App\Models\Profile::class);
     }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -107,23 +107,23 @@ class User extends Authenticatable
      */
     public function social()
     {
-        return $this->hasMany('App\Models\Social');
+        return $this->hasMany(\App\Models\Social::class);
     }
 
     /**
      * Get the profile associated with the user.
      */
     public function profile()
     {
-        return $this->hasOne('App\Models\Profile');
+        return $this->hasOne(\App\Models\Profile::class);
     }
 
     /**
      * The profiles that belong to the user.
      */
     public function profiles()
     {
-        return $this->belongsToMany('App\Models\Profile')->withTimestamps();
+        return $this->belongsToMany(\App\Models\Profile::class)->withTimestamps();
     }
 
     /**

diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php
@@ -16,7 +16,7 @@ public function boot()
     {
         View::composer(
             'layouts.app',
-            'App\Http\ViewComposers\ThemeComposer'
+            \App\Http\ViewComposers\ThemeComposer::class
         );
     }
 

diff --git a/routes/web.php b/routes/web.php
@@ -69,7 +69,7 @@
     // User Profile and Account Routes
     Route::resource(
         'profile',
-        'App\Http\Controllers\ProfilesController',
+        \App\Http\Controllers\ProfilesController::class,
         [
             'only' => [
                 'show',
@@ -103,13 +103,13 @@
 
 // Registered, activated, and is admin routes.
 Route::group(['middleware' => ['auth', 'activated', 'role:admin', 'activity', 'twostep', 'checkblocked']], function () {
-    Route::resource('/users/deleted', 'App\Http\Controllers\SoftDeletesController', [
+    Route::resource('/users/deleted', \App\Http\Controllers\SoftDeletesController::class, [
         'only' => [
             'index', 'show', 'update', 'destroy',
         ],
     ]);
 
-    Route::resource('users', 'App\Http\Controllers\UsersManagementController', [
+    Route::resource('users', \App\Http\Controllers\UsersManagementController::class, [
         'names' => [
             'index'   => 'users',
             'destroy' => 'user.destroy',
@@ -120,7 +120,7 @@
     ]);
     Route::post('search-users', 'App\Http\Controllers\UsersManagementController@search')->name('search-users');
 
-    Route::resource('themes', 'App\Http\Controllers\ThemesManagementController', [
+    Route::resource('themes', \App\Http\Controllers\ThemesManagementController::class, [
         'names' => [
             'index'   => 'themes',
             'destroy' => 'themes.destroy',