Skip to content

Commit e5c3c7e

Browse files
glo72880sivaram7andriyShevtsovtomreece
authored
MCP Release 1.0.27 (#99)
* update template version * update template * update compatible versions * Use abstract parent cest to fix tests * Add abstract patchesDataProvider signature * phpcs fix for missing doc (#101) --------- Co-authored-by: Sivaram Manijeganathan <[email protected]> Co-authored-by: Andrii Shevtsov <[email protected]> Co-authored-by: Tom Reece <[email protected]> Co-authored-by: Tom Reece <[email protected]>
1 parent a77832e commit e5c3c7e

File tree

5 files changed

+41
-21
lines changed

5 files changed

+41
-21
lines changed

composer.json

+10-11
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"license": "OSL-3.0",
77
"repositories": {
88
"repo.magento.com": {
9-
"type": "composer",
10-
"url": "https://repo.magento.com/"
9+
"type": "composer",
10+
"url": "https://repo.magento.com/"
1111
}
1212
},
1313
"require": {
@@ -18,19 +18,18 @@
1818
"symfony/config": "^3.3||^4.4||^5.0||^6.0",
1919
"symfony/console": "^2.6||^4.0||^5.0||^6.0",
2020
"symfony/dependency-injection": "^3.3||^4.3||^5.0||^6.0",
21-
"symfony/process": "^2.1||^4.1||^5.0||^6.0",
21+
"symfony/process": "^2.1 || ^4.1 || ^5.1 || ^5.4 || ^6.4",
2222
"symfony/proxy-manager-bridge": "^3.3||^4.3||^5.0||^6.0",
2323
"symfony/yaml": "^3.3||^4.0||^5.0||^6.0",
24-
"monolog/monolog": "^1.25||^2.3||^2.7",
25-
"magento/quality-patches": "^1.1.0"
24+
"monolog/monolog": "^1.25||^2.3||^2.7"
2625
},
2726
"require-dev": {
28-
"codeception/codeception": "^4.1",
29-
"codeception/module-asserts": "^1.2",
30-
"codeception/module-db": "^1.0",
31-
"codeception/module-phpbrowser": "^1.0",
32-
"codeception/module-rest": "^1.2",
33-
"consolidation/robo": "^1.2 || ^2.0",
27+
"codeception/codeception": "^4.1 || ^5.1",
28+
"codeception/module-asserts": "^1.2 || ^3.0",
29+
"codeception/module-db": "^1.0 || ^3.0",
30+
"codeception/module-phpbrowser": "^1.0 || ^3.0",
31+
"codeception/module-rest": "^1.2 || ^3.0",
32+
"consolidation/robo": "^1.2 || ^3.0",
3433
"phpmd/phpmd": "@stable",
3534
"phpunit/phpunit": "^8.5 || ^9.5",
3635
"squizlabs/php_codesniffer": "^3.0"

src/Test/Functional/Acceptance/Acceptance82Cest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ protected function patchesDataProvider(): array
2020
return [
2121
['templateVersion' => '2.4.6', 'magentoVersion' => '2.4.6'],
2222
['templateVersion' => '2.4.6', 'magentoVersion' => '2.4.6-p1'],
23-
['templateVersion' => '2.4.7-beta', 'magentoVersion' => null],
23+
['templateVersion' => '2.4.7', 'magentoVersion' => null],
2424
];
2525
}
2626
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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\CloudPatches\Test\Functional\Acceptance;
9+
10+
/**
11+
* @group php83
12+
*/
13+
class Acceptance83Cest extends AcceptanceCest
14+
{
15+
/**
16+
* @return array
17+
*/
18+
protected function patchesDataProvider(): array
19+
{
20+
return [
21+
['templateVersion' => '2.4.7', 'magentoVersion' => '2.4.7'],
22+
];
23+
}
24+
}

src/Test/Functional/Acceptance/AcceptanceCest.php

+5-8
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
namespace Magento\CloudPatches\Test\Functional\Acceptance;
99

1010
/**
11-
* @group php83
11+
* Abstract AcceptanceCest
12+
*
13+
* @abstract
1214
*/
13-
class AcceptanceCest extends AbstractCest
15+
abstract class AcceptanceCest extends AbstractCest
1416
{
1517
/**
1618
* @param \CliTester $I
@@ -46,10 +48,5 @@ public function testPatches(\CliTester $I, \Codeception\Example $data): void
4648
/**
4749
* @return array
4850
*/
49-
protected function patchesDataProvider(): array
50-
{
51-
return [
52-
['templateVersion' => '2.4.7-beta-test', 'magentoVersion' => '2.4.7-beta401'],
53-
];
54-
}
51+
abstract protected function patchesDataProvider(): array;
5552
}

src/Test/Functional/Acceptance/PatchApplierCest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function _before(\CliTester $I): void
2121
{
2222
parent::_before($I);
2323

24-
$this->prepareTemplate($I, '2.4.7-beta-test');
24+
$this->prepareTemplate($I, '2.4.7');
2525
$I->copyFileToWorkDir('files/debug_logging/.magento.env.yaml', '.magento.env.yaml');
2626
}
2727

0 commit comments

Comments
 (0)