Updating the package for Laravel 5.4

.gitignore

@@ -1,5 +1,4 @@
 /build/
-/node_modules/
 /vendor/
 /composer.lock
 /composer.phar

.scrutinizer.yml

@@ -22,7 +22,7 @@ checks:
 tools:
     external_code_coverage:
         timeout: 600
-        runs: 2
+        runs: 3
     php_code_sniffer:
         enabled: true
         config:

composer.json

@@ -15,9 +15,9 @@
     "require": {
         "php":                    ">=5.6.4",
         "arcanedev/log-viewer":   "~4.3",
-        "arcanedev/route-viewer": "~0.1",
-        "arcanesoft/auth":        "~1.12",
-        "arcanesoft/core":        "~1.4"
+        "arcanedev/route-viewer": "~1.0",
+        "arcanesoft/auth":        "~2.0",
+        "arcanesoft/core":        "~1.5"
     },
     "require-dev": {
         "phpunit/phpcov":  "~3.0",

helpers.php

@@ -4,9 +4,9 @@
     /**
      * Get the Foundation instance.
      *
-     * @return \Arcanesoft\Foundation\Foundation
+     * @return \Arcanesoft\Foundation\Contracts\Foundation
      */
     function foundation() {
-        return app('arcanesoft.foundation');
+        return app(Arcanesoft\Foundation\Contracts\Foundation::class);
     }
 }

resources/views/admin/system/routes/list.blade.php

@@ -40,7 +40,7 @@
                                 @endif
                             </td>
                             <td>
-                                <small><b>N: </b> {{ $route->name }}</small>
+                                <small><b>N: </b> <span class="label label-{{ $route->hasName() ? 'primary' : 'default' }}">{{ $route->name }}</span></small>
                                 <br>
                                 <small>
                                     <b>A: </b> {!! preg_replace('#(@.*)$#', '<span class="text-success">$1</span>', $route->action) !!}

src/Contracts/Foundation.php

@@ -0,0 +1,17 @@
+<?php namespace Arcanesoft\Foundation\Contracts;
+
+/**
+ * Interface  Foundation
+ *
+ * @package   Arcanesoft\Foundation\Contracts
+ * @author    ARCANEDEV <[email protected]>
+ */
+interface Foundation
+{
+    /**
+     * Get the package version.
+     *
+     * @return string
+     */
+    public function version();
+}

src/Foundation.php

@@ -1,18 +1,46 @@
 <?php namespace Arcanesoft\Foundation;
 
+use Arcanesoft\Foundation\Contracts\Foundation as FoundationContract;
+use Illuminate\Contracts\Foundation\Application;
+
 /**
  * Class     Foundation
  *
  * @package  Arcanesoft\Foundation
  * @author   ARCANEDEV <[email protected]>
  */
-class Foundation
+class Foundation implements FoundationContract
 {
     /* ------------------------------------------------------------------------------------------------
      |  Constants
      | ------------------------------------------------------------------------------------------------
      */
-    const VERSION = '1.2.0';
+    const VERSION = '1.5.1';
+
+    /* ------------------------------------------------------------------------------------------------
+     |  Properties
+     | ------------------------------------------------------------------------------------------------
+     */
+    /**
+     * The application instance.
+     *
+     * @var \Illuminate\Contracts\Foundation\Application
+     */
+    protected $app;
+
+    /* ------------------------------------------------------------------------------------------------
+     |  Constructor
+     | ------------------------------------------------------------------------------------------------
+     */
+    /**
+     * Foundation constructor.
+     *
+     * @param  \Illuminate\Contracts\Foundation\Application  $app
+     */
+    public function __construct(Application $app)
+    {
+        $this->app = $app;
+    }
 
     /* ------------------------------------------------------------------------------------------------
      |  Getters & Setters

src/FoundationServiceProvider.php

@@ -81,7 +81,9 @@ public function boot()
      */
     public function provides()
     {
-        return ['arcanesoft.foundation'];
+        return [
+            Contracts\Foundation::class,
+        ];
     }
 
     /* ------------------------------------------------------------------------------------------------
@@ -93,7 +95,7 @@ public function provides()
      */
     private function registerFoundationService()
     {
-        $this->singleton('arcanesoft.foundation', Foundation::class);
+        $this->singleton(Contracts\Foundation::class, Foundation::class);
     }
 
     /**

src/Http/Routes/Admin/DashboardRoute.php

@@ -1,26 +1,23 @@
 <?php namespace Arcanesoft\Foundation\Http\Routes\Admin;
 
-use Arcanedev\Support\Bases\RouteRegister;
-use Illuminate\Contracts\Routing\Registrar;
+use Arcanedev\Support\Routing\RouteRegistrar;
 
 /**
  * Class     DashboardRoute
  *
  * @package  Arcanesoft\Foundation\Http\Routes\Admin
  * @author   ARCANEDEV <[email protected]>
  */
-class DashboardRoute extends RouteRegister
+class DashboardRoute extends RouteRegistrar
 {
     /* ------------------------------------------------------------------------------------------------
      |  Main Functions
      | ------------------------------------------------------------------------------------------------
      */
     /**
      * Map routes.
-     *
-     * @param  \Illuminate\Contracts\Routing\Registrar  $router
      */
-    public function map(Registrar $router)
+    public function map()
     {
         $this->get('/', 'DashboardController@index')
              ->name('home'); // admin::foundation.home

src/Http/Routes/Admin/SettingsRoutes.php

@@ -1,6 +1,6 @@
 <?php namespace Arcanesoft\Foundation\Http\Routes\Admin;
 
-use Arcanedev\Support\Bases\RouteRegister;
+use Arcanedev\Support\Routing\RouteRegistrar;
 use Illuminate\Contracts\Routing\Registrar;
 
 /**
@@ -9,20 +9,18 @@
  * @package  Arcanesoft\Foundation\Http\Routes\Admin
  * @author   ARCANEDEV <[email protected]>
  */
-class SettingsRoutes extends RouteRegister
+class SettingsRoutes extends RouteRegistrar
 {
     /* ------------------------------------------------------------------------------------------------
      |  Main Functions
      | ------------------------------------------------------------------------------------------------
      */
     /**
      * Map routes.
-     *
-     * @param  \Illuminate\Contracts\Routing\Registrar  $router
      */
-    public function map(Registrar $router)
+    public function map()
     {
-        $this->group(['prefix' => 'settings', 'as' => 'settings.'], function () {
+        $this->prefix('settings')->name('settings.')->group(function () {
             $this->get('/', 'SettingsController@index')
                  ->name('index'); // admin::foundation.settings.index
         });

src/Http/Routes/Admin/SystemRoutes.php

@@ -1,28 +1,25 @@
 <?php namespace Arcanesoft\Foundation\Http\Routes\Admin;
 
-use Arcanedev\Support\Bases\RouteRegister;
-use Illuminate\Contracts\Routing\Registrar;
+use Arcanedev\Support\Routing\RouteRegistrar;
 
 /**
  * Class     SystemRoutes
  *
  * @package  Arcanesoft\Foundation\Http\Routes\Admin
  * @author   ARCANEDEV <[email protected]>
  */
-class SystemRoutes extends RouteRegister
+class SystemRoutes extends RouteRegistrar
 {
     /* ------------------------------------------------------------------------------------------------
      |  Main Functions
      | ------------------------------------------------------------------------------------------------
      */
     /**
      * Map routes.
-     *
-     * @param  \Illuminate\Contracts\Routing\Registrar $router
      */
-    public function map(Registrar $router)
+    public function map()
     {
-        $this->group(['prefix' => 'system', 'as' => 'system.', 'namespace' => 'System'], function () {
+        $this->prefix('system')->name('system.')->namespace('System')->group(function () {
             $this->registerSystemInformationRoutes();
             $this->registerLogViewerRoutes();
             $this->registerRouteViewerRoutes();
@@ -38,9 +35,9 @@ public function map(Registrar $router)
      */
     private function registerSystemInformationRoutes()
     {
-        $this->group(['prefix' => 'information', 'as' => 'information.'], function () {
+        $this->prefix('information')->name('information.')->group(function () {
             $this->get('/',  'InformationController@index')
-                ->name('index');
+                ->name('index');  // admin::foundation.system.information.index
         });
     }
 
@@ -49,15 +46,15 @@ private function registerSystemInformationRoutes()
      */
     private function registerLogViewerRoutes()
     {
-        $this->group(['prefix' => 'log-viewer', 'as' => 'log-viewer.'], function () {
+        $this->prefix('log-viewer')->name('log-viewer.')->group(function () {
             $this->get('/', 'LogViewerController@index')
-                 ->name('index'); // foundation::system.log-viewer.index
+                 ->name('index'); // admin::foundation.system.log-viewer.index
 
-            $this->group(['prefix' => 'logs', 'as' => 'logs.'], function() {
+            $this->prefix('logs')->name('logs.')->group(function() {
                 $this->get('/', 'LogViewerController@listLogs')
                      ->name('list'); // foundation::system.log-viewer.logs.list
 
-                $this->group(['prefix' => '{date}'], function() {
+                $this->prefix('{date}')->group(function() {
                     $this->get('/', 'LogViewerController@show')
                          ->name('show'); // foundation::system.log-viewer.logs.show
 
@@ -79,9 +76,9 @@ private function registerLogViewerRoutes()
      */
     private function registerRouteViewerRoutes()
     {
-        $this->group(['prefix' => 'routes', 'as' => 'routes.'], function () {
+        $this->prefix('routes')->name('routes.')->group(function () {
             $this->get('/', 'RoutesController@index')
-                 ->name('index');
+                 ->name('index'); // foundation::system.routes.index
         });
     }
 }

tests/FoundationServiceProviderTest.php

@@ -58,7 +58,7 @@ public function it_can_be_instantiated()
     public function it_can_provides()
     {
         $expected = [
-            'arcanesoft.foundation',
+            \Arcanesoft\Foundation\Contracts\Foundation::class,
         ];
 
         $this->assertEquals($expected, $this->provider->provides());

tests/FoundationTest.php

@@ -25,7 +25,7 @@ public function setUp()
     {
         parent::setUp();
 
-        $this->foundation = app('arcanesoft.foundation');
+        $this->foundation = $this->app->make(\Arcanesoft\Foundation\Contracts\Foundation::class);
     }
 
     public function tearDown()