Skip to content

Commit 47c63fb

Browse files
committed
fix
1 parent 353d09b commit 47c63fb

9 files changed

Lines changed: 30 additions & 9 deletions

phpstan.neon.dist

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,6 @@ parameters:
3636
-
3737
message: '#^Instanceof between mysqli_result<array<string, int<-2147483648, 2147483647>\|string\|null>> and mysqli_result will always evaluate to true\.$#'
3838
path: src/DbSchema/SchemaHasherMysql.php
39+
-
40+
message: '#^Public property ".*::\$classMethods" is never used$#'
41+
path: src/Rules/*

src/Rules/DoctrineKeyValueStyleRule.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ final class DoctrineKeyValueStyleRule implements Rule
3333
/**
3434
* @var array<array{string, string, list<int>}>
3535
*/
36-
private array $classMethods;
36+
public array $classMethods;
3737

3838
private ReflectionProvider $reflectionProvider;
3939

src/Rules/SyntaxErrorInPreparedStatementMethodRule.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ final class SyntaxErrorInPreparedStatementMethodRule implements Rule
3131
/**
3232
* @var list<string>
3333
*/
34-
private array $classMethods;
34+
public array $classMethods;
3535

3636
private ReflectionProvider $reflectionProvider;
3737

src/Rules/SyntaxErrorInQueryMethodRule.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ final class SyntaxErrorInQueryMethodRule implements Rule
2424
/**
2525
* @var list<string>
2626
*/
27-
private array $classMethods;
27+
public array $classMethods;
2828

2929
private ReflectionProvider $reflectionProvider;
3030

tests/rules/DoctrineKeyValueStyleRuleStrictTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ protected function tearDown(): void
2727

2828
protected function getRule(): Rule
2929
{
30-
return self::getContainer()->getByType(DoctrineKeyValueStyleRule::class);
30+
$rule = self::getContainer()->getByType(DoctrineKeyValueStyleRule::class);
31+
$rule->classMethods[] = ['staabm\PHPStanDba\Tests\Fixture\Connection', 'assembleNoArrays', []];
32+
$rule->classMethods[] = ['staabm\PHPStanDba\Tests\Fixture\Connection', 'assembleOneArray', [1]];
33+
$rule->classMethods[] = ['staabm\PHPStanDba\Tests\Fixture\Connection', 'assembleTwoArrays', [1,2]];
34+
return $rule;
3135
}
3236

3337
public static function getAdditionalConfigFiles(): array

tests/rules/DoctrineKeyValueStyleRuleTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ class DoctrineKeyValueStyleRuleTest extends RuleTestCase
1515
{
1616
protected function getRule(): Rule
1717
{
18-
return self::getContainer()->getByType(DoctrineKeyValueStyleRule::class);
18+
$rule = self::getContainer()->getByType(DoctrineKeyValueStyleRule::class);
19+
$rule->classMethods[] = ['staabm\PHPStanDba\Tests\Fixture\Connection', 'assembleNoArrays', []];
20+
$rule->classMethods[] = ['staabm\PHPStanDba\Tests\Fixture\Connection', 'assembleOneArray', [1]];
21+
$rule->classMethods[] = ['staabm\PHPStanDba\Tests\Fixture\Connection', 'assembleTwoArrays', [1,2]];
22+
return $rule;
1923
}
2024

2125
public static function getAdditionalConfigFiles(): array

tests/rules/SyntaxErrorInPreparedStatementMethodRuleTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ class SyntaxErrorInPreparedStatementMethodRuleTest extends RuleTestCase
1818
{
1919
protected function getRule(): Rule
2020
{
21-
return self::getContainer()->getByType(SyntaxErrorInPreparedStatementMethodRule::class);
22-
}
21+
$rule = self::getContainer()->getByType(SyntaxErrorInPreparedStatementMethodRule::class);
22+
$rule->classMethods[] ='staabm\PHPStanDba\Tests\Fixture\Connection::preparedQuery';
23+
$rule->classMethods[] ='staabm\PHPStanDba\Tests\Fixture\PreparedStatement::__construct';
24+
$rule->classMethods[] ='staabm\PHPStanDba\Tests\Fixture\BaseQueryClass::doQuery';
25+
return $rule; }
2326

2427
public static function getAdditionalConfigFiles(): array
2528
{

tests/rules/SyntaxErrorInPreparedStatementMethodSubclassedRuleTest.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use staabm\PHPStanDba\QueryReflection\PdoMysqlQueryReflector;
1111
use staabm\PHPStanDba\QueryReflection\PdoPgSqlQueryReflector;
1212
use staabm\PHPStanDba\Rules\SyntaxErrorInPreparedStatementMethodRule;
13+
use staabm\PHPStanDba\Rules\SyntaxErrorInQueryMethodRule;
1314

1415
/**
1516
* @extends RuleTestCase<SyntaxErrorInPreparedStatementMethodRule>
@@ -18,7 +19,11 @@ class SyntaxErrorInPreparedStatementMethodSubclassedRuleTest extends RuleTestCas
1819
{
1920
protected function getRule(): Rule
2021
{
21-
return self::getContainer()->getByType(SyntaxErrorInPreparedStatementMethodRule::class);
22+
$rule = self::getContainer()->getByType(SyntaxErrorInPreparedStatementMethodRule::class);
23+
$rule->classMethods[] ='staabm\PHPStanDba\Tests\Fixture\Connection::preparedQuery';
24+
$rule->classMethods[] ='staabm\PHPStanDba\Tests\Fixture\PreparedStatement::__construct';
25+
$rule->classMethods[] ='staabm\PHPStanDba\Tests\Fixture\BaseQueryClass::doQuery';
26+
return $rule;
2227
}
2328

2429
public static function getAdditionalConfigFiles(): array

tests/rules/SyntaxErrorInQueryMethodSubclassedRuleTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ class SyntaxErrorInQueryMethodSubclassedRuleTest extends RuleTestCase
1818
{
1919
protected function getRule(): Rule
2020
{
21-
return self::getContainer()->getByType(SyntaxErrorInQueryMethodRule::class);
21+
$rule = self::getContainer()->getByType(SyntaxErrorInQueryMethodRule::class);
22+
$rule->classMethods[] = 'staabm\PHPStanDba\Tests\Fixture\BaseQueryClass::doQuery#0';
23+
return $rule;
2224
}
2325

2426
public static function getAdditionalConfigFiles(): array

0 commit comments

Comments
 (0)