Merge pull request #26 from saeidraei/master

laravel 6 support added

Author: markusjwetzel

composer.json

@@ -15,13 +15,13 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "illuminate/view": "^5.5",
+        "php": "^7.2",
+        "illuminate/view": "^6.0",
         "zordius/lightncandy": "1.2.*"
     },
     "require-dev": {
-        "orchestra/testbench": "~3.2",
-        "phpunit/phpunit": "^6.0"
+        "orchestra/testbench": "^4.0",
+        "phpunit/phpunit": "^8.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -7,8 +7,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false">
+         stopOnFailure="false">
 
     <testsuites>
         <testsuite name="Laravel Handlebars">

src/Compilers/BladeCompiler.php

@@ -1,5 +1,6 @@
 <?php namespace ProAI\Handlebars\Compilers;
 
+use Illuminate\Support\Str;
 use Illuminate\View\Compilers\BladeCompiler as BaseBladeCompiler;
 use Illuminate\View\Compilers\CompilerInterface;
 
@@ -14,7 +15,7 @@ class BladeCompiler extends BaseBladeCompiler implements CompilerInterface
      */
     protected function compileRaw($expression)
     {
-        if (starts_with($expression, '(')) {
+        if (Str::startsWith($expression, '(')) {
             $expression = substr($expression, 1, -1);
         }
 

src/Compilers/HandlebarsCompiler.php

@@ -1,5 +1,6 @@
 <?php namespace ProAI\Handlebars\Compilers;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\View\Compilers\Compiler;
@@ -104,7 +105,7 @@ public function compileString($path, $raw = false)
         }
 
         // set raw option
-        array_set($options, 'compile_helpers_only', $raw);
+        Arr::set($options, 'compile_helpers_only', $raw);
 
         // set language helper functions
         if ($this->languageHelpers) {
@@ -116,7 +117,7 @@ public function compileString($path, $raw = false)
                 $helpers = [];
             }
 
-            array_set($options, 'helpers', $helpers);
+            Arr::set($options, 'helpers', $helpers);
         }
 
         // As of LightnCandy v0.91 resolving via `basedir` and `fileext` options has been stripped from LightnCandy.

tests/FunctionalTest.php

@@ -7,7 +7,7 @@
 
 class FunctionalTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }

tests/expected/handlebars.html

@@ -36,27 +36,21 @@ <h2>by Markus Wetzel</h2>
     </div>
 </div>
 
-
 <div class="m-formItem">
         <label for="textarea" class="m-formItem__label">&lt;textarea&gt; Element</label>
     <div class="m-formItem__group">
             <textarea id="textarea">Test</textarea>
     </div>
 </div>
 
-
 <ul>
-        <li>
+    <li>
             One
-        </li>
-
-        <li>
+</li>
+<li>
             Two
-        </li>
-
-        <li>
+</li>
+<li>
             Three
-        </li>
-
+</li>
 </ul>
-