Skip to content

Commit 14a2622

Browse files
Deepak TiwariDeepak Tiwari
Deepak Tiwari
authored and
Deepak Tiwari
committed
Resolve conflicts
2 parents 973b29e + 4e443c8 commit 14a2622

File tree

9 files changed

+161
-85
lines changed

9 files changed

+161
-85
lines changed

‎composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento-cloud-patches",
33
"description": "Provides critical fixes for Magento 2 Enterprise Edition",
44
"type": "magento2-component",
5-
"version": "1.1.7",
5+
"version": "1.1.8",
66
"license": "OSL-3.0",
77
"repositories": {
88
"repo.magento.com": {
@@ -16,12 +16,12 @@
1616
"composer/composer": "^1.9 || ^2.8 || !=2.2.16",
1717
"composer/semver": "@stable",
1818
"monolog/monolog": "^2.3 || ^2.7 || ^3.6",
19-
"symfony/config": "^4.4 || ^5.1 || ^5.4 || ^6.4",
20-
"symfony/console": "^4.4 || ^5.1 || ^5.4 || ^6.4",
21-
"symfony/dependency-injection": "^4.4 || ^5.1 || ^5.4 || ^6.4",
22-
"symfony/process": "^4.4 || ^5.1 || ^5.4 || ^6.4",
19+
"symfony/config": "^4.4 || ^5.1 || ^5.4 || ^6.4 || ^7.2",
20+
"symfony/console": "^4.4 || ^5.1 || ^5.4 || ^6.4 || ^7.2",
21+
"symfony/dependency-injection": "^4.4 || ^5.1 || ^5.4 || ^6.4 || ^7.2",
22+
"symfony/process": "^4.4 || ^5.1 || ^5.4 || ^6.4 || ^7.2",
2323
"symfony/proxy-manager-bridge": "^3.3||^4.3||^5.0||^6.0",
24-
"symfony/yaml": "^4.4 || ^5.1 || ^5.4 || ^6.4",
24+
"symfony/yaml": "^4.4 || ^5.1 || ^5.4 || ^6.4 || ^7.2",
2525
"magento/quality-patches": "^1.1.0"
2626
},
2727
"require-dev": {
@@ -30,7 +30,7 @@
3030
"codeception/module-db": "^1.0 || ^3.0",
3131
"codeception/module-phpbrowser": "^1.0 || ^3.0",
3232
"codeception/module-rest": "^1.2 || ^3.0",
33-
"consolidation/robo": "^1.2 || ^3.0 || ^5.0",
33+
"consolidation/robo": "^1.2 || ^3.0 || ^4.0 || ^5.0",
3434
"phpmd/phpmd": "@stable",
3535
"phpunit/phpunit": "^10.0",
3636
"squizlabs/php_codesniffer": "^3.0"

‎patches.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,9 @@
302302
"Patch - Improve-web-api-async-performance": {
303303
">=2.4.4 <2.4.4-p13 || >=2.4.5 <2.4.5-p12 || >=2.4.6 <2.4.6-p10 || >=2.4.7 <2.4.7-p5 || 2.4.8": "MCLOUD-13619__Improve_web_api_async_performance__2.4.x.patch"
304304
},
305+
"Patch for CVE-2025-47109 - Improve-category-view": {
306+
"2.4.8": "MCLOUD-13752__Patch_for_CVE-2025-47109_Improve_category_view__2.4.8.patch"
307+
},
305308
"Patch for CVE-2025-47110 - Improve-admin-cache-efficiency": {
306309
">=2.4.4 <2.4.4-p14 || >=2.4.5 <2.4.5-p13 || >=2.4.6 <2.4.6-p11 || >=2.4.7 <2.4.7-p6 || 2.4.8": "MCLOUD-13753__Patch_for_CVE-2025-47110_improve-admin-cache-efficiency__2.4.x.patch"
307310
}

‎patches/MCLOUD-13752__Patch_for_CVE-2025-47109_Improve_category_view__2.4.8.patch

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
diff --git a/vendor/magento/module-catalog/Helper/Category.php b/vendor/magento/module-catalog/Helper/Category.php
2+
index fe511d40e9caa..761dc6f62adda 100644
3+
--- a/vendor/magento/module-catalog/Helper/Category.php
4+
+++ b/vendor/magento/module-catalog/Helper/Category.php
5+
@@ -10,8 +10,10 @@
6+
use Magento\Catalog\Model\CategoryFactory;
7+
use Magento\Framework\App\Helper\AbstractHelper;
8+
use Magento\Framework\App\Helper\Context;
9+
+use Magento\Framework\App\ObjectManager;
10+
use Magento\Framework\Data\CollectionFactory;
11+
use Magento\Framework\Data\Tree\Node\Collection;
12+
+use Magento\Framework\Escaper;
13+
use Magento\Framework\Exception\NoSuchEntityException;
14+
use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
15+
use Magento\Store\Model\ScopeInterface;
16+
@@ -63,24 +65,33 @@ class Category extends AbstractHelper implements ResetAfterRequestInterface
17+
*/
18+
protected $categoryRepository;
19+
20+
+ /**
21+
+ * @var Escaper|null
22+
+ */
23+
+ private ?Escaper $escaper;
24+
+
25+
/**
26+
* @param Context $context
27+
* @param CategoryFactory $categoryFactory
28+
* @param StoreManagerInterface $storeManager
29+
* @param CollectionFactory $dataCollectionFactory
30+
* @param CategoryRepositoryInterface $categoryRepository
31+
+ * @param Escaper|null $escaper
32+
*/
33+
public function __construct(
34+
Context $context,
35+
CategoryFactory $categoryFactory,
36+
StoreManagerInterface $storeManager,
37+
CollectionFactory $dataCollectionFactory,
38+
- CategoryRepositoryInterface $categoryRepository
39+
+ CategoryRepositoryInterface $categoryRepository,
40+
+ ?Escaper $escaper = null
41+
) {
42+
$this->_categoryFactory = $categoryFactory;
43+
$this->_storeManager = $storeManager;
44+
$this->_dataCollectionFactory = $dataCollectionFactory;
45+
$this->categoryRepository = $categoryRepository;
46+
+ $this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);
47+
+
48+
parent::__construct($context);
49+
}
50+
51+
@@ -204,6 +215,7 @@ public function getCanonicalUrl(string $categoryUrl): string
52+
if ($params && isset($params['p'])) {
53+
$categoryUrl = $categoryUrl . '?p=' . $params['p'];
54+
}
55+
- return $categoryUrl;
56+
+
57+
+ return $this->escaper->escapeUrl($categoryUrl);
58+
}
59+
}

‎src/Command/Apply.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ protected function configure()
8181
/**
8282
* @inheritDoc
8383
*/
84-
public function execute(InputInterface $input, OutputInterface $output)
84+
public function execute(InputInterface $input, OutputInterface $output): int
8585
{
8686
$this->logger->info($this->magentoVersion->get());
8787

‎src/Command/Ece/Apply.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ protected function configure()
8989
/**
9090
* @inheritDoc
9191
*/
92-
public function execute(InputInterface $input, OutputInterface $output)
92+
public function execute(InputInterface $input, OutputInterface $output): int
9393
{
9494
$this->logger->info($this->magentoVersion->get());
9595

‎src/Command/Ece/Revert.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ protected function configure()
7171
/**
7272
* {@inheritDoc}
7373
*/
74-
public function execute(InputInterface $input, OutputInterface $output)
74+
public function execute(InputInterface $input, OutputInterface $output): int
7575
{
7676
$this->logger->info($this->magentoVersion->get());
7777

‎src/Command/Revert.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ protected function configure()
9494
/**
9595
* {@inheritDoc}
9696
*/
97-
public function execute(InputInterface $input, OutputInterface $output)
97+
public function execute(InputInterface $input, OutputInterface $output): int
9898
{
9999
$this->logger->info($this->magentoVersion->get());
100100

‎src/Command/Status.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ protected function configure()
6161
/**
6262
* {@inheritDoc}
6363
*/
64-
public function execute(InputInterface $input, OutputInterface $output)
64+
public function execute(InputInterface $input, OutputInterface $output): int
6565
{
6666
try {
6767
$this->showStatus->run($input, $output);

0 commit comments

Comments
 (0)