Merge pull request #28 from saineshmamgain/main

fixes #27

Author: infureal

src/Http/Controllers/GuiController.php

@@ -9,6 +9,8 @@
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Str;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
@@ -31,7 +33,7 @@ function run($command) {
 
         $permissions = config('artisan-gui.permissions', []);
 
-        if (in_array($command->getName(), array_keys($permissions)) && !\Gate::check($permissions[$command->getName()]))
+        if (in_array($command->getName(), array_keys($permissions)) && !Gate::check($permissions[$command->getName()]))
             abort(403);
 
         $rules = $this->buildRules($command);
@@ -81,7 +83,7 @@ protected function prepareToJson(array $commands): array {
         foreach ($commands as $gKey => $group) {
             foreach ($group as $cKey => $command) {
 
-                if (($permission = $permissions[$command] ?? null) && !\Gate::check($permission)) {
+                if (($permission = $permissions[$command] ?? null) && !Gate::check($permission)) {
                     unset($commands[$gKey][$cKey]);
                     continue;
                 }
@@ -126,7 +128,7 @@ protected function optionsToArray(Command $command): ?array {
 
         $options = array_map(function (InputOption $option) {
             return [
-                'title' => \Str::of($option->getName())->snake()->replace('_', ' ')->title()->__toString(),
+                'title' => Str::of($option->getName())->snake()->replace('_', ' ')->title()->__toString(),
                 'name' => $option->getName(),
                 'description' => $option->getDescription(),
                 'shortcut' => $option->getShortcut(),
@@ -144,7 +146,7 @@ protected function argumentsToArray(Command $command): ?array {
         $definition = $command->getDefinition();
         $arguments = array_map(function (InputArgument $argument) {
             return [
-                'title' => \Str::of($argument->getName())->snake()->replace('_', ' ')->title()->__toString(),
+                'title' => Str::of($argument->getName())->snake()->replace('_', ' ')->title()->__toString(),
                 'name' => $argument->getName(),
                 'description' => $argument->getDescription(),
                 'default' => empty($default = $argument->getDefault()) ? null : $default,
@@ -158,7 +160,7 @@ protected function argumentsToArray(Command $command): ?array {
 
     protected function renameKeys(array $array): array {
         $keys = array_map(function ($key) {
-            return \Str::title($key);
+            return Str::title($key);
         }, array_keys($array));
 
         return array_combine($keys, array_values($array));
@@ -192,4 +194,4 @@ protected function buildRules(Command $command) {
         return $rules;
     }
 
-}
+}

src/Providers/GuiServiceProvider.php

@@ -5,7 +5,11 @@
 
 
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Str;
 
 
 class GuiServiceProvider extends ServiceProvider {
@@ -21,7 +25,7 @@ protected function registerRoutes() {
 
         $middleware = config('artisan-gui.middlewares', []);
 
-        \Route::middleware($middleware)
+        Route::middleware($middleware)
             ->prefix(config('artisan-gui.prefix', '~') . 'artisan')
             ->group(function () {
 
@@ -47,7 +51,7 @@ public function register() {
 
     public function boot() {
         $this->publishVendors();
-        \View::share('guiRoot', $this->root);
+        View::share('guiRoot', $this->root);
     }
 
     protected function publishVendors() {
@@ -69,7 +73,7 @@ protected function discoverComponents($dir = null) {
         $prefix = 'gui';
 
         if ($dir)
-            $prefix .= '-' . \Str::of($dir)->replace(['\\', '/'], ' ')->slug();
+            $prefix .= '-' . Str::of($dir)->replace(['\\', '/'], ' ')->slug();
 
         $namespace = '';
 
@@ -100,7 +104,7 @@ protected function loadComponents() {
         foreach ($components as $key => $group) {
             foreach ($group as $component) {
                 $name = strtolower(last(explode('\\', $component)));
-                \Blade::component($component, $name, $key);
+                Blade::component($component, $name, $key);
             }
         }