Merge pull request #5728 from magento-tsg/2.3.6-develop-pr133

zakdma · web-flow · commit c5d7a67de231 · 2020-06-02T16:16:14.000+03:00
[TSG] Fixes for 2.3 (pr133) (2.3.6-develop)
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultVideoBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultVideoBundleProductTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-110"/>
             <group value="Bundle"/>
+            <skip>
+                <issueId value="MC-34447"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-205"/>
             <group value="Bundle"/>
+            <skip>
+                <issueId value="MC-34447"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-111"/>
             <group value="Catalog"/>
+            <skip>
+                <issueId value="MC-34447"/>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="EnableAdminAccountSharingActionGroup" stepKey="enableAdminAccountSharing"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoVirtualProductTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-109"/>
             <group value="Catalog"/>
+            <skip>
+                <issueId value="MC-34447"/>
+            </skip>
         </annotations>
 
         <!-- Replacing steps in base AdminAddDefaultVideoSimpleProductTest -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-206"/>
             <group value="Catalog"/>
+            <skip>
+                <issueId value="MC-34447"/>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="EnableAdminAccountSharingActionGroup" stepKey="enableAdminAccountSharing"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoVirtualProductTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-204"/>
             <group value="Catalog"/>
+            <skip>
+                <issueId value="MC-34447"/>
+            </skip>
         </annotations>
 
         <!-- Replacing steps in base AdminRemoveDefaultVideoSimpleProductTest -->
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultVideoDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultVideoDownloadableProductTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-114"/>
             <group value="Downloadable"/>
+            <skip>
+                <issueId value="MC-34447"/>
+            </skip>
         </annotations>
         <before>
             <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com" before="enableAdminAccountSharing"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-207"/>
             <group value="Downloadable"/>
+            <skip>
+                <issueId value="MC-34447"/>
+            </skip>
         </annotations>
         <before>
             <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com" before="enableAdminAccountSharing"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultVideoGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultVideoGroupedProductTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-108"/>
             <group value="GroupedProduct"/>
+            <skip>
+                <issueId value="MC-34447"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultVideoGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultVideoGroupedProductTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-203"/>
             <group value="GroupedProduct"/>
+            <skip>
+                <issueId value="MC-34447"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php
@@ -21,7 +21,7 @@ class Download extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
     public function _getValue(\Magento\Framework\DataObject $row)
     {
         return '<p> ' . $this->escapeHtml($row->getData('imported_file')) .  '</p><a href="'
-        . $this->escapeUrl($this->getUrl('*/*/download', ['filename' => $row->getData('imported_file')])) . '">'
+        . $this->getUrl('*/*/download', ['filename' => $row->getData('imported_file')]) . '">'
         . $this->escapeHtml(__('Download'))
         . '</a>';
     }
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php
@@ -23,7 +23,7 @@ public function _getValue(\Magento\Framework\DataObject $row)
         $result = '';
         if ($row->getData('error_file') != '') {
             $result = '<p> ' . $this->escapeHtml($row->getData('error_file')) .  '</p><a href="'
-                . $this->escapeUrl($this->getUrl('*/*/download', ['filename' => $row->getData('error_file')])) . '">'
+                . $this->getUrl('*/*/download', ['filename' => $row->getData('error_file')]) . '">'
                 . $this->escapeHtml(__('Download'))
                 . '</a>';
         }
diff --git a/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php b/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php
@@ -71,8 +71,7 @@ public function testGetValue()
             ->method('escapeHtml')
             ->with('file.csv')
             ->willReturn('file.csv');
-        $this->escaperMock->expects($this->once())->method('escapeUrl')->willReturn('url');
-        $this->escaperMock->expects($this->at(2))
+        $this->escaperMock->expects($this->at(1))
             ->method('escapeHtml')
             ->with('Download')
             ->willReturn('Download');
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/YoutubeVideoWindowOnProductPageTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/YoutubeVideoWindowOnProductPageTest.xml
@@ -17,6 +17,9 @@
             <description value="Check Youtube video window on the product page"/>
             <severity value="MAJOR"/>
             <group value="ProductVideo"/>
+            <skip>
+                <issueId value="MC-34447"/>
+            </skip>
         </annotations>
 
         <before>
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
@@ -15,7 +15,6 @@
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\Url as UrlBuilder;
-use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filter/VariableResolver/LegacyResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filter/VariableResolver/LegacyResolverTest.php
@@ -117,6 +117,7 @@ public function getThing()
                 ['foo' => $dataClassStub, 'g' => ['h' => ['i' => 'abc']]],
                 'abca=123,b=321,'
             ],
+            'disallow __callParent method' => ['foo.___callParent()',['foo' => $classStub], null],
         ];
     }
 }
diff --git a/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php b/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php
@@ -160,12 +160,31 @@ private function handleObjectMethod(Template $filter, array $templateVariables,
     {
         $object = $stackArgs[$i - 1]['variable'];
         $method = $stackArgs[$i]['name'];
-        if (method_exists($object, $method) && substr($method, 0, 3) !== 'set') {
+        if ($this->isMethodCallable($object, $method)) {
             $args = $this->getStackArgs($stackArgs[$i]['args'], $filter, $templateVariables);
             $stackArgs[$i]['variable'] = call_user_func_array([$object, $method], $args);
         }
     }
 
+    /**
+     * Check if object method can be called.
+     *
+     * @param mixed $object
+     * @param string $method
+     * @return bool
+     */
+    private function isMethodCallable($object, string $method): bool
+    {
+        if (method_exists($object, $method)
+            && substr($method, 0, 3) !== 'set'
+            && $method !== '___callParent'
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Return if the given index should be processed for data access
      *
