Skip to content

Commit 629ccf6

Browse files
committed
[BCB] Changed return types of various methods that had |false to |null
1 parent a321a3e commit 629ccf6

39 files changed

+110
-145
lines changed

composer.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Analyser/FileAnalyser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function analyseFile(
108108
$metadata = [];
109109
if ($scope->isInTrait()) {
110110
$traitReflection = $scope->getTraitReflection();
111-
if ($traitReflection->getFileName() !== false) {
111+
if ($traitReflection->getFileName() !== null) {
112112
$traitFilePath = $traitReflection->getFileName();
113113
}
114114
}

src/Analyser/MutatingScope.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ public function getFileDescription(): string
292292
}
293293

294294
$traitReflection = $this->context->getTraitReflection();
295-
if ($traitReflection->getFileName() === false) {
295+
if ($traitReflection->getFileName() === null) {
296296
throw new \PHPStan\ShouldNotHappenException();
297297
}
298298

@@ -2588,7 +2588,7 @@ private function resolveExactName(Name $name): ?string
25882588
return null;
25892589
}
25902590
$currentClassReflection = $this->getClassReflection();
2591-
if ($currentClassReflection->getParentClass() !== false) {
2591+
if ($currentClassReflection->getParentClass() !== null) {
25922592
return $currentClassReflection->getParentClass()->getName();
25932593
}
25942594
return null;
@@ -2614,7 +2614,7 @@ public function resolveName(Name $name): string
26142614
return $this->getClassReflection()->getName();
26152615
} elseif ($originalClass === 'parent') {
26162616
$currentClassReflection = $this->getClassReflection();
2617-
if ($currentClassReflection->getParentClass() !== false) {
2617+
if ($currentClassReflection->getParentClass() !== null) {
26182618
return $currentClassReflection->getParentClass()->getName();
26192619
}
26202620
}
@@ -3385,7 +3385,7 @@ public function getFunctionType($type, bool $isNullable, bool $isVariadic): Type
33853385
$className = (string) $type;
33863386
$lowercasedClassName = strtolower($className);
33873387
if ($lowercasedClassName === 'parent') {
3388-
if ($this->isInClass() && $this->getClassReflection()->getParentClass() !== false) {
3388+
if ($this->isInClass() && $this->getClassReflection()->getParentClass() !== null) {
33893389
return new ObjectType($this->getClassReflection()->getParentClass()->getName());
33903390
}
33913391

src/Analyser/NodeScopeResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3663,7 +3663,7 @@ private function processTraitUse(Node\Stmt\TraitUse $node, MutatingScope $classS
36633663
}
36643664
$traitReflection = $this->reflectionProvider->getClass($traitName);
36653665
$traitFileName = $traitReflection->getFileName();
3666-
if ($traitFileName === false) {
3666+
if ($traitFileName === null) {
36673667
continue; // trait from eval or from PHP itself
36683668
}
36693669
$fileName = $this->fileHelper->normalizePath($traitFileName);

src/Analyser/ResultCache/ResultCacheManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ private function getProjectExtensionFiles(?array $projectConfig, array $dependen
633633

634634
$classReflection = $this->reflectionProvider->getClass($class);
635635
$fileName = $classReflection->getFileName();
636-
if ($fileName === false) {
636+
if ($fileName === null) {
637637
continue;
638638
}
639639

src/Analyser/TypeSpecifier.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public function specifyTypesInCondition(
123123
} elseif ($lowercasedClassName === 'parent') {
124124
if (
125125
$scope->isInClass()
126-
&& $scope->getClassReflection()->getParentClass() !== false
126+
&& $scope->getClassReflection()->getParentClass() !== null
127127
) {
128128
$type = new ObjectType($scope->getClassReflection()->getParentClass()->getName());
129129
} else {

src/Dependency/DependencyResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR
230230
}
231231

232232
$classReflection = $classReflection->getParentClass();
233-
} while ($classReflection !== false);
233+
} while ($classReflection !== null);
234234
}
235235

236236
private function getFunctionReflection(\PhpParser\Node\Name $nameNode, ?Scope $scope): ReflectionWithFilename

src/Dependency/NodeDependencies.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function getFileDependencies(string $currentFile, array $analysedFiles):
4141

4242
foreach ($this->reflections as $dependencyReflection) {
4343
$dependencyFile = $dependencyReflection->getFileName();
44-
if ($dependencyFile === false) {
44+
if ($dependencyFile === null) {
4545
continue;
4646
}
4747
$dependencyFile = $this->fileHelper->normalizePath($dependencyFile);

src/PhpDoc/PhpDocBlock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ private static function getParentReflections(ClassReflection $classReflection):
341341
$result = [];
342342

343343
$parent = $classReflection->getParentClass();
344-
if ($parent !== false) {
344+
if ($parent !== null) {
345345
$result[] = $parent;
346346
}
347347

src/PhpDoc/TypeNodeResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ private function resolveIdentifierTypeNode(IdentifierTypeNode $typeNode, NameSco
310310
case 'parent':
311311
if ($this->getReflectionProvider()->hasClass($nameScope->getClassName())) {
312312
$classReflection = $this->getReflectionProvider()->getClass($nameScope->getClassName());
313-
if ($classReflection->getParentClass() !== false) {
313+
if ($classReflection->getParentClass() !== null) {
314314
return new ObjectType($classReflection->getParentClass()->getName());
315315
}
316316
}
@@ -681,7 +681,7 @@ private function resolveConstTypeNode(ConstTypeNode $typeNode, NameScope $nameSc
681681
case 'parent':
682682
if ($this->getReflectionProvider()->hasClass($nameScope->getClassName())) {
683683
$classReflection = $this->getReflectionProvider()->getClass($nameScope->getClassName());
684-
if ($classReflection->getParentClass() === false) {
684+
if ($classReflection->getParentClass() === null) {
685685
return new ErrorType();
686686

687687
}

0 commit comments

Comments
 (0)