Merge pull request pdepend#775 from AJenbo/null

Use null coalescing
tvbeek · May 2, 2024 · 013685e · 013685e
2 parents 08d2095 + 39664cb
commit 013685e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/src/main/php/PDepend/Source/Language/PHP/PHPTokenizerInternal.php b/src/main/php/PDepend/Source/Language/PHP/PHPTokenizerInternal.php
@@ -1101,7 +1101,7 @@ private function consumeNonePhpTokens(array &$tokens)
         while ($token[0] !== T_OPEN_TAG_WITH_ECHO &&
                $token[0] !== T_OPEN_TAG &&
                $token[0] !== false) {
-            $content .= (isset($token[1]) ? $token[1] : $token[0]);
+            $content .= ($token[1] ?? $token[0]);
 
             $token = (array) next($tokens);
         }

diff --git a/src/main/php/PDepend/Source/Parser/SymbolTable.php b/src/main/php/PDepend/Source/Parser/SymbolTable.php
@@ -141,9 +141,7 @@ public function lookup($key)
 
         $normalizedKey = $this->normalizeKey($key);
 
-        return isset($this->scope[$normalizedKey])
-            ? $this->scope[$normalizedKey]
-            : null;
+        return $this->scope[$normalizedKey] ?? null;
     }
 
     /**

diff --git a/...php/PDepend/Source/Language/PHP/Features/PHP82/AllowNullAndFalseAsStandAloneTypesTest.php b/...php/PDepend/Source/Language/PHP/Features/PHP82/AllowNullAndFalseAsStandAloneTypesTest.php
@@ -78,7 +78,7 @@ public function testTypedProperties()
             array('false', '$falsy'),
         ) as $index => $expected) {
             list($expectedType, $expectedVariable) = $expected;
-            $expectedTypeClass = isset($expected[2]) ? $expected[2] : 'PDepend\\Source\\AST\\ASTScalarType';
+            $expectedTypeClass = $expected[2] ?? 'PDepend\\Source\\AST\\ASTScalarType';
             list($type, $variable) = $declarations[$index];
 
             $this->assertInstanceOf(

diff --git a/src/test/php/PDepend/Source/Language/PHP/Features/PHP82/TrueTypeTest.php b/src/test/php/PDepend/Source/Language/PHP/Features/PHP82/TrueTypeTest.php
@@ -78,7 +78,7 @@ public function testTypedProperties()
             array('true', '$truthy'),
         ) as $index => $expected) {
             list($expectedType, $expectedVariable) = $expected;
-            $expectedTypeClass = isset($expected[2]) ? $expected[2] : 'PDepend\\Source\\AST\\ASTScalarType';
+            $expectedTypeClass = $expected[2] ?? 'PDepend\\Source\\AST\\ASTScalarType';
             list($type, $variable) = $declarations[$index];
 
             $this->assertInstanceOf(

diff --git a/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion74Test.php b/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion74Test.php
@@ -127,7 +127,7 @@ public function testTypedProperties()
             array('?Role', '$roleN', 'PDepend\\Source\\AST\\ASTClassOrInterfaceReference'),
         ) as $index => $expected) {
             list($expectedType, $expectedVariable) = $expected;
-            $expectedTypeClass = isset($expected[2]) ? $expected[2] : 'PDepend\\Source\\AST\\ASTScalarType';
+            $expectedTypeClass = $expected[2] ?? 'PDepend\\Source\\AST\\ASTScalarType';
             list($type, $variable) = $declarations[$index];
 
             $this->assertInstanceOf(