Skip to content

ci: Fix strict types sniff #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 19, 2024
Merged

ci: Fix strict types sniff #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2bcb394
ci: Fix strict types sniff
tomasnorre Nov 12, 2024
5739507
Properly comply with PHPCS naming conventions
jrfnl Nov 15, 2024
448baf4
ExplainStrictTypesSniff: use proper error code
jrfnl Nov 15, 2024
212c487
PHPCS config: include sniff from installed standard by name
jrfnl Nov 15, 2024
ed8d16a
Merge pull request #2 from jrfnl/feature/fix-sniff-namingconventions-…
tomasnorre Nov 15, 2024
26c3b3a
update squizlabs/php_codesniffer dependency
tomasnorre Nov 18, 2024
836a54f
Update namespace + composer autoload
tomasnorre Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "exercism/php",
"autoload": {
"Exercism\\": "src",
"Exercism\\Sniffs\\": "src/Exercism/Sniffs",
"Exercism\\Exercises\\": "exercises"
},
"config": {
Expand All @@ -13,7 +13,7 @@
"php": "^8.1",
"phpunit/phpunit": "^10.5",
"slevomat/coding-standard": "^8.14.1",
"squizlabs/php_codesniffer": "^3.9"
"squizlabs/php_codesniffer": "^3.11.1"
},
"scripts": {
"post-install-cmd": [
Expand Down
4 changes: 2 additions & 2 deletions phpcs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<exclude-pattern>*/concept/city-office/*</exclude-pattern>
<exclude-pattern>*/concept/windowing-system/*</exclude-pattern>
</rule>
<rule ref="vendor/slevomat/coding-standard/SlevomatCodingStandard/Sniffs/TypeHints/DeclareStrictTypesSniff.php">
<rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
<exclude-pattern>*/.meta/*\.php</exclude-pattern>
<exclude-pattern>*/concept/*</exclude-pattern>
<exclude-pattern>*/hello-world/*</exclude-pattern>
Expand All @@ -44,7 +44,7 @@
<property name="spacesCountAroundEqualsSign" value="0" />
</properties>
</rule>
<rule ref="src/Sniffs/ExplainStrictTypesSniff.php">
<rule ref="src/Exercism/Sniffs/StrictTypes/ExplainStrictTypesSniff.php">
<exclude-pattern>*/*Test\.php</exclude-pattern>
<exclude-pattern>*/.meta/*\.php</exclude-pattern>
<exclude-pattern>src/*</exclude-pattern>
Expand Down
12 changes: 6 additions & 6 deletions src/Sniffs/ExplainStrictTypesSniff.php → ...s/StrictTypes/ExplainStrictTypesSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Exercism\Sniffs;
namespace Exercism\Sniffs\StrictTypes;

use PHP_CodeSniffer\Files\File;
use PHP_CodeSniffer\Fixer;
Expand Down Expand Up @@ -48,16 +48,16 @@ public function register(): array
];
}

public function process(File $file, $stackPtr)
public function process(File $phpcsFile, $stackPtr): void
{
$this->fixer = $file->fixer;
$this->fixer = $phpcsFile->fixer;
$this->position = $stackPtr;

if (!$file->findPrevious($this->tokens, $stackPtr)) {
$file->addFixableError(
if (!$phpcsFile->findPrevious($this->tokens, $stackPtr)) {
$phpcsFile->addFixableError(
'Missing explanation of declaration of strict types.',
$stackPtr - 1,
self::class
'Missing'
);
$this->fix();
}
Expand Down