Skip to content

Commit 381e4e5

Browse files
okolesnykokolesnyk
authored
Merge pull request #11 from magento-pangolin/MQE-2305
MQE-2305: Implement `-report-type=mftf` in magento-semver to launch MFTF SVC
2 parents c9c39df + c563a41 commit 381e4e5

19 files changed

+169
-221
lines changed

‎src/Analyzer/Factory/MFTFAnalyzerFactory.php‎ renamed to ‎src/Analyzer/Factory/MftfAnalyzerFactory.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?php
2-
32
/**
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
@@ -22,9 +21,9 @@
2221
use Magento\SemanticVersionChecker\MftfReport;
2322

2423
/**
25-
* Build Mftf analyzer
24+
* Mftf analyzers factory
2625
*/
27-
class MFTFAnalyzerFactory implements AnalyzerFactoryInterface
26+
class MftfAnalyzerFactory implements AnalyzerFactoryInterface
2827
{
2928
/**
3029
* @param DependencyGraph|null $dependencyGraph

‎src/Analyzer/Mftf/ActionGroupAnalyzer.php‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace Magento\SemanticVersionChecker\Analyzer\Mftf;
88

9+
use Magento\SemanticVersionChecker\Analyzer\AnalyzerInterface;
910
use Magento\SemanticVersionChecker\MftfReport;
1011
use Magento\SemanticVersionChecker\Operation\Mftf\ActionGroup\ActionGroupActionAdded;
1112
use Magento\SemanticVersionChecker\Operation\Mftf\ActionGroup\ActionGroupActionChanged;
@@ -16,17 +17,19 @@
1617
use Magento\SemanticVersionChecker\Operation\Mftf\ActionGroup\ActionGroupArgumentChanged;
1718
use Magento\SemanticVersionChecker\Operation\Mftf\ActionGroup\ActionGroupArgumentRemoved;
1819
use Magento\SemanticVersionChecker\Operation\Mftf\ActionGroup\ActionGroupRemoved;
20+
use Magento\SemanticVersionChecker\Registry\XmlRegistry;
1921
use Magento\SemanticVersionChecker\Scanner\MftfScanner;
20-
use PHPSemVerChecker\Registry\Registry;
2122
use PHPSemVerChecker\Report\Report;
2223
use Magento\SemanticVersionChecker\Operation\Mftf\ActionGroup\ActionGroupRemoveActionRemoved;
2324
use Magento\SemanticVersionChecker\Operation\Mftf\ActionGroup\ActionGroupRemoveActionAdded;
2425

25-
class ActionGroupAnalyzer extends AbstractEntityAnalyzer
26+
/**
27+
* Analyzer for Mftf Action Groups.
28+
*/
29+
class ActionGroupAnalyzer extends AbstractEntityAnalyzer implements AnalyzerInterface
2630
{
2731
const MFTF_ARGUMENTS_ELEMENT = "{}arguments";
2832
const MFTF_DATA_TYPE = 'actionGroup';
29-
const MFTF_DATA_DIRECTORY = '/Mftf/ActionGroup/';
3033

3134
/**
3235
* operations array
@@ -45,13 +48,13 @@ class ActionGroupAnalyzer extends AbstractEntityAnalyzer
4548
];
4649

4750
/**
48-
* MFTF actionGroup.xml analyzer
51+
* MFTF ActionGroup.xml analyzer.
4952
*
50-
* @param Registry $registryBefore
51-
* @param Registry $registryAfter
53+
* @param XmlRegistry $registryBefore
54+
* @param XmlRegistry $registryAfter
5255
* @return Report
5356
*/
54-
public function analyze(Registry $registryBefore, Registry $registryAfter)
57+
public function analyze($registryBefore, $registryAfter)
5558
{
5659
$beforeEntities = $registryBefore->data[MftfScanner::MFTF_ENTITY] ?? [];
5760
$afterEntities = $registryAfter->data[MftfScanner::MFTF_ENTITY] ?? [];

‎src/Analyzer/Mftf/DataAnalyzer.php‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace Magento\SemanticVersionChecker\Analyzer\Mftf;
88

9+
use Magento\SemanticVersionChecker\Analyzer\AnalyzerInterface;
910
use Magento\SemanticVersionChecker\MftfReport;
1011
use Magento\SemanticVersionChecker\Operation\Mftf\Data\DataEntityAdded;
1112
use Magento\SemanticVersionChecker\Operation\Mftf\Data\DataEntityArrayAdded;
@@ -18,27 +19,29 @@
1819
use Magento\SemanticVersionChecker\Operation\Mftf\Data\DataEntityReqEntityRemoved;
1920
use Magento\SemanticVersionChecker\Operation\Mftf\Data\DataEntityVarAdded;
2021
use Magento\SemanticVersionChecker\Operation\Mftf\Data\DataEntityVarRemoved;
22+
use Magento\SemanticVersionChecker\Registry\XmlRegistry;
2123
use Magento\SemanticVersionChecker\Scanner\MftfScanner;
22-
use PHPSemVerChecker\Registry\Registry;
2324
use PHPSemVerChecker\Report\Report;
2425

25-
class DataAnalyzer extends AbstractEntityAnalyzer
26+
/**
27+
* Mftf Data entities analyzer class.
28+
*/
29+
class DataAnalyzer extends AbstractEntityAnalyzer implements AnalyzerInterface
2630
{
2731
const MFTF_DATA_FIELD_ELEMENT = "{}data";
2832
const MFTF_VAR_ELEMENT = "{}var";
2933
const MFTF_REQ_ELEMENT = "{}requiredEntity";
3034
const MFTF_ARRAY_ELEMENT = "{}array";
3135
const MFTF_DATA_TYPE = 'entity';
32-
const MFTF_DATA_DIRECTORY = '/Mftf/Data/';
3336

3437
/**
3538
* MFTF data.xml analyzer
3639
*
37-
* @param Registry $registryBefore
38-
* @param Registry $registryAfter
40+
* @param XmlRegistry $registryBefore
41+
* @param XmlRegistry $registryAfter
3942
* @return Report
4043
*/
41-
public function analyze(Registry $registryBefore, Registry $registryAfter)
44+
public function analyze($registryBefore, $registryAfter)
4245
{
4346
$beforeEntities = $registryBefore->data[MftfScanner::MFTF_ENTITY] ?? [];
4447
$afterEntities = $registryAfter->data[MftfScanner::MFTF_ENTITY] ?? [];

‎src/Analyzer/Mftf/MetadataAnalyzer.php‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,32 @@
66

77
namespace Magento\SemanticVersionChecker\Analyzer\Mftf;
88

9+
use Magento\SemanticVersionChecker\Analyzer\AnalyzerInterface;
910
use Magento\SemanticVersionChecker\MftfReport;
1011
use Magento\SemanticVersionChecker\Operation\Mftf\Metadata\MetadataAdded;
1112
use Magento\SemanticVersionChecker\Operation\Mftf\Metadata\MetadataChanged;
1213
use Magento\SemanticVersionChecker\Operation\Mftf\Metadata\MetadataChildAdded;
1314
use Magento\SemanticVersionChecker\Operation\Mftf\Metadata\MetadataChildRemoved;
1415
use Magento\SemanticVersionChecker\Operation\Mftf\Metadata\MetadataRemoved;
16+
use Magento\SemanticVersionChecker\Registry\XmlRegistry;
1517
use Magento\SemanticVersionChecker\Scanner\MftfScanner;
16-
use PHPSemVerChecker\Registry\Registry;
1718
use PHPSemVerChecker\Report\Report;
1819

19-
class MetadataAnalyzer extends AbstractEntityAnalyzer
20+
/**
21+
* Mftf MetaData analyzer class.
22+
*/
23+
class MetadataAnalyzer extends AbstractEntityAnalyzer implements AnalyzerInterface
2024
{
2125
const MFTF_DATA_TYPE = 'operation';
22-
const MFTF_DATA_DIRECTORY = '/Mftf/Test/';
2326

2427
/**
2528
* MFTF test.xml analyzer
2629
*
27-
* @param Registry $registryBefore
28-
* @param Registry $registryAfter
30+
* @param XmlRegistry $registryBefore
31+
* @param XmlRegistry $registryAfter
2932
* @return Report
3033
*/
31-
public function analyze(Registry $registryBefore, Registry $registryAfter)
34+
public function analyze($registryBefore, $registryAfter)
3235
{
3336
$beforeEntities = $registryBefore->data[MftfScanner::MFTF_ENTITY] ?? [];
3437
$afterEntities = $registryAfter->data[MftfScanner::MFTF_ENTITY] ?? [];

‎src/Analyzer/Mftf/PageAnalyzer.php‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,32 @@
66

77
namespace Magento\SemanticVersionChecker\Analyzer\Mftf;
88

9+
use Magento\SemanticVersionChecker\Analyzer\AnalyzerInterface;
910
use Magento\SemanticVersionChecker\MftfReport;
1011
use Magento\SemanticVersionChecker\Operation\Mftf\Page\PageAdded;
1112
use Magento\SemanticVersionChecker\Operation\Mftf\Page\PageRemoved;
1213
use Magento\SemanticVersionChecker\Operation\Mftf\Page\PageSectionAdded;
1314
use Magento\SemanticVersionChecker\Operation\Mftf\Page\PageSectionRemoved;
15+
use Magento\SemanticVersionChecker\Registry\XmlRegistry;
1416
use Magento\SemanticVersionChecker\Scanner\MftfScanner;
15-
use PHPSemVerChecker\Registry\Registry;
1617
use PHPSemVerChecker\Report\Report;
1718

18-
class PageAnalyzer extends AbstractEntityAnalyzer
19+
/**
20+
* Mftf Page analyzer class.
21+
*/
22+
class PageAnalyzer extends AbstractEntityAnalyzer implements AnalyzerInterface
1923
{
2024
const MFTF_SECTION_ELEMENT = "{}section";
2125
const MFTF_DATA_TYPE = 'page';
22-
const MFTF_DATA_DIRECTORY = '/Mftf/Page/';
2326

2427
/**
2528
* MFTF page.xml analyzer
2629
*
27-
* @param Registry $registryBefore
28-
* @param Registry $registryAfter
30+
* @param XmlRegistry $registryBefore
31+
* @param XmlRegistry $registryAfter
2932
* @return Report
3033
*/
31-
public function analyze(Registry $registryBefore, Registry $registryAfter)
34+
public function analyze($registryBefore, $registryAfter)
3235
{
3336
$beforeEntities = $registryBefore->data[MftfScanner::MFTF_ENTITY] ?? [];
3437
$afterEntities = $registryAfter->data[MftfScanner::MFTF_ENTITY] ?? [];

‎src/Analyzer/Mftf/SectionAnalyzer.php‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace Magento\SemanticVersionChecker\Analyzer\Mftf;
88

9+
use Magento\SemanticVersionChecker\Analyzer\AnalyzerInterface;
910
use Magento\SemanticVersionChecker\MftfReport;
1011
use Magento\SemanticVersionChecker\Operation\Mftf\Section\SectionAdded;
1112
use Magento\SemanticVersionChecker\Operation\Mftf\Section\SectionElementAdded;
@@ -15,15 +16,17 @@
1516
use Magento\SemanticVersionChecker\Operation\Mftf\Section\SectionElementSelectorChanged;
1617
use Magento\SemanticVersionChecker\Operation\Mftf\Section\SectionElementTypeChanged;
1718
use Magento\SemanticVersionChecker\Operation\Mftf\Section\SectionRemoved;
19+
use Magento\SemanticVersionChecker\Registry\XmlRegistry;
1820
use Magento\SemanticVersionChecker\Scanner\MftfScanner;
19-
use PHPSemVerChecker\Registry\Registry;
2021
use PHPSemVerChecker\Report\Report;
2122

22-
class SectionAnalyzer extends AbstractEntityAnalyzer
23+
/**
24+
* Mftf Section analyzer class.
25+
*/
26+
class SectionAnalyzer extends AbstractEntityAnalyzer implements AnalyzerInterface
2327
{
2428
const MFTF_ELEMENT_ELEMENT = "{}element";
2529
const MFTF_DATA_TYPE = 'section';
26-
const MFTF_DATA_DIRECTORY = '/Mftf/Section/';
2730
const MFTF_ELEMENT_PARAM = 'parameterized';
2831

2932
/**
@@ -41,11 +44,11 @@ class SectionAnalyzer extends AbstractEntityAnalyzer
4144
/**
4245
* MFTF section.xml analyzer
4346
*
44-
* @param Registry $registryBefore
45-
* @param Registry $registryAfter
47+
* @param XmlRegistry $registryBefore
48+
* @param XmlRegistry $registryAfter
4649
* @return Report
4750
*/
48-
public function analyze(Registry $registryBefore, Registry $registryAfter)
51+
public function analyze($registryBefore, $registryAfter)
4952
{
5053
$beforeEntities = $registryBefore->data[MftfScanner::MFTF_ENTITY] ?? [];
5154
$afterEntities = $registryAfter->data[MftfScanner::MFTF_ENTITY] ?? [];

‎src/Analyzer/Mftf/SuiteAnalyzer.php‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace Magento\SemanticVersionChecker\Analyzer\Mftf;
88

9+
use Magento\SemanticVersionChecker\Analyzer\AnalyzerInterface;
910
use Magento\SemanticVersionChecker\MftfReport;
1011
use Magento\SemanticVersionChecker\Operation\Mftf\Suite\SuiteIncludeExcludeAdded;
1112
use Magento\SemanticVersionChecker\Operation\Mftf\Suite\SuiteIncludeExcludeRemoved;
@@ -19,18 +20,20 @@
1920
use Magento\SemanticVersionChecker\Operation\Mftf\Suite\SuiteBeforeAfterRemoveActionRemoved;
2021
use Magento\SemanticVersionChecker\Operation\Mftf\Suite\SuiteAdded;
2122
use Magento\SemanticVersionChecker\Operation\Mftf\Suite\SuiteRemoved;
23+
use Magento\SemanticVersionChecker\Registry\XmlRegistry;
2224
use Magento\SemanticVersionChecker\Scanner\MftfScanner;
23-
use PHPSemVerChecker\Registry\Registry;
2425
use PHPSemVerChecker\Report\Report;
2526

26-
class SuiteAnalyzer extends AbstractEntityAnalyzer
27+
/**
28+
* Mftf Suite analyzer class.
29+
*/
30+
class SuiteAnalyzer extends AbstractEntityAnalyzer implements AnalyzerInterface
2731
{
2832
const MFTF_SUITE_BEFORE_ELEMENT = "{}before";
2933
const MFTF_SUITE_AFTER_ELEMENT = "{}after";
3034
const MFTF_SUITE_INCLUDE_ELEMENT = "{}include";
3135
const MFTF_SUITE_EXCLUDE_ELEMENT = "{}exclude";
3236
const MFTF_DATA_TYPE = 'suite';
33-
const MFTF_DATA_DIRECTORY = '/Mftf/Suite/';
3437

3538
/**
3639
* Action operations array
@@ -51,11 +54,11 @@ class SuiteAnalyzer extends AbstractEntityAnalyzer
5154
/**
5255
* MFTF test.xml analyzer
5356
*
54-
* @param Registry $registryBefore
55-
* @param Registry $registryAfter
57+
* @param XmlRegistry $registryBefore
58+
* @param XmlRegistry $registryAfter
5659
* @return Report
5760
*/
58-
public function analyze(Registry $registryBefore, Registry $registryAfter)
61+
public function analyze($registryBefore, $registryAfter)
5962
{
6063
$beforeEntities = $registryBefore->data[MftfScanner::MFTF_ENTITY] ?? [];
6164
$afterEntities = $registryAfter->data[MftfScanner::MFTF_ENTITY] ?? [];

‎src/Analyzer/Mftf/TestAnalyzer.php‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,34 @@
66

77
namespace Magento\SemanticVersionChecker\Analyzer\Mftf;
88

9+
use Magento\SemanticVersionChecker\Analyzer\AnalyzerInterface;
910
use Magento\SemanticVersionChecker\MftfReport;
10-
use Magento\SemanticVersionChecker\Operation\Mftf\ActionGroup\ActionGroupActionChanged;
1111
use Magento\SemanticVersionChecker\Operation\Mftf\Test\TestActionAdded;
1212
use Magento\SemanticVersionChecker\Operation\Mftf\Test\TestActionChanged;
1313
use Magento\SemanticVersionChecker\Operation\Mftf\Test\TestActionGroupRefChanged;
1414
use Magento\SemanticVersionChecker\Operation\Mftf\Test\TestActionRemoved;
1515
use Magento\SemanticVersionChecker\Operation\Mftf\Test\TestActionSequenceChanged;
1616
use Magento\SemanticVersionChecker\Operation\Mftf\Test\TestActionTypeChanged;
1717
use Magento\SemanticVersionChecker\Operation\Mftf\Test\TestAdded;
18-
use Magento\SemanticVersionChecker\Operation\Mftf\Test\TestAnnotationAdded;
1918
use Magento\SemanticVersionChecker\Operation\Mftf\Test\TestAnnotationChanged;
2019
use Magento\SemanticVersionChecker\Operation\Mftf\Test\TestGroupRemoved;
2120
use Magento\SemanticVersionChecker\Operation\Mftf\Test\TestRemoved;
21+
use Magento\SemanticVersionChecker\Registry\XmlRegistry;
2222
use Magento\SemanticVersionChecker\Scanner\MftfScanner;
23-
use PHPSemVerChecker\Registry\Registry;
2423
use PHPSemVerChecker\Report\Report;
2524
use Magento\SemanticVersionChecker\Operation\Mftf\Test\TestRemoveActionRemoved;
2625
use Magento\SemanticVersionChecker\Operation\Mftf\Test\TestRemoveActionAdded;
2726

28-
class TestAnalyzer extends AbstractEntityAnalyzer
27+
/**
28+
* Mftf Test analyzer class.
29+
*/
30+
class TestAnalyzer extends AbstractEntityAnalyzer implements AnalyzerInterface
2931
{
3032
const MFTF_ANOTATION_ELEMENT = "{}annotations";
3133
const MFTF_BEFORE_ELEMENT = "{}before";
3234
const MFTF_AFTER_ELEMENT = "{}after";
3335
const MFTF_GROUP_ELEMENT = "{}group";
3436
const MFTF_DATA_TYPE = 'test';
35-
const MFTF_DATA_DIRECTORY = '/Mftf/Test/';
3637

3738
/**
3839
* operations array
@@ -53,11 +54,11 @@ class TestAnalyzer extends AbstractEntityAnalyzer
5354
/**
5455
* MFTF test.xml analyzer
5556
*
56-
* @param Registry $registryBefore
57-
* @param Registry $registryAfter
57+
* @param XmlRegistry $registryBefore
58+
* @param XmlRegistry $registryAfter
5859
* @return Report
5960
*/
60-
public function analyze(Registry $registryBefore, Registry $registryAfter)
61+
public function analyze($registryBefore, $registryAfter)
6162
{
6263
$beforeEntities = $registryBefore->data[MftfScanner::MFTF_ENTITY] ?? [];
6364
$afterEntities = $registryAfter->data[MftfScanner::MFTF_ENTITY] ?? [];

0 commit comments

Comments
 (0)