Merge commit 'd2174ab5'

* commit 'd2174ab5':
  Squashed 'Modules/Workshop/' changes from a484d0e..02afc9e

Modules/Workshop/.sensiolabs.yml

+rules:
+  php.interface_has_no_interface_suffix:
+    enabled: false

Modules/Workshop/.travis.yml

+language: php
+php:
+  - 5.6
+  - 5.5
+  - 5.4
+  - hhvm

Modules/Workshop/Composers/MigrateViewComposer.php

 <?php namespace Modules\Workshop\Composers;
 
+use Illuminate\Contracts\View\View;
 use Modules\Workshop\Manager\ModuleManager;
 
 class MigrateViewComposer
@@ -14,8 +15,8 @@ class MigrateViewComposer
         $this->module = $module;
     }
 
-    public function compose($view)
+    public function compose(View $view)
     {
         $view->modules = $this->module->enabled();
     }
-}
\ No newline at end of file
+}

Modules/Workshop/Config/permissions.php

@@ -23,4 +23,4 @@ return [
     'seed' => [
         'seed'
     ]
-];
\ No newline at end of file
+];

Modules/Workshop/Database/Seeders/WorkshopDatabaseSeeder.php

@@ -14,8 +14,6 @@ class WorkshopDatabaseSeeder extends Seeder
     public function run()
     {
         Model::unguard();
-
-        // $this->call("OthersTableSeeder");
     }
 
-}
\ No newline at end of file
+}

Modules/Workshop/Http/Controllers/ModulesController.php

@@ -46,4 +46,4 @@ class ModulesController extends AdminBaseController
         Flash::success('Modules configuration saved!');
         return Redirect::route('dashboard.modules.index');
     }
-}
\ No newline at end of file
+}

Modules/Workshop/Http/Controllers/WorkbenchController.php

@@ -86,4 +86,4 @@ class WorkbenchController extends AdminBaseController
         Flash::message($output->fetch());
         return Redirect::route('dashboard.workbench.index');
     }
-}
\ No newline at end of file
+}

Modules/Workshop/Http/Requests/GenerateModuleRequest.php

@@ -20,4 +20,4 @@ class GenerateModuleRequest extends FormRequest
     {
         return [];
     }
-}
\ No newline at end of file
+}

Modules/Workshop/Http/Requests/InstallModuleRequest.php

@@ -20,4 +20,4 @@ class InstallModuleRequest extends FormRequest
     {
         return [];
     }
-}
\ No newline at end of file
+}

Modules/Workshop/Http/Requests/MigrateModuleRequest.php

@@ -20,4 +20,4 @@ class MigrateModuleRequest extends FormRequest
     {
         return [];
     }
-}
\ No newline at end of file
+}

Modules/Workshop/Http/Requests/ModulesRequest.php

@@ -18,4 +18,4 @@ class ModulesRequest extends FormRequest
     {
         return [];
     }
-}
\ No newline at end of file
+}

Modules/Workshop/Http/Requests/SeedModuleRequest.php

@@ -20,4 +20,4 @@ class SeedModuleRequest extends FormRequest
     {
         return [];
     }
-}
\ No newline at end of file
+}

Modules/Workshop/Http/routes.php

 <?php
 
-Route::group(['prefix' => LaravelLocalization::setLocale(), 'before' => 'LaravelLocalizationRedirectFilter|auth.admin|permissions'], function()
+use Illuminate\Routing\Router;
+
+$router->group(['prefix' => LaravelLocalization::setLocale(), 'before' => 'LaravelLocalizationRedirectFilter|auth.admin|permissions'], function(Router $router)
 {
-    Route::group(['prefix' => Config::get('core::core.admin-prefix'), 'namespace' => 'Modules\Workshop\Http\Controllers'],
-        function () {
-            Route::get('modules', ['as' => 'dashboard.modules.index', 'uses' => 'ModulesController@index']);
-            Route::post('modules', ['as' => 'dashboard.modules.store', 'uses' => 'ModulesController@store']);
+    $router->group(['prefix' => Config::get('core::core.admin-prefix'), 'namespace' => 'Modules\Workshop\Http\Controllers'],
+        function (Router $router) {
+            $router->get('modules', ['as' => 'dashboard.modules.index', 'uses' => 'ModulesController@index']);
+            $router->post('modules', ['as' => 'dashboard.modules.store', 'uses' => 'ModulesController@store']);
             # Workbench
-            Route::get('workbench', ['as' => 'dashboard.workbench.index', 'uses' => 'WorkbenchController@index']);
-            Route::post('generate', ['as' => 'dashboard.workbench.generate.index', 'uses' => 'WorkbenchController@generate']);
-            Route::post('migrate', ['as' => 'dashboard.workbench.migrate.index', 'uses' => 'WorkbenchController@migrate']);
-            Route::post('install', ['as' => 'dashboard.workbench.install.index', 'uses' => 'WorkbenchController@install']);
-            Route::post('seed', ['as' => 'dashboard.workbench.seed.index', 'uses' => 'WorkbenchController@seed']);
+            $router->get('workbench', ['as' => 'dashboard.workbench.index', 'uses' => 'WorkbenchController@index']);
+            $router->post('generate', ['as' => 'dashboard.workbench.generate.index', 'uses' => 'WorkbenchController@generate']);
+            $router->post('migrate', ['as' => 'dashboard.workbench.migrate.index', 'uses' => 'WorkbenchController@migrate']);
+            $router->post('install', ['as' => 'dashboard.workbench.install.index', 'uses' => 'WorkbenchController@install']);
+            $router->post('seed', ['as' => 'dashboard.workbench.seed.index', 'uses' => 'WorkbenchController@seed']);
         }
     );
 });

Modules/Workshop/Manager/ModuleManager.php

@@ -92,4 +92,4 @@ class ModuleManager
             $this->module->enable($moduleToEnable);
         }
     }
-}
\ No newline at end of file
+}

Modules/Workshop/Providers/RouteServiceProvider.php

+<?php namespace Modules\Workshop\Providers;
+
+use Illuminate\Routing\Router;
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+
+class RouteServiceProvider extends ServiceProvider
+{
+    /**
+     * The root namespace to assume when generating URLs to actions.
+     *
+     * @var string
+     */
+    protected $rootUrlNamespace = 'Modules\Workshop\Http\Controllers';
+
+    /**
+     * The controllers to scan for route annotations.
+     *
+     * @var array
+     */
+    protected $scan = [
+        'Modules\Workshop\Http\Controllers',
+    ];
+
+    /**
+     * Called before routes are registered.
+     *
+     * Register any model bindings or pattern based filters.
+     *
+     * @param  Router $router
+     * @return void
+     */
+    public function before(Router $router)
+    {
+        //
+    }
+
+    /**
+     * Define the routes for the application.
+     *
+     * @return void
+     */
+    public function map(Router $router)
+    {
+        require __DIR__ . '/../Http/routes.php';
+    }
+
+}

Modules/Workshop/Resources/views/admin/modules/index.blade.php

@@ -24,7 +24,6 @@
             </ul>
             <div class="tab-content">
                 <div class="tab-pane active" id="tab_1-1">
-                    @include('flash::message')
                     <ul>
                         @foreach($modules as $module)
                             <li>

Modules/Workshop/Resources/views/admin/workbench/tabs/generate.blade.php

-@include('flash::message')
 <div class="row">
     <div class="col-md-6">
         {!! Form::open(['route' => 'dashboard.workbench.generate.index', 'method' => 'post']) !!}
@@ -35,4 +34,4 @@
         </div>
         {!! Form::close() !!}
     </div>
-</div>
\ No newline at end of file
+</div>

Modules/Workshop/Resources/views/admin/workbench/tabs/migrate.blade.php

-@include('flash::message')
 {!! Form::open(['route' => 'dashboard.workbench.migrate.index', 'method' => 'post']) !!}
     <div class="box-body">
         <div class='form-group{{ $errors->has('module') ? ' has-error' : '' }}'>
@@ -10,4 +9,4 @@
     <div class="box-footer">
         <button type="submit" class="btn btn-primary btn-flat">{{ trans('workshop::workbench.button.migrate') }}</button>
     </div>
-{!! Form::close() !!}
\ No newline at end of file
+{!! Form::close() !!}

Modules/Workshop/Resources/views/admin/workbench/tabs/seed.blade.php

-@include('flash::message')
 {!! Form::open(['route' => 'dashboard.workbench.seed.index', 'method' => 'post']) !!}
     <div class="box-body">
         <div class='form-group{{ $errors->has('module') ? ' has-error' : '' }}'>
@@ -10,4 +9,4 @@
     <div class="box-footer">
         <button type="submit" class="btn btn-primary btn-flat">{{ trans('workshop::workbench.button.seed') }}</button>
     </div>
-{!! Form::close() !!}
\ No newline at end of file
+{!! Form::close() !!}

Modules/Workshop/module.json

@@ -6,6 +6,7 @@
   ],
   "active": 1,
   "providers": [
+      "Modules\\Workshop\\Providers\\RouteServiceProvider",
       "Modules\\Workshop\\Providers\\WorkshopServiceProvider"
   ]
-}
\ No newline at end of file
+}

Modules/Workshop/readme.md

 # Workshop Module
 
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/d6258dc8-cd2a-4288-94a5-8a8089e6609e/mini.png)](https://insight.sensiolabs.com/projects/d6258dc8-cd2a-4288-94a5-8a8089e6609e)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nWidart-Modules/Workshop/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nWidart-Modules/Workshop/?branch=master)
\ No newline at end of file
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nWidart-Modules/Workshop/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nWidart-Modules/Workshop/?branch=master)
+[![Code Climate](https://codeclimate.com/github/nWidart-Modules/Workshop/badges/gpa.svg)](https://codeclimate.com/github/nWidart-Modules/Workshop)

Modules/Workshop/start.php

@@ -16,14 +16,4 @@ Lang::addNamespace('workshop', __DIR__ . '/Resources/lang/');
 
 Config::addNamespace('workshop', __DIR__ . '/Config/');
 
-/*
-|--------------------------------------------------------------------------
-| Require The Routes file.
-|--------------------------------------------------------------------------
-|
-| Next, this module will load filters and routes file.
-|
-*/
-
-require __DIR__ . '/Http/routes.php';
-require __DIR__ . '/composers.php';
\ No newline at end of file
+require __DIR__ . '/composers.php';