[Magento Community Engineering] Community Contributions - 2.4-develop-express-lane-prs

magento-engcom-team · web-flow · commit 5c3a2ba086fd · 2020-04-24T17:25:47.000-05:00
- merged with '2.4-develop-expedited-prs' branch
diff --git a/app/code/Magento/MediaContent/Model/GetContentByAssetIds.php b/app/code/Magento/MediaContent/Model/GetContentByAssetIds.php
@@ -70,7 +70,7 @@ public function execute(array $assetIds): array
                 ->where(self::ASSET_ID . ' IN (?)', $assetIds);
 
             $contentIdentities = [];
-            foreach ($connection->fetchAssoc($select) as $contentIdentityData) {
+            foreach ($connection->fetchAll($select) as $contentIdentityData) {
                 $contentIdentities[] = $this->factory->create($contentIdentityData);
             }
             return $contentIdentities;
diff --git a/app/code/Magento/MediaContentCatalog/etc/media_content.xml b/app/code/Magento/MediaContentCatalog/etc/media_content.xml
@@ -9,6 +9,7 @@
     <search>
         <patterns>
             <pattern name="catalog_image">/^\/?media\/(.*)/</pattern>
+            <pattern name="catalog_image_with_pub">/^\/pub\/?media\/(.*)/</pattern>
         </patterns>
     </search>
-</config>
+</config>
diff --git a/dev/tests/integration/testsuite/Magento/MediaContent/Model/ExtractAssetsFromContentTest.php b/dev/tests/integration/testsuite/Magento/MediaContent/Model/ExtractAssetsFromContentTest.php
@@ -83,6 +83,12 @@ public function contentProvider()
                     2020
                 ]
             ],
+            'Relevant path content with pub' => [
+                '/pub/media/testDirectory/path.jpg',
+                [
+                    2020
+                ]
+            ],
             'Relevant path content' => [
                 '/media/testDirectory/path.jpg',
                 [

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function execute(array $assetIds): array`
`70`	`70`	`->where(self::ASSET_ID . ' IN (?)', $assetIds);`
`71`	`71`
`72`	`72`	`$contentIdentities = [];`
`73`		`- foreach ($connection->fetchAssoc($select) as $contentIdentityData) {`
	`73`	`+ foreach ($connection->fetchAll($select) as $contentIdentityData) {`
`74`	`74`	`$contentIdentities[] = $this->factory->create($contentIdentityData);`
`75`	`75`	`}`
`76`	`76`	`return $contentIdentities;`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,12 @@ public function contentProvider()`
`83`	`83`	`2020`
`84`	`84`	`]`
`85`	`85`	`],`
	`86`	`+ 'Relevant path content with pub' => [`
	`87`	`+ '/pub/media/testDirectory/path.jpg',`
	`88`	`+ [`
	`89`	`+ 2020`
	`90`	`+ ]`
	`91`	`+ ],`
`86`	`92`	`'Relevant path content' => [`
`87`	`93`	`'/media/testDirectory/path.jpg',`
`88`	`94`	`[`