Merge pull request #49 from wave-framework/twig-bug

Fix twig regression

Author: calcinai

src/Wave/Controller.php

@@ -193,9 +193,15 @@ protected function _buildPayload($status, $message = '', $payload = null) {
     }
 
     protected function _buildDataSet() {
-        $this->_setTemplatingGlobals();
+        $request_properties = [
+            'input' => $this->_sanitized ?? $this->_data,
+            'errors' => $this->_input_errors ?? array(),
+            '_identity' => $this->_identity
+        ];
+
         $properties = $this->_getResponseProperties();
-        return array_merge($properties);
+
+        return array_merge($request_properties, $properties);
     }
 
     protected function _getResponseProperties() {
@@ -209,12 +215,6 @@ protected function _getResponseProperties() {
         return $payload;
     }
 
-    protected function _setTemplatingGlobals() {
-        View::registerGlobal('input', isset($this->_sanitized) ? $this->_sanitized : $this->_data);
-        View::registerGlobal('errors', isset($this->_input_errors) ? $this->_input_errors : array());
-        View::registerGlobal('_identity', $this->_identity);
-    }
-
     protected function respond($payload = null) {
         if($this->_invoke_method === self::INVOKE_SUB_REQUEST) {
             if($payload !== null) {