Skip to content

Commit 52012b1

Browse files
BaDosBaDos
authored
MCLOUD-9902: Add FT to Magento Cloud Tools for PHP 8.2 & Magento 2.4.6 (#109)
1 parent 1297906 commit 52012b1

File tree

10 files changed

+144
-15
lines changed

10 files changed

+144
-15
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"codeception/module-db": "^1.0",
2525
"codeception/module-phpbrowser": "^1.0",
2626
"codeception/module-rest": "^1.2",
27-
"consolidation/robo": "^1.2",
27+
"consolidation/robo": "^1.2 || ^2.0",
2828
"phpmd/phpmd": "@stable",
2929
"phpstan/phpstan": "^0.12",
3030
"phpunit/phpunit": "^8.5 || ^9.5",

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

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

4040
$I->addEceToolsGitRepoToComposer();
4141
$I->addDependencyToComposer(

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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 Robo\Exception\TaskException;
11+
12+
/**
13+
* @group php81
14+
*/
15+
class Acceptance81Cest extends AcceptanceCest
16+
{
17+
/**
18+
* Template version for testing
19+
*/
20+
protected const TEMPLATE_VERSION = '2.4.4';
21+
}

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

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

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

2222
/**
2323
* @param \CliTester $I

‎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 php81
13+
* @group php82
1414
*/
1515
class DeveloperCest extends AbstractCest
1616
{
1717
/**
1818
* Template version for testing
1919
*/
20-
protected const TEMPLATE_VERSION = '2.4.4';
20+
protected const TEMPLATE_VERSION = '2.4.6';
2121

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

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
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 php81
16+
*/
17+
class Elasticsearch81Cest extends ElasticsearchCest
18+
{
19+
/**
20+
* Template version for testing
21+
*/
22+
protected const TEMPLATE_VERSION = '2.4.4';
23+
24+
/**
25+
* @return array
26+
*/
27+
protected function dataProvider(): array
28+
{
29+
return [
30+
[
31+
'version' => '7.6',
32+
'xms' => '520m',
33+
'xmx' => '520m',
34+
'plugins' => ['analysis-nori'],
35+
'param' => [
36+
'key' => 'node.store.allow_mmap',
37+
'value' => 'false',
38+
'needle' => '"store":{"allow_mmap":"false"}',
39+
]
40+
],
41+
];
42+
}
43+
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
use Robo\Exception\TaskException;
1313

1414
/**
15-
* @group php81
15+
* @group php82
1616
*/
1717
class ElasticsearchCest extends AbstractCest
1818
{
1919
/**
2020
* Template version for testing
2121
*/
22-
protected const TEMPLATE_VERSION = '2.4.4';
22+
protected const TEMPLATE_VERSION = '2.4.6';
2323

2424
/**
2525
* @param CliTester $I
@@ -81,7 +81,7 @@ protected function dataProvider(): array
8181
{
8282
return [
8383
[
84-
'version' => '7.6',
84+
'version' => '7.10',
8585
'xms' => '520m',
8686
'xmx' => '520m',
8787
'plugins' => ['analysis-nori'],

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
namespace Magento\CloudDocker\Test\Functional\Acceptance;
99

1010
/**
11-
* @group php81
11+
* @group php82
1212
*/
1313
class MailHogCest extends AbstractCest
1414
{
1515
/**
1616
* Template version for testing
1717
*/
18-
protected const TEMPLATE_VERSION = '2.4.4';
18+
protected const TEMPLATE_VERSION = '2.4.6';
1919

2020
/**
2121
* @param \CliTester $I

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

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
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 php81
16+
*/
17+
class Opensearch81Cest extends OpensearchCest
18+
{
19+
/**
20+
* Template version for testing
21+
*/
22+
protected const TEMPLATE_VERSION = '2.4.4';
23+
24+
/**
25+
* @return array
26+
*/
27+
protected function dataProvider(): array
28+
{
29+
return [
30+
[
31+
'version' => '1.1',
32+
'xms' => '520m',
33+
'xmx' => '520m',
34+
'plugins' => ['analysis-nori'],
35+
'param' => [
36+
'key' => 'node.store.allow_mmap',
37+
'value' => 'false',
38+
'needle' => '"store":{"allow_mmap":"false"}',
39+
]
40+
],
41+
[
42+
'version' => '1.2',
43+
'xms' => '520m',
44+
'xmx' => '520m',
45+
'plugins' => ['analysis-nori'],
46+
'param' => [
47+
'key' => 'node.store.allow_mmap',
48+
'value' => 'false',
49+
'needle' => '"store":{"allow_mmap":"false"}',
50+
]
51+
],
52+
];
53+
}
54+
}

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
use Robo\Exception\TaskException;
1313

1414
/**
15-
* @group php81
15+
* @group php82
1616
*/
1717
class OpensearchCest extends AbstractCest
1818
{
1919
/**
2020
* Template version for testing
2121
*/
22-
protected const TEMPLATE_VERSION = '2.4.4';
22+
protected const TEMPLATE_VERSION = '2.4.6';
2323

2424
/**
2525
* @param CliTester $I
@@ -81,7 +81,18 @@ protected function dataProvider(): array
8181
{
8282
return [
8383
[
84-
'version' => '1.2',
84+
'version' => '2.3',
85+
'xms' => '520m',
86+
'xmx' => '520m',
87+
'plugins' => ['analysis-nori'],
88+
'param' => [
89+
'key' => 'node.store.allow_mmap',
90+
'value' => 'false',
91+
'needle' => '"store":{"allow_mmap":"false"}',
92+
]
93+
],
94+
[
95+
'version' => '2.4',
8596
'xms' => '520m',
8697
'xmx' => '520m',
8798
'plugins' => ['analysis-nori'],

0 commit comments

Comments
 (0)