Update to Laravel 5.7 (PHP 7.3 support) (librenms#9800)

* Move assets to 5.7 location * Add 5.7 SVGs * add cache data dir * update QUEUE_DRIVER -> QUEUE_CONNECTION * Update trusted proxy config * update composer.json * 5.5 command loading * @php and @endphp can't be inline * Laravel 5.6 logging, Nice! * Update blade directives * improved redirects * remove unneeded service providers * Improved debugbar loading * no need to emulate renderable exceptions anymore * merge updated 5.7 files (WIP) * Enable CSRF * database_path() call causes issue in init.php * fix old testcase name * generic phpunit 7 fixes * add missed file_get_contents Keep migrations table content * fix duplicate key * Drop old php versions from travis-ci * remove hhvm * fix code climate message * remove use of deprecated function assertInternalType * Disable CSRF, we'll enable it separately. All forms need to be updated to work. * Update document references
TheMysteriousX · Feb 12, 2019 · e18f452 · e18f452
1 parent 25954cc
commit e18f452
Show file tree

Hide file tree

Showing 70 changed files with 3,072 additions and 1,346 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,19 +1,15 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-# top-most EditorConfig file
 root = true
 
-# Unix-style newlines with a newline ending every file
 [*]
-end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = true
+end_of_line = lf
 insert_final_newline = true
-
-[**.css]
-indent_style = space
-indent_size = 2
-
-[**.php]
 indent_style = space
 indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2
diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,8 @@ patches
 !/lib/yaml
 /vendor
 /node_modules
+npm-debug.log
+yarn-error.log
 composer.phar
 _ide_helper.php
 

diff --git a/.travis.yml b/.travis.yml
@@ -5,19 +5,12 @@ services:
 matrix:
   fast_finish: true
   include:
-  - php: 7.2
+  - php: 7.3
     env: SKIP_STYLE_CHECK=1
-  - php: 7.1
+  - php: 7.2
     env: SKIP_UNIT_CHECK=1
-  - php: 7.0
-    env: SKIP_STYLE_CHECK=1 SKIP_UNIT_CHECK=1
-  - php: 5.6
+  - php: 7.1
     env: SKIP_STYLE_CHECK=1 EXECUTE_BUILD_DOCS=true
-#  - php: hhvm
-#    env: SKIP_STYLE_CHECK=1
-
-  allow_failures:
-  - php: hhvm
 
 cache:
   directories:

diff --git a/LibreNMS/Util/Laravel.php b/LibreNMS/Util/Laravel.php
@@ -83,48 +83,15 @@ public static function disableQueryDebug()
 
     public static function enableCliDebugOutput()
     {
-        if (class_exists('\Log')) {
-            $logger = Log::getMonolog();
-
-            // only install if not existing
-            $install = true;
-            $logfile = Config::get('log_file', base_path('logs/librenms.log'));
-            foreach ($logger->getHandlers() as $handler) {
-                if ($handler instanceof \Monolog\Handler\StreamHandler) {
-                    if ($handler->getUrl() == 'php://stdout') {
-                        $install = false;
-                    } elseif ($handler->getUrl() == $logfile) {
-                        // send to librenms log file if not a cli app
-                        if (!App::runningInConsole()) {
-                            set_error_handler(function ($errno, $errstr, $errfile, $errline) {
-                                Log::error("$errno $errfile:$errline $errstr");
-                            });
-                            $handler->setLevel(\Monolog\Logger::DEBUG);
-                        }
-                    }
-                }
-            }
-
-            if ($install) {
-                $handler = new \Monolog\Handler\StreamHandler(
-                    'php://stdout',
-                    \Monolog\Logger::DEBUG
-                );
-
-                $handler->setFormatter(new CliColorFormatter());
-
-                $logger->pushHandler($handler);
-            }
+        if (class_exists('\Log') && App::runningInConsole()) {
+            Log::setDefaultDriver('console');
         }
     }
 
     public static function disableCliDebugOutput()
     {
         if (class_exists('Log')) {
-            $handlers = Log::getMonolog()->getHandlers();
-            if (isset($handlers[0]) && $handlers[0]->getUrl() == 'php://stdout') {
-                Log::getMonolog()->popHandler();
-            }
+            Log::setDefaultDriver('logfile');
         }
     }
 }
diff --git a/LibreNMS/Util/ModuleTestHelper.php b/LibreNMS/Util/ModuleTestHelper.php
@@ -95,7 +95,7 @@ public function __construct($modules, $os, $variant = '')
 
         if (is_null(self::$module_tables)) {
             // only load the yaml once, then keep it in memory
-            self::$module_tables = Yaml::parse($install_dir . '/tests/module_tables.yaml');
+            self::$module_tables = Yaml::parse(file_get_contents($install_dir . '/tests/module_tables.yaml'));
         }
     }
 

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -14,7 +14,7 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-        \App\Console\Commands\BashCompletionCommand::class,
+        //
     ];
 
     /**
@@ -30,12 +30,14 @@ protected function schedule(Schedule $schedule)
     }
 
     /**
-     * Register the Closure based commands for the application.
+     * Register the commands for the application.
      *
      * @return void
      */
     protected function commands()
     {
+        $this->load(__DIR__.'/Commands');
+
         require base_path('routes/console.php');
 
         if ($this->app->environment() !== 'production') {

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -27,11 +27,6 @@ class Handler extends ExceptionHandler
 
     public function render($request, Exception $exception)
     {
-        // emulate Laravel 5.5 renderable exceptions
-        if (method_exists($exception, 'render')) {
-            return $exception->render($request);
-        }
-
         return parent::render($request, $exception);
     }
 

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -4,6 +4,7 @@
 
 use App\User;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Auth\RegistersUsers;
 
@@ -48,9 +49,9 @@ public function __construct()
     protected function validator(array $data)
     {
         return Validator::make($data, [
-            'name' => 'required|string|max:255',
-            'email' => 'required|string|email|max:255|unique:users',
-            'password' => 'required|string|min:6|confirmed',
+            'name' => ['required', 'string', 'max:255'],
+            'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
+            'password' => ['required', 'string', 'min:6', 'confirmed'],
         ]);
     }
 
@@ -65,7 +66,7 @@ protected function create(array $data)
         return User::create([
             'name' => $data['name'],
             'email' => $data['email'],
-            'password' => bcrypt($data['password']),
+            'password' => Hash::make($data['password']),
         ]);
     }
 }
diff --git a/app/Http/Controllers/Auth/VerificationController.php b/app/Http/Controllers/Auth/VerificationController.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\VerifiesEmails;
+
+class VerificationController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Email Verification Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling email verification for any
+    | user that recently registered with the application. Emails may also
+    | be re-sent if the user didn't receive the original email message.
+    |
+    */
+
+    use VerifiesEmails;
+
+    /**
+     * Where to redirect users after verification.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/home';
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+        $this->middleware('signed')->only('verify');
+        $this->middleware('throttle:6,1')->only('verify', 'resend');
+    }
+}
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -33,7 +33,7 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
-//            \Illuminate\Session\Middleware\AuthenticateSession::class, // Works in Laravel 5.5
+            // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \App\Http\Middleware\LegacyExternalAuth::class,
@@ -64,11 +64,29 @@ class Kernel extends HttpKernel
         '2fa' => \App\Http\Middleware\VerifyTwoFactor::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,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
     ];
 
+    /**
+     * The priority-sorted list of middleware.
+     *
+     * This forces non-global middleware to always be in the given order.
+     *
+     * @var array
+     */
+    protected $middlewarePriority = [
+        \Illuminate\Session\Middleware\StartSession::class,
+        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+        \Illuminate\Auth\Middleware\Authenticate::class,
+        \Illuminate\Session\Middleware\AuthenticateSession::class,
+        \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        \Illuminate\Auth\Middleware\Authorize::class,
+    ];
 
     public function bootstrap()
     {

diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
@@ -2,9 +2,9 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter;
+use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
 
-class EncryptCookies extends BaseEncrypter
+class EncryptCookies extends Middleware
 {
     /**
      * The names of the cookies that should not be encrypted.

diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php
@@ -2,9 +2,9 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Foundation\Http\Middleware\TrimStrings as BaseTrimmer;
+use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
 
-class TrimStrings extends BaseTrimmer
+class TrimStrings extends Middleware
 {
     /**
      * The names of the attributes that should not be trimmed.

diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
@@ -2,10 +2,17 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
+use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
 
-class VerifyCsrfToken extends BaseVerifier
+class VerifyCsrfToken extends Middleware
 {
+    /**
+     * Indicates whether the XSRF-TOKEN cookie should be set on the response.
+     *
+     * @var bool
+     */
+    protected $addHttpCookie = true;
+
     /**
      * The URIs that should be excluded from CSRF verification.
      *

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -31,43 +31,9 @@ public function boot()
         // load config
         Config::load();
 
-        // replace early boot logging redirect log to config location, unless APP_LOG is set
-        Log::getMonolog()->popHandler(); // remove existing errorlog logger
-        Log::useFiles(config('app.log') ?: Config::get('log_file', base_path('logs/librenms.log')), 'error');
-
-        // Blade directives (Yucky because of < L5.5)
-        Blade::directive('config', function ($key) {
-            return "<?php if (\LibreNMS\Config::get(($key))): ?>";
-        });
-        Blade::directive('notconfig', function ($key) {
-            return "<?php if (!\LibreNMS\Config::get(($key))): ?>";
-        });
-        Blade::directive('endconfig', function () {
-            return "<?php endif; ?>";
-        });
-        Blade::directive('admin', function () {
-            return "<?php if (auth()->check() && auth()->user()->isAdmin()): ?>";
-        });
-        Blade::directive('endadmin', function () {
-            return "<?php endif; ?>";
-        });
-
+        $this->bootCustomBladeDirectives();
         $this->bootCustomValidators();
         $this->configureMorphAliases();
-
-        // Development service providers
-        if ($this->app->environment() !== 'production') {
-            if (class_exists(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class)) {
-                $this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
-            }
-
-            if (config('app.debug') && class_exists(\Barryvdh\Debugbar\ServiceProvider::class)) {
-                // disable debugbar for api routes
-                if (!Request::is('api/*')) {
-                    $this->app->register(\Barryvdh\Debugbar\ServiceProvider::class);
-                }
-            }
-        }
     }
 
     /**
@@ -80,6 +46,19 @@ public function register()
         $this->registerGeocoder();
     }
 
+    private function bootCustomBladeDirectives()
+    {
+        Blade::if('config', function ($key) {
+            return \LibreNMS\Config::get($key);
+        });
+        Blade::if('notconfig', function ($key) {
+            return !\LibreNMS\Config::get($key);
+        });
+        Blade::if('admin', function () {
+            return auth()->check() && auth()->user()->isAdmin();
+        });
+    }
+
     private function configureMorphAliases()
     {
         Relation::morphMap([

diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -12,8 +12,8 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
-        'Illuminate\Auth\Events\Login' => ['App\Listeners\AuthEventListener@login'],
-        'Illuminate\Auth\Events\Logout' => ['App\Listeners\AuthEventListener@logout'],
+        \Illuminate\Auth\Events\Login::class => ['App\Listeners\AuthEventListener@login'],
+        \Illuminate\Auth\Events\Logout::class => ['App\Listeners\AuthEventListener@logout'],
     ];
 
     /**

diff --git a/artisan b/artisan