Merge branch 'main' into issue/478

Author: mglaman

src/Drupal/ExtensionDiscovery.php

@@ -376,7 +376,7 @@ protected function scanDirectory($dir): array
             // Determine extension type from info file.
             $type = false;
             $file = $fileinfo->openFile('r');
-            while (!$type && !$file->eof()) {
+            while ($type === false && !$file->eof()) {
                 if ($line = $file->fgets()) {
                     preg_match('@^type:\s*(\'|")?(\w+)\1?\s*$@', $line, $matches);
                     if (isset($matches[2])) {

src/Rules/Drupal/GlobalDrupalDependencyInjectionRule.php

@@ -28,9 +28,6 @@ public function processNode(Node $node, Scope $scope): array
             return [];
         }
         $scopeClassReflection = $scope->getClassReflection();
-        if ($scopeClassReflection === null) {
-            throw new ShouldNotHappenException();
-        }
 
         $allowed_list = [
             // Ignore tests.

src/Rules/Drupal/PluginManager/PluginManagerSetsCacheBackendRule.php

@@ -38,10 +38,6 @@ public function processNode(Node $node, Scope $scope): array
 
         $scopeClassReflection = $scope->getClassReflection();
 
-        if ($scopeClassReflection === null) {
-            throw new ShouldNotHappenException();
-        }
-
         if (!$this->isPluginManager($scopeClassReflection)) {
             return [];
         }

src/Rules/Drupal/RenderCallbackRule.php

@@ -68,8 +68,6 @@ public function processNode(Node $node, Scope $scope): array
         if ($keyChecked === '#lazy_builder') {
             if ($scope->isInClass()) {
                 $classReflection = $scope->getClassReflection();
-                // @todo why doesn't isInClass assert this isn't null?
-                assert($classReflection !== null);
                 $classType = new ObjectType($classReflection->getName());
                 // These classes use #lazy_builder in array_intersect_key. With
                 // PHPStan 1.6, nodes do not track their parent/next/prev which
@@ -177,9 +175,6 @@ private function doProcessNode(Node\Expr $node, Scope $scope, string $keyChecked
         } elseif ($type instanceof ClosureType) {
             if ($scope->isInClass()) {
                 $classReflection = $scope->getClassReflection();
-                if ($classReflection === null) {
-                    throw new \PHPStan\ShouldNotHappenException();
-                }
                 $classType = new ObjectType($classReflection->getName());
                 $formType = new ObjectType('\Drupal\Core\Form\FormInterface');
                 if ($formType->isSuperTypeOf($classType)->yes()) {
@@ -247,7 +242,7 @@ private function getType(Node\Expr $node, Scope $scope):  Type
             }
             // @see \PHPStan\Type\Constant\ConstantStringType::isCallable
             preg_match('#^([a-zA-Z_\\x7f-\\xff\\\\][a-zA-Z0-9_\\x7f-\\xff\\\\]*)::([a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff]*)\\z#', $type->getValue(), $matches);
-            if ($matches !== null && count($matches) > 0) {
+            if (count($matches) > 0) {
                 return new ConstantArrayType(
                     [new ConstantIntegerType(0), new ConstantIntegerType(1)],
                     [