Run artisan optimize after composer install (#11465)

* Remove unused routes

Prevents route:cache from working also

* Run artisan optimize after composer install

Helps cleaning up issues with upgrades, and also makes laravel a bit
faster

* Update composer.json

Co-authored-by: Tony Murray <murraytony@gmail.com>

.env.example

@@ -1,3 +1,7 @@
+#
+# Remember to run "php artisan optimize" after changing this file
+#
+
 APP_KEY=
 
 #DB_HOST=

.travis.yml

@@ -48,6 +48,7 @@ script:
   - php scripts/pre-commit.php -q -l
   - php scripts/pre-commit.php -q -s
   - php scripts/pre-commit.php -u --db --snmpsim --fail-fast
+  - test -z "$BROWSER_TEST" || php artisan config:clear
   - test -z "$BROWSER_TEST" || php artisan dusk
   - bash -n daily.sh
   - pylint -E poller-wrapper.py discovery-wrapper.py

LibreNMS/Util/Env.php

@@ -37,7 +37,10 @@ class Env
      */
     public static function parseArray($env_name, $default = null, $except = [''])
     {
-        $value = env($env_name, $default);
+        $value = getenv($env_name);
+        if ($value === false) {
+            $value = $default;
+        }
 
         if (is_string($value) && !in_array($value, $except)) {
             $value = explode(',', $value);

composer.json

@@ -115,6 +115,8 @@
             "LibreNMS\\ComposerHelper::postInstall",
             "Illuminate\\Foundation\\ComposerScripts::postInstall",
             "@php artisan vue-i18n:generate --multi-locales --format=umd",
+            "@php artisan view:cache",
+            "@php artisan optimize",
             "@python-requirements"
         ],
         "post-update-cmd": [

resources/views/vue.blade.php

@@ -1,51 +0,0 @@
-@extends('layouts.librenmsv1')
-
-@section('content')
-    <div class="container-fluid">
-        <div class="container">
-            <div id="app" v-cloak>
-                <tabs>
-                    <template v-slot:header>
-                        <div>Banana</div>
-                    </template>
-                    <tab name="One" selected icon="fa-ambulance" selected>
-                        <accordion :multiple="false">
-                            <accordion-item name="Test" icon="fa-wrench" active>
-                                Test Content
-                            </accordion-item>
-                            <accordion-item name="Test 2" icon="fa-archive">
-                                Test 2 Content
-                            </accordion-item>
-                            <accordion-item name="Test 3" icon="fa-android">
-                                Test 3 Content
-                            </accordion-item>
-                        </accordion>
-                    </tab>
-                    <tab name="Dave" icon="fa-bomb">
-                        Dave's not here man
-                    </tab>
-                </tabs>
-            </div>
-        </div>
-        <hr />
-
-    </div>
-@endsection
-
-@section('css')
-    <style>
-        [v-cloak] > * { display:none; }
-        [v-cloak]::before {
-            content: " ";
-            display: block;
-            width: 16px;
-            height: 16px;
-            background-image: url('data:image/gif;base64,R0lGODlhEAAQAPIAAP///wAAAMLCwkJCQgAAAGJiYoKCgpKSkiH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCgAAACwAAAAAEAAQAAADMwi63P4wyklrE2MIOggZnAdOmGYJRbExwroUmcG2LmDEwnHQLVsYOd2mBzkYDAdKa+dIAAAh+QQJCgAAACwAAAAAEAAQAAADNAi63P5OjCEgG4QMu7DmikRxQlFUYDEZIGBMRVsaqHwctXXf7WEYB4Ag1xjihkMZsiUkKhIAIfkECQoAAAAsAAAAABAAEAAAAzYIujIjK8pByJDMlFYvBoVjHA70GU7xSUJhmKtwHPAKzLO9HMaoKwJZ7Rf8AYPDDzKpZBqfvwQAIfkECQoAAAAsAAAAABAAEAAAAzMIumIlK8oyhpHsnFZfhYumCYUhDAQxRIdhHBGqRoKw0R8DYlJd8z0fMDgsGo/IpHI5TAAAIfkECQoAAAAsAAAAABAAEAAAAzIIunInK0rnZBTwGPNMgQwmdsNgXGJUlIWEuR5oWUIpz8pAEAMe6TwfwyYsGo/IpFKSAAAh+QQJCgAAACwAAAAAEAAQAAADMwi6IMKQORfjdOe82p4wGccc4CEuQradylesojEMBgsUc2G7sDX3lQGBMLAJibufbSlKAAAh+QQJCgAAACwAAAAAEAAQAAADMgi63P7wCRHZnFVdmgHu2nFwlWCI3WGc3TSWhUFGxTAUkGCbtgENBMJAEJsxgMLWzpEAACH5BAkKAAAALAAAAAAQABAAAAMyCLrc/jDKSatlQtScKdceCAjDII7HcQ4EMTCpyrCuUBjCYRgHVtqlAiB1YhiCnlsRkAAAOwAAAAAAAAAAAA==');
-        }
-    </style>
-@endsection
-
-@push('scripts')
-    @routes
-    <script src="{{ mix('js/app.js') }}"></script>
-@endpush

routes/web.php

@@ -16,10 +16,6 @@ Auth::routes();
 
 // WebUI
 Route::group(['middleware' => ['auth', '2fa'], 'guard' => 'auth'], function () {
-    // Test
-    Route::get('/vue/{sub?}', function () {
-        return view('vue');
-    })->where('sub', '.*');
 
     // pages
     Route::resource('device-groups', 'DeviceGroupController');
@@ -51,9 +47,6 @@ Route::group(['middleware' => ['auth', '2fa'], 'guard' => 'auth'], function () {
 
     // old route redirects
     Route::permanentRedirect('poll-log', 'poller/log');
-    Route::get('settings/sub={tab}', function ($tab) {
-        return redirect("settings/$tab");
-    });
 
     // Two Factor Auth
     Route::group(['prefix' => '2fa', 'namespace' => 'Auth'], function () {
@@ -149,11 +142,6 @@ Route::group(['middleware' => ['auth', '2fa'], 'guard' => 'auth'], function () {
     // demo helper
     Route::permanentRedirect('demo', '/');
 
-    // blank page, dummy page for external code using Laravel::bootWeb()
-    Route::any('/blank', function () {
-        return '';
-    });
-
     // Legacy routes
     Route::any('/{path?}', 'LegacyController@index')
         ->where('path', '^((?!_debugbar).)*');

tests/DuskTestCase.php

@@ -33,7 +33,7 @@ abstract class DuskTestCase extends BaseTestCase
             '--disable-gpu',
         ];
 
-        if (env('CHROME_HEADLESS')) {
+        if (getenv('CHROME_HEADLESS')) {
             $arguments[] = '--headless';
         }