Skip to content

Commit 38ad6eb

Browse files
committed
Migrate to PHPCS 4.0
1 parent 681c62b commit 38ad6eb

File tree

9 files changed

+31
-14
lines changed

9 files changed

+31
-14
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?php declare(strict_types=1);
2+
3+
namespace IxDFCodingStandard\Helpers;
4+
5+
/** Created based on \SlevomatCodingStandard\Helpers to have a SSoT for this internal API */
6+
final class ClassHelper extends \SlevomatCodingStandard\Helpers\ClassHelper
7+
{
8+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?php declare(strict_types=1);
2+
3+
namespace IxDFCodingStandard\Helpers;
4+
5+
/** Created based on \SlevomatCodingStandard\Helpers to have a SSoT for this internal API */
6+
final class TokenHelper extends \SlevomatCodingStandard\Helpers\TokenHelper
7+
{
8+
}

IxDFCodingStandard/Sniffs/Classes/ForbidMethodDeclarationSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace IxDFCodingStandard\Sniffs\Classes;
44

5+
use IxDFCodingStandard\Helpers\ClassHelper;
56
use PHP_CodeSniffer\Files\File;
67
use PHP_CodeSniffer\Sniffs\Sniff;
7-
use SlevomatCodingStandard\Helpers\ClassHelper;
88

99
final class ForbidMethodDeclarationSniff implements Sniff
1010
{

IxDFCodingStandard/Sniffs/Functions/MissingOptionalArgumentSniff.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace IxDFCodingStandard\Sniffs\Functions;
44

5+
use IxDFCodingStandard\Helpers\TokenHelper;
56
use PHP_CodeSniffer\Files\File;
67
use PHP_CodeSniffer\Sniffs\Sniff;
78
use PHP_CodeSniffer\Util\Tokens;
8-
use SlevomatCodingStandard\Helpers\TokenHelper;
99

1010
/** Inspired by {@see \SlevomatCodingStandard\Sniffs\Functions\StrictCallSniff}. */
1111
final class MissingOptionalArgumentSniff implements Sniff
@@ -21,7 +21,7 @@ final class MissingOptionalArgumentSniff implements Sniff
2121
/** @return array<int, (int|string)> */
2222
public function register(): array
2323
{
24-
return TokenHelper::ONLY_NAME_TOKEN_CODES;
24+
return TokenHelper::NAME_TOKEN_CODES;
2525
}
2626

2727
/** @inheritDoc */

IxDFCodingStandard/Sniffs/Laravel/BladeTemplateExtractor.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use BadMethodCallException;
66

7+
/** phpcs:disable IxDFCodingStandard.Laravel.NonExistingBladeTemplate.TemplateNotFound */
78
final class BladeTemplateExtractor
89
{
910
private const INVALID_METHOD_CALL = 'Invalid method call';
@@ -53,7 +54,7 @@ public function getBladeTemplateName(string $tokenContent): string
5354
throw new BadMethodCallException(self::INVALID_METHOD_CALL);
5455
}
5556

56-
return (string) $matches[2];
57+
return $matches[2];
5758
}
5859

5960
public function getConditionalBladeTemplateName(string $tokenContent): string
@@ -69,7 +70,7 @@ public function getConditionalBladeTemplateName(string $tokenContent): string
6970
throw new BadMethodCallException(self::INVALID_METHOD_CALL);
7071
}
7172

72-
return (string) $matches[2];
73+
return $matches[2];
7374
}
7475

7576
public function getEachBladeTemplateName(string $tokenContent): string
@@ -85,7 +86,7 @@ public function getEachBladeTemplateName(string $tokenContent): string
8586
throw new BadMethodCallException(self::INVALID_METHOD_CALL);
8687
}
8788

88-
return (string) $matches[1];
89+
return $matches[1];
8990
}
9091

9192
public function getFirstBladeTemplateName(string $tokenContent): string
@@ -101,6 +102,6 @@ public function getFirstBladeTemplateName(string $tokenContent): string
101102
throw new BadMethodCallException(self::INVALID_METHOD_CALL);
102103
}
103104

104-
return (string) $matches[2];
105+
return $matches[2];
105106
}
106107
}

IxDFCodingStandard/Sniffs/Laravel/DisallowGuardedAttributeSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace IxDFCodingStandard\Sniffs\Laravel;
44

5+
use IxDFCodingStandard\Helpers\ClassHelper;
56
use PHP_CodeSniffer\Files\File;
67
use PHP_CodeSniffer\Sniffs\AbstractScopeSniff;
7-
use SlevomatCodingStandard\Helpers\ClassHelper;
88

99
final class DisallowGuardedAttributeSniff extends AbstractScopeSniff
1010
{

IxDFCodingStandard/Sniffs/Laravel/NonExistingBladeTemplateSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function register(): array
4646
}
4747

4848
/** @inheritDoc */
49-
public function process(File $phpcsFile, $stackPtr): int // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded, SlevomatCodingStandard.Complexity.Cognitive.ComplexityTooHigh
49+
public function process(File $phpcsFile, $stackPtr): int // phpcs:ignore SlevomatCodingStandard.Complexity.Cognitive.ComplexityTooHigh
5050
{
5151
$filename = $phpcsFile->getFilename();
5252

IxDFCodingStandard/Sniffs/Laravel/RequireCustomAbortMessageSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function register(): array
3030
}
3131

3232
/** @param int $functionPointer */
33-
public function process(File $phpcsFile, $functionPointer): void // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded, SlevomatCodingStandard.Functions.FunctionLength.FunctionLength, SlevomatCodingStandard.Files.FunctionLength.FunctionLength, SlevomatCodingStandard.Complexity.Cognitive.ComplexityTooHigh
33+
public function process(File $phpcsFile, $functionPointer): void // phpcs:ignore SlevomatCodingStandard.Complexity.Cognitive.ComplexityTooHigh,SlevomatCodingStandard.Functions.FunctionLength.FunctionLength
3434
{
3535
$tokens = $phpcsFile->getTokens();
3636

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
"require": {
77
"php": "^8.2",
88
"dealerdirect/phpcodesniffer-composer-installer": "^1.0",
9-
"slevomat/coding-standard": "^8.22",
10-
"squizlabs/php_codesniffer": "^3.13"
9+
"slevomat/coding-standard": "^8.23",
10+
"squizlabs/php_codesniffer": "^4.0"
1111
},
1212
"require-dev": {
1313
"friendsofphp/php-cs-fixer": "^3.87",
14-
"phpunit/phpunit": "^11 || ^12",
15-
"vimeo/psalm": "^6.12"
14+
"phpunit/phpunit": "^12.3",
15+
"vimeo/psalm": "^6.13"
1616
},
1717
"minimum-stability": "dev",
1818
"prefer-stable": true,

0 commit comments

Comments
 (0)