Merge pull request #126 from iMattPro/fix-125

Fix issues with PHPParser in PHP 8

Author: iMattPro

src/Tests/Tests/epv_test_validate_php_functions.php

@@ -9,7 +9,6 @@
  */
 namespace Phpbb\Epv\Tests\Tests;
 
-
 use Phpbb\Epv\Files\FileInterface;
 use Phpbb\Epv\Files\Type\LangFileInterface;
 use Phpbb\Epv\Files\Type\PHPFileInterface;
@@ -29,6 +28,7 @@
 use PhpParser\Node\Expr\Print_;
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\Variable;
+use PhpParser\Node\Name;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Declare_;
@@ -333,7 +333,11 @@ private function checkInDefined(If_ $node)
 	{
 		$cond = $node->cond;
 
-		if ($cond instanceof BooleanNot && $cond->expr instanceof FuncCall && $cond->expr->name->parts[0] == 'defined' && $cond->expr->args[0]->value->value == 'IN_PHPBB')
+		if ($cond instanceof BooleanNot
+			&& $cond->expr instanceof FuncCall
+			&& $cond->expr->name->getFirst() === 'defined'
+			&& $cond->expr->args[0]->value->value === 'IN_PHPBB'
+		)
 		{
 
 			if ($node->stmts[0]->expr instanceof Node\Expr\Exit_)
@@ -369,9 +373,9 @@ private function validateFunctionNames(Node $node)
 		{
 			$name = $this->getMethodName($node);
 		}
-		else if (isset($node->expr) && $node->expr instanceof FuncCall && isset($node->expr->name->parts) && is_array($node->expr->name->parts))
+		else if (isset($node->expr) && $node->expr instanceof FuncCall && $node->expr->name instanceof Name)
 		{
-			$name = (string)$node->expr->name->parts[0];
+			$name = $node->expr->name->getFirst();
 		}
 
 		if ($name !== null)
@@ -393,9 +397,17 @@ private function validateMethodCalls(Node $node) {
 		{
             $name = $this->getMethodName($node);
         }
-		else if (isset($node->expr) && $node->expr instanceof Node\Expr\MethodCall && !($node->expr->name instanceof Variable) && !($node->expr->name instanceof PropertyFetch) && !($node->expr->name instanceof Concat))
+		else if (isset($node->expr)
+			&& $node->expr instanceof Node\Expr\MethodCall
+			&& !($node->expr->name instanceof Variable
+				|| $node->expr->name instanceof PropertyFetch
+				|| $node->expr->name instanceof Concat
+				|| $node->expr->name instanceof Node\Scalar\Encapsed
+				|| $node->expr->name instanceof Node\Expr\Ternary
+			)
+		)
 		{
-			$name = (string)$node->expr->name;
+			$name = $node->expr->name->toString();
 		}
 
 		if ($name !== null)
@@ -414,21 +426,62 @@ private function getMethodName(Node $node)
         {
             return null; // This is a variable. We are going to ignore this. We do not want to track variable contents
         }
-        else if ($node->name instanceof Concat)
-        {
-            // Only test if both are a string
-            // This mean that if a user works around this test he can do so, but otherwise we will
-            // need to parse variables and stuff.
-            if ($node->name->left instanceof String_ && $node->name->right instanceof String_)
-            {
-                return $node->name->left->value . $node->name->right->value;
-            }
-        }
-        else
-        {
-            return (string)$node->name;
-        }
-        return null;
+
+		if ($node->name instanceof Concat)
+		{
+			// Only test if both are a string
+			// This mean that if a user works around this test he can do so, but otherwise we will
+			// need to parse variables and stuff.
+			if ($node->name->left instanceof String_ && $node->name->right instanceof String_)
+			{
+				return $node->name->left->value . $node->name->right->value;
+			}
+		}
+		else if ($node->name instanceof Expr\Ternary)
+		{
+			return $node->name->if;
+		}
+		else if ($node->name instanceof Node\Scalar\Encapsed)
+		{
+			$encapsed = '';
+			foreach ($node->name->parts as $part)
+			{
+				if ($part instanceof Node\Scalar\EncapsedStringPart)
+				{
+					$encapsed .= $part->value;
+				}
+				else if ($part instanceof Variable)
+				{
+					$encapsed .= $part->name;
+				}
+				else if ($part instanceof PropertyFetch)
+				{
+					$encapsed .= $part->name->name;
+				}
+				else if ($part instanceof ArrayDimFetch)
+				{
+					$encapsed .= $part->var->name;
+				}
+				else
+				{
+					$encapsed .= $part->toString();
+				}
+			}
+			return $encapsed ?: null;
+		}
+		else if ($node->name instanceof Node\Identifier)
+		{
+			return $node->name->name;
+		}
+		else if ($node->name instanceof Node\Name)
+		{
+			return $node->name->getFirst();
+		}
+		else
+		{
+			return $node->name->toString();
+		}
+		return null;
     }
 
     /**

tests/testFiles/var_test2.php

@@ -8,6 +8,9 @@ class var_test2
     public function __construct()
     {
         $name = 'test';
-        $result = $this->{'validate_' . $name}();
-    }
+        $result1 = $this->{'validate1_' . $name}();
+		$result2 = $this->{"validate2_$name"}();
+		$result3 = $this->{$name === 'test' ? 'callBack1' : 'callBack2'}();
+
+	}
 }