diff --git a/src/Suin/Sniffs/Classes/PSR4/AutoloadabilityInspector.php b/src/Suin/Sniffs/Classes/PSR4/AutoloadabilityInspector.php index 2ef2305..264c879 100644 --- a/src/Suin/Sniffs/Classes/PSR4/AutoloadabilityInspector.php +++ b/src/Suin/Sniffs/Classes/PSR4/AutoloadabilityInspector.php @@ -30,6 +30,12 @@ public function inspect( new PSR4UnrelatedClass(); } + private function classFileIsUnderBaseDirectory( + ClassFileUnderInspection $classFile + ): bool { + return \strpos($classFile->getFileName(), $this->baseDirectory) === 0; + } + private function inspectAutoloadability( ClassFileUnderInspection $classFile ): InspectionResult { @@ -76,19 +82,13 @@ private function guessFullyQualifiedClassName( return $this->namespacePrefix . $relativeClassName; } - private function classFileIsUnderBaseDirectory( - ClassFileUnderInspection $classFile - ): bool { - return \strpos($classFile->getFileName(), $this->baseDirectory) === 0; + private function directoryEndsWithSlash(): bool + { + return \substr($this->baseDirectory, -1) === '/'; } private function namespaceEndsWithBackslash(): bool { return \substr($this->namespacePrefix, -1) === '\\'; } - - private function directoryEndsWithSlash(): bool - { - return \substr($this->baseDirectory, -1) === '/'; - } } diff --git a/src/Suin/Sniffs/Classes/PSR4Sniff.php b/src/Suin/Sniffs/Classes/PSR4Sniff.php index 0366180..dbf33b3 100644 --- a/src/Suin/Sniffs/Classes/PSR4Sniff.php +++ b/src/Suin/Sniffs/Classes/PSR4Sniff.php @@ -34,14 +34,14 @@ final class PSR4Sniff implements Sniff public $composerJsonPath = 'composer.json'; /** - * @var AutoloadabilityInspectors + * @var int */ - private $autoloadabilityInspectors; + private $initialization = self::UNINITIALIZED; /** - * @var int + * @var AutoloadabilityInspectors */ - private $initialization = self::UNINITIALIZED; + private $autoloadabilityInspectors; /** * {@inheritdoc} @@ -83,6 +83,16 @@ private function initializeThisSniffIfNotYet(Config $config): void } } + private function getClassFileOf( + File $phpcsFile, + $typePointer + ): ClassFileUnderInspection { + return new ClassFileUnderInspection( + $phpcsFile->getFilename(), + ClassHelper::getFullyQualifiedName($phpcsFile, $typePointer) + ); + } + private function addError( File $phpcsFile, NonAutoloadableClass $result, @@ -106,14 +116,4 @@ private function getClassNameDeclarationPosition( ): ?int { return TokenHelper::findNext($phpcsFile, \T_STRING, $typePointer + 1); } - - private function getClassFileOf( - File $phpcsFile, - $typePointer - ): ClassFileUnderInspection { - return new ClassFileUnderInspection( - $phpcsFile->getFilename(), - ClassHelper::getFullyQualifiedName($phpcsFile, $typePointer) - ); - } }