Merge remote-tracking branch 'refs/remotes/origin/dev'

FoilPHP · Nov 1, 2015 · 4530177 · 4530177
2 parents 95a31d4 + ad5cb41
commit 4530177
Show file tree

Hide file tree

Showing 50 changed files with 289 additions and 219 deletions.
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
         "aura/html": "~2.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.4",
+        "phpunit/phpunit": "~4.8",
         "mockery/mockery": "0.9.3",
         "brain/monkey": "~1.1"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/inc/functions.php b/inc/functions.php
@@ -46,15 +46,16 @@ function engine(array $options = [], array $providers = [])
 
 if (! function_exists('Foil\render')) {
     /**
-     * @param  string $path    Full path or just name (requires folders option) for the template
-     * @param  array  $data    Template context
-     * @param  array  $options Options for the engine
+     * @param  string $path      Full path or just name (requires folders option) for the template
+     * @param  array  $data      Template context
+     * @param  array  $options   Options for the engine
      * @param  array  $providers
      * @return string
      */
     function render($path, array $data = [], array $options = [], array $providers = [])
     {
         $foil = Foil::boot($options, $providers);
+
         return $foil->engine()->render($path, $data);
     }
 }

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,5 +1,5 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.4/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
          bootstrap="./tests/boot.php"
          colors="true"
          convertErrorsToExceptions="true"

diff --git a/src/Contracts/AliasAllowedTemplateInterface.php b/src/Contracts/AliasAllowedTemplateInterface.php
@@ -22,9 +22,8 @@
  */
 interface AliasAllowedTemplateInterface extends TemplateInterface
 {
-
     /**
-     * @param \Foil\Template\Alias $alias
+     * @param  \Foil\Template\Alias                          $alias
      * @return \Foil\Contracts\AliasAllowedTemplateInterface
      */
     public function alias(Alias $alias);

diff --git a/src/Engine.php b/src/Engine.php
@@ -124,7 +124,7 @@ public function registerFilter($filterName, callable $filter)
      *
      * @param  string       $functionName
      * @param  callable     $function
-     * @param  boolean      $safe          Can function output html?
+     * @param  boolean      $safe         Can function output html?
      * @return \Foil\Engine Itself for fluent interface
      */
     public function registerFunction($functionName, callable $function, $safe = false)
@@ -287,13 +287,16 @@ public function renderSections($template, array $data = [], $class = null)
      */
     private function doRender($path, array $data = [], $class = null)
     {
-        if ($this->status() === self::STATUS_IDLE) {
+        $status = $this->status();
+        if ($status === self::STATUS_IDLE) {
             $this->statusTransitions();
+        } elseif ($status & self::STATUS_IDLE) {
+            $this->status = self::STATUS_IN_LAYOUT;
         }
         $template = $this->stack()->factory($path, $this, $class);
         $this->events->fire('f.template.render', $template, $data);
         $output = trim($template->render($data));
-        $this->events->fire('f.template.renderered', $template, $output);
+        $this->events->fire('f.template.renderered', $template, $output, $this->status);
 
         return $output;
     }
@@ -326,7 +329,8 @@ private function statusTransitions()
         $this->events->on('f.template.renderered', function () {
             $this->stack()->pop();
             if ($this->stack()->count() === 0) {
-                $this->status = self::STATUS_RENDERED;
+                $this->status = self::STATUS_RENDERED | self::STATUS_IDLE;
+                $this->events->fire('f.renderered', $this);
             }
         });
     }

diff --git a/src/Extensions/AuraHtml.php b/src/Extensions/AuraHtml.php
@@ -113,7 +113,7 @@ public function provideFunctions()
     }
 
     /**
-     * @param string $tag
+     * @param  string                              $tag
      * @return mixed
      * @throws \Aura\Html\Exception\HelperNotFound
      * @link https://github.com/auraphp/Aura.Html/blob/2.x/README-HELPERS.md

diff --git a/src/Extensions/Links.php b/src/Extensions/Links.php
@@ -145,37 +145,37 @@ public function asset($asset, $scheme = null)
     private function setupHost(array $args, $which = 'host')
     {
         $checks = [
-            function(array $args, $which) {
+            function (array $args, $which) {
                 return ! isset($args[$which]) || is_null($args[$which]);
             },
-            function(array $args, $which) {
+            function (array $args, $which) {
                 return empty($args[$which]);
             },
-            function(array $args, $which) {
+            function (array $args, $which) {
                 return is_string($args[$which]) && strtolower($args[$which]) !== 'auto';
             },
-            function(array $args, $which) {
+            function (array $args, $which) {
                 return $args[$which] === true || is_string($args[$which]);
-            }
+            },
         ];
         $actions = [
-            function($var, $which) {
+            function ($var, $which) {
                 $this->$var = $which === 'host' ? false : null;
             },
-            function($var) {
+            function ($var) {
                 $this->$var = false;
             },
-            function($var, $which, array $args) {
+            function ($var, $which, array $args) {
                 $parse = parse_url($args[$which]);
                 $host = isset($parse['host']) ? $parse['host'] : $parse['path'];
                 $this->$var = $this->clean($host);
             },
-            function($var) {
+            function ($var) {
                 $this->$var = $this->clean(filter_input(INPUT_SERVER, 'SERVER_NAME'));
             },
         ];
 
-        foreach($checks as $i => $check) {
+        foreach ($checks as $i => $check) {
             if ($check($args, $which)) {
                 $args = [
                     $which === 'assets_host' ? 'assetsHost' : 'host',

diff --git a/src/Extensions/Sections.php b/src/Extensions/Sections.php
@@ -74,6 +74,12 @@ public function __construct(Factory $factory, Events $events)
      */
     public function setup(array $args = [])
     {
+        $this->events->on('f.renderered', function () {
+            $this->stack = new SplStack();
+            $this->names = new SplStack();
+            $this->factory->flush();
+        });
+
         return;
     }
 

diff --git a/src/Section/Factory.php b/src/Section/Factory.php
@@ -58,8 +58,8 @@ public function __construct(ArrayAccess $sections, $defaultMode = null, $contrac
     /**
      * Factory a section instance (if it was not already factored) and return it.
      *
-     * @param  string                           $name       Section name
-     * @param  int|bool                         $mode       Section mode, one of the mode const
+     * @param  string                           $name      Section name
+     * @param  int|bool                         $mode      Section mode, one of the mode const
      * @param  string                           $className Full qualified section class name
      * @return \Foil\Contracts\SectionInterface
      * @throws InvalidArgumentException
@@ -100,4 +100,9 @@ public function getClass($class)
 
         return $class;
     }
+
+    public function flush()
+    {
+        $this->sections = new \ArrayObject();
+    }
 }
diff --git a/src/Template/Alias.php b/src/Template/Alias.php
@@ -19,7 +19,6 @@
  */
 final class Alias
 {
-
     const REGEX = '#^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$#';
 
     /**
@@ -49,8 +48,8 @@ public function __toString()
      */
     private function validate($alias)
     {
-        if ( ! is_string($alias) || ! preg_match(self::REGEX, $alias)) {
+        if (! is_string($alias) || ! preg_match(self::REGEX, $alias)) {
             throw new InvalidArgumentException('Alias must be a valid variable name.');
         }
     }
-}
+}
diff --git a/src/Template/Factory.php b/src/Template/Factory.php
@@ -85,7 +85,7 @@ public function __construct(
     /**
      * Factory and/or returns template objects.
      *
-     * @param  string                            $path       Full path to template file
+     * @param  string                            $path      Full path to template file
      * @param  \Foil\Engine                      $engine
      * @param  string                            $className A custom template class name
      * @return \Foil\Contracts\TemplateInterface

diff --git a/tests/_files/bar/second.php b/tests/_files/bar/second.php
@@ -1,16 +1,16 @@
 <?php $this->layout('main', ['foo' => 'Bar!']) ?>
 
 <?php $this->section('one') ?>
-World <?= $this->foo ?>
+    World <?= $this->foo ?>
 <?php $this->stop() ?>
 
 <?php $this->section('two') ?>
-I Win
+    I Win
 <?php $this->replace() ?>
 
-Buffalo Bill
+    Buffalo Bill
 
 <?php $this->section('three') ?>
-MAN
+    MAN
 <?php
 $this->stop();
diff --git a/tests/_files/foo/blocks.php b/tests/_files/foo/blocks.php
@@ -1,11 +1,11 @@
 <?php $this->block('spaceless') ?>
-    <?php $this->block('wrap', '<div>', '</div>') ?>
-        <?php $this->block('spaceless') ?>
-            <ul>
-                <?php $this->block('repeat', 3) ?>
-                <li>a</li>
-                <?php $this->endblock('repeat'); ?>
-            </ul>
-        <?php $this->endblock('spaceless') ?>
-    <?php $this->endblock('wrap') ?>
+<?php $this->block('wrap', '<div>', '</div>') ?>
+<?php $this->block('spaceless') ?>
+<ul>
+    <?php $this->block('repeat', 3) ?>
+    <li>a</li>
+    <?php $this->endblock('repeat'); ?>
+</ul>
+<?php $this->endblock('spaceless') ?>
+<?php $this->endblock('wrap') ?>
 <?php $this->endblock('spaceless') ?>
diff --git a/tests/_files/foo/main.php b/tests/_files/foo/main.php
@@ -1,14 +1,14 @@
 <?php $this->section('one') ?>
-Hello <?= $this->foo.' ' ?>
+    Hello <?= $this->foo.' ' ?>
 <?php $this->stop() ?>
 
-Alone
+    Alone
 
 <?php $this->section('two') ?>
-NO
+    NO
 <?php $this->stop() ?>
 
 <?php $this->section('three') ?>
-YES
+    YES
 <?php
 $this->stop();
diff --git a/tests/_files/stubs.php b/tests/_files/stubs.php
@@ -4,6 +4,7 @@
 
 class Value
 {
+
     public $value;
 
     public function __construct($value)
@@ -14,22 +15,25 @@ public function __construct($value)
 
 class ToArray extends Value
 {
+
     public function toArray()
     {
-        return ['toarray' => (array) $this->value];
+        return ['toarray' => (array)$this->value];
     }
 }
 
 class AsArray extends Value
 {
+
     public function asArray()
     {
-        return ['asarray' => (array) $this->value];
+        return ['asarray' => (array)$this->value];
     }
 }
 
 class Json implements JsonSerializable
 {
+
     public function jsonSerialize()
     {
         return '<b>I am JSON</b>';
@@ -38,10 +42,12 @@ public function jsonSerialize()
 
 class Target extends Value
 {
+
 }
 
 class Transformer
 {
+
     public function transform($object)
     {
         return is_object($object) ? ['transformed' => get_object_vars($object)] : false;