Laravel 8.x Shift (librenms#12235)

* Shift HTTP kernel and middleware * Shift service providers * Shift console routes * Shift to class based factories * Namespace seeders * Shift PSR-4 autoloading * Default config files In an effort to make upgrading the constantly changing config files easier, Shift defaulted them. This allows you to review the commit diff for once for customizations when you are done Shifting. Moving forward, consider using ENV variables or create a separate config file to allow the core config files to remain as default as possible. * Shift Laravel dependencies * Shift return type of base TestCase methods From the [PHPUnit 8 release notes][1], the `TestCase` methods below now declare a `void` return type: - `setUpBeforeClass()` - `setUp()` - `assertPreConditions()` - `assertPostConditions()` - `tearDown()` - `tearDownAfterClass()` - `onNotSuccessfulTest()` [1]: https://phpunit.de/announcements/phpunit-8.html * Shift cleanup * console routes * composer update * factories * phpunit * bootstrap pagination * model factory * wip * Apply fixes from StyleCI (librenms#12236) * wip * Apply fixes from StyleCI (librenms#12238) * wip * wip * wip * wip * Apply fixes from StyleCI (librenms#12240) * wip * Apply fixes from StyleCI (librenms#12242) * composer update * Bump to PHP 7.3 minimum Co-authored-by: Laravel Shift <[email protected]>
SylvainGuibert · Nov 3, 2020 · 50c8033 · 50c8033
1 parent bc02ab3
commit 50c8033
Show file tree

Hide file tree

Showing 97 changed files with 2,342 additions and 1,450 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ jobs:
   - php: 7.3
     dist: bionic
     env: SKIP_UNIT_CHECK=1
-  - php: 7.2
+  - php: 7.3
     dist: bionic
     env: SKIP_STYLE_CHECK=1 SKIP_WEB_CHECK=1 EXECUTE_BUILD_DOCS=true
 

diff --git a/app/Checks.php b/app/Checks.php
@@ -37,9 +37,9 @@ class Checks
     public static function preAutoload()
     {
         // Check PHP version otherwise it will just say server error
-        if (version_compare('7.2.5', PHP_VERSION, '>=')) {
+        if (version_compare(PHP_VERSION, '7.3', '<')) {
             self::printMessage(
-                'PHP version 7.2.5 or newer is required to run LibreNMS',
+                'PHP version 7.3 or newer is required to run LibreNMS',
                 null,
                 true
             );

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -18,7 +18,7 @@ class Kernel extends HttpKernel
         // \App\Http\Middleware\TrustHosts::class,
         \App\Http\Middleware\TrustProxies::class,
         \App\Http\Middleware\HandleCors::class,
-        \App\Http\Middleware\CheckForMaintenanceMode::class,
+        \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
@@ -69,7 +69,6 @@ class Kernel extends HttpKernel
     protected $routeMiddleware = [
         'authenticate' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'deny-demo' => \App\Http\Middleware\DenyDemoUser::class,

diff --git a/...tp/Middleware/CheckForMaintenanceMode.php → ...ware/PreventRequestsDuringMaintenance.php b/...tp/Middleware/CheckForMaintenanceMode.php → ...ware/PreventRequestsDuringMaintenance.php
@@ -2,9 +2,9 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;
+use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance as Middleware;
 
-class CheckForMaintenanceMode extends Middleware
+class PreventRequestsDuringMaintenance extends Middleware
 {
     /**
      * The URIs that should be reachable while maintenance mode is enabled.

diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -4,6 +4,7 @@
 
 use App\Providers\RouteServiceProvider;
 use Closure;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
 class RedirectIfAuthenticated
@@ -13,13 +14,17 @@ class RedirectIfAuthenticated
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
-     * @param  string|null  $guard
+     * @param  string|null  ...$guards
      * @return mixed
      */
-    public function handle($request, Closure $next, $guard = null)
+    public function handle(Request $request, Closure $next, ...$guards)
     {
-        if (Auth::guard($guard)->check()) {
-            return redirect(RouteServiceProvider::HOME);
+        $guards = empty($guards) ? [null] : $guards;
+
+        foreach ($guards as $guard) {
+            if (Auth::guard($guard)->check()) {
+                return redirect(RouteServiceProvider::HOME);
+            }
         }
 
         return $next($request);

diff --git a/app/Models/AlertSchedule.php b/app/Models/AlertSchedule.php
@@ -28,12 +28,15 @@
 use Carbon\CarbonImmutable;
 use Date;
 use DB;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 use LibreNMS\Enum\AlertScheduleStatus;
 
 class AlertSchedule extends Model
 {
+    use HasFactory;
+
     public $timestamps = false;
     protected $table = 'alert_schedule';
     protected $primaryKey = 'schedule_id';

diff --git a/app/Models/BgpPeer.php b/app/Models/BgpPeer.php
@@ -25,9 +25,12 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class BgpPeer extends DeviceRelatedModel
 {
+    use HasFactory;
+
     public $timestamps = false;
     protected $table = 'bgpPeers';
     protected $primaryKey = 'bgpPeer_id';

diff --git a/app/Models/Bill.php b/app/Models/Bill.php
@@ -24,10 +24,13 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Bill extends Model
 {
+    use HasFactory;
+
     public $timestamps = false;
     protected $primaryKey = 'bill_id';
 

diff --git a/app/Models/Component.php b/app/Models/Component.php
@@ -24,8 +24,12 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
 class Component extends DeviceRelatedModel
 {
+    use HasFactory;
+
     public $timestamps = false;
     protected $table = 'component';
     protected $fillable = ['device_id', 'type', 'label', 'status', 'disabled', 'ignore', 'error'];

diff --git a/app/Models/Device.php b/app/Models/Device.php
@@ -4,6 +4,7 @@
 
 use Fico7489\Laravel\Pivot\Traits\PivotEventTrait;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Str;
@@ -18,7 +19,7 @@
 
 class Device extends BaseModel
 {
-    use PivotEventTrait;
+    use PivotEventTrait, HasFactory;
 
     public $timestamps = false;
     protected $primaryKey = 'device_id';

diff --git a/app/Models/Ipv4Address.php b/app/Models/Ipv4Address.php
@@ -24,8 +24,12 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
 class Ipv4Address extends PortRelatedModel
 {
+    use HasFactory;
+
     public $timestamps = false;
     protected $primaryKey = 'ipv4_address_id';
 }
diff --git a/app/Models/Ipv4Network.php b/app/Models/Ipv4Network.php
@@ -24,10 +24,13 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Ipv4Network extends Model
 {
+    use HasFactory;
+
     public $timestamps = false;
     protected $primaryKey = 'ipv4_network_id';
 

diff --git a/app/Models/OspfNbr.php b/app/Models/OspfNbr.php
@@ -24,8 +24,12 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
 class OspfNbr extends DeviceRelatedModel
 {
+    use HasFactory;
+
     public $timestamps = false;
     protected $fillable = [
         'device_id',

diff --git a/app/Models/OspfPort.php b/app/Models/OspfPort.php
@@ -24,8 +24,12 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
 class OspfPort extends PortRelatedModel
 {
+    use HasFactory;
+
     public $timestamps = false;
     protected $fillable = [
         'device_id',

diff --git a/app/Models/Port.php b/app/Models/Port.php
@@ -4,12 +4,15 @@
 
 use DB;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Support\Str;
 use LibreNMS\Util\Rewrite;
 use Permissions;
 
 class Port extends DeviceRelatedModel
 {
+    use HasFactory;
+
     public $timestamps = false;
     protected $primaryKey = 'port_id';
 

diff --git a/app/Models/Sensor.php b/app/Models/Sensor.php
@@ -2,8 +2,12 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
 class Sensor extends DeviceRelatedModel
 {
+    use HasFactory;
+
     public $timestamps = false;
     protected $primaryKey = 'sensor_id';
     protected static $icons = [

diff --git a/app/Models/Syslog.php b/app/Models/Syslog.php
@@ -24,8 +24,12 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
 class Syslog extends DeviceRelatedModel
 {
+    use HasFactory;
+
     protected $table = 'syslog';
     protected $primaryKey = 'seq';
     public $timestamps = false;

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -4,6 +4,7 @@
 
 use App\Events\UserCreated;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\Hash;
@@ -12,7 +13,7 @@
 
 class User extends Authenticatable
 {
-    use Notifiable;
+    use Notifiable, HasFactory;
 
     protected $primaryKey = 'user_id';
     protected $fillable = ['realname', 'username', 'email', 'level', 'descr', 'can_modify_passwd', 'auth_type', 'auth_id', 'enabled'];

diff --git a/app/Models/UserPref.php b/app/Models/UserPref.php
@@ -24,8 +24,6 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Builder;
-
 class UserPref extends BaseModel
 {
     public $timestamps = false;
@@ -91,7 +89,7 @@ public function user()
      * @param  \Illuminate\Database\Eloquent\Builder $query
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    protected function setKeysForSaveQuery(Builder $query)
+    protected function setKeysForSaveQuery($query)
     {
         $keys = $this->getKeyName();
         if (! is_array($keys)) {

diff --git a/app/Models/Vminfo.php b/app/Models/Vminfo.php
@@ -2,8 +2,12 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
 class Vminfo extends DeviceRelatedModel
 {
+    use HasFactory;
+
     protected $table = 'vminfo';
     public $timestamps = false;
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -40,6 +40,8 @@ public function register()
      */
     public function boot()
     {
+        \Illuminate\Pagination\Paginator::useBootstrap();
+
         $this->app->booted('\LibreNMS\DB\Eloquent::initLegacyListeners');
         $this->app->booted('\LibreNMS\Config::load');
 

diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -25,7 +25,6 @@ class EventServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        parent::boot();
 
         //
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,6 @@ class EventServiceProvider extends ServiceProvider @@
          */
         public function boot()
         {
-            parent::boot();
             //
         }
@@ Expand Down @@