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

Commit

Permalink
use chubbyphp-dev-helper
Browse files Browse the repository at this point in the history
  • Loading branch information
dominikzogg committed Feb 2, 2020
1 parent b248567 commit 36dfe0d
Show file tree
Hide file tree
Showing 51 changed files with 148 additions and 193 deletions.
36 changes: 9 additions & 27 deletions .php_cs
Original file line number Diff line number Diff line change
@@ -1,39 +1,21 @@
<?php

declare(strict_types=1);

$finder = PhpCsFixer\Finder::create()
->files()
->name('*.php')
->in(__DIR__ . '/src')
->in(__DIR__ . '/tests')
;

/** @var array $config */
$config = require __DIR__ . '/vendor/chubbyphp/chubbyphp-dev-helper/phpcs.php';

return PhpCsFixer\Config::create()
->setIndent(" ")
->setLineEnding("\n")
->setRules([
'@DoctrineAnnotation' => true,
'@PhpCsFixer' => true,
'@Symfony' => true,
'array_syntax' => ['syntax' => 'short'],
'declare_strict_types' => true,
'dir_constant' => true,
'final_class' => true,
'is_null' => true,
'linebreak_after_opening_tag' => true,
'list_syntax' => ['syntax' => 'short'],
'method_chaining_indentation' => false,
'no_php4_constructor' => true,
'ordered_interfaces' => true,
'php_unit_dedicate_assert_internal_type' => true,
'php_unit_dedicate_assert' => true,
'php_unit_expectation' => true,
'php_unit_mock' => true,
'php_unit_namespaced' => true,
'php_unit_no_expectation_annotation' => true,
'single_line_throw' => false,
'ternary_to_null_coalescing' => true,
'void_return' => true,
])
->setRiskyAllowed(true)
->setIndent($config['indent'])
->setLineEnding($config['lineEnding'])
->setRules($config['rules'])
->setRiskyAllowed($config['riskyAllowed'])
->setFinder($finder)
;
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@
},
"require-dev": {
"chubbyphp/chubbyphp-container": "^1.0",
"chubbyphp/chubbyphp-dev-helper": "dev-master",
"chubbyphp/chubbyphp-mock": "^1.4.2",
"friendsofphp/php-cs-fixer": "^2.16.1",
"infection/infection": "^0.15",
"mavimo/phpstan-junit": "^0.3",
"nunomaduro/phpinsights": "^1.11.1",
"php-coveralls/php-coveralls": "^2.2",
"phploc/phploc": "^5.0",
"phpstan/extension-installer": "^1.0.3",
Expand Down Expand Up @@ -60,7 +59,7 @@
],
"test:cs": "mkdir -p build && vendor/bin/php-cs-fixer fix --dry-run --stop-on-violation --cache-file=build/phpcs.cache",
"test:infection": "vendor/bin/infection --threads=$(nproc) --min-msi=100 --verbose --coverage=build/phpunit",
"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'",
"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'",
"test:integration": "vendor/bin/phpunit --testsuite=Integration --cache-result-file=build/phpunit/result.cache",
"test:lint": "mkdir -p build && find src tests -name '*.php' -print0 | xargs -0 -n1 -P$(nproc) php -l | tee build/phplint.log",
"test:loc": "mkdir -p build && vendor/bin/phploc src --verbose | tee build/phploc.log",
Expand Down
59 changes: 3 additions & 56 deletions phpinsights.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,60 +2,7 @@

declare(strict_types=1);

use NunoMaduro\PhpInsights\Domain\Insights\CyclomaticComplexityIsHigh;
use NunoMaduro\PhpInsights\Domain\Sniffs\ForbiddenSetterSniff;
use ObjectCalisthenics\Sniffs\Files\FunctionLengthSniff;
use ObjectCalisthenics\Sniffs\Metrics\MaxNestingLevelSniff;
use ObjectCalisthenics\Sniffs\Metrics\MethodPerClassLimitSniff;
use PHP_CodeSniffer\Standards\Generic\Sniffs\Arrays\ArrayIndentSniff;
use PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\UselessOverridingMethodSniff;
use PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff;
use PHP_CodeSniffer\Standards\Generic\Sniffs\Formatting\SpaceAfterNotSniff;
use PHP_CodeSniffer\Standards\Generic\Sniffs\Strings\UnnecessaryStringConcatSniff;
use SlevomatCodingStandard\Sniffs\Classes\SuperfluousAbstractClassNamingSniff;
use SlevomatCodingStandard\Sniffs\Classes\SuperfluousExceptionNamingSniff;
use SlevomatCodingStandard\Sniffs\Classes\SuperfluousInterfaceNamingSniff;
use SlevomatCodingStandard\Sniffs\Classes\SuperfluousTraitNamingSniff;
use SlevomatCodingStandard\Sniffs\ControlStructures\AssignmentInConditionSniff;
use SlevomatCodingStandard\Sniffs\ControlStructures\DisallowYodaComparisonSniff;
use SlevomatCodingStandard\Sniffs\Namespaces\UnusedUsesSniff;
/** @var array $config */
$config = require __DIR__ . '/vendor/chubbyphp/chubbyphp-dev-helper/phpinsights.php';

return [
'preset' => 'default',
'exclude' => [],
'add' => [],
'remove' => [
ArrayIndentSniff::class,
AssignmentInConditionSniff::class,
DisallowYodaComparisonSniff::class,
ForbiddenSetterSniff::class,
SpaceAfterNotSniff::class,
SuperfluousAbstractClassNamingSniff::class,
SuperfluousExceptionNamingSniff::class,
SuperfluousInterfaceNamingSniff::class,
SuperfluousTraitNamingSniff::class,
UnnecessaryStringConcatSniff::class,
UselessOverridingMethodSniff::class, // cause visibility change on expections __construct,
],
'config' => [
CyclomaticComplexityIsHigh::class => [
'maxComplexity' => 15,
],
FunctionLengthSniff::class => [
'maxLength' => 30,
],
LineLengthSniff::class => [
'lineLimit' => 120,
'absoluteLineLimit' => 120,
],
MaxNestingLevelSniff::class => [
'maxNestingLevel' => 5,
],
MethodPerClassLimitSniff::class => [
'maxCount' => 20,
],
UnusedUsesSniff::class => [
'searchAnnotations' => true,
],
],
];
return $config;
4 changes: 2 additions & 2 deletions src/ApiProblem/AbstractApiProblem.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public function __construct(
string $type,
int $status,
string $title,
string $detail = null,
string $instance = null
?string $detail = null,
?string $instance = null
) {
$this->type = $type;
$this->status = $status;
Expand Down
8 changes: 4 additions & 4 deletions src/ApiProblem/ClientError/BadRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
final class BadRequest extends AbstractApiProblem
{
/**
* @var array<int, array>
* @var array<int, array<mixed>>
*/
private $invalidParameters = [];

/**
* @param array<int, array> $invalidParameters
* @param array<int, array<mixed>> $invalidParameters
*/
public function __construct(array $invalidParameters, string $detail = null, string $instance = null)
public function __construct(array $invalidParameters, ?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.1',
Expand All @@ -30,7 +30,7 @@ public function __construct(array $invalidParameters, string $detail = null, str
}

/**
* @return array<int, array>
* @return array<int, array<mixed>>
*/
public function getInvalidParameters(): array
{
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ClientError/Conflict.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

final class Conflict extends AbstractApiProblem
{
public function __construct(string $detail = null, string $instance = null)
public function __construct(?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.10',
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ClientError/ExpectationFailed.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ final class ExpectationFailed extends AbstractApiProblem
/**
* @param array<int, string> $failedExpectations
*/
public function __construct(array $failedExpectations, string $detail = null, string $instance = null)
public function __construct(array $failedExpectations, ?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.18',
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ClientError/FailedDependency.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

final class FailedDependency extends AbstractApiProblem
{
public function __construct(string $detail = null, string $instance = null)
public function __construct(?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc4918#section-11.4',
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ClientError/Forbidden.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

final class Forbidden extends AbstractApiProblem
{
public function __construct(string $detail = null, string $instance = null)
public function __construct(?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.4',
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ClientError/Gone.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

final class Gone extends AbstractApiProblem
{
public function __construct(string $detail = null, string $instance = null)
public function __construct(?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.11',
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ClientError/LengthRequired.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

final class LengthRequired extends AbstractApiProblem
{
public function __construct(string $detail = null, string $instance = null)
public function __construct(?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.12',
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ClientError/Locked.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

final class Locked extends AbstractApiProblem
{
public function __construct(string $detail = null, string $instance = null)
public function __construct(?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc4918#section-11.3',
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ClientError/MethodNotAllowed.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ final class MethodNotAllowed extends AbstractApiProblem
* @param string $method,
* @param array<int, string> $allowedMethods
*/
public function __construct(string $method, array $allowedMethods, string $detail = null, string $instance = null)
public function __construct(string $method, array $allowedMethods, ?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.6',
Expand Down
4 changes: 2 additions & 2 deletions src/ApiProblem/ClientError/NotAcceptable.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ final class NotAcceptable extends AbstractApiProblem
public function __construct(
string $accept,
array $acceptables,
string $detail = null,
string $instance = null
?string $detail = null,
?string $instance = null
) {
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.7',
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ClientError/NotFound.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

final class NotFound extends AbstractApiProblem
{
public function __construct(string $detail = null, string $instance = null)
public function __construct(?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.5',
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ClientError/PaymentRequired.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ final class PaymentRequired extends AbstractApiProblem
/**
* @param array<int, string> $paymentTypes
*/
public function __construct(array $paymentTypes, string $detail = null, string $instance = null)
public function __construct(array $paymentTypes, ?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.3',
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ClientError/PreconditionFailed.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ final class PreconditionFailed extends AbstractApiProblem
/**
* @param array<int, string> $failedPreconditions
*/
public function __construct(array $failedPreconditions, string $detail = null, string $instance = null)
public function __construct(array $failedPreconditions, ?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.13',
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ClientError/ProxyAuthenticationRequired.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

final class ProxyAuthenticationRequired extends AbstractApiProblem
{
public function __construct(string $detail = null, string $instance = null)
public function __construct(?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.8',
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ClientError/RequestEntityTooLarge.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ final class RequestEntityTooLarge extends AbstractApiProblem
*/
private $maxContentLength;

public function __construct(int $maxContentLength, string $detail = null, string $instance = null)
public function __construct(int $maxContentLength, ?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.14',
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ClientError/RequestTimeout.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

final class RequestTimeout extends AbstractApiProblem
{
public function __construct(string $detail = null, string $instance = null)
public function __construct(?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.9',
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ClientError/RequestUriTooLong.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ final class RequestUriTooLong extends AbstractApiProblem
*/
private $maxUriLength;

public function __construct(int $maxUriLength, string $detail = null, string $instance = null)
public function __construct(int $maxUriLength, ?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.15',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

final class RequestedRangeNotSatisfiable extends AbstractApiProblem
{
public function __construct(string $detail = null, string $instance = null)
public function __construct(?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.17',
Expand Down
4 changes: 2 additions & 2 deletions src/ApiProblem/ClientError/Unauthorized.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ final class Unauthorized extends AbstractApiProblem
public function __construct(
string $authorization,
array $authorizationTypes,
string $detail = null,
string $instance = null
?string $detail = null,
?string $instance = null
) {
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.2',
Expand Down
8 changes: 4 additions & 4 deletions src/ApiProblem/ClientError/UnprocessableEntity.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
final class UnprocessableEntity extends AbstractApiProblem
{
/**
* @var array<int, array>
* @var array<int, array<mixed>>
*/
private $invalidParameters = [];

/**
* @param array<int, array> $invalidParameters
* @param array<int, array<mixed>> $invalidParameters
*/
public function __construct(array $invalidParameters, string $detail = null, string $instance = null)
public function __construct(array $invalidParameters, ?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc4918#section-11.2',
Expand All @@ -30,7 +30,7 @@ public function __construct(array $invalidParameters, string $detail = null, str
}

/**
* @return array<int, array>
* @return array<int, array<mixed>>
*/
public function getInvalidParameters(): array
{
Expand Down
4 changes: 2 additions & 2 deletions src/ApiProblem/ClientError/UnsupportedMediaType.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ final class UnsupportedMediaType extends AbstractApiProblem
public function __construct(
string $mediaType,
array $supportedMediaTypes,
string $detail = null,
string $instance = null
?string $detail = null,
?string $instance = null
) {
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.4.16',
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ServerError/BadGateway.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

final class BadGateway extends AbstractApiProblem
{
public function __construct(string $detail = null, string $instance = null)
public function __construct(?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.5.3',
Expand Down
2 changes: 1 addition & 1 deletion src/ApiProblem/ServerError/GatewayTimeout.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

final class GatewayTimeout extends AbstractApiProblem
{
public function __construct(string $detail = null, string $instance = null)
public function __construct(?string $detail = null, ?string $instance = null)
{
parent::__construct(
'https://tools.ietf.org/html/rfc2616#section-10.5.5',
Expand Down
Loading

0 comments on commit 36dfe0d

Please sign in to comment.