Fix Psalm

inpsyde · Aug 31, 2023 · 4f6cff1 · 4f6cff1
1 parent 3bac935
commit 4f6cff1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Inpsyde/Helpers/FunctionDocBlock.php b/Inpsyde/Helpers/FunctionDocBlock.php
@@ -170,10 +170,10 @@ public static function normalizeTypesString(string $typesString): array
             if (strpos($splitType, '&') !== false) {
                 $splitType = rtrim(ltrim($splitType, '('), ')');
             } elseif (strpos($splitType, '?') === 0) {
-                $splitType = substr($splitType, 1);
-                $hasNull = $splitType !== false;
+                $splitType = substr($splitType, 1) ?: '';
+                $hasNull = $hasNull || ($splitType !== '');
             }
-            if ($splitType === false) {
+            if (!$splitType) {
                 continue;
             }
             if (strtolower($splitType) === 'null') {

diff --git a/Inpsyde/Sniffs/CodeQuality/StaticClosureSniff.php b/Inpsyde/Sniffs/CodeQuality/StaticClosureSniff.php
@@ -71,10 +71,11 @@ public function process(File $phpcsFile, $stackPtr): void
         $tokens = $phpcsFile->getTokens();
         while (!$thisFound && ($i < $functionEnd)) {
             $token = $tokens[$i];
-            $thisFound = (($token['code'] === T_VARIABLE) && ($token['content'] === '$this'))
+            $content = (string)($token['content'] ?? '');
+            $thisFound = (($token['code'] === T_VARIABLE) && ($content === '$this'))
                 || (
                     in_array($token['code'], [T_DOUBLE_QUOTED_STRING, T_HEREDOC], true)
-                    && (strpos($token['content'], '$this->') !== false)
+                    && (strpos($content, '$this->') !== false)
                 );
             $i++;
         }