Improve error handling and messages

Author: aleksip

src/aleksip/DataTransformPlugin/DataTransformer.php

@@ -22,6 +22,8 @@ class DataTransformer
     protected $patternDataStore;
     protected $renderer;
     protected $hasRun;
+    protected $currentPattern;
+    protected $renderError;
 
     public function __construct($verbose = false)
     {
@@ -42,11 +44,12 @@ public function run(Renderer $renderer)
         Data::replaceStore($dataStore);
         // Process pattern specific data.
         foreach (array_keys($this->patternDataStore) as $pattern) {
+            $this->currentPattern = $pattern;
             $this->processPattern($pattern);
         }
         $this->hasRun = true;
         if ($this->verbose) {
-            Console::writeInfo('data transform plugin processing done...');
+            Console::writeInfo('[data transform plugin] processing done...');
         }
     }
 
@@ -161,19 +164,33 @@ public function getProcessedPatternSpecificData($pattern, $extraData = array())
         return Data::getPatternSpecificData($pattern, $extraData);
     }
 
+    public function renderErrorHandler($errno, $errstr) {
+        $this->renderError = $errstr;
+
+        return TRUE;
+    }
+
     protected function renderPattern($pattern, $data)
     {
         if (isset($this->patternDataStore[$pattern]['patternRaw'])) {
             foreach (array_keys($data) as $key) {
                 $data = $this->cloneObjects($data, $key);
             }
-            $pattern = $this->renderer->render(
+            $this->renderError = NULL;
+            set_error_handler(array($this, 'renderErrorHandler'));
+            $rendered = $this->renderer->render(
                 $this->patternDataStore[$pattern]['patternRaw'],
                 $data
             );
+            restore_error_handler();
+            if (isset($this->renderError)) {
+                Console::writeWarning('[data transform plugin] pattern ' . $this->currentPattern);
+                Console::writeWarning('error rendering ' . $pattern, true);
+                Console::writeWarning($this->renderError, true);
+            }
         }
 
-        return $pattern;
+        return $rendered;
     }
 
     protected function cloneObjects($data, $key)

src/aleksip/DataTransformPlugin/PatternLabListener.php

@@ -24,7 +24,7 @@ public function __construct()
         $this->addListener('patternData.codeHelperStart', 'dataTransformer');
         $this->addListener('twigPatternLoader.customize', 'addNodeVisitor', -99);
         if ($this->isVerbose()) {
-            Console::writeLine('data transform plugin listeners added...');
+            Console::writeLine('[data transform plugin] listeners added...');
         }
     }
 
@@ -65,7 +65,7 @@ protected function isEnabled()
         $enabled = (is_null($enabled) || (bool)$enabled);
 
         if ($this->isVerbose() && !$enabled) {
-            Console::writeLine('data transform plugin is disabled...');
+            Console::writeLine('[data transform plugin] plugin is disabled...');
         }
 
         return $enabled;