Skip to content

Commit 7867bd4

Browse files
prateek-karanpuria-adobeprateek-karanpuria-adobe
authored
Merge pull request #212 from magento-commerce/develop
MCLOUD-13940: Cloud tools August 2025 release
2 parents 7a543ea + 2934584 commit 7867bd4

File tree

92 files changed

+282
-685
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+282
-685
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/ece-tools",
33
"description": "Provides tools to build and deploy Magento 2 Enterprise Edition",
44
"type": "magento2-component",
5-
"version": "2002.2.6",
5+
"version": "2002.2.7",
66
"license": "OSL-3.0",
77
"repositories": {
88
"repo.magento.com": {

‎config/eol.yaml

Lines changed: 33 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,49 @@
11
# Service EOLs (YYYY-MM-DD).
22
php:
3-
- version: '7.0'
4-
eol: 2019-01-10
5-
- version: '7.1'
6-
eol: 2019-12-01
7-
- version: '7.2'
8-
eol: 2020-11-30
9-
- version: '7.3'
10-
eol: 2021-12-06
11-
- version: '7.4'
12-
eol: 2022-11-28
133
- version: '8.1'
14-
eol: 2023-11-25
4+
eol: 2024-11-24
155
- version: '8.2'
16-
eol: 2024-12-08
6+
eol: 2025-12-08
177
- version: '8.3'
18-
eol: 2025-11-23
8+
eol: 2026-12-31
9+
- version: '8.4'
10+
eol: 2027-12-31
1911
mariadb:
20-
- version: '10.0'
21-
eol: 2019-03-31
22-
- version: '10.1'
23-
eol: 2020-10-17
24-
- version: '10.2'
25-
eol: 2022-05-23
26-
- version: '10.3'
27-
eol: 2023-05-25
2812
- version: '10.4'
29-
eol: 2024-06-18
13+
eol: 2024-06-30
14+
- version: '10.5'
15+
eol: 2025-05-30
3016
- version: '10.6'
31-
eol: 2026-07-31
32-
elasticsearch:
33-
- version: '1.7'
34-
eol: 2017-01-16
35-
- version: '2.4'
36-
eol: 2018-02-28
37-
- version: '5.2'
38-
eol: 2018-07-31
39-
- version: '6.5'
40-
eol: 2020-05-14
41-
- version: '6.8'
42-
eol: 2020-11-20
43-
- version: '7.2'
44-
eol: 2020-12-25
45-
- version: '7.5'
46-
eol: 2021-06-02
47-
- version: '7.6'
48-
eol: 2021-08-11
49-
- version: '7.7'
50-
eol: 2021-11-13
51-
- version: '7.9'
52-
eol: 2022-02-18
53-
rabbitmq:
54-
- version: '3.5'
55-
eol: 2016-10-31
56-
- version: '3.7'
57-
eol: 2020-03-31
58-
- version: '3.8'
59-
eol: 2022-07-31
17+
eol: 2026-06-30
18+
- version: '10.11'
19+
eol: 2027-10-25
20+
- version: '11.4'
21+
eol: 2028-04-30
22+
opensearch:
23+
- version: '1'
24+
eol: 2024-09-30
25+
- version: '2'
26+
eol: 2025-02-28
27+
- version: '3'
28+
eol: 2026-05-06
29+
rabbitmq:
6030
- version: '3.9'
61-
eol: 2023-07-31
31+
eol: 2024-10-31
6232
- version: '3.11'
63-
eol: 2024-06-30
33+
eol: 2025-11-30
34+
- version: '3.12'
35+
eol: 2026-05-31
36+
- version: '3.13'
37+
eol: 2027-11-30
38+
- version: '4.1'
39+
eol: 2028-12-31
6440
redis:
65-
- version: '3.2'
66-
eol: 2018-10-17
67-
- version: '4.0'
68-
eol: 2020-04-30
69-
- version: '5.0'
70-
eol: 2020-04-30
71-
- version: '5.2'
72-
eol: 2019-12-31
73-
- version: '6.0'
74-
eol: 2022-05-31
7541
- version: '6.2'
76-
eol: 2024-08-31
42+
eol: 2024-04-30
7743
- version: '7.0'
78-
eol: 2023-08-15
44+
eol: 2026-04-30
7945
- version: '7.2'
80-
eol: 2025-08-31
46+
eol: 2028-06-30
8147
valkey:
8248
- version: '8.0'
83-
eol: 2029-04-16
49+
eol: 2027-09-15

‎config/schema.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ variables:
465465
type: string
466466
allowed:
467467
- 'Cm_Cache_Backend_Redis'
468-
- '\Magento\Framework\Cache\Backend\Valkey'
468+
- '\Magento\Framework\Cache\Backend\Redis'
469469
- '\Magento\Framework\Cache\Backend\RemoteSynchronizedCache'
470470
stages:
471471
- deploy
@@ -474,7 +474,7 @@ variables:
474474
examples:
475475
- stage:
476476
deploy:
477-
VALKEY_BACKEND: '\Magento\Framework\Cache\Backend\Valkey'
477+
VALKEY_BACKEND: '\Magento\Framework\Cache\Backend\Redis'
478478
CACHE_CONFIGURATION:
479479
description: "Replace or modify the Magento cache configuration generated during the deployment process.
480480
To replace the existing configuration, specify values for each configuration option required for your environment.

‎src/Command/ConfigValidate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ protected function configure(): void
5555
*
5656
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
5757
*/
58-
public function execute(InputInterface $input, OutputInterface $output)
58+
public function execute(InputInterface $input, OutputInterface $output): int
5959
{
6060
try {
6161
if (($result = $this->stageConfig->validate()) instanceof Error) {

‎src/Command/Wizard/IdealState.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ protected function configure()
6060
/**
6161
* @inheritdoc
6262
*/
63-
public function execute(InputInterface $input, OutputInterface $output)
63+
public function execute(InputInterface $input, OutputInterface $output): int
6464
{
6565
$message = 'The configured state is ideal';
6666

‎src/Command/Wizard/ScdOnBuild.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
$errors = $this->scdOnBuildValidator->getErrors();
6767
$status = !$errors;

‎src/Command/Wizard/ScdOnDemand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected function configure()
5858
/**
5959
* @inheritdoc
6060
*/
61-
public function execute(InputInterface $input, OutputInterface $output)
61+
public function execute(InputInterface $input, OutputInterface $output): int
6262
{
6363
$scdOnDemandEnabled = $this->globalStage->get(GlobalSection::VAR_SCD_ON_DEMAND);
6464
$scdOnDemandStatus = $scdOnDemandEnabled ? 'enabled' : 'disabled';

‎src/Command/Wizard/ScdOnDeploy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ protected function configure()
5757
/**
5858
* @inheritdoc
5959
*/
60-
public function execute(InputInterface $input, OutputInterface $output)
60+
public function execute(InputInterface $input, OutputInterface $output): int
6161
{
6262
$errors = $this->scdOnDeployValidator->getErrors();
6363
$status = !$errors;

‎src/Config/Environment/Reader.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,13 @@ public function read(): array
5858
if (!$this->file->isExists($path)) {
5959
$this->config = [];
6060
} else {
61-
$parseFlag = defined(Yaml::class . '::PARSE_CONSTANT') ? Yaml::PARSE_CONSTANT : 0;
61+
$parseFlag = 0;
62+
if (defined(Yaml::class . '::PARSE_CONSTANT')) {
63+
$parseFlag |= Yaml::PARSE_CONSTANT;
64+
}
65+
if (defined(Yaml::class . '::PARSE_CUSTOM_TAGS')) {
66+
$parseFlag |= Yaml::PARSE_CUSTOM_TAGS;
67+
}
6268
$this->config = (array)Yaml::parse($this->file->fileGetContents($path), $parseFlag);
6369
}
6470
}

‎src/Config/Factory/Cache.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ public function get(): array
148148
}
149149

150150
// Determine backend based on available configuration
151-
$backendConfig = !empty($redisConfig) ? $redisConfig : $valkeyConfig;
152-
$cacheBackendModel = !empty($redisConfig) ? $envCacheRadisBackendModel :$envCacheValkeyBackendModel;
151+
$backendConfig = !empty($redisConfig) ? $redisConfig : $valkeyConfig;
152+
$cacheBackendModel = !empty($redisConfig) ? $envCacheRadisBackendModel :$envCacheValkeyBackendModel;
153153
if ($this->isSynchronizedConfigStructure()) {
154154
$cacheCacheBackend = $this->getSynchronizedConfigStructure($cacheBackendModel, $backendConfig);
155155
$cacheCacheBackend['backend_options']['remote_backend_options'] = array_merge(
@@ -386,4 +386,12 @@ public function isValkeyEnabled(): array
386386
{
387387
return $this->valkey->getConfiguration();
388388
}
389+
390+
/**
391+
* @return array
392+
*/
393+
public function isRedisEnabled(): array
394+
{
395+
return $this->redis->getConfiguration();
396+
}
389397
}

0 commit comments

Comments
 (0)