[17] Merge api-proto with develop #71

- Fixed phpunit compatibility in catalog-storefront ExportTest.php
magento · Jun 18, 2020 · 6c4a58b · 6c4a58b
1 parent 0c9e66f
commit 6c4a58b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/dev/tests/api-functional/testsuite/Magento/CatalogExport/ExportTest.php b/dev/tests/api-functional/testsuite/Magento/CatalogExport/ExportTest.php
@@ -58,7 +58,7 @@ class ExportTest extends WebapiAbstract
         'url',
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $this->productsFeed = $this->objectManager->get(\Magento\CatalogDataExporter\Model\Feed\Products::class);