From 1b2e77d90741b8c6febebbdf6009323afe38aa60 Mon Sep 17 00:00:00 2001
From: Arno Kaimbacher <arno.kaimbacher@geologie.ac.at>
Date: Fri, 5 Aug 2022 13:26:42 +0200
Subject: [PATCH] - Convert class references from strings to static ::class
 constants built-in to PHP for improved code completion and static analysis. -
 Replace Facade references using the global namespace with their FQCN for
 improved code completion and static analysis. - delete
 database\factories\PageFactory.php and app\services\Registrar.php

---
 app/Console/Kernel.php                        | 11 ++---
 app/Http/Controllers/Auth/LoginController.php |  1 +
 app/Http/Controllers/Controller.php           |  7 ++--
 .../Frontend/LocalizationController.php       |  8 ++--
 app/Http/Middleware/LocaleSessionRedirect.php |  8 ++--
 app/Models/Person.php                         |  9 +++--
 app/Providers/DoiServiceProvider.php          |  2 +-
 app/Providers/EventServiceProvider.php        |  4 +-
 app/Services/Registrar.php                    | 40 -------------------
 config/entrust.php                            |  6 +--
 config/services.php                           |  2 +-
 database/factories/PageFactory.php            | 22 ----------
 12 files changed, 32 insertions(+), 88 deletions(-)
 delete mode 100755 app/Services/Registrar.php
 delete mode 100644 database/factories/PageFactory.php

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 2e482ee..d848762 100755
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace App\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
@@ -12,11 +13,11 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-        'App\Console\Commands\Inspire',
-        'App\Console\Commands\DatasetState',
-        'App\Console\Commands\SolrIndexBuilder',
-        'App\Console\Commands\Log\ClearLogFile',
-        'App\Console\Commands\UpdateSolrDataset'
+        \App\Console\Commands\Inspire::class,
+        \App\Console\Commands\DatasetState::class,
+        \App\Console\Commands\SolrIndexBuilder::class,
+        \App\Console\Commands\Log\ClearLogFile::class,
+        \App\Console\Commands\UpdateSolrDataset::class,
     ];
 
     /**
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 37221f3..3f41447 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -53,6 +53,7 @@ class LoginController extends Controller
         $request->session()->flush();
         $request->session()->regenerate();
         $frontend = config('tethys.frontend');
+        
         return redirect($frontend);
     }
 }
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 2f7a1d3..b7d786e 100755
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -1,11 +1,12 @@
 <?php
+
 namespace App\Http\Controllers;
 
 //use Illuminate\Foundation\Bus\DispatchesCommands;
-use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Routing\Controller as BaseController;
 
 abstract class Controller extends BaseController
 {
diff --git a/app/Http/Controllers/Frontend/LocalizationController.php b/app/Http/Controllers/Frontend/LocalizationController.php
index 231a92e..b9573c9 100644
--- a/app/Http/Controllers/Frontend/LocalizationController.php
+++ b/app/Http/Controllers/Frontend/LocalizationController.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Frontend;
 
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Input;
-use Session;
-use App;
+// use Illuminate\Http\Request;
+// use Illuminate\Support\Facades\Input;
+// use Illuminate\Support\Facades\Session;
+// use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Redirect;
 use App\Http\Controllers\Controller;
 
diff --git a/app/Http/Middleware/LocaleSessionRedirect.php b/app/Http/Middleware/LocaleSessionRedirect.php
index 232d77c..c75303b 100644
--- a/app/Http/Middleware/LocaleSessionRedirect.php
+++ b/app/Http/Middleware/LocaleSessionRedirect.php
@@ -3,10 +3,10 @@
 namespace App\Http\Middleware;
 
 use Closure;
-use Session;
-use App;
-use Config;
-use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\App;
+// use Illuminate\Support\Facades\Config;
+// use Illuminate\Http\RedirectResponse;
 use Mcamara\LaravelLocalization\LanguageNegotiator;
 
 class LocaleSessionRedirect extends LaravelLocalizationMiddlewareBase
diff --git a/app/Models/Person.php b/app/Models/Person.php
index 18050f8..fb43598 100644
--- a/app/Models/Person.php
+++ b/app/Models/Person.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace App\Models;
 
 use App\Models\Dataset;
@@ -6,7 +7,6 @@ use Illuminate\Database\Eloquent\Model;
 
 class Person extends Model
 {
-
     protected $fillable = [
         'academic_title',
         'date_of_birth',
@@ -15,10 +15,13 @@ class Person extends Model
         'email',
         'identifier_orcid',
         'status',
-        'name_type'
+        'name_type',
     ];
+
     protected $table = 'persons';
+
     public $timestamps = false;
+
     protected $appends = ['full_name'];
 
     public function documents()
@@ -39,7 +42,7 @@ class Person extends Model
      */
     public function getFullNameAttribute()
     {
-        return $this->first_name . " " . $this->last_name . " " . $this->date_of_birth;
+        return $this->first_name.' '.$this->last_name.' '.$this->date_of_birth;
     }
 
     public function scopeActive($query)
diff --git a/app/Providers/DoiServiceProvider.php b/app/Providers/DoiServiceProvider.php
index 8a4775d..fa133a1 100644
--- a/app/Providers/DoiServiceProvider.php
+++ b/app/Providers/DoiServiceProvider.php
@@ -33,7 +33,7 @@ class DoiServiceProvider extends ServiceProvider
     public function register()
     {
         //
-        $this->app->singleton('App\Interfaces\DoiInterface', function ($app) {
+        $this->app->singleton(\App\Interfaces\DoiInterface::class, function ($app) {
             return new DoiClient();
         });
     }
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index ca973a3..26aaf79 100755
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -11,8 +11,8 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
-        'App\Events\Event' => [
-            'App\Listeners\EventListener',
+        \App\Events\Event::class => [
+            \App\Listeners\EventListener::class,
         ],
         \App\Events\Dataset\DatasetUpdated::class => [
             \App\Listeners\DatasetUpdated::class,
diff --git a/app/Services/Registrar.php b/app/Services/Registrar.php
deleted file mode 100755
index 42bf1ce..0000000
--- a/app/Services/Registrar.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-namespace App\Services;
-
-use App\Models\User;
-use Validator;
-use Illuminate\Contracts\Auth\Registrar as RegistrarContract;
-
-class Registrar implements RegistrarContract
-{
-
-    /**
-     * Get a validator for an incoming registration request.
-     *
-     * @param  array  $data
-     * @return \Illuminate\Contracts\Validation\Validator
-     */
-    public function validator(array $data)
-    {
-        return Validator::make($data, [
-            'name' => 'required|max:255',
-            'email' => 'required|email|max:255|unique:users',
-            'password' => 'required|confirmed|min:6',
-        ]);
-    }
-
-    /**
-     * Create a new user instance after a valid registration.
-     *
-     * @param  array  $data
-     * @return User
-     */
-    public function create(array $data)
-    {
-        return User::create([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => bcrypt($data['password']),
-        ]);
-    }
-}
diff --git a/config/entrust.php b/config/entrust.php
index b103523..7695d1a 100644
--- a/config/entrust.php
+++ b/config/entrust.php
@@ -19,7 +19,7 @@ return [
     | the role if it is in a different namespace.
     |
     */
-    'role' => 'App\Models\Role',
+    'role' => App\Models\Role::class,
 
     /*
     |--------------------------------------------------------------------------
@@ -51,7 +51,7 @@ return [
     | Update the User if it is in a different namespace.
     |
     */
-    'user' => 'App\Models\User',
+    'user' => App\Models\User::class,
 
     /*
     |--------------------------------------------------------------------------
@@ -95,7 +95,7 @@ return [
     | Update the permission if it is in a different namespace.
     |
     */
-    'permission' => 'App\Models\Permission',
+    'permission' => App\Models\Permission::class,
 
     /*
     |--------------------------------------------------------------------------
diff --git a/config/services.php b/config/services.php
index 62ac69e..0b15ba6 100755
--- a/config/services.php
+++ b/config/services.php
@@ -30,7 +30,7 @@ return [
     ],
 
     'stripe' => [
-        'model'  => 'App\Models\User',
+        'model'  => App\Models\User::class,
         'secret' => '',
     ],
 
diff --git a/database/factories/PageFactory.php b/database/factories/PageFactory.php
deleted file mode 100644
index b5c19b1..0000000
--- a/database/factories/PageFactory.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-use App\Models\Access\User\User;
-use App\Models\Page;
-use Faker\Generator as Faker;
-
-$factory->define(Page::class, function (Faker $faker) {
-    $title = $faker->sentence;
-
-    // $newestPage = Page::orderBy('id', 'desc')->first();
-
-    return [
-        'title'           => $title,
-        'page_slug'       => str_slug($title),
-        'description'     => $faker->paragraph,
-        'cannonical_link' => 'http://localhost/'.str_slug($title),
-        'created_by'      => 1,
-        'status'      => 1,
-        'created_at'  => Carbon\Carbon::now(),
-        'updated_at'  => Carbon\Carbon::now(),
-    ];
-});