Updates for Laravel 5.6 (#30)

* update for laravel 5.6

* fix for laravel 5.6

Author: professorhaseeb

src/Compilers/ShortcodeCompiler.php

@@ -37,6 +37,8 @@ class ShortcodeCompiler
      * @var array
      */
     protected $data = [];
+    
+    protected $_viewData;
 
     /**
      * Enable
@@ -139,6 +141,13 @@ protected function renderShortcodes($value)
 
         return preg_replace_callback("/{$pattern}/s", [$this, 'render'], $value);
     }
+    
+    // get view data
+    public function viewData( $viewData )
+    {
+        $this->_viewData = $viewData;
+        return $this;
+    }
 
     /**
      * Render the current calld shortcode.
@@ -152,14 +161,15 @@ public function render($matches)
         // Compile the shortcode
         $compiled = $this->compileShortcode($matches);
         $name = $compiled->getName();
+        $viewData = $this->_viewData;
 
         // Render the shortcode through the callback
         return call_user_func_array($this->getCallback($name), [
             $compiled,
             $compiled->getContent(),
             $this,
             $name,
-            $this->getData()
+            $viewData
         ]);
     }
 

src/View/View.php

@@ -3,8 +3,8 @@
 use ArrayAccess;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\View\View as IlluminateView;
-use Illuminate\Contracts\View\Engine as EngineInterface;
 use Webwizo\Shortcodes\Compilers\ShortcodeCompiler;
+use Illuminate\View\Engines\CompilerEngine;
 
 class View extends IlluminateView implements ArrayAccess, Renderable
 {
@@ -20,13 +20,13 @@ class View extends IlluminateView implements ArrayAccess, Renderable
      * Create a new view instance.
      *
      * @param \Illuminate\View\Factory|Factory                           $factory
-     * @param \Illuminate\Contracts\View\Engine|EngineInterface $engine
+     * @param \Illuminate\View\Compilers\CompilerEngine|CompilerEngine   $engine
      * @param  string                                                    $view
      * @param  string                                                    $path
      * @param  array                                                     $data
      * @param \Webwizo\Shortcodes\Compilers\ShortcodeCompiler            $shortcode
      */
-    public function __construct(Factory $factory, EngineInterface $engine, $view, $path, $data = [], ShortcodeCompiler $shortcode)
+    public function __construct(Factory $factory, CompilerEngine $engine, $view, $path, $data = [], ShortcodeCompiler $shortcode)
     {
         parent::__construct($factory, $engine, $view, $path, $data);
         $this->shortcode = $shortcode;
@@ -39,8 +39,6 @@ public function withShortcodes()
     {
         $this->shortcode->enable();
 
-        $this->shortcode->attachData($this->getData());
-
         return $this;
     }