Commit 38aa821

committed

fixed logic in ReferenceUsedNamesAfterUsageSniff

1 parent 3159be2 commit 38aa821Copy full SHA for 38aa821

File tree

1 file changed

+10

-10

lines changed

InfinityloopCodingStandard/Sniffs/Namespaces
- ReferenceUsedNamesAfterUsageSniff.php

1 file changed

+10

-10

lines changed

`‎InfinityloopCodingStandard/Sniffs/Namespaces/ReferenceUsedNamesAfterUsageSniff.php‎`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -174,29 +174,29 @@ public function process(File $phpcsFile, $openTagPointer) : void`
`174`	`174`	`$lineLength = \strlen(TokenHelper::getContent($phpcsFile, $start, $end));`
`175`	`175`
`176`	`176`	`if (!$shouldBeUsed`
`177`		`- \|\| ($this->count !== null && $referenced[$canonicalName] < $this->count)`
`178`		`- && ($this->length !== null && $this->length > \strlen($canonicalName))`
`179`		`- && ($this->lineLength !== null && $this->lineClassLength !== null && ($this->lineClassLength >= \strlen($canonicalName)`
`180`		`- \|\| $this->lineLength >= $lineLength))`
	`177`	`+ \|\| ($this->count === null \|\| $this->count > $referenced[$canonicalName])`
	`178`	`+ && ($this->length === null \|\| $this->length > \strlen($canonicalName))`
	`179`	`+ && ($this->lineLength === null \|\| $this->lineClassLength === null \|\| $this->lineClassLength > \strlen($canonicalName)`
	`180`	`+ \|\| $this->lineLength > $lineLength)`
`181`	`181`	`) {`
`182`	`182`	`continue;`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`$reason = '';`
`186`	`186`
`187`		`- if ($referenced[$canonicalName] >= $this->count) {`
	`187`	`+ if ($this->count !== null && $referenced[$canonicalName] >= $this->count) {`
`188`	`188`	`$reason = 'because it\'s used more than ' . $this->count . ' times.';`
`189`	`189`	`}`
`190`	`190`
`191`		`- if ($this->length !== null && $this->length < \strlen($canonicalName)) {`
	`191`	`+ if ($this->length !== null && $this->length <= \strlen($canonicalName)) {`
`192`	`192`	`$reason = $reason === ''`
`193`	`193`	`? 'because it\'s length is more than ' . $this->length . ' symbols.'`
`194`	`194`	`: 'because it\'s used more than ' . $this->count . ' times and it\'s length is more than '`
`195`		`- . $this->length . ' symbols.';`
	`195`	`+ . $this->length . ' symbols.';`
`196`	`196`	`}`
`197`	`197`
`198`		`- if ($this->lineLength !== null && $this->lineClassLength !== null && \strlen($canonicalName) > $this->lineClassLength`
`199`		`- && $lineLength > $this->lineLength) {`
	`198`	`+ if ($this->lineLength !== null && $this->lineClassLength !== null && \strlen($canonicalName) >= $this->lineClassLength`
	`199`	`+ && $lineLength >= $this->lineLength) {`
`200`	`200`	`$reason = 'because line length is more than ' . $this->lineLength`
`201`	`201`	`. ' symbols and class length is more than ' . $this->lineClassLength . ' symbols.';`
`202`	`202`	`}`
`@@ -485,7 +485,7 @@ private function getUniqueNameFromNamespace(string $first, string $second) : arr`
`485`	`485`	`private function getNormalizedClassName(string $name, array $useStatements, File $phpcsFile) : array`
`486`	`486`	`{`
`487`	`487`	`$unqualifiedName = NamespaceHelper::getUnqualifiedNameFromFullyQualifiedName($name);`
`488`		`- $className = ClassHelper::getName($phpcsFile, TokenHelper::findNext($phpcsFile, \T_CLASS, 0));`
	`488`	`+ $className = ClassHelper::getName($phpcsFile, TokenHelper::findNext($phpcsFile, [\T_CLASS, \T_INTERFACE, T_TRAIT], 0));`
`489`	`489`
`490`	`490`	`if ($className === $unqualifiedName) {`
`491`	`491`	`return $this->getUniqueNameFromNamespace(`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 38aa821

File tree

1 file changed

1 file changed

`‎InfinityloopCodingStandard/Sniffs/Namespaces/ReferenceUsedNamesAfterUsageSniff.php‎`

0 commit comments