Skip to content

Commit f2cfb7e

Browse files
simPodsimPod
committed
Test cover and refactor
1 parent 71672c3 commit f2cfb7e

File tree

3 files changed

+186
-60
lines changed

3 files changed

+186
-60
lines changed

‎src/Provider/PhpBenchUsageProvider.php‎

Lines changed: 82 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
use ShipMonk\PHPStan\DeadCode\Graph\ClassMethodRef;
1717
use ShipMonk\PHPStan\DeadCode\Graph\ClassMethodUsage;
1818
use ShipMonk\PHPStan\DeadCode\Graph\UsageOrigin;
19-
use function array_map;
2019
use function array_merge;
2120
use function explode;
2221
use function in_array;
2322
use function is_array;
2423
use function is_string;
24+
use function preg_match;
2525
use function sprintf;
2626
use function strpos;
2727
use function substr;
@@ -81,15 +81,26 @@ public function getUsages(
8181
);
8282
}
8383

84+
$beforeAfterMethodsFromAttributes = array_merge(
85+
$this->getMethodNamesFromAttribute($method, BeforeMethods::class),
86+
$this->getMethodNamesFromAttribute($method, AfterMethods::class),
87+
);
88+
89+
foreach ($beforeAfterMethodsFromAttributes as $beforeAfterMethod) {
90+
$usages[] = $this->createUsage(
91+
$className,
92+
$beforeAfterMethod,
93+
sprintf('Before/After method, used by %s', $methodName),
94+
);
95+
}
96+
8497
if ($this->isBenchmarkMethod($method)) {
8598
$usages[] = $this->createUsage($className, $methodName, 'Benchmark method');
8699
}
87100

88-
if (!$this->isBeforeOrAfterMethod($method, $className)) {
89-
continue;
101+
if ($this->isBeforeOrAfterMethod($method, $className)) {
102+
$usages[] = $this->createUsage($className, $methodName, 'Before/After method');
90103
}
91-
92-
$usages[] = $this->createUsage($className, $methodName, 'Before/After method');
93104
}
94105

95106
return $usages;
@@ -100,6 +111,32 @@ private function isBenchmarkMethod(ReflectionMethod $method): bool
100111
return strpos($method->getName(), 'bench') === 0;
101112
}
102113

114+
/**
115+
* @return list<string>
116+
*/
117+
private function getMethodNamesFromAttribute(
118+
ReflectionMethod $method,
119+
string $attributeClass
120+
): array
121+
{
122+
$result = [];
123+
124+
foreach ($method->getAttributes($attributeClass) as $attribute) {
125+
$methods = $attribute->getArguments()[0] ?? $attribute->getArguments()['methods'] ?? [];
126+
if (!is_array($methods)) {
127+
$methods = [$methods];
128+
}
129+
130+
foreach ($methods as $methodName) {
131+
if (is_string($methodName)) {
132+
$result[] = $methodName;
133+
}
134+
}
135+
}
136+
137+
return $result;
138+
}
139+
103140
private function isBeforeOrAfterMethod(
104141
ReflectionMethod $method,
105142
string $className
@@ -108,7 +145,7 @@ private function isBeforeOrAfterMethod(
108145
$classReflection = $method->getDeclaringClass();
109146
$methodName = $method->getName();
110147

111-
// Check annotations
148+
// Check class-level annotations
112149
$docComment = $classReflection->getDocComment();
113150
if ($docComment !== false) {
114151
$beforeMethodsFromAnnotations = $this->getBeforeMethodsFromAnnotations($docComment);
@@ -119,7 +156,7 @@ private function isBeforeOrAfterMethod(
119156
}
120157
}
121158

122-
// Check attributes
159+
// Check class-level attributes
123160
foreach ($classReflection->getAttributes(BeforeMethods::class) as $attribute) {
124161
$methods = $attribute->getArguments()[0] ?? $attribute->getArguments()['methods'] ?? [];
125162
if (!is_array($methods)) {
@@ -153,9 +190,12 @@ private function isBeforeOrAfterMethod(
153190
* @param false|string $rawPhpDoc
154191
* @return list<string>
155192
*/
156-
private function getParamProvidersFromAnnotations($rawPhpDoc): array
193+
private function getMethodNamesFromAnnotation(
194+
$rawPhpDoc,
195+
string $annotationName
196+
): array
157197
{
158-
if ($rawPhpDoc === false || strpos($rawPhpDoc, '@ParamProviders') === false) {
198+
if ($rawPhpDoc === false || strpos($rawPhpDoc, $annotationName) === false) {
159199
return [];
160200
}
161201

@@ -164,15 +204,30 @@ private function getParamProvidersFromAnnotations($rawPhpDoc): array
164204

165205
$result = [];
166206

167-
foreach ($phpDoc->getTagsByName('@ParamProviders') as $tag) {
207+
foreach ($phpDoc->getTagsByName($annotationName) as $tag) {
168208
$value = (string) $tag->value;
169-
// Parse the value which could be like "provideData" or {"provideData", "provideMore"}
170-
// For simplicity, we'll extract method names from the string
171-
// This is a basic implementation - PhpBench uses simple format like @ParamProviders({"provideData"})
172-
$value = trim($value, '{}()');
173-
$methods = array_map('trim', explode(',', $value));
209+
210+
// Extract content from parentheses: @BeforeMethods("setUp") -> "setUp"
211+
// or @BeforeMethods({"setUp", "tearDown"}) -> {"setUp", "tearDown"}
212+
if (preg_match('/\((.+)\)\s*$/', $value, $matches)) {
213+
$value = $matches[1];
214+
}
215+
216+
$value = trim($value);
217+
$value = trim($value, '"\'');
218+
219+
// If it's a single method name, add it directly
220+
if (strpos($value, ',') === false && strpos($value, '{') === false) {
221+
$result[] = $value;
222+
continue;
223+
}
224+
225+
// Handle array format: {"method1", "method2"}
226+
$value = trim($value, '{}');
227+
$methods = explode(',', $value);
174228
foreach ($methods as $method) {
175-
$method = trim($method, '\'" ');
229+
$method = trim($method);
230+
$method = trim($method, '"\'');
176231
if ($method !== '') {
177232
$result[] = $method;
178233
}
@@ -182,6 +237,15 @@ private function getParamProvidersFromAnnotations($rawPhpDoc): array
182237
return $result;
183238
}
184239

240+
/**
241+
* @param false|string $rawPhpDoc
242+
* @return list<string>
243+
*/
244+
private function getParamProvidersFromAnnotations($rawPhpDoc): array
245+
{
246+
return $this->getMethodNamesFromAnnotation($rawPhpDoc, '@ParamProviders');
247+
}
248+
185249
/** @return list<string> */
186250
private function getParamProvidersFromAttributes(ReflectionMethod $method): array
187251
{
@@ -214,28 +278,7 @@ private function getParamProvidersFromAttributes(ReflectionMethod $method): arra
214278
*/
215279
private function getBeforeMethodsFromAnnotations($rawPhpDoc): array
216280
{
217-
if ($rawPhpDoc === false || strpos($rawPhpDoc, '@BeforeMethods') === false) {
218-
return [];
219-
}
220-
221-
$tokens = new TokenIterator($this->lexer->tokenize($rawPhpDoc));
222-
$phpDoc = $this->phpDocParser->parse($tokens);
223-
224-
$result = [];
225-
226-
foreach ($phpDoc->getTagsByName('@BeforeMethods') as $tag) {
227-
$value = (string) $tag->value;
228-
$value = trim($value, '{}()');
229-
$methods = array_map('trim', explode(',', $value));
230-
foreach ($methods as $method) {
231-
$method = trim($method, '\'" ');
232-
if ($method !== '') {
233-
$result[] = $method;
234-
}
235-
}
236-
}
237-
238-
return $result;
281+
return $this->getMethodNamesFromAnnotation($rawPhpDoc, '@BeforeMethods');
239282
}
240283

241284
/**
@@ -244,28 +287,7 @@ private function getBeforeMethodsFromAnnotations($rawPhpDoc): array
244287
*/
245288
private function getAfterMethodsFromAnnotations($rawPhpDoc): array
246289
{
247-
if ($rawPhpDoc === false || strpos($rawPhpDoc, '@AfterMethods') === false) {
248-
return [];
249-
}
250-
251-
$tokens = new TokenIterator($this->lexer->tokenize($rawPhpDoc));
252-
$phpDoc = $this->phpDocParser->parse($tokens);
253-
254-
$result = [];
255-
256-
foreach ($phpDoc->getTagsByName('@AfterMethods') as $tag) {
257-
$value = (string) $tag->value;
258-
$value = trim($value, '{}()');
259-
$methods = array_map('trim', explode(',', $value));
260-
foreach ($methods as $method) {
261-
$method = trim($method, '\'" ');
262-
if ($method !== '') {
263-
$result[] = $method;
264-
}
265-
}
266-
}
267-
268-
return $result;
290+
return $this->getMethodNamesFromAnnotation($rawPhpDoc, '@AfterMethods');
269291
}
270292

271293
private function createUsage(

‎tests/Rule/DeadCodeRuleTest.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
use ShipMonk\PHPStan\DeadCode\Provider\EnumUsageProvider;
4343
use ShipMonk\PHPStan\DeadCode\Provider\MemberUsageProvider;
4444
use ShipMonk\PHPStan\DeadCode\Provider\NetteUsageProvider;
45+
use ShipMonk\PHPStan\DeadCode\Provider\PhpBenchUsageProvider;
4546
use ShipMonk\PHPStan\DeadCode\Provider\PhpStanUsageProvider;
4647
use ShipMonk\PHPStan\DeadCode\Provider\PhpUnitUsageProvider;
4748
use ShipMonk\PHPStan\DeadCode\Provider\ReflectionBasedMemberUsageProvider;
@@ -856,6 +857,7 @@ public static function provideFiles(): Traversable
856857
yield 'provider-symfony-7.1' => [__DIR__ . '/data/providers/symfony-gte71.php', self::requiresPhp(8_00_00) && self::requiresPackage('symfony/dependency-injection', '>= 7.1')];
857858
yield 'provider-twig' => [__DIR__ . '/data/providers/twig.php', self::requiresPhp(8_00_00)];
858859
yield 'provider-phpunit' => [__DIR__ . '/data/providers/phpunit.php', self::requiresPhp(8_00_00)];
860+
yield 'provider-phpbench' => [__DIR__ . '/data/providers/phpbench.php', self::requiresPhp(8_00_00)];
859861
yield 'provider-doctrine' => [__DIR__ . '/data/providers/doctrine.php', self::requiresPhp(8_01_00)];
860862
yield 'provider-phpstan' => [__DIR__ . '/data/providers/phpstan.php'];
861863
yield 'provider-nette' => [__DIR__ . '/data/providers/nette.php'];
@@ -991,6 +993,11 @@ private function getMemberUsageProviders(): array
991993
self::getContainer()->getByType(PhpDocParser::class),
992994
self::getContainer()->getByType(Lexer::class),
993995
),
996+
new PhpBenchUsageProvider(
997+
$this->providersEnabled,
998+
self::getContainer()->getByType(PhpDocParser::class),
999+
self::getContainer()->getByType(Lexer::class),
1000+
),
9941001
new DoctrineUsageProvider(
9951002
$this->providersEnabled,
9961003
),

‎tests/Rule/data/providers/phpbench.php‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<?php declare(strict_types = 1);
2+
3+
namespace PhpBench;
4+
5+
use PhpBench\Attributes\AfterMethods;
6+
use PhpBench\Attributes\BeforeMethods;
7+
use PhpBench\Attributes\ParamProviders;
8+
9+
#[BeforeMethods('setUp')]
10+
#[AfterMethods('tearDown')]
11+
class SimpleBench
12+
{
13+
14+
public function setUp(): void
15+
{
16+
}
17+
18+
public function tearDown(): void
19+
{
20+
}
21+
22+
public function benchSimpleMethod(): void
23+
{
24+
}
25+
26+
#[ParamProviders(['provideParams'])]
27+
public function benchWithParams(array $params): void
28+
{
29+
}
30+
31+
public function provideParams(): array
32+
{
33+
return [];
34+
}
35+
36+
}
37+
38+
class MethodLevelAttributesBench
39+
{
40+
41+
public function beforeMethod(): void
42+
{
43+
}
44+
45+
public function afterMethod(): void
46+
{
47+
}
48+
49+
#[BeforeMethods('beforeMethod')]
50+
#[AfterMethods('afterMethod')]
51+
public function benchSomething(): void
52+
{
53+
}
54+
55+
}
56+
57+
/**
58+
* @BeforeMethods("setUpAnnotation")
59+
* @AfterMethods({"tearDownAnnotation"})
60+
*/
61+
class AnnotationBench
62+
{
63+
64+
public function setUpAnnotation(): void
65+
{
66+
}
67+
68+
public function tearDownAnnotation(): void
69+
{
70+
}
71+
72+
public function benchAnnotationStyle(): void
73+
{
74+
}
75+
76+
/**
77+
* @ParamProviders({"provideDataAnnotation"})
78+
*/
79+
public function benchWithAnnotationParams(array $params): void
80+
{
81+
}
82+
83+
public function provideDataAnnotation(): array
84+
{
85+
return [];
86+
}
87+
88+
}
89+
90+
class NotBenchmark
91+
{
92+
93+
public function benchSomething(): void // error: Unused PhpBench\NotBenchmark::benchSomething
94+
{
95+
}
96+
97+
}

0 commit comments

Comments
 (0)