Skip to content

Commit 6bf8b87

Browse files
tomzxtomzx
committed
Code style pass.
1 parent 931d81f commit 6bf8b87

Some content is hidden

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

54 files changed

+154
-130
lines changed

‎src/PHPSemVerChecker/Analyzer/Analyzer.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
use PHPSemVerChecker\Registry\Registry;
66
use PHPSemVerChecker\Report\Report;
77

8-
class Analyzer {
8+
class Analyzer
9+
{
910
/**
1011
* Compare with a destination registry (what the new source code is like).
1112
*

‎src/PHPSemVerChecker/Analyzer/ClassAnalyzer.php‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
namespace PHPSemVerChecker\Analyzer;
44

55
use PHPSemVerChecker\Operation\ClassAdded;
6-
use PHPSemVerChecker\Operation\ClassRemoved;
76
use PHPSemVerChecker\Operation\ClassCaseChanged;
7+
use PHPSemVerChecker\Operation\ClassRemoved;
88
use PHPSemVerChecker\Registry\Registry;
99
use PHPSemVerChecker\Report\Report;
1010

11-
class ClassAnalyzer {
11+
class ClassAnalyzer
12+
{
1213
/**
1314
* @var string
1415
*/
@@ -28,16 +29,14 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
2829

2930
$classesBeforeKeyed = [];
3031
$filesBeforeKeyed = [];
31-
foreach($classesBefore as $key => $classBefore)
32-
{
32+
foreach ($classesBefore as $key => $classBefore) {
3333
$classesBeforeKeyed[strtolower($classBefore->name)] = $classBefore;
3434
$filesBeforeKeyed[strtolower($classBefore->name)] = $registryBefore->mapping['class'][$key];
3535
}
3636

3737
$classesAfterKeyed = [];
3838
$filesAfterKeyed = [];
39-
foreach($classesAfter as $key => $classAfter)
40-
{
39+
foreach ($classesAfter as $key => $classAfter) {
4140
$classesAfterKeyed[strtolower($classAfter->name)] = $classAfter;
4241
$filesAfterKeyed[strtolower($classAfter->name)] = $registryAfter->mapping['class'][$key];
4342
}
@@ -66,7 +65,6 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
6665

6766
// Leave non-strict comparison here
6867
if ($classBefore != $classAfter) {
69-
7068
// Check for case change of class name.
7169
// If we entered this section then the normalized names (lowercase) were equal.
7270
if ($classBefore->name !== $classAfter->name) {

‎src/PHPSemVerChecker/Analyzer/ClassMethodAnalyzer.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use PHPSemVerChecker\Comparator\Implementation;
77
use PHPSemVerChecker\Comparator\Signature;
88
use PHPSemVerChecker\Operation\ClassMethodAdded;
9+
use PHPSemVerChecker\Operation\ClassMethodCaseChanged;
910
use PHPSemVerChecker\Operation\ClassMethodImplementationChanged;
1011
use PHPSemVerChecker\Operation\ClassMethodOperationUnary;
1112
use PHPSemVerChecker\Operation\ClassMethodParameterAdded;
@@ -17,10 +18,10 @@
1718
use PHPSemVerChecker\Operation\ClassMethodParameterTypingAdded;
1819
use PHPSemVerChecker\Operation\ClassMethodParameterTypingRemoved;
1920
use PHPSemVerChecker\Operation\ClassMethodRemoved;
20-
use PHPSemVerChecker\Operation\ClassMethodCaseChanged;
2121
use PHPSemVerChecker\Report\Report;
2222

23-
class ClassMethodAnalyzer {
23+
class ClassMethodAnalyzer
24+
{
2425
/**
2526
* @var string
2627
*/
@@ -91,7 +92,6 @@ public function analyze(Stmt $contextBefore, Stmt $contextAfter)
9192

9293
// Leave non-strict comparison here
9394
if ($methodBefore != $methodAfter) {
94-
9595
// Detect method case changed.
9696
// If we entered this section then the normalized names (lowercase) were equal.
9797
if ($methodBefore->name !== $methodAfter->name) {
@@ -112,13 +112,13 @@ public function analyze(Stmt $contextBefore, Stmt $contextAfter)
112112
$signatureResult = Signature::analyze($methodBefore->getParams(), $methodAfter->getParams());
113113

114114
$changes = [
115-
'parameter_added' => ClassMethodParameterAdded::class,
116-
'parameter_removed' => ClassMethodParameterRemoved::class,
117-
'parameter_renamed' => ClassMethodParameterNameChanged::class,
118-
'parameter_typing_added' => ClassMethodParameterTypingAdded::class,
119-
'parameter_typing_removed' => ClassMethodParameterTypingRemoved::class,
120-
'parameter_default_added' => ClassMethodParameterDefaultAdded::class,
121-
'parameter_default_removed' => ClassMethodParameterDefaultRemoved::class,
115+
'parameter_added' => ClassMethodParameterAdded::class,
116+
'parameter_removed' => ClassMethodParameterRemoved::class,
117+
'parameter_renamed' => ClassMethodParameterNameChanged::class,
118+
'parameter_typing_added' => ClassMethodParameterTypingAdded::class,
119+
'parameter_typing_removed' => ClassMethodParameterTypingRemoved::class,
120+
'parameter_default_added' => ClassMethodParameterDefaultAdded::class,
121+
'parameter_default_removed' => ClassMethodParameterDefaultRemoved::class,
122122
'parameter_default_value_changed' => ClassMethodParameterDefaultValueChanged::class,
123123
];
124124

@@ -144,7 +144,7 @@ public function analyze(Stmt $contextBefore, Stmt $contextAfter)
144144

145145
// Difference in source code
146146
// Cast to array because interfaces do not have stmts (= null)
147-
if (!Implementation::isSame((array)$methodBefore->stmts, (array)$methodAfter->stmts)) {
147+
if ( ! Implementation::isSame((array)$methodBefore->stmts, (array)$methodAfter->stmts)) {
148148
$data = new ClassMethodImplementationChanged(
149149
$this->context,
150150
$this->fileBefore,

‎src/PHPSemVerChecker/Analyzer/FunctionAnalyzer.php‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use PHPSemVerChecker\Comparator\Implementation;
66
use PHPSemVerChecker\Comparator\Signature;
77
use PHPSemVerChecker\Operation\FunctionAdded;
8+
use PHPSemVerChecker\Operation\FunctionCaseChanged;
89
use PHPSemVerChecker\Operation\FunctionImplementationChanged;
910
use PHPSemVerChecker\Operation\FunctionOperationUnary;
1011
use PHPSemVerChecker\Operation\FunctionParameterAdded;
@@ -17,11 +18,11 @@
1718
use PHPSemVerChecker\Operation\FunctionParameterTypingAdded;
1819
use PHPSemVerChecker\Operation\FunctionParameterTypingRemoved;
1920
use PHPSemVerChecker\Operation\FunctionRemoved;
20-
use PHPSemVerChecker\Operation\FunctionCaseChanged;
2121
use PHPSemVerChecker\Registry\Registry;
2222
use PHPSemVerChecker\Report\Report;
2323

24-
class FunctionAnalyzer {
24+
class FunctionAnalyzer
25+
{
2526
/**
2627
* @var string
2728
*/
@@ -36,22 +37,19 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
3637
{
3738
$report = new Report();
3839

39-
4040
$functionsBefore = $registryBefore->data['function'];
4141
$functionsAfter = $registryAfter->data['function'];
4242

4343
$functionsBeforeKeyed = [];
4444
$filesBeforeKeyed = [];
45-
foreach($functionsBefore as $key => $functionBefore)
46-
{
45+
foreach ($functionsBefore as $key => $functionBefore) {
4746
$functionsBeforeKeyed[strtolower($functionBefore->name)] = $functionBefore;
4847
$filesBeforeKeyed[strtolower($functionBefore->name)] = $registryBefore->mapping['function'][$key];
4948
}
5049

5150
$functionsAfterKeyed = [];
5251
$filesAfterKeyed = [];
53-
foreach($functionsAfter as $key => $functionAfter)
54-
{
52+
foreach ($functionsAfter as $key => $functionAfter) {
5553
$functionsAfterKeyed[strtolower($functionAfter->name)] = $functionAfter;
5654
$filesAfterKeyed[strtolower($functionAfter->name)] = $registryAfter->mapping['function'][$key];
5755
}
@@ -78,8 +76,7 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
7876

7977
// Leave non-strict comparison here
8078
if ($functionBefore != $functionAfter) {
81-
82-
// Check if the name of the interface has changed case.
79+
// Check if the name of the function has changed case.
8380
// If we entered this section then the normalized names (lowercase) were equal.
8481
if ($functionBefore->name !== $functionAfter->name) {
8582
$report->addFunction(
@@ -95,13 +92,13 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
9592
$signatureResult = Signature::analyze($functionBefore->getParams(), $functionAfter->getParams());
9693

9794
$changes = [
98-
'parameter_added' => FunctionParameterAdded::class,
99-
'parameter_removed' => FunctionParameterRemoved::class,
100-
'parameter_renamed' => FunctionParameterNameChanged::class,
101-
'parameter_typing_added' => FunctionParameterTypingAdded::class,
102-
'parameter_typing_removed' => FunctionParameterTypingRemoved::class,
103-
'parameter_default_added' => FunctionParameterDefaultAdded::class,
104-
'parameter_default_removed' => FunctionParameterDefaultRemoved::class,
95+
'parameter_added' => FunctionParameterAdded::class,
96+
'parameter_removed' => FunctionParameterRemoved::class,
97+
'parameter_renamed' => FunctionParameterNameChanged::class,
98+
'parameter_typing_added' => FunctionParameterTypingAdded::class,
99+
'parameter_typing_removed' => FunctionParameterTypingRemoved::class,
100+
'parameter_default_added' => FunctionParameterDefaultAdded::class,
101+
'parameter_default_removed' => FunctionParameterDefaultRemoved::class,
105102
'parameter_default_value_changed' => FunctionParameterDefaultValueChanged::class,
106103
];
107104

‎src/PHPSemVerChecker/Analyzer/InterfaceAnalyzer.php‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
namespace PHPSemVerChecker\Analyzer;
44

55
use PHPSemVerChecker\Operation\InterfaceAdded;
6-
use PHPSemVerChecker\Operation\InterfaceRemoved;
76
use PHPSemVerChecker\Operation\InterfaceCaseChanged;
7+
use PHPSemVerChecker\Operation\InterfaceRemoved;
88
use PHPSemVerChecker\Registry\Registry;
99
use PHPSemVerChecker\Report\Report;
1010

11-
class InterfaceAnalyzer {
11+
class InterfaceAnalyzer
12+
{
1213
/**
1314
* @var string
1415
*/
@@ -28,16 +29,14 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
2829

2930
$interfacesBeforeKeyed = [];
3031
$filesBeforeKeyed = [];
31-
foreach($interfacesBefore as $key => $interfaceBefore)
32-
{
32+
foreach ($interfacesBefore as $key => $interfaceBefore) {
3333
$interfacesBeforeKeyed[strtolower($interfaceBefore->name)] = $interfaceBefore;
3434
$filesBeforeKeyed[strtolower($interfaceBefore->name)] = $registryBefore->mapping['interface'][$key];
3535
}
3636

3737
$interfacesAfterKeyed = [];
3838
$filesAfterKeyed = [];
39-
foreach($interfacesAfter as $key => $interfaceAfter)
40-
{
39+
foreach ($interfacesAfter as $key => $interfaceAfter) {
4140
$interfacesAfterKeyed[strtolower($interfaceAfter->name)] = $interfaceAfter;
4241
$filesAfterKeyed[strtolower($interfaceAfter->name)] = $registryAfter->mapping['interface'][$key];
4342
}
@@ -66,7 +65,6 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
6665

6766
// Leave non-strict comparison here
6867
if ($interfaceBefore != $interfaceAfter) {
69-
7068
// Check if the name of the interface has changed case.
7169
// If we entered this section then the normalized names (lowercase) were equal.
7270
if ($interfaceBefore->name !== $interfaceAfter->name) {

‎src/PHPSemVerChecker/Analyzer/PropertyAnalyzer.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
use PHPSemVerChecker\Operation\PropertyRemoved;
99
use PHPSemVerChecker\Report\Report;
1010

11-
class PropertyAnalyzer {
11+
class PropertyAnalyzer
12+
{
1213
/**
1314
* @var string
1415
*/

‎src/PHPSemVerChecker/Analyzer/TraitAnalyzer.php‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
namespace PHPSemVerChecker\Analyzer;
44

55
use PHPSemVerChecker\Operation\TraitAdded;
6-
use PHPSemVerChecker\Operation\TraitRemoved;
76
use PHPSemVerChecker\Operation\TraitCaseChanged;
7+
use PHPSemVerChecker\Operation\TraitRemoved;
88
use PHPSemVerChecker\Registry\Registry;
99
use PHPSemVerChecker\Report\Report;
1010

11-
class TraitAnalyzer {
11+
class TraitAnalyzer
12+
{
1213
/**
1314
* @var string
1415
*/
@@ -28,16 +29,14 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
2829

2930
$traitsBeforeKeyed = [];
3031
$filesBeforeKeyed = [];
31-
foreach($traitsBefore as $key => $traitBefore)
32-
{
32+
foreach ($traitsBefore as $key => $traitBefore) {
3333
$traitsBeforeKeyed[strtolower($traitBefore->name)] = $traitBefore;
3434
$filesBeforeKeyed[strtolower($traitBefore->name)] = $registryBefore->mapping['trait'][$key];
3535
}
3636

3737
$traitsAfterKeyed = [];
3838
$filesAfterKeyed = [];
39-
foreach($traitsAfter as $key => $traitAfter)
40-
{
39+
foreach ($traitsAfter as $key => $traitAfter) {
4140
$traitsAfterKeyed[strtolower($traitAfter->name)] = $traitAfter;
4241
$filesAfterKeyed[strtolower($traitAfter->name)] = $registryAfter->mapping['trait'][$key];
4342
}
@@ -64,7 +63,6 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
6463

6564
// Leave non-strict comparison here
6665
if ($traitBefore != $traitAfter) {
67-
6866
// Check for name case change.
6967
// If we entered this section then the normalized names (lowercase) were equal.
7068
if ($traitBefore->name !== $traitAfter->name) {

‎src/PHPSemVerChecker/Comparator/Signature.php‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
namespace PHPSemVerChecker\Comparator;
44

5-
class Signature {
5+
class Signature
6+
{
67
/**
78
* @param array $parametersA
89
* @param array $parametersB
@@ -11,13 +12,13 @@ class Signature {
1112
public static function analyze(array $parametersA, array $parametersB)
1213
{
1314
$changes = [
14-
'parameter_added' => false,
15-
'parameter_removed' => false,
16-
'parameter_renamed' => false,
17-
'parameter_typing_added' => false,
18-
'parameter_typing_removed' => false,
19-
'parameter_default_added' => false,
20-
'parameter_default_removed' => false,
15+
'parameter_added' => false,
16+
'parameter_removed' => false,
17+
'parameter_renamed' => false,
18+
'parameter_typing_added' => false,
19+
'parameter_typing_removed' => false,
20+
'parameter_default_added' => false,
21+
'parameter_default_removed' => false,
2122
'parameter_default_value_changed' => false,
2223
];
2324
$lengthA = count($parametersA);
@@ -39,8 +40,8 @@ public static function analyze(array $parametersA, array $parametersB)
3940

4041
// Type checking
4142
if (Type::get($parametersA[$i]->type) !== Type::get($parametersB[$i]->type)) {
42-
// if ($paramsA[$i]->default !== null && $paramsB[$i]->default !== null) {
43-
// $changes['parameter_default_value_changed'] = true;
43+
//if ($paramsA[$i]->default !== null && $paramsB[$i]->default !== null) {
44+
// $changes['parameter_default_value_changed'] = true;
4445
if ($parametersA[$i]->type !== null) {
4546
$changes['parameter_typing_removed'] = true;
4647
}
@@ -56,7 +57,7 @@ public static function analyze(array $parametersA, array $parametersB)
5657
$changes['parameter_default_removed'] = true;
5758
} elseif ($parametersA[$i]->default === null && $parametersB[$i]->default !== null) {
5859
$changes['parameter_default_added'] = true;
59-
// TODO(tom@tomrochette.com): Not all nodes have a value property
60+
// TODO(tom@tomrochette.com): Not all nodes have a value property
6061
} elseif ( ! Node::isEqual($parametersA[$i]->default, $parametersB[$i]->default)) {
6162
$changes['parameter_default_value_changed'] = true;
6263
}

‎src/PHPSemVerChecker/Comparator/Type.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
namespace PHPSemVerChecker\Comparator;
44

5-
class Type {
5+
class Type
6+
{
67
/**
78
* @param \PhpParser\Node\Name|string|null $typeA
89
* @param \PhpParser\Node\Name|string|null $typeB

‎src/PHPSemVerChecker/Configuration/Configuration.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public static function fromFile($file)
4343
*/
4444
public static function defaults($name)
4545
{
46-
return self::fromFile(['?'.$name.'.yml.dist', '?'.$name.'.yml']);
46+
return self::fromFile(['?' . $name . '.yml.dist', '?' . $name . '.yml']);
4747
}
4848

4949
/**
@@ -67,7 +67,7 @@ public function getLevelMapping()
6767

6868
/**
6969
* @see \Noodlehaus\Config::get
70-
* @param string $key
70+
* @param string $key
7171
* @param mixed|null $default
7272
* @return array|mixed|null
7373
*/
@@ -79,7 +79,7 @@ public function get($key, $default = null)
7979
/**
8080
* @see \Noodlehaus\Config::set
8181
* @param string $key
82-
* @param mixed $value
82+
* @param mixed $value
8383
*/
8484
public function set($key, $value)
8585
{

0 commit comments

Comments
 (0)