Merge branch 'MAGETWO-71366-fx' into 'SPRINT-41'

MAGETWO-71528: Add an ability to call methods through objects in email templates

See merge request !268

Author: kalashnikau-uladzimir

lib/internal/Magento/Framework/Filter/Template.php

@@ -320,7 +320,7 @@ protected function getVariable($value, $default = '{no_value_defined}')
             } elseif (isset($stackVars[$i - 1]['variable'])
                     && $stackVars[$i - 1]['variable'] instanceof \Magento\Framework\DataObject
             ) {
-                // If object calling methods or getting properties
+                // If data object calling methods or getting properties
                 if ($stackVars[$i]['type'] == 'property') {
                     $caller = 'get' . $this->string->upperCaseWords($stackVars[$i]['name'], '_', '');
                     $stackVars[$i]['variable'] = method_exists(
@@ -330,7 +330,7 @@ protected function getVariable($value, $default = '{no_value_defined}')
                         $stackVars[$i]['name']
                     );
                 } elseif ($stackVars[$i]['type'] == 'method') {
-                    // Calling of object method
+                    // Calling of data object method
                     if (method_exists($stackVars[$i - 1]['variable'], $stackVars[$i]['name'])
                             || substr($stackVars[$i]['name'], 0, 3) == 'get'
                     ) {
@@ -342,6 +342,16 @@ protected function getVariable($value, $default = '{no_value_defined}')
                     }
                 }
                 $last = $i;
+            } elseif (isset($stackVars[$i - 1]['variable']) && $stackVars[$i]['type'] == 'method') {
+                // Calling object methods
+                if (method_exists($stackVars[$i - 1]['variable'], $stackVars[$i]['name'])) {
+                    $stackVars[$i]['args'] = $this->getStackArgs($stackVars[$i]['args']);
+                    $stackVars[$i]['variable'] = call_user_func_array(
+                        [$stackVars[$i - 1]['variable'], $stackVars[$i]['name']],
+                        $stackVars[$i]['args']
+                    );
+                }
+                $last = $i;
             }
         }
 

lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php

@@ -140,16 +140,23 @@ public function testVarDirective($construction, $variables, $expectedResult)
 
     public function varDirectiveDataProvider()
     {
-        /* @var $stub \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject */
-        $stub = $this->getMockBuilder(\Magento\Framework\DataObject::class)
+        /* @var $dataObjectVariable \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject */
+        $dataObjectVariable = $this->getMockBuilder(\Magento\Framework\DataObject::class)
             ->disableOriginalConstructor()
             ->disableProxyingToOriginalMethods()
             ->setMethods(['bar'])
             ->getMock();
-
-        $stub->expects($this->once())
+        $dataObjectVariable->expects($this->once())
             ->method('bar')
-            ->willReturn('Mocked Method Return');
+            ->willReturn('DataObject Method Return');
+
+        /* @var $nonDataObjectVariable \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject */
+        $nonDataObjectVariable = $this->getMockBuilder(\Magento\Framework\Escaper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $nonDataObjectVariable->expects($this->once())
+            ->method('escapeHtml')
+            ->willReturnArgument(0);
 
         return [
             'no variables' => [
@@ -170,12 +177,28 @@ public function varDirectiveDataProvider()
             'array argument to method' => [
                 '{{var foo.bar([param_1:value_1, param_2:$value_2, param_3:[a:$b, c:$d]])}}',
                 [
-                    'foo' => $stub,
+                    'foo' => $dataObjectVariable,
                     'value_2' => 'lorem',
                     'b' => 'bee',
                     'd' => 'dee',
                 ],
-                'Mocked Method Return'
+                'DataObject Method Return'
+            ],
+            'non DataObject method call' => [
+                '{{var foo.escapeHtml($value)}}',
+                [
+                    'foo' => $nonDataObjectVariable,
+                    'value' => 'lorem'
+                ],
+                'lorem'
+            ],
+            'non DataObject undefined method call' => [
+                '{{var foo.undefinedMethod($value)}}',
+                [
+                    'foo' => $nonDataObjectVariable,
+                    'value' => 'lorem'
+                ],
+                ''
             ],
         ];
     }