Merge MC-11058 into 2.3-bugfixes-070219

Author: dvoskoboinikov

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

@@ -436,7 +436,10 @@ protected function getVariable($value, $default = '{no_value_defined}')
                     }
                 }
                 $last = $i;
-            } elseif (isset($stackVars[$i - 1]['variable']) && $stackVars[$i]['type'] == 'method') {
+            } elseif (isset($stackVars[$i - 1]['variable'])
+                && is_object($stackVars[$i - 1]['variable'])
+                && $stackVars[$i]['type'] == 'method'
+            ) {
                 // Calling object methods
                 $object = $stackVars[$i - 1]['variable'];
                 $method = $stackVars[$i]['name'];

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

@@ -381,6 +381,18 @@ private function getObjectData()
         return $dataObject;
     }
 
+    /**
+     * Check that if calling a method of an object fails expected result is returned.
+     */
+    public function testInvalidMethodCall()
+    {
+        $this->templateFilter->setVariables(['dateTime' => '\DateTime']);
+        $this->assertEquals(
+            '\DateTime',
+            $this->templateFilter->filter('{{var dateTime.createFromFormat(\'d\',\'1548201468\')}}')
+        );
+    }
+
     /**
      * Test adding callbacks when already filtering.
      *