Skip to content

Commit 7a083ea

Browse files
magterskinemagterskine
committed
Latest code from Infra on Nov01, updated namespaces, updated composer
1 parent c94c35b commit 7a083ea

File tree

193 files changed

+11269
-445
lines changed

Some content is hidden

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

193 files changed

+11269
-445
lines changed

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
],
99
"bin": ["bin/svc"],
1010
"require": {
11-
"php": "~7.1.3||~7.2.0",
11+
"php": "~7.1.3||~7.2.0||~7.3.0",
1212
"tomzx/php-semver-checker": "^0.13.0",
13-
"symfony/console": "~4.1.0",
13+
"symfony/console": "~4.0.0",
1414
"nikic/php-parser": "^3.1.0"
1515
},
1616
"require-dev": {

‎src/Analyzer/AbstractCodeAnalyzer.php‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

7-
namespace Magento\SemanticVersionChecker\Analyzer;
8+
namespace Magento\SemanticVersionCheckr\Analyzer;
89

9-
use Magento\SemanticVersionChecker\Helper\ClassParser;
10+
use Magento\SemanticVersionCheckr\Helper\ClassParser;
1011
use PhpParser\Node;
1112
use PhpParser\Node\Stmt\Class_;
1213
use PhpParser\Node\Stmt\ClassLike;
@@ -48,26 +49,26 @@ public function __construct($context = null, $fileBefore = null, $fileAfter = nu
4849
$this->fileAfter = $fileAfter;
4950
}
5051

51-
public function analyze($contextBefore, $contextAfter)
52+
public function analyze($registryBefore, $registryAfter)
5253
{
5354
$report = new Report();
5455

55-
$beforeNameMap = $this->getNodeNameMap($contextBefore);
56-
$afterNameMap = $this->getNodeNameMap($contextAfter);
56+
$beforeNameMap = $this->getNodeNameMap($registryBefore);
57+
$afterNameMap = $this->getNodeNameMap($registryAfter);
5758

5859
$namesBefore = array_keys($beforeNameMap);
5960
$namesAfter = array_keys($afterNameMap);
6061
$added = array_diff($namesAfter, $namesBefore);
6162
$removed = array_diff($namesBefore, $namesAfter);
6263
$toVerify = array_intersect($namesBefore, $namesAfter);
6364

64-
$this->reportAdded($report, $contextAfter, $added);
65-
$this->reportMovedOrRemoved($report, $contextBefore, $contextAfter, $removed);
65+
$this->reportAdded($report, $registryAfter, $added);
66+
$this->reportMovedOrRemoved($report, $registryBefore, $registryAfter, $removed);
6667

6768
$this->reportChanged(
6869
$report,
69-
$contextBefore,
70-
$contextAfter,
70+
$registryBefore,
71+
$registryAfter,
7172
$toVerify
7273
);
7374

‎src/Analyzer/Analyzer.php‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,31 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

7-
namespace Magento\SemanticVersionChecker\Analyzer;
8+
namespace Magento\SemanticVersionCheckr\Analyzer;
89

9-
use Magento\SemanticVersionChecker\DbSchemaReport;
10+
use Magento\SemanticVersionCheckr\DbSchemaReport;
1011
use PHPSemVerChecker\Registry\Registry;
1112
use PHPSemVerChecker\Report\Report;
1213

1314
class Analyzer implements AnalyzerInterface
1415
{
16+
17+
/**
18+
* @var array|AnalyzerInterface[]
19+
*/
20+
private $analyzers;
21+
22+
/**
23+
* Analyzer constructor.
24+
* @param AnalyzerInterface[] $analyzers
25+
*/
26+
public function __construct(array $analyzers)
27+
{
28+
$this->analyzers = $analyzers;
29+
}
30+
1531
/**
1632
* Compare with a destination registry (what the new source code is like).
1733
*
@@ -24,15 +40,7 @@ public function analyze($registryBefore, $registryAfter)
2440
$finalReport = new DbSchemaReport();
2541

2642
/** @var AnalyzerInterface[] */
27-
$analyzers = [
28-
new ClassAnalyzer(),
29-
new InterfaceAnalyzer(),
30-
new DbSchemaAnalyzer(),
31-
new DbSchemaWhitelistAnalyzer(),
32-
new DbSchemaWhitelistReductionAnalyzer()
33-
];
34-
35-
foreach ($analyzers as $analyzer) {
43+
foreach ($this->analyzers as $analyzer) {
3644
$report = $analyzer->analyze($registryBefore, $registryAfter);
3745
$finalReport->merge($report);
3846
}

‎src/Analyzer/AnalyzerInterface.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,26 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

7-
namespace Magento\SemanticVersionChecker\Analyzer;
8+
namespace Magento\SemanticVersionCheckr\Analyzer;
89

910
use PhpParser\Node\Stmt;
1011
use PHPSemVerChecker\Registry\Registry;
1112
use PHPSemVerChecker\Report\Report;
1213

14+
/**
15+
* Defines an interface for analyzer.
16+
* Analyzer performs comparison of and creates report.
17+
*/
1318
interface AnalyzerInterface
1419
{
1520
/**
16-
* Compare with a destination registry (what the new source code is like).
21+
* Compare with a destination registry (what the new source code is like)
1722
*
1823
* @param Registry|Stmt $registryBefore
1924
* @param Registry|Stmt $registryAfter
25+
*
2026
* @return Report
2127
*/
2228
public function analyze($registryBefore, $registryAfter);

‎src/Analyzer/ApiMembership/ApiMembershipAnalyzer.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

7-
namespace Magento\SemanticVersionChecker\Analyzer\ApiMembership;
8+
namespace Magento\SemanticVersionCheckr\Analyzer\ApiMembership;
89

910
use PHPSemVerChecker\Registry\Registry;
1011
use PHPSemVerChecker\Report\Report;

‎src/Analyzer/ApiMembership/ApiMembershipAnalyzerTrait.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

7-
namespace Magento\SemanticVersionChecker\Analyzer\ApiMembership;
8+
namespace Magento\SemanticVersionCheckr\Analyzer\ApiMembership;
89

910
use PhpParser\Node;
1011
use PHPSemVerChecker\Registry\Registry;
@@ -107,10 +108,11 @@ public function analyzeWithMembership($apiBefore, $apiAfter, $fullBefore, $fullA
107108
*
108109
* @param Registry $registryBefore
109110
* @param Registry $registryAfter
111+
*
110112
* @return void
111113
* @throws \BadMethodCallException
112114
*/
113-
public function analyze($registryBefore, $registryAfter)
115+
public function analyze($registryBefore, $registryAfter): void
114116
{
115117
throw new \BadMethodCallException('API Membership Analyzers use analyzeWithMembership() instead of analyze()');
116118
}

‎src/Analyzer/ApiMembership/ClassApiMembershipAnalyzer.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

7-
namespace Magento\SemanticVersionChecker\Analyzer\ApiMembership;
8+
namespace Magento\SemanticVersionCheckr\Analyzer\ApiMembership;
89

9-
use Magento\SemanticVersionChecker\Analyzer\ClassAnalyzer;
10+
use Magento\SemanticVersionCheckr\Analyzer\ClassAnalyzer;
1011
use PHPSemVerChecker\Registry\Registry;
1112

1213
/**

‎src/Analyzer/ApiMembership/ClassConstantApiMembershipAnalyzer.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

7-
namespace Magento\SemanticVersionChecker\Analyzer\ApiMembership;
8+
namespace Magento\SemanticVersionCheckr\Analyzer\ApiMembership;
89

9-
use Magento\SemanticVersionChecker\Analyzer\ClassConstantAnalyzer;
10+
use Magento\SemanticVersionCheckr\Analyzer\ClassConstantAnalyzer;
1011

1112
/**
1213
* Class constant analyzer.

‎src/Analyzer/ApiMembership/ClassMethodApiMembershipAnalyzer.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

7-
namespace Magento\SemanticVersionChecker\Analyzer\ApiMembership;
8+
namespace Magento\SemanticVersionCheckr\Analyzer\ApiMembership;
89

9-
use Magento\SemanticVersionChecker\Analyzer\ClassMethodAnalyzer;
10+
use Magento\SemanticVersionCheckr\Analyzer\ClassMethodAnalyzer;
1011

1112
/**
1213
* Class method analyzer with separate API membership report.

‎src/Analyzer/ApiMembership/InterfaceApiMembershipAnalyzer.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

7-
namespace Magento\SemanticVersionChecker\Analyzer\ApiMembership;
8+
namespace Magento\SemanticVersionCheckr\Analyzer\ApiMembership;
89

9-
use Magento\SemanticVersionChecker\Analyzer\InterfaceAnalyzer;
10+
use Magento\SemanticVersionCheckr\Analyzer\InterfaceAnalyzer;
1011
use PHPSemVerChecker\Registry\Registry;
1112

1213
/**

0 commit comments

Comments
 (0)