* 3.48 see changelog.

EFTEC · Jan 6, 2021 · ec215af · ec215af
1 parent 6829b32
commit ec215af
Show file tree

Hide file tree

Showing 9 changed files with 101 additions and 66 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ BladeOne is a standalone version of Blade Template Engine that uses a single PHP
 [![Build Status](https://travis-ci.org/EFTEC/BladeOne.svg?branch=master)](https://travis-ci.org/EFTEC/BladeOne)
 [![Packagist](https://img.shields.io/packagist/v/eftec/bladeone.svg)](https://packagist.org/packages/eftec/bladeone)
 [![Total Downloads](https://poser.pugx.org/eftec/bladeone/downloads)](https://packagist.org/packages/eftec/bladeone)
-[![Maintenance](https://img.shields.io/maintenance/yes/2020.svg)]()
+[![Maintenance](https://img.shields.io/maintenance/yes/2021.svg)]()
 [![composer](https://img.shields.io/badge/composer-%3E1.6-blue.svg)]()
 [![php](https://img.shields.io/badge/php->5.6-green.svg)]()
 [![php](https://img.shields.io/badge/php-7.x-green.svg)]()
@@ -467,6 +467,6 @@ You are welcome to use it, share it, ask for changes and whatever you want to. J
 
 ## License
 MIT License.
-BladeOne (c) 2016-2020 Jorge Patricio Castro Castillo
+BladeOne (c) 2016-2021 Jorge Patricio Castro Castillo
 Blade (c) 2012 Laravel Team (This code is based and inspired in the work of the team of Laravel, however BladeOne is mostly a original work)
 
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "eftec/bladeone",
   "description": "The standalone version Blade Template Engine from Laravel in a single php file",
   "type": "library",
-  "version": "3.47.3",
+  "version": "3.48",
   "keywords": [
     "blade",
     "template",

diff --git a/examples/testcomponent.php b/examples/testcomponent.php
@@ -12,7 +12,7 @@
 
 
 try {
-    echo $blade->run("TestComponent.component", []);
+    echo $blade->run("TestComponent.component", ['myglobal'=>'hello']);
 } catch (Exception $e) {
     echo "error found ".$e->getMessage()."<br>".$e->getTraceAsString();
 }
diff --git a/examples/views/TestComponent/alert.blade.php b/examples/views/TestComponent/alert.blade.php
@@ -1,4 +1,7 @@
-<div class="alert alert-danger" style="background-color: {!! $color  !!}; padding-left: 100px;">
-    <div>{!! $title !!}</div>
+<div class="alert alert-danger" style="background-color: {!! $color  !!}; padding-left: 100px;border: black 1px solid">
+    <div>title:{!! $title !!}</div>
+    <div>myglobal:{!! $myglobal !!}</div>
     {!! $slot !!}
-</div>
+    <div>end title:{!! $title !!}</div>
+</div>
+<br>
diff --git a/examples/views/TestComponent/component.blade.php b/examples/views/TestComponent/component.blade.php
@@ -1,26 +1,60 @@
 <h1>It is a test of the tags @@component</h1>
+<h2>paramless</h2>
+
+@component('TestComponent.paramless')
+    <strong>Whoops!</strong> Something went wrong! (the code is right btw), it must show a no-color background
+@endcomponent
+
+@component('TestComponent.paramless')
+    <strong>Whoops!</strong> Something went wrong! (the code is right btw), it must show a no-color background
+@endcomponent
+
+
+<h2>with parameters</h2>
+@component('TestComponent.alert',array('title'=>'no title'))
+    <strong>Whoops!</strong> Something went wrong! (the code is right btw), it must show a no-color background
+@endcomponent
+<br>
+
 @component('TestComponent.alert',array('title'=>'COMPONENT #1','color'=>"red"))
-    <strong>Whoops!</strong> Something went wrong! (the code is right btw)
+    <strong>Whoops!</strong> Something went wrong! (the code is right btw), it must show a red background
 @endcomponent
 
 @component('TestComponent.alert',['color'=>'orange'])
     @slot('title')
-        <hr>
         COMPONENT #2
+    @endslot
+        <hr>
+
         @component('TestComponent.alert',['color'=>'yellow'])
             @slot('title')
                 COMPONENT #2.1
             @endslot
-            <strong>Whoops!</strong> Something went wrong! (the code is right btw)
+            <strong>Whoops!</strong> Something went wrong! (the code is right btw), it must show a yellow background
+                <hr>
+                COMPONENT #3 starts here:
+                @component('TestComponent.alert',['color'=>'lightblue'])
+                    @slot('title')
+                        COMPONENT #3.1
+                    @endslot
+                    <strong>Whoops!</strong> Something went wrong! (the code is right btw), it must show a lightblue background
+                @endcomponent
+
+                <hr>
         @endcomponent
-
         <hr>
-    @endslot
-    <strong>Whoops!</strong> Something went wrong! (the code is right btw)
+
+    <strong>Whoops!</strong> Something went wrong! (the code is right btw), iit must show a orange background
 @endcomponent
 
 @component('TestComponent.alert',['color'=>'lightblue'])
     @slot('title', 'COMPONENT #3')
 
-    <strong>Whoops!</strong> Something went wrong! (the code is right btw)
-@endcomponent
+    <strong>Whoops!</strong> Something went wrong! (the code is right btw), it must show a lightblue background
+@endcomponent
+
+@component('TestComponent.alert',[])
+    @slot('title', 'COMPONENT #3')
+
+    <strong>Whoops!</strong> Something went wrong! (the code is right btw), it must show a no-color background
+@endcomponent
diff --git a/examples/views/TestComponent/paramless.blade.php b/examples/views/TestComponent/paramless.blade.php
@@ -0,0 +1,6 @@
+<div class="alert alert-danger" style="; padding-left: 100px; border: black 1px solid">
+    <div>PARAMLESS (colorless)</div>
+    <div>myglobal:{!! $myglobal !!}</div>
+    {!! $slot !!}
+</div>
+<br>
diff --git a/lib/BladeOne.php b/lib/BladeOne.php
@@ -1,4 +1,5 @@
-<?php
+<?php /** @noinspection PhpUnusedParameterInspection */
+
 /** @noinspection SyntaxError
  * @noinspection ForgottenDebugOutputInspection
  * @noinspection UnknownInspectionInspection
@@ -34,7 +35,7 @@
  * @copyright Copyright (c) 2016-2020 Jorge Patricio Castro Castillo MIT License.
  *            Don't delete this comment, its part of the license.
  *            Part of this code is based in the work of Laravel PHP Components.
- * @version   3.47.3
+ * @version   3.48
  * @link      https://github.com/EFTEC/BladeOne
  */
 class BladeOne
@@ -537,6 +538,7 @@ public function runString($string, $data = [])
         $previousError = \error_get_last();
 
         try {
+            /** @noinspection PhpExpressionResultUnusedInspection */
             @eval('?' . '>' . $php);
         } catch (Exception $e) {
             while (\ob_get_level() > $obLevel) {
@@ -1004,7 +1006,13 @@ public function runChild($view, $variables = [])
         if (\is_array($variables)) {
             $newVariables = \array_merge($this->variables, $variables);
         } else {
-            $this->showError('run/include', "Include/run variables should be defined as array ['idx'=>'value']", true);
+            if ($variables===null) {
+                $newVariables=$this->variables;
+                var_dump($newVariables);
+                die(1);
+            }
+
+            $this->showError('run/include', "RunChild: Include/run variables should be defined as array ['idx'=>'value']", true);
             return '';
         }
         return $this->runInternal($view, $newVariables, false, false, $this->isRunFast);
@@ -1995,27 +2003,15 @@ protected function currentComponent()
      */
     public function renderComponent()
     {
+        //echo "<hr>render<br>";
         $name = \array_pop($this->componentStack);
         //return $this->runChild($name, $this->componentData());
         $cd=$this->componentData();
-        if (!is_array($cd)) {
-            $keys=array_keys($cd);
-            foreach ($keys as $key) {
-                if (isset($this->variables[$key])) {
-                    $backup[$key]=$this->variables[$key];
-                }
-            }
-        }
+        $clean=array_keys($cd);
         $r=$this->runChild($name, $cd);
-        if (!isset($keys)) {
-            return $r;
-        }
-        foreach ($keys as $key) {
-            if (isset($backup[$key])) {
-                $this->variables[$key] = $backup[$key]; // this value is recovered
-            } else {
-                unset($this->variables[$key]); // this value must be deleted
-            }
+        // we clean variables defined inside the component (so they are garbaged when the component is used)
+        foreach ($clean as $key) {
+            unset($this->variables[$key]);
         }
         return $r;
     }
@@ -2027,10 +2023,16 @@ public function renderComponent()
      */
     protected function componentData()
     {
-        return \array_merge(
-            $this->componentData[\count($this->componentStack)],
-            ['slot' => \trim(\ob_get_clean())],
-            $this->slots[\count($this->componentStack)]
+        $cs=count($this->componentStack);
+        //echo "<hr>";
+        //echo "<br>data:<br>";
+        //var_dump($this->componentData);
+        //echo "<br>datac:<br>";
+        //var_dump(count($this->componentStack));
+        return array_merge(
+            $this->componentData[$cs],
+            ['slot' => trim(ob_get_clean())],
+            $this->slots[$cs]
         );
     }
 
@@ -2727,12 +2729,6 @@ protected function compileStatements($value)
                     // it calls the function compile<name of the tag>
                     $match[0] = $this->$method(static::get($match, 3));
                 } else {
-                    /*echo "<pre>";
-                    var_dump($match);
-                    echo "</pre>";
-                    echo "operation not defined!";
-                    */
-                    //todo: $this->showError("@compile", "Operation not defined:@".$match[1], true);
                     return $match[0];
                 }
             }
@@ -3614,7 +3610,7 @@ protected function compileExtends($expression)
         return $this->phpTag . '$_shouldextend[' . $this->uidCounter . ']=1; ?>';
     }
 
-    
+
 
     /**
      * Execute the @parent command. This operation works in tandem with extendSection

diff --git a/tests/IfTest.php b/tests/IfTest.php
@@ -6,11 +6,13 @@
  * @author G.J.W. Oolbekkink <g.j.w.oolbekkink@gmail.com>
  * @since 16/09/2018
  */
-class IfTest extends AbstractBladeTestCase {
+class IfTest extends AbstractBladeTestCase
+{
     /**
      * @throws \Exception
      */
-    public function testIf() {
+    public function testIf()
+    {
         $bladeSource = /** @lang Blade */
             <<<'BLADE'
 @if($a == 4)
@@ -25,7 +27,8 @@ public function testIf() {
     /**
      * @throws \Exception
      */
-    public function testElse() {
+    public function testElse()
+    {
         $bladeSource = /** @lang Blade */
             <<<'BLADE'
 @if($a == 4)
@@ -41,7 +44,8 @@ public function testElse() {
     /**
      * @throws \Exception
      */
-    public function testElseIf() {
+    public function testElseIf()
+    {
         $bladeSource = /** @lang Blade */
             <<<'BLADE'
 @if($a == 4)
@@ -60,7 +64,8 @@ public function testElseIf() {
     /**
      * @throws \Exception
      */
-    public function testUnless() {
+    public function testUnless()
+    {
         $bladeSource = /** @lang Blade */
             <<<'BLADE'
 @unless($a == 4)
@@ -74,7 +79,8 @@ public function testUnless() {
     /**
      * @throws \Exception
      */
-    public function testIsset() {
+    public function testIsset()
+    {
         $bladeSource = /** @lang Blade */
             <<<'BLADE'
 @isset($a)
@@ -88,7 +94,8 @@ public function testIsset() {
     /**
      * @throws \Exception
      */
-    public function testEmpty() {
+    public function testEmpty()
+    {
         $bladeSource = /** @lang Blade */
             <<<'BLADE'
 @empty($a)
@@ -100,17 +107,5 @@ public function testEmpty() {
 
     }
 
-    /**
-     * @throws \Exception
-     */
-    public function testInvalidIf() {
-        $this->expectException(\Exception::class);
 
-        /** @noinspection BladeControlDirectives */
-        $bladeSource = /** @lang Blade */
-            <<<'BLADE'
-@if($a == 4)
-BLADE;
-        $this->blade->runString($bladeSource, ['a' => 4]);
-    }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -6,7 +6,8 @@
 if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
     require_once __DIR__ . '/../vendor/autoload.php';
 } else {
-    function create_autoloader($prefix, $base_dir) {
+    function create_autoloader($prefix, $base_dir)
+    {
         return function ($class) use ($prefix, $base_dir) {
             if (strncmp($prefix, $class, strlen($prefix)) !== 0) {
                 return;