Skip to content

Remove references to test-only classes from rules.neon #757

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 3 commits into from
May 6, 2025
Merged

Remove references to test-only classes from rules.neon #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
353d09b
Remove references to test-only classes from rules.neon
staabm May 6, 2025
47c63fb
fix
staabm May 6, 2025
2e54cce
fix
staabm May 6, 2025
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
7 changes: 0 additions & 7 deletions config/rules.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ services:
tags: [phpstan.rules.rule]
arguments:
classMethods:
- 'staabm\PHPStanDba\Tests\Fixture\Connection::preparedQuery'
- 'staabm\PHPStanDba\Tests\Fixture\PreparedStatement::__construct'
- 'staabm\PHPStanDba\Tests\Fixture\BaseQueryClass::doQuery'
- 'Doctrine\DBAL\Connection::executeQuery'
- 'Doctrine\DBAL\Connection::executeCacheQuery'
- 'Doctrine\DBAL\Connection::executeStatement'
Expand Down Expand Up @@ -45,7 +42,6 @@ services:
tags: [phpstan.rules.rule]
arguments:
classMethods:
- 'staabm\PHPStanDba\Tests\Fixture\BaseQueryClass::doQuery#0'
- 'PDO::query#0'
- 'PDO::prepare#0'
- 'mysqli::query#0'
Expand All @@ -67,9 +63,6 @@ services:
tags: [phpstan.rules.rule]
arguments:
classMethods:
- 'staabm\PHPStanDba\Tests\Fixture\Connection::assembleNoArrays'
- 'staabm\PHPStanDba\Tests\Fixture\Connection::assembleOneArray#1'
- 'staabm\PHPStanDba\Tests\Fixture\Connection::assembleTwoArrays#1,2'
- 'Doctrine\DBAL\Connection::insert#1'
- 'Doctrine\DBAL\Connection::delete#1'
- 'Doctrine\DBAL\Connection::update#1,2'
Expand Down
3 changes: 3 additions & 0 deletions phpstan.neon.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ parameters:
-
message: '#^Instanceof between mysqli_result<array<string, int<-2147483648, 2147483647>\|string\|null>> and mysqli_result will always evaluate to true\.$#'
path: src/DbSchema/SchemaHasherMysql.php
-
message: '#^Public property ".*::\$classMethods" is never used$#'
path: src/Rules/*
2 changes: 1 addition & 1 deletion src/Rules/DoctrineKeyValueStyleRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ final class DoctrineKeyValueStyleRule implements Rule
/**
* @var array<array{string, string, list<int>}>
*/
private array $classMethods;
public array $classMethods;

private ReflectionProvider $reflectionProvider;

Expand Down
2 changes: 1 addition & 1 deletion src/Rules/SyntaxErrorInPreparedStatementMethodRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ final class SyntaxErrorInPreparedStatementMethodRule implements Rule
/**
* @var list<string>
*/
private array $classMethods;
public array $classMethods;

private ReflectionProvider $reflectionProvider;

Expand Down
2 changes: 1 addition & 1 deletion src/Rules/SyntaxErrorInQueryMethodRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ final class SyntaxErrorInQueryMethodRule implements Rule
/**
* @var list<string>
*/
private array $classMethods;
public array $classMethods;

private ReflectionProvider $reflectionProvider;

Expand Down
6 changes: 5 additions & 1 deletion tests/rules/DoctrineKeyValueStyleRuleStrictTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ protected function tearDown(): void

protected function getRule(): Rule
{
return self::getContainer()->getByType(DoctrineKeyValueStyleRule::class);
$rule = self::getContainer()->getByType(DoctrineKeyValueStyleRule::class);
$rule->classMethods[] = ['staabm\PHPStanDba\Tests\Fixture\Connection', 'assembleNoArrays', []];
$rule->classMethods[] = ['staabm\PHPStanDba\Tests\Fixture\Connection', 'assembleOneArray', [1]];
$rule->classMethods[] = ['staabm\PHPStanDba\Tests\Fixture\Connection', 'assembleTwoArrays', [1, 2]];
return $rule;
}

public static function getAdditionalConfigFiles(): array
Expand Down
6 changes: 5 additions & 1 deletion tests/rules/DoctrineKeyValueStyleRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ class DoctrineKeyValueStyleRuleTest extends RuleTestCase
{
protected function getRule(): Rule
{
return self::getContainer()->getByType(DoctrineKeyValueStyleRule::class);
$rule = self::getContainer()->getByType(DoctrineKeyValueStyleRule::class);
$rule->classMethods[] = ['staabm\PHPStanDba\Tests\Fixture\Connection', 'assembleNoArrays', []];
$rule->classMethods[] = ['staabm\PHPStanDba\Tests\Fixture\Connection', 'assembleOneArray', [1]];
$rule->classMethods[] = ['staabm\PHPStanDba\Tests\Fixture\Connection', 'assembleTwoArrays', [1, 2]];
return $rule;
}

public static function getAdditionalConfigFiles(): array
Expand Down
5 changes: 4 additions & 1 deletion tests/rules/SyntaxErrorInPreparedStatementMethodRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ class SyntaxErrorInPreparedStatementMethodRuleTest extends RuleTestCase
{
protected function getRule(): Rule
{
return self::getContainer()->getByType(SyntaxErrorInPreparedStatementMethodRule::class);
$rule = self::getContainer()->getByType(SyntaxErrorInPreparedStatementMethodRule::class);
$rule->classMethods[] = 'staabm\PHPStanDba\Tests\Fixture\Connection::preparedQuery';
$rule->classMethods[] = 'staabm\PHPStanDba\Tests\Fixture\PreparedStatement::__construct';
return $rule;
}

public static function getAdditionalConfigFiles(): array
Expand Down
4 changes: 3 additions & 1 deletion tests/rules/SyntaxErrorInPreparedStatementMethodSubclassedRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ class SyntaxErrorInPreparedStatementMethodSubclassedRuleTest extends RuleTestCas
{
protected function getRule(): Rule
{
return self::getContainer()->getByType(SyntaxErrorInPreparedStatementMethodRule::class);
$rule = self::getContainer()->getByType(SyntaxErrorInPreparedStatementMethodRule::class);
$rule->classMethods[] = 'staabm\PHPStanDba\Tests\Fixture\BaseQueryClass::doQuery';
return $rule;
}

public static function getAdditionalConfigFiles(): array
Expand Down
4 changes: 3 additions & 1 deletion tests/rules/SyntaxErrorInQueryMethodSubclassedRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ class SyntaxErrorInQueryMethodSubclassedRuleTest extends RuleTestCase
{
protected function getRule(): Rule
{
return self::getContainer()->getByType(SyntaxErrorInQueryMethodRule::class);
$rule = self::getContainer()->getByType(SyntaxErrorInQueryMethodRule::class);
$rule->classMethods[] = 'staabm\PHPStanDba\Tests\Fixture\BaseQueryClass::doQuery#0';
return $rule;
}

public static function getAdditionalConfigFiles(): array
Expand Down