Fix view instance

Author: barryvdh

src/Console/MetaCommand.php

@@ -135,7 +135,7 @@ public function handle()
             return gettype($value);
         });
 
-        $content = $this->view->make('meta', [
+        $content = $this->view->make('ide-helper::meta', [
             'bindings' => $bindings,
             'methods' => $this->methods,
             'factories' => $factories,
@@ -191,6 +191,8 @@ protected function getExpectedArgumentSets()
         return [
             'configs' => $this->loadTemplate('configs')->pluck('name')->filter(),
             'routes' => $this->loadTemplate('routes')->pluck('name')->filter(),
+            'views' => $this->loadTemplate('views')->pluck('key')->filter(),
+            
         ];
     }
 
@@ -215,6 +217,9 @@ protected function getExpectedArguments()
             '\route()' => [
                 0 => 'routes',
             ],
+            '\view()' => [
+                0 => 'views',
+            ],
         ];
     }
 

src/Generator.php

@@ -79,7 +79,7 @@ public function __construct(
     public function generate()
     {
         $app = app();
-        return $this->view->make('helper')
+        return $this->view->make('ide-helper::helper')
             ->with('namespaces_by_extends_ns', $this->getAliasesByExtendsNamespace())
             ->with('namespaces_by_alias_ns', $this->getAliasesByAliasNamespace())
             ->with('real_time_facades', $this->getRealTimeFacades())
@@ -105,7 +105,7 @@ public function generateEloquent()
         }
 
         $app = app();
-        return $this->view->make('helper')
+        return $this->view->make('ide-helper::helper')
             ->with('namespaces_by_extends_ns', [])
             ->with('namespaces_by_alias_ns', ['__root' => [$alias]])
             ->with('real_time_facades', [])

src/IdeHelperServiceProvider.php

@@ -65,12 +65,6 @@ public function register()
         $configPath = __DIR__ . '/../config/ide-helper.php';
         $this->mergeConfigFrom($configPath, 'ide-helper');
 
-        $this->app->when([GeneratorCommand::class, MetaCommand::class, ModelsCommand::class])
-            ->needs(\Illuminate\Contracts\View\Factory::class)
-            ->give(function () {
-                return $this->createLocalViewFactory();
-            });
-
         $this->commands(
             [
                 GeneratorCommand::class,
@@ -95,20 +89,4 @@ public function provides()
             EloquentCommand::class,
         ];
     }
-
-    /**
-     * @return Factory
-     */
-    private function createLocalViewFactory()
-    {
-        $resolver = new EngineResolver();
-        $resolver->register('php', function () {
-            return new PhpEngine($this->app['files']);
-        });
-        $finder = new FileViewFinder($this->app['files'], [__DIR__ . '/../resources/views']);
-        $factory = new Factory($resolver, $finder, $this->app['events']);
-        $factory->addExtension('php', 'php');
-
-        return $factory;
-    }
 }