Laravel 5.4 compatibility

arrilot · Jan 26, 2017 · b115c03 · b115c03
1 parent 852b1ed
commit b115c03
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,11 @@ php:
   - 5.5
   - 5.6
   - 7.0
-  - hhvm
+  - 7.1
+
+cache:
+  directories:
+    - $HOME/.composer/cache
 
 before_script:
   - composer self-update

diff --git a/src/Console/WidgetMakeCommand.php b/src/Console/WidgetMakeCommand.php
@@ -2,14 +2,11 @@
 
 namespace Arrilot\Widgets\Console;
 
-use Illuminate\Console\AppNamespaceDetectorTrait;
 use Illuminate\Console\GeneratorCommand;
 use Symfony\Component\Console\Input\InputOption;
 
 class WidgetMakeCommand extends GeneratorCommand
 {
-    use AppNamespaceDetectorTrait;
-
     /**
      * The console command name.
      *
@@ -98,7 +95,7 @@ protected function replaceNamespace(&$stub, $name)
         );
 
         $stub = str_replace(
-            '{{rootNamespace}}', $this->getAppNamespace(), $stub
+            '{{rootNamespace}}', $this->laravel->getNamespace(), $stub
         );
 
         return $this;
@@ -194,7 +191,7 @@ protected function getViewPath()
      */
     protected function makeViewName()
     {
-        $name = str_replace($this->getAppNamespace(), '', $this->argument('name'));
+        $name = str_replace($this->laravel->getNamespace(), '', $this->argument('name'));
         $name = str_replace('\\', '/', $name);
 
         // convert to snake_case part by part to avoid unexpected underscores.

diff --git a/src/Misc/LaravelApplicationWrapper.php b/src/Misc/LaravelApplicationWrapper.php
@@ -4,13 +4,10 @@
 
 use Arrilot\Widgets\Contracts\ApplicationWrapperContract;
 use Closure;
-use Illuminate\Console\AppNamespaceDetectorTrait;
 use Illuminate\Container\Container;
 
 class LaravelApplicationWrapper implements ApplicationWrapperContract
 {
-    use AppNamespaceDetectorTrait;
-
     /**
      * Laravel application instance.
      */
@@ -71,7 +68,7 @@ public function config($key, $default = null)
      */
     public function getNamespace()
     {
-        return $this->getAppNamespace();
+        return $this->app->getNamespace();
     }
 
     /**

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -6,13 +6,10 @@
 use Arrilot\Widgets\Factories\AsyncWidgetFactory;
 use Arrilot\Widgets\Factories\WidgetFactory;
 use Arrilot\Widgets\Misc\LaravelApplicationWrapper;
-use Illuminate\Console\AppNamespaceDetectorTrait;
 use Illuminate\Support\Facades\Blade;
 
 class ServiceProvider extends \Illuminate\Support\ServiceProvider
 {
-    use AppNamespaceDetectorTrait;
-
     /**
      * Register the service provider.
      *