Merge pull request #5 from MarcusSchwarz/TAL-4

make tests passing on 7.2 as well. fixes #4 and #1
SC-Networks · May 15, 2018 · 6ee72dd · 6ee72dd
2 parents 8e7d695 + b1e17cd
commit 6ee72dd
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,10 +4,6 @@ php:
   - 5.6
   - 7.2
 
-matrix:
-  allow_failures:
-    - php: 7.2
-
 before_script:
   # Make sure the locales used in the tests are installed
   - sudo locale-gen en_GB

diff --git a/classes/Context.php b/classes/Context.php
@@ -231,7 +231,7 @@ public function fillSlot($key, $content)
 
     public function fillSlotCallback($key, $callback, $_thistpl, $tpl)
     {
-        assert('is_callable($callback)');
+        assert(is_callable($callback));
         $this->_slots[$key] = array($callback, $_thistpl, $tpl);
         if ($this->_parentContext) {
             // Works around bug with tal:define popping context after fillslot

diff --git a/classes/ExceptionHandler.php b/classes/ExceptionHandler.php
@@ -14,6 +14,8 @@
 
 namespace PhpTal;
 
+use PhpTal\Exception\TemplateException;
+
 class ExceptionHandler
 {
     private $encoding;
@@ -28,21 +30,30 @@ function __construct($encoding)
      *
      * Doesn't change exception handler if non-default one is set.
      *
-     * @param \Exception e exception to re-throw and display
+     * @param \Exception|\Throwable $e exception to re-throw and display
+     * @param string $encoding
      *
      * @return void
-     * @throws \Exception
+     * @throws TemplateException
+     * @throws \Throwable
      */
-    public static function handleException(\Exception $e, $encoding)
+    public static function handleException($e, $encoding) // todo 7.2 -> $e should be \Throwable
     {
         // PHPTAL's handler is only useful on fresh HTTP response
         if (PHP_SAPI !== 'cli' && !headers_sent()) {
-            $old_exception_handler = set_exception_handler(array(new ExceptionHandler($encoding), '_defaultExceptionHandler'));
+            $old_exception_handler = set_exception_handler([
+                new ExceptionHandler($encoding),
+                '_defaultExceptionHandler'
+            ]);
 
-            if ($old_exception_handler !== NULL) {
+            if ($old_exception_handler !== null) {
                 restore_exception_handler(); // if there's user's exception handler, let it work
             }
         }
+
+        if (PHP_VERSION_ID >= 70000 && get_class($e) === \ParseError::class) {
+            $e = new TemplateException($e->getMessage());
+        }
         throw $e; // throws instead of outputting immediately to support user's try/catch
     }
 

diff --git a/classes/PHPTAL.php b/classes/PHPTAL.php
@@ -684,7 +684,12 @@ public function execute()
                 $templateFunction($this, $this->_context);
                 $res = ob_get_clean();
             }
-            catch (Exception $e)
+            catch (\Throwable $e)
+            {
+                ob_end_clean();
+                throw $e;
+            }
+            catch (\Exception $e)
             {
                 ob_end_clean();
                 throw $e;
@@ -704,7 +709,11 @@ public function execute()
                 return $this->_postfilter->filter($res);
             }
         }
-        catch (Exception $e)
+        catch (\Throwable $e)
+        {
+            PhpTal\ExceptionHandler::handleException($e, $this->getEncoding());
+        }
+        catch (\Exception $e)
         {
             PhpTal\ExceptionHandler::handleException($e, $this->getEncoding());
         }
@@ -867,7 +876,11 @@ public function prepare()
                 try {
                     eval("?>\n".$result);
                 }
-                catch(Exception $e) {
+                catch(\Throwable $e) {
+                    ob_end_clean();
+                    throw $e;
+                }
+                catch(\Exception $e) {
                     ob_end_clean();
                     throw $e;
                 }

diff --git a/composer.json b/composer.json
@@ -38,6 +38,11 @@
           "PhpTal\\": "classes/"
         }
     },
+    "autoload-dev": {
+        "classmap": [
+            "classes/", "tests/"
+        ]
+    },
     "config": {
         "platform": {
             "php": "5.6"

diff --git a/tests/PhptalTest.php b/tests/PhptalTest.php
@@ -224,7 +224,11 @@ function testPHPParseErrorDoesNotStopPHPTAL2()
         try {
             @$tpl->execute(); // if test dies for no apparent reason, the reason is '@'
         }
-        catch(Exception $e) {
+        catch(\Throwable $e) {
+            ob_end_clean();
+            throw $e;
+        }
+        catch(\Exception $e) {
             ob_end_clean();
             throw $e;
         }

diff --git a/tests/TalDefineTest.php b/tests/TalDefineTest.php
@@ -202,7 +202,7 @@ function testEmpty()
     {
         $tal = $this->newPHPTAL();
         $tal->setSource('<div class="blank_bg" tal:define="book relative/book" tal:condition="php: count(book)>0"></div>');
-        $tal->relative = array('book'=>1);
+        $tal->relative = array('book'=>[1]);
 
         $this->assertEquals($tal->execute(), '<div class="blank_bg"></div>');
     }

diff --git a/tests/config.php b/tests/config.php
@@ -16,7 +16,7 @@
 error_reporting( E_ALL | E_STRICT );
 assert_options(ASSERT_ACTIVE, 1);
 
-require_once 'vendor/autoload.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 
 abstract class PHPTAL_TestCase extends PHPUnit_Framework_TestCase
 {