MC-13741: Fixed incorrect behavior of template variables

Author: roman

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

@@ -74,7 +74,8 @@ class Template implements \Zend_Filter_Interface
         'getresourcecollection',
         'load',
         'save',
-        'getcollection'
+        'getcollection',
+        'getresource'
     ];
 
     /**

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

@@ -6,17 +6,25 @@
 
 namespace Magento\Framework\Filter\Test\Unit;
 
+use Magento\Store\Model\Store;
+
 class TemplateTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\Framework\Filter\Template
      */
     private $templateFilter;
 
+    /**
+     * @var Store
+     */
+    private $store;
+
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->templateFilter = $objectManager->getObject(\Magento\Framework\Filter\Template::class);
+        $this->store = $objectManager->getObject(Store::class);
     }
 
     public function testFilter()
@@ -391,4 +399,32 @@ public function testInappropriateCallbacks()
         $this->templateFilter->setVariables(['filter' => $this->templateFilter]);
         $this->templateFilter->filter('Test {{var filter.addAfterFilterCallback(\'mb_strtolower\')}}');
     }
+
+    /**
+     * Test adding callbacks when already filtering.
+     *
+     * @expectedException \InvalidArgumentException
+     * @dataProvider disallowedMethods
+     */
+    public function testDisallowedMethods($method)
+    {
+        $this->templateFilter->setVariables(['store' => $this->store]);
+        $this->templateFilter->filter('{{var store.'.$method.'()}}');
+    }
+
+    /**
+     * Data for testDisallowedMethods method
+     *
+     * @return array
+     */
+    public function disallowedMethods()
+    {
+        return [
+            ['getResourceCollection'],
+            ['load'],
+            ['save'],
+            ['getCollection'],
+            ['getResource'],
+        ];
+    }
 }