Skip to content

Commit 2ca75a4

Browse files
SpomkySpomky
authored
CI/CD update (#443)
Fix CI/CD
1 parent 7761778 commit 2ca75a4

File tree

75 files changed

+2738
-698
lines changed

Some content is hidden

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

75 files changed

+2738
-698
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
/Makefile export-ignore
1616
/phpbench.json export-ignore
1717
/phpstan.neon export-ignore
18+
/phpstan-baseline.neon export-ignore
1819
/phpunit.xml.dist export-ignore
1920
/rector.php export-ignore

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mu: vendor ## Mutation tests
2-
vendor/bin/infection -s --threads=$$(nproc) --min-msi=40 --min-covered-msi=40
2+
vendor/bin/infection -s --threads=$$(nproc) --min-msi=45 --min-covered-msi=60
33

44
tests: vendor ## Run all tests
55
vendor/bin/phpunit --color
@@ -26,7 +26,7 @@ st: vendor ## Run static analyse
2626
################################################
2727

2828
ci-mu: vendor ## Mutation tests (for Github only)
29-
vendor/bin/infection --logger-github -s --threads=$$(nproc) --min-msi=40 --min-covered-msi=40
29+
vendor/bin/infection --logger-github -s --threads=$$(nproc) --min-msi=45 --min-covered-msi=60
3030

3131
ci-cc: vendor ## Show test coverage rates (console)
3232
vendor/bin/phpunit --coverage-text

‎composer.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,22 @@
7676
"ext-curl": "*",
7777
"ext-gmp": "*",
7878
"bjeavons/zxcvbn-php": "^1.3",
79-
"blackfire/php-sdk": "^1.31",
79+
"blackfire/php-sdk": "^2.0",
8080
"ekino/phpstan-banned-code": "^1.0",
81-
"infection/infection": "^0.26",
81+
"infection/infection": "^0.27",
8282
"matthiasnoback/symfony-config-test": "^4.3.0",
8383
"nyholm/psr7": "^1.5",
8484
"php-http/mock-client": "^1.5",
8585
"php-parallel-lint/php-parallel-lint": "^1.3",
8686
"phpbench/phpbench": "^1.2",
87+
"phpstan/extension-installer": "^1.3",
8788
"phpstan/phpstan": "^1.8",
8889
"phpstan/phpstan-deprecation-rules": "^1.0",
8990
"phpstan/phpstan-phpunit": "^1.1",
9091
"phpstan/phpstan-strict-rules": "^1.4",
9192
"phpunit/phpunit": "^9.5.23",
9293
"qossmic/deptrac-shim": "^1.0",
93-
"rector/rector": "^0.15",
94+
"rector/rector": "^0.16",
9495
"roave/security-advisories": "dev-latest",
9596
"symfony/browser-kit": "^6.1.3",
9697
"symfony/finder": "^5.4|^6.0",
@@ -147,8 +148,8 @@
147148
"allow-plugins": {
148149
"infection/extension-installer": true,
149150
"composer/package-versions-deprecated": true,
150-
"phpstan/extension-installer": false,
151-
"php-http/discovery": false
151+
"phpstan/extension-installer": true,
152+
"php-http/discovery": true
152153
}
153154
}
154155
}

‎ecs.php‎

Lines changed: 47 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -46,62 +46,53 @@
4646
$config->import(SetList::NAMESPACES);
4747
$config->import(SetList::STRICT);
4848

49-
$services = $config->services();
50-
$services->set(StrictParamFixer::class);
51-
$services->set(StrictComparisonFixer::class);
52-
$services->set(ArraySyntaxFixer::class)
53-
->call('configure', [[
54-
'syntax' => 'short',
55-
]])
56-
;
57-
$services->set(ArrayIndentationFixer::class);
58-
$services->set(OrderedImportsFixer::class);
59-
$services->set(ProtectedToPrivateFixer::class);
60-
$services->set(DeclareStrictTypesFixer::class);
61-
$services->set(NativeConstantInvocationFixer::class);
62-
$services->set(NativeFunctionInvocationFixer::class)
63-
->call('configure', [[
64-
'include' => ['@compiler_optimized'],
65-
'scope' => 'namespaced',
66-
'strict' => true,
67-
]])
68-
;
69-
$services->set(MbStrFunctionsFixer::class);
70-
$services->set(LinebreakAfterOpeningTagFixer::class);
71-
$services->set(CombineConsecutiveIssetsFixer::class);
72-
$services->set(CombineConsecutiveUnsetsFixer::class);
73-
$services->set(CompactNullableTypehintFixer::class);
74-
$services->set(NoSuperfluousElseifFixer::class);
75-
$services->set(NoSuperfluousPhpdocTagsFixer::class);
76-
$services->set(PhpdocTrimConsecutiveBlankLineSeparationFixer::class);
77-
$services->set(PhpdocOrderFixer::class);
78-
$services->set(SimplifiedNullReturnFixer::class);
79-
$services->set(HeaderCommentFixer::class)
80-
->call('configure', [[
81-
'header' => $header,
82-
]])
83-
;
84-
$services->set(AlignMultilineCommentFixer::class)
85-
->call('configure', [[
86-
'comment_type' => 'all_multiline',
87-
]])
88-
;
89-
$services->set(PhpUnitTestAnnotationFixer::class)
90-
->call('configure', [[
91-
'style' => 'annotation',
92-
]])
93-
;
94-
$services->set(PhpUnitTestCaseStaticMethodCallsFixer::class);
95-
$services->set(GlobalNamespaceImportFixer::class)
96-
->call('configure', [[
97-
'import_classes' => true,
98-
'import_constants' => true,
99-
'import_functions' => true,
100-
]])
101-
;
49+
$config->rule(StrictParamFixer::class);
50+
$config->rule(StrictComparisonFixer::class);
51+
$config->rule(ArrayIndentationFixer::class);
52+
$config->rule(OrderedImportsFixer::class);
53+
$config->rule(ProtectedToPrivateFixer::class);
54+
$config->rule(DeclareStrictTypesFixer::class);
55+
$config->rule(NativeConstantInvocationFixer::class);
56+
$config->rule(MbStrFunctionsFixer::class);
57+
$config->rule(LinebreakAfterOpeningTagFixer::class);
58+
$config->rule(CombineConsecutiveIssetsFixer::class);
59+
$config->rule(CombineConsecutiveUnsetsFixer::class);
60+
$config->rule(CompactNullableTypehintFixer::class);
61+
$config->rule(NoSuperfluousElseifFixer::class);
62+
$config->rule(NoSuperfluousPhpdocTagsFixer::class);
63+
$config->rule(PhpdocTrimConsecutiveBlankLineSeparationFixer::class);
64+
$config->rule(PhpdocOrderFixer::class);
65+
$config->rule(SimplifiedNullReturnFixer::class);
66+
$config->rule(PhpUnitTestCaseStaticMethodCallsFixer::class);
67+
$config->ruleWithConfiguration(ArraySyntaxFixer::class, [
68+
'syntax' => 'short',
69+
]);
70+
$config->ruleWithConfiguration(NativeFunctionInvocationFixer::class, [
71+
'include' => ['@compiler_optimized'],
72+
'scope' => 'namespaced',
73+
'strict' => true,
74+
]);
75+
$config->ruleWithConfiguration(HeaderCommentFixer::class, [
76+
'header' => $header,
77+
]);
78+
$config->ruleWithConfiguration(AlignMultilineCommentFixer::class, [
79+
'comment_type' => 'all_multiline',
80+
]);
81+
$config->ruleWithConfiguration(PhpUnitTestAnnotationFixer::class, [
82+
'style' => 'annotation',
83+
]);
84+
$config->ruleWithConfiguration(GlobalNamespaceImportFixer::class, [
85+
'import_classes' => true,
86+
'import_constants' => true,
87+
'import_functions' => true,
88+
]);
10289

103-
$services->remove(PhpUnitTestClassRequiresCoversFixer::class);
90+
$config->services()
91+
->remove(PhpUnitTestClassRequiresCoversFixer::class);
10492
$config->parallel();
105-
$config->paths([__DIR__]);
106-
$config->skip([__DIR__ . '/.github', __DIR__ . '/var', __DIR__ . '/vendor']);
93+
$config->paths([
94+
__DIR__ . '/performance',
95+
__DIR__ . '/src',
96+
__DIR__ . '/tests',
97+
]);
10798
};

0 commit comments

Comments
 (0)