Skip to content

Commit a72b567

Browse files
BaDosBaDos
authored
ACMP-1459: Make ece-tools compatible with php 8.0/8.1 (#74)
1 parent ce5e3f3 commit a72b567

File tree

15 files changed

+239
-39
lines changed

15 files changed

+239
-39
lines changed

‎composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
"name": "magento/magento-cloud-docker",
33
"description": "Magento Cloud Docker",
44
"type": "magento2-component",
5-
"version": "1.3.0",
5+
"version": "1.3.1",
66
"license": [
77
"OSL-3.0",
88
"AFL-3.0"
99
],
1010
"require": {
11-
"php": "^7.2",
11+
"php": "^7.2 || ^8.0",
1212
"ext-json": "*",
13-
"composer/composer": "^1.0||^2.0",
14-
"composer/semver": "^1.0||^2.0||^3.0",
15-
"illuminate/config": "^5.5",
16-
"symfony/config": "^4.4||^5.1",
17-
"symfony/console": "^2.8||^4.0",
18-
"symfony/dependency-injection": "^3.3||^4.3||^5.1",
19-
"symfony/yaml": "^3.3||^4.0||^5.1"
13+
"composer/composer": "^1.4 || ^2.0",
14+
"composer/semver": "@stable",
15+
"illuminate/config": "^5.5||^8.77",
16+
"symfony/config": "^4.4 || ^5.1",
17+
"symfony/console": "^2.8 || ^4.0 || ^5.1",
18+
"symfony/dependency-injection": "^3.3 || ^4.3 || ^5.1",
19+
"symfony/yaml": "^3.3 || ^4.0 || ^5.1"
2020
},
2121
"require-dev": {
2222
"codeception/codeception": "^4.1",
@@ -27,7 +27,7 @@
2727
"consolidation/robo": "^1.2",
2828
"phpmd/phpmd": "@stable",
2929
"phpstan/phpstan": "^0.12",
30-
"phpunit/phpunit": "^8.5",
30+
"phpunit/phpunit": "^8.5 || ^9.5",
3131
"squizlabs/php_codesniffer": "^3.0"
3232
},
3333
"bin": [

‎images/elasticsearch/7.11/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM docker.elastic.co/elasticsearch/elasticsearch:7.11.2
22

33
RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* && \
4-
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-* && \
4+
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=https://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-* && \
55
yum -y install zip && \
66
zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
77
yum remove -y zip && \

‎src/Command/Image/GenerateEs.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
105105
{
106106
$fixRepo = <<<FIX
107107
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* && \
108-
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-* && \
108+
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=https://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-* && \
109109
110110
FIX;
111111
foreach ($this->versionMap as $version => $versionData) {

‎src/Test/Functional/Acceptance/AbstractCest.php

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,30 @@ public function _before(\CliTester $I): void
3333
$I->cloneTemplateToWorkDir(static::TEMPLATE_VERSION);
3434
$I->createAuthJson();
3535
$I->createArtifactsDir();
36-
$I->createArtifactCurrentTestedCode('docker', '1.3.99');
36+
$I->createArtifactCurrentTestedCode('docker', '1.3.1');
3737
$I->addArtifactsRepoToComposer();
38-
$I->addDependencyToComposer('magento/magento-cloud-docker', '1.3.99');
38+
$I->addDependencyToComposer('magento/magento-cloud-docker', '1.3.1');
3939

4040
$I->addEceToolsGitRepoToComposer();
41-
$I->addDependencyToComposer('magento/ece-tools', 'dev-develop as 2002.1.99');
41+
$I->addDependencyToComposer(
42+
'magento/ece-tools',
43+
$I->getDependencyVersion('magento/ece-tools') ?: 'dev-develop as 2002.1.99'
44+
);
45+
46+
if ($mccVersion = $I->getDependencyVersion('magento/magento-cloud-components')) {
47+
$I->addCloudComponentsGitRepoToComposer();
48+
$I->addDependencyToComposer('magento/magento-cloud-components', $mccVersion);
49+
}
50+
51+
if ($mcpVersion = $I->getDependencyVersion('magento/magento-cloud-patches')) {
52+
$I->addCloudPatchesGitRepoToComposer();
53+
$I->addDependencyToComposer('magento/magento-cloud-patches', $mcpVersion);
54+
}
55+
56+
if ($mqpVersion = $I->getDependencyVersion('magento/quality-patches')) {
57+
$I->addQualityPatchesGitRepoToComposer();
58+
$I->addDependencyToComposer('magento/quality-patches', $mqpVersion);
59+
}
4260

4361
$I->assertTrue($I->composerUpdate(), 'Composer update failed');
4462
$I->cacheWorkDir(static::TEMPLATE_VERSION);
@@ -49,6 +67,7 @@ public function _before(\CliTester $I): void
4967
*/
5068
public function _after(\CliTester $I): void
5169
{
70+
$I->runDockerComposeCommand('ps');
5271
$I->stopEnvironment();
5372
$I->removeWorkDir();
5473
}

‎src/Test/Functional/Acceptance/Acceptance72Cest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@
1212
*/
1313
class Acceptance72Cest extends AcceptanceCest
1414
{
15+
/**
16+
* Template version for testing
17+
*/
1518
protected const TEMPLATE_VERSION = '2.3.2';
1619
}

‎src/Test/Functional/Acceptance/Acceptance73Cest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@
1212
*/
1313
class Acceptance73Cest extends AcceptanceCest
1414
{
15+
/**
16+
* Template version for testing
17+
*/
1518
protected const TEMPLATE_VERSION = '2.3.5';
1619
}

‎src/Test/Functional/Acceptance/Acceptance74Cest.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\CloudDocker\Test\Functional\Acceptance;
9+
10+
/**
11+
* @group php74
12+
*/
13+
class Acceptance74Cest extends AcceptanceCest
14+
{
15+
/**
16+
* Template version for testing
17+
*/
18+
protected const TEMPLATE_VERSION = '2.4.3';
19+
}

‎src/Test/Functional/Acceptance/AcceptanceCest.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,15 @@
1010
use Robo\Exception\TaskException;
1111

1212
/**
13-
* @group php74
13+
* @group php81
1414
*/
1515
class AcceptanceCest extends AbstractCest
1616
{
17+
/**
18+
* Template version for testing
19+
*/
20+
protected const TEMPLATE_VERSION = '2.4.4';
21+
1722
/**
1823
* @param \CliTester $I
1924
* @throws TaskException
@@ -39,9 +44,9 @@ public function testProductionMode(\CliTester $I): void
3944
*/
4045
public function testCustomHost(\CliTester $I): void
4146
{
42-
$I->updateBaseUrl('http://magento2.test:8080/');
47+
$I->updateBaseUrl('http://magento2.test/');
4348
$I->assertTrue(
44-
$I->generateDockerCompose('--mode=production --host=magento2.test --port=8080'),
49+
$I->generateDockerCompose('--mode=production --host=magento2.test'),
4550
'Command build:compose failed'
4651
);
4752
$I->replaceImagesWithCustom();

‎src/Test/Functional/Acceptance/DeveloperCest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
use CliTester;
1111

1212
/**
13-
* @group php74
13+
* @group php81
1414
*/
1515
class DeveloperCest extends AbstractCest
1616
{
1717
/**
1818
* Template version for testing
1919
*/
20-
protected const TEMPLATE_VERSION = '2.4.1';
20+
protected const TEMPLATE_VERSION = '2.4.4';
2121

2222
/**
2323
* Tests that php settings contains configuration from php.dev.ini

‎src/Test/Functional/Acceptance/Elasticsearch74Cest.php

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\CloudDocker\Test\Functional\Acceptance;
9+
10+
use CliTester;
11+
use Codeception\Example;
12+
use Robo\Exception\TaskException;
13+
14+
/**
15+
* @group php74
16+
*/
17+
class Elasticsearch74Cest extends ElasticsearchCest
18+
{
19+
/**
20+
* Template version for testing
21+
*/
22+
protected const TEMPLATE_VERSION = '2.4.0';
23+
24+
/**
25+
* @return array
26+
*/
27+
protected function dataProvider(): array
28+
{
29+
return [
30+
[
31+
'version' => '6.5',
32+
'xms' => '518m',
33+
'xmx' => '518m',
34+
'param' => [
35+
'key' => 'node.store.allow_mmapfs',
36+
'value' => 'false',
37+
'needle' => '"store":{"allow_mmapfs":"false"}',
38+
]
39+
],
40+
[
41+
'version' => '7.5',
42+
'xms' => '520m',
43+
'xmx' => '520m',
44+
'plugins' => ['analysis-nori'],
45+
'param' => [
46+
'key' => 'node.store.allow_mmap',
47+
'value' => 'false',
48+
'needle' => '"store":{"allow_mmap":"false"}',
49+
]
50+
],
51+
];
52+
}
53+
}

0 commit comments

Comments
 (0)