Merge remote-tracking branch 'local/ACP2E-1565' into PR_7_JAN_2023

Author: o-dubovyk

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -2080,9 +2080,13 @@ private function getFileContent(string $path): string
      */
     private function getRemoteFileContent(string $filename): string
     {
-        // phpcs:disable Magento2.Functions.DiscouragedFunction
-        $content = file_get_contents($filename);
-        // phpcs:enable Magento2.Functions.DiscouragedFunction
+        try {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $content = file_get_contents($filename);
+        } catch (\Exception $e) {
+            $content = false;
+        }
+
         return $content !== false ? $content : '';
     }
 

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ImportWithNotExistImagesTest.php

@@ -109,10 +109,11 @@ protected function tearDown(): void
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
-     *
+     * @dataProvider unexistingImagesDataProvider
+     * @param string $imagesPath
      * @return void
      */
-    public function testImportWithUnexistingImages(): void
+    public function testImportWithUnexistingImages(string $imagesPath): void
     {
         $cache = $this->objectManager->get(\Magento\Framework\App\Cache::class);
         $cache->clean();
@@ -132,7 +133,7 @@ public function testImportWithUnexistingImages(): void
         $this->assertTrue($this->directory->isExist($this->filePath), 'Products were not imported to file');
         $fileContent = $this->getCsvData($this->directory->getAbsolutePath($this->filePath));
         $this->assertCount(2, $fileContent);
-        $this->updateFileImagesToInvalidValues();
+        $this->updateFileImagesToInvalidValues($imagesPath);
         $mediaDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::MEDIA);
         $mediaDirectory->create('import');
         $this->import->setParameters([
@@ -144,6 +145,17 @@ public function testImportWithUnexistingImages(): void
         $this->assertProductImages('/m/a/magento_image.jpg', 'simple');
     }
 
+    /**
+     * @return array
+     */
+    public function unexistingImagesDataProvider(): array
+    {
+        return [
+            ['/m/a/invalid_image.jpg'],
+            ['http://127.0.0.1/pub/static/nonexistent_image.jpg'],
+        ];
+    }
+
     /**
      * Export products from queue to csv file
      *
@@ -158,9 +170,10 @@ private function exportProducts(): void
     /**
      * Change image names in an export file
      *
+     * @param string $imagesPath
      * @return void
      */
-    private function updateFileImagesToInvalidValues(): void
+    private function updateFileImagesToInvalidValues(string $imagesPath): void
     {
         $absolutePath = $this->directory->getAbsolutePath($this->filePath);
         $csv = $this->getCsvData($absolutePath);
@@ -171,7 +184,7 @@ private function updateFileImagesToInvalidValues(): void
         }
 
         foreach ($imagesPositions as $imagesPosition) {
-            $csv[1][$imagesPosition] = '/m/a/invalid_image.jpg';
+            $csv[1][$imagesPosition] = $imagesPath;
         }
 
         $this->appendCsvData($absolutePath, $csv);