Skip to content
This repository was archived by the owner on Jul 6, 2024. It is now read-only.

Commit 36dfe0d

Browse files
author
Dominik Zogg
committed
use chubbyphp-dev-helper
1 parent b248567 commit 36dfe0d

Some content is hidden

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

51 files changed

+148
-193
lines changed

‎.php_cs‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,21 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
$finder = PhpCsFixer\Finder::create()
46
->files()
57
->name('*.php')
68
->in(__DIR__ . '/src')
79
->in(__DIR__ . '/tests')
810
;
911

12+
/** @var array $config */
13+
$config = require __DIR__ . '/vendor/chubbyphp/chubbyphp-dev-helper/phpcs.php';
14+
1015
return PhpCsFixer\Config::create()
11-
->setIndent(" ")
12-
->setLineEnding("\n")
13-
->setRules([
14-
'@DoctrineAnnotation' => true,
15-
'@PhpCsFixer' => true,
16-
'@Symfony' => true,
17-
'array_syntax' => ['syntax' => 'short'],
18-
'declare_strict_types' => true,
19-
'dir_constant' => true,
20-
'final_class' => true,
21-
'is_null' => true,
22-
'linebreak_after_opening_tag' => true,
23-
'list_syntax' => ['syntax' => 'short'],
24-
'method_chaining_indentation' => false,
25-
'no_php4_constructor' => true,
26-
'ordered_interfaces' => true,
27-
'php_unit_dedicate_assert_internal_type' => true,
28-
'php_unit_dedicate_assert' => true,
29-
'php_unit_expectation' => true,
30-
'php_unit_mock' => true,
31-
'php_unit_namespaced' => true,
32-
'php_unit_no_expectation_annotation' => true,
33-
'single_line_throw' => false,
34-
'ternary_to_null_coalescing' => true,
35-
'void_return' => true,
36-
])
37-
->setRiskyAllowed(true)
16+
->setIndent($config['indent'])
17+
->setLineEnding($config['lineEnding'])
18+
->setRules($config['rules'])
19+
->setRiskyAllowed($config['riskyAllowed'])
3820
->setFinder($finder)
3921
;

‎composer.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@
2020
},
2121
"require-dev": {
2222
"chubbyphp/chubbyphp-container": "^1.0",
23+
"chubbyphp/chubbyphp-dev-helper": "dev-master",
2324
"chubbyphp/chubbyphp-mock": "^1.4.2",
24-
"friendsofphp/php-cs-fixer": "^2.16.1",
2525
"infection/infection": "^0.15",
2626
"mavimo/phpstan-junit": "^0.3",
27-
"nunomaduro/phpinsights": "^1.11.1",
2827
"php-coveralls/php-coveralls": "^2.2",
2928
"phploc/phploc": "^5.0",
3029
"phpstan/extension-installer": "^1.0.3",
@@ -60,7 +59,7 @@
6059
],
6160
"test:cs": "mkdir -p build && vendor/bin/php-cs-fixer fix --dry-run --stop-on-violation --cache-file=build/phpcs.cache",
6261
"test:infection": "vendor/bin/infection --threads=$(nproc) --min-msi=100 --verbose --coverage=build/phpunit",
63-
"test:insights": "mkdir -p build && bash -c 'vendor/bin/phpinsights analyse -v --no-interaction --min-quality=94 --disable-security-check | tee build/phpinsights.log; if [ ${PIPESTATUS[0]} -ne \"0\" ]; then exit 1; fi'",
62+
"test:insights": "mkdir -p build && bash -c 'vendor/bin/phpinsights analyse -v --no-interaction --min-quality=95 --disable-security-check | tee build/phpinsights.log; if [ ${PIPESTATUS[0]} -ne \"0\" ]; then exit 1; fi'",
6463
"test:integration": "vendor/bin/phpunit --testsuite=Integration --cache-result-file=build/phpunit/result.cache",
6564
"test:lint": "mkdir -p build && find src tests -name '*.php' -print0 | xargs -0 -n1 -P$(nproc) php -l | tee build/phplint.log",
6665
"test:loc": "mkdir -p build && vendor/bin/phploc src --verbose | tee build/phploc.log",

‎phpinsights.php‎

Lines changed: 3 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2,60 +2,7 @@
22

33
declare(strict_types=1);
44

5-
use NunoMaduro\PhpInsights\Domain\Insights\CyclomaticComplexityIsHigh;
6-
use NunoMaduro\PhpInsights\Domain\Sniffs\ForbiddenSetterSniff;
7-
use ObjectCalisthenics\Sniffs\Files\FunctionLengthSniff;
8-
use ObjectCalisthenics\Sniffs\Metrics\MaxNestingLevelSniff;
9-
use ObjectCalisthenics\Sniffs\Metrics\MethodPerClassLimitSniff;
10-
use PHP_CodeSniffer\Standards\Generic\Sniffs\Arrays\ArrayIndentSniff;
11-
use PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\UselessOverridingMethodSniff;
12-
use PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff;
13-
use PHP_CodeSniffer\Standards\Generic\Sniffs\Formatting\SpaceAfterNotSniff;
14-
use PHP_CodeSniffer\Standards\Generic\Sniffs\Strings\UnnecessaryStringConcatSniff;
15-
use SlevomatCodingStandard\Sniffs\Classes\SuperfluousAbstractClassNamingSniff;
16-
use SlevomatCodingStandard\Sniffs\Classes\SuperfluousExceptionNamingSniff;
17-
use SlevomatCodingStandard\Sniffs\Classes\SuperfluousInterfaceNamingSniff;
18-
use SlevomatCodingStandard\Sniffs\Classes\SuperfluousTraitNamingSniff;
19-
use SlevomatCodingStandard\Sniffs\ControlStructures\AssignmentInConditionSniff;
20-
use SlevomatCodingStandard\Sniffs\ControlStructures\DisallowYodaComparisonSniff;
21-
use SlevomatCodingStandard\Sniffs\Namespaces\UnusedUsesSniff;
5+
/** @var array $config */
6+
$config = require __DIR__ . '/vendor/chubbyphp/chubbyphp-dev-helper/phpinsights.php';
227

23-
return [
24-
'preset' => 'default',
25-
'exclude' => [],
26-
'add' => [],
27-
'remove' => [
28-
ArrayIndentSniff::class,
29-
AssignmentInConditionSniff::class,
30-
DisallowYodaComparisonSniff::class,
31-
ForbiddenSetterSniff::class,
32-
SpaceAfterNotSniff::class,
33-
SuperfluousAbstractClassNamingSniff::class,
34-
SuperfluousExceptionNamingSniff::class,
35-
SuperfluousInterfaceNamingSniff::class,
36-
SuperfluousTraitNamingSniff::class,
37-
UnnecessaryStringConcatSniff::class,
38-
UselessOverridingMethodSniff::class, // cause visibility change on expections __construct,
39-
],
40-
'config' => [
41-
CyclomaticComplexityIsHigh::class => [
42-
'maxComplexity' => 15,
43-
],
44-
FunctionLengthSniff::class => [
45-
'maxLength' => 30,
46-
],
47-
LineLengthSniff::class => [
48-
'lineLimit' => 120,
49-
'absoluteLineLimit' => 120,
50-
],
51-
MaxNestingLevelSniff::class => [
52-
'maxNestingLevel' => 5,
53-
],
54-
MethodPerClassLimitSniff::class => [
55-
'maxCount' => 20,
56-
],
57-
UnusedUsesSniff::class => [
58-
'searchAnnotations' => true,
59-
],
60-
],
61-
];
8+
return $config;

‎src/ApiProblem/AbstractApiProblem.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public function __construct(
3535
string $type,
3636
int $status,
3737
string $title,
38-
string $detail = null,
39-
string $instance = null
38+
?string $detail = null,
39+
?string $instance = null
4040
) {
4141
$this->type = $type;
4242
$this->status = $status;

‎src/ApiProblem/ClientError/BadRequest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
final class BadRequest extends AbstractApiProblem
1010
{
1111
/**
12-
* @var array<int, array>
12+
* @var array<int, array<mixed>>
1313
*/
1414
private $invalidParameters = [];
1515

1616
/**
17-
* @param array<int, array> $invalidParameters
17+
* @param array<int, array<mixed>> $invalidParameters
1818
*/
19-
public function __construct(array $invalidParameters, string $detail = null, string $instance = null)
19+
public function __construct(array $invalidParameters, ?string $detail = null, ?string $instance = null)
2020
{
2121
parent::__construct(
2222
'https://tools.ietf.org/html/rfc2616#section-10.4.1',
@@ -30,7 +30,7 @@ public function __construct(array $invalidParameters, string $detail = null, str
3030
}
3131

3232
/**
33-
* @return array<int, array>
33+
* @return array<int, array<mixed>>
3434
*/
3535
public function getInvalidParameters(): array
3636
{

‎src/ApiProblem/ClientError/Conflict.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
final class Conflict extends AbstractApiProblem
1010
{
11-
public function __construct(string $detail = null, string $instance = null)
11+
public function __construct(?string $detail = null, ?string $instance = null)
1212
{
1313
parent::__construct(
1414
'https://tools.ietf.org/html/rfc2616#section-10.4.10',

‎src/ApiProblem/ClientError/ExpectationFailed.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ final class ExpectationFailed extends AbstractApiProblem
1616
/**
1717
* @param array<int, string> $failedExpectations
1818
*/
19-
public function __construct(array $failedExpectations, string $detail = null, string $instance = null)
19+
public function __construct(array $failedExpectations, ?string $detail = null, ?string $instance = null)
2020
{
2121
parent::__construct(
2222
'https://tools.ietf.org/html/rfc2616#section-10.4.18',

‎src/ApiProblem/ClientError/FailedDependency.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
final class FailedDependency extends AbstractApiProblem
1010
{
11-
public function __construct(string $detail = null, string $instance = null)
11+
public function __construct(?string $detail = null, ?string $instance = null)
1212
{
1313
parent::__construct(
1414
'https://tools.ietf.org/html/rfc4918#section-11.4',

‎src/ApiProblem/ClientError/Forbidden.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
final class Forbidden extends AbstractApiProblem
1010
{
11-
public function __construct(string $detail = null, string $instance = null)
11+
public function __construct(?string $detail = null, ?string $instance = null)
1212
{
1313
parent::__construct(
1414
'https://tools.ietf.org/html/rfc2616#section-10.4.4',

‎src/ApiProblem/ClientError/Gone.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
final class Gone extends AbstractApiProblem
1010
{
11-
public function __construct(string $detail = null, string $instance = null)
11+
public function __construct(?string $detail = null, ?string $instance = null)
1212
{
1313
parent::__construct(
1414
'https://tools.ietf.org/html/rfc2616#section-10.4.11',

0 commit comments

Comments
 (0)