Skip to content

Commit e34bef4

Browse files
committed
add line to unused definitino, to easier removal
1 parent ec3c625 commit e34bef4

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed

src/Analyzer/UnusedDefinitionsAnalyzer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace Rector\Behastan\Analyzer;
66

7-
use Nette\Utils\Strings;
87
use Rector\Behastan\DefinitionMasksResolver;
98
use Rector\Behastan\Reporting\MaskCollectionStatsPrinter;
109
use Rector\Behastan\UsedInstructionResolver;

src/Command/UnusedDefinitionsCommand.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ private function printMask(AbstractMask $unusedMask): void
9090

9191
// make path relative
9292
$relativeFilePath = str_replace(getcwd() . '/', '', $unusedMask->filePath);
93-
$this->symfonyStyle->writeln($relativeFilePath);
93+
$filePathWithLine = $relativeFilePath . ':' . $unusedMask->line;
94+
95+
$this->symfonyStyle->writeln($filePathWithLine);
9496
$this->symfonyStyle->newLine();
9597
}
9698
}

src/DefinitionMasksResolver.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public function resolve(array $contextFiles): MaskCollection
4444
$masks[] = new SkippedMask(
4545
$rawMask,
4646
$classMethodContextDefinition->getFilePath(),
47+
$classMethodContextDefinition->getMethodLine(),
4748
$classMethodContextDefinition->getClass(),
4849
$classMethodContextDefinition->getMethodName()
4950
);
@@ -55,6 +56,7 @@ public function resolve(array $contextFiles): MaskCollection
5556
$masks[] = new RegexMask(
5657
$rawMask,
5758
$classMethodContextDefinition->getFilePath(),
59+
$classMethodContextDefinition->getMethodLine(),
5860
$classMethodContextDefinition->getClass(),
5961
$classMethodContextDefinition->getMethodName()
6062
);
@@ -67,6 +69,7 @@ public function resolve(array $contextFiles): MaskCollection
6769
$masks[] = new NamedMask(
6870
$rawMask,
6971
$classMethodContextDefinition->getFilePath(),
72+
$classMethodContextDefinition->getMethodLine(),
7073
$classMethodContextDefinition->getClass(),
7174
$classMethodContextDefinition->getMethodName()
7275
);
@@ -76,6 +79,7 @@ public function resolve(array $contextFiles): MaskCollection
7679
$masks[] = new ExactMask(
7780
$rawMask,
7881
$classMethodContextDefinition->getFilePath(),
82+
$classMethodContextDefinition->getMethodLine(),
7983
$classMethodContextDefinition->getClass(),
8084
$classMethodContextDefinition->getMethodName()
8185
);
@@ -118,7 +122,8 @@ private function resolveMasksFromFiles(array $fileInfos): array
118122
$fileInfo->getRealPath(),
119123
$className,
120124
$classMethod->name->toString(),
121-
$rawMask
125+
$rawMask,
126+
$classMethod->getStartLine()
122127
);
123128
}
124129
}

src/Resolver/ClassMethodMasksResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ final class ClassMethodMasksResolver
1818
/**
1919
* @var string[]
2020
*/
21-
private const ATTRIBUTE_NAMES = ['Behat\Step\Then', 'Behat\Step\Given', 'Behat\Step\And'];
21+
private const ATTRIBUTE_NAMES = ['Behat\Step\When', 'Behat\Step\Then', 'Behat\Step\Given', 'Behat\Step\And'];
2222

2323
/**
2424
* @return string[]

src/ValueObject/ClassMethodContextDefinition.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public function __construct(
1313
private readonly string $class,
1414
private readonly string $methodName,
1515
private readonly string $mask,
16-
private readonly ?int $methodLine = null
16+
private readonly int $methodLine
1717
) {
1818
}
1919

@@ -37,7 +37,7 @@ public function getMask(): string
3737
return $this->mask;
3838
}
3939

40-
public function getMethodLine(): ?int
40+
public function getMethodLine(): int
4141
{
4242
return $this->methodLine;
4343
}

src/ValueObject/Mask/AbstractMask.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ abstract class AbstractMask implements MaskInterface
99
public function __construct(
1010
public readonly string $mask,
1111
public readonly string $filePath,
12+
public readonly int $line,
1213
public readonly string $className,
1314
public readonly string $methodName,
1415
) {

0 commit comments

Comments
 (0)