FRW-8773 Increased dependencies, adjustments to support a new version…

… of nikic/php-parser
spryker-sdk · Nov 6, 2024 · d72d363 · d72d363
1 parent c80b38b
commit d72d363
Show file tree

Hide file tree

Showing 23 changed files with 79 additions and 143 deletions.
diff --git a/src/Builder/Checker/ClassMethodChecker.php b/src/Builder/Checker/ClassMethodChecker.php
@@ -52,11 +52,6 @@ class ClassMethodChecker extends AbstractMethodChecker implements ClassMethodChe
      */
     public const METHOD_FIELD_NAME = 'name';
 
-    /**
-     * @var string
-     */
-    public const METHOD_FIELD_PARTS = 'parts';
-
     /**
      * @var array
      */
@@ -138,7 +133,7 @@ public function isMethodNodeSameAsValue(?ClassMethod $methodNode, $value): bool
         if (!$methodNode || !$methodNode->stmts) {
             return true;
         }
-        $parser = $this->parserFactory->create(ParserFactory::PREFER_PHP7);
+        $parser = $this->parserFactory->createForHostVersion();
         $previousValue = $parser->parse(sprintf('<?php %s;', $value));
         if (!$previousValue) {
             return false;

diff --git a/src/Builder/Checker/MethodStatementChecker/NameMethodStatementChecker.php b/src/Builder/Checker/MethodStatementChecker/NameMethodStatementChecker.php
@@ -36,16 +36,19 @@ public function isSameStatement($previousValue, $currentValue): bool
         if (is_string($previousValue->name) && is_string($currentValue->name) && $previousValue->name !== $currentValue->name) {
             return false;
         }
+
         if (
-            $this->isExistsStatementField($previousValue->name, $currentValue->name, 'parts')
-            && $previousValue->name->parts !== $currentValue->name->parts
+            $this->isExistsStatementField($previousValue->name, $currentValue->name, 'name')
+            && $previousValue->name->name !== $currentValue->name->name
         ) {
             return false;
         }
-        if (property_exists($previousValue->name, 'parts') && !property_exists($currentValue->name, 'parts')) {
+
+        if (property_exists($previousValue->name, 'name') && !property_exists($currentValue->name, 'name')) {
             return false;
         }
-        if (!property_exists($previousValue->name, 'parts') && property_exists($currentValue->name, 'parts')) {
+
+        if (!property_exists($previousValue->name, 'name') && property_exists($currentValue->name, 'name')) {
             return false;
         }
 

diff --git a/src/Builder/Checker/MethodStatementChecker/PartsMethodStatementChecker.php b/src/Builder/Checker/MethodStatementChecker/PartsMethodStatementChecker.php
@@ -22,7 +22,7 @@ class PartsMethodStatementChecker extends AbstractMethodChecker implements Metho
      */
     public function isApplicable($previousValue, $currentValue): bool
     {
-        return $this->isExistsStatementField($previousValue, $currentValue, ClassMethodChecker::METHOD_FIELD_PARTS);
+        return $this->isExistsStatementField($previousValue, $currentValue, ClassMethodChecker::METHOD_FIELD_NAME);
     }
 
     /**
@@ -33,6 +33,6 @@ public function isApplicable($previousValue, $currentValue): bool
      */
     public function isSameStatement($previousValue, $currentValue): bool
     {
-        return $this->isSameStatementsArrayPart($currentValue->parts, $previousValue->parts);
+        return $this->isSameStatementsArrayPart($currentValue->name, $previousValue->name);
     }
 }
diff --git a/src/Builder/ClassLoader/AbstractLoader.php b/src/Builder/ClassLoader/AbstractLoader.php
@@ -9,7 +9,6 @@
 
 namespace SprykerSdk\Integrator\Builder\ClassLoader;
 
-use PhpParser\Lexer;
 use PhpParser\NodeTraverser;
 use PhpParser\NodeVisitor\CloningVisitor;
 use PhpParser\NodeVisitor\NameResolver;
@@ -22,19 +21,12 @@ abstract class AbstractLoader
      */
     protected $parser;
 
-    /**
-     * @var \PhpParser\Lexer
-     */
-    protected $lexer;
-
     /**
      * @param \PhpParser\Parser $parser
-     * @param \PhpParser\Lexer $lexer
      */
-    public function __construct(Parser $parser, Lexer $lexer)
+    public function __construct(Parser $parser)
     {
         $this->parser = $parser;
-        $this->lexer = $lexer;
     }
 
     /**

diff --git a/src/Builder/ClassLoader/ClassLoader.php b/src/Builder/ClassLoader/ClassLoader.php
@@ -51,7 +51,7 @@ public function loadClass(string $className): ClassInformationTransfer
 
         $classInformationTransfer->setTokenTree($syntaxTree)
             ->setOriginalTokenTree($originalSyntaxTree)
-            ->setTokens($this->lexer->getTokens())
+            ->setTokens($this->parser->getTokens())
             ->setFilePath(realpath($fileName));
 
         $parentClass = $this->getParent($syntaxTree);

diff --git a/src/Builder/ClassLoader/FileLoader.php b/src/Builder/ClassLoader/FileLoader.php
@@ -36,7 +36,7 @@ public function loadFile(string $path): FileInformationTransfer
 
         $fileInformationTransfer->setTokenTree($syntaxTree)
             ->setOriginalTokenTree($originalSyntaxTree)
-            ->setTokens($this->lexer->getTokens());
+            ->setTokens($this->parser->getTokens());
 
         return $fileInformationTransfer;
     }

diff --git a/src/Builder/ClassModifier/ClassConstant/ClassConstantModifier.php b/src/Builder/ClassModifier/ClassConstant/ClassConstantModifier.php
@@ -109,7 +109,7 @@ protected function parseValue($value, bool $isLiteral)
     protected function parseSingleValue(string $value): Expr
     {
         /** @var array<\PhpParser\Node\Stmt\Expression> $tree */
-        $tree = $this->parserFactory->create(ParserFactory::PREFER_PHP7)->parse(sprintf('<?php %s;', $value));
+        $tree = $this->parserFactory->createForHostVersion()->parse(sprintf('<?php %s;', $value));
 
         if ($tree === null) {
             throw new LiteralValueParsingException(sprintf('Value is not valid statement PHP code: `%s`', $value));

diff --git a/src/Builder/ClassModifier/ConfigFile/ConfigFileModifier.php b/src/Builder/ClassModifier/ConfigFile/ConfigFileModifier.php
@@ -10,7 +10,7 @@
 namespace SprykerSdk\Integrator\Builder\ClassModifier\ConfigFile;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr\ArrayItem;
+use PhpParser\Node\ArrayItem;
 use PhpParser\NodeFinder;
 use PhpParser\NodeTraverser;
 use SprykerSdk\Integrator\Builder\PartialParser\ExpressionPartialParserInterface;
@@ -43,7 +43,7 @@ public function addArrayItemToEnvConfig(
     ): FileInformationTransfer {
         $valueStm = $this->expressionPartialParser->parse(sprintf('$var = %s;', $value));
 
-        /** @var \PhpParser\Node\Expr\ArrayItem|null $arrayItem */
+        /** @var \PhpParser\Node\ArrayItem|null $arrayItem */
         $arrayItem = (new NodeFinder())->findFirst($valueStm, function (Node $node) {
             return $node instanceof ArrayItem;
         });

diff --git a/src/Builder/Comparer/ClassConstExpressionCompareStrategy.php b/src/Builder/Comparer/ClassConstExpressionCompareStrategy.php
@@ -14,7 +14,7 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
-use PhpParser\Node\Stmt\UseUse;
+use PhpParser\Node\UseItem;
 use SprykerSdk\Integrator\Builder\Finder\UseStatementsFinder\UseStatementsFinderInterface;
 
 class ClassConstExpressionCompareStrategy implements CompareStrategyInterface
@@ -109,7 +109,7 @@ protected function getUseClassNames(array $classTokenTree): array
         $useStatements = $this->useStatementsFinder->findUseStatements($classTokenTree);
 
         foreach ($useStatements as $useStatement) {
-            $names[] = array_map(static fn (UseUse $use): string => $use->name->toString(), $useStatement->uses);
+            $names[] = array_map(static fn (UseItem $use): string => $use->name->toString(), $useStatement->uses);
         }
 
         return array_merge(...$names);

diff --git a/src/Builder/Creator/MethodCreator.php b/src/Builder/Creator/MethodCreator.php
@@ -10,13 +10,14 @@
 namespace SprykerSdk\Integrator\Builder\Creator;
 
 use PhpParser\Comment\Doc;
+use PhpParser\Modifiers;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Identifier;
+use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\NullableType;
 use PhpParser\Node\Scalar\String_;
-use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Return_;
@@ -102,7 +103,7 @@ public function createMethodBody(ClassInformationTransfer $classInformationTrans
         }
 
         $preparedValue = $this->createPreparedValueForParser($value);
-        $tree = $this->parserFactory->create(ParserFactory::PREFER_PHP7)->parse($preparedValue);
+        $tree = $this->parserFactory->createForHostVersion()->parse($preparedValue);
         if (!$tree) {
             throw new LiteralValueParsingException(sprintf('Value is not valid PHP code: `%s`', $value));
         }
@@ -148,7 +149,7 @@ public function createMethod(
             $parentReturnType = $parentClassMethod ? $this->getReturnType($parentClassMethod) : null;
         }
         $returnType = $parentReturnType ?: $this->methodReturnTypeCreator->createMethodReturnType($value);
-        $flags = $parentClassMethod ? $this->getModifierFromClassMethod($parentClassMethod) : Class_::MODIFIER_PUBLIC;
+        $flags = $parentClassMethod ? $this->getModifierFromClassMethod($parentClassMethod) : Modifiers::PUBLIC;
         $docType = $parentClassMethod && $parentClassMethod->getDocComment() ?
             new Doc($parentClassMethod->getDocComment()->getText()) :
             $this->methodDocBlockCreator->createMethodDocBlock($value);
@@ -192,7 +193,7 @@ public function getReturnType(ClassMethod $classMethod)
             $parentReturnType = $parentReturnType->type;
         }
         if ($parentReturnType instanceof Identifier) {
-            $returnType = $nullable . $parentReturnType->name;
+            return new Identifier($nullable . $parentReturnType->name);
         }
         if ($parentReturnType instanceof FullyQualified) {
             return new FullyQualified($parentReturnType->toString());
@@ -208,7 +209,7 @@ public function getReturnType(ClassMethod $classMethod)
      */
     protected function getModifierFromClassMethod(ClassMethod $classMethod): int
     {
-        return $classMethod->isProtected() ? Class_::MODIFIER_PROTECTED : Class_::MODIFIER_PUBLIC;
+        return $classMethod->isProtected() ? Modifiers::PROTECTED : Modifiers::PUBLIC;
     }
 
     /**
@@ -276,7 +277,7 @@ protected function createClassConstantReturnStatement(ClassInformationTransfer $
         $expressionName = $expressionStatement->name;
         /** @var \PhpParser\Node\Name\FullyQualified $expressionClass */
         $expressionClass = $expressionStatement->class;
-        $expressionClass->parts = [$expressionClass->toString()];
+        $expressionClass->name = (new Name([$expressionClass->toString()]))->name;
         $returnClassConstExpression = $this->createClassConstantExpression(
             $classInformationTransfer,
             $expressionClass->toString(),

diff --git a/src/Builder/Creator/MethodStatementsCreator.php b/src/Builder/Creator/MethodStatementsCreator.php
@@ -10,7 +10,8 @@
 namespace SprykerSdk\Integrator\Builder\Creator;
 
 use PhpParser\BuilderFactory;
-use PhpParser\Node\Expr\ArrayItem;
+use PhpParser\Node\ArrayItem;
+use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Identifier;
@@ -122,7 +123,7 @@ protected function createNodeTreeFromArrayValue(ClassInformationTransfer $classI
      * @param array $keyParts
      * @param array $insideArrayItems
      *
-     * @return \PhpParser\Node\Expr\ArrayItem
+     * @return \PhpParser\Node\ArrayItem
      */
     protected function createArrayItem(
         ClassInformationTransfer $classInformationTransfer,
@@ -150,7 +151,9 @@ protected function createArrayItem(
 
         if ($insideArrayItems) {
             return new ArrayItem(
-                (new BuilderFactory())->val($insideArrayItems),
+                (new BuilderFactory())->val(
+                    new Array_($insideArrayItems),
+                ),
                 $key,
             );
         }
@@ -166,7 +169,7 @@ protected function createArrayItem(
      * @param array $itemParts
      * @param array $keyParts
      *
-     * @return \PhpParser\Node\Expr\ArrayItem
+     * @return \PhpParser\Node\ArrayItem
      */
     protected function createSingleSemicolonVariableArrayItem(ClassInformationTransfer $classInformationTransfer, array $itemParts, array $keyParts): ArrayItem
     {

diff --git a/src/Builder/Printer/ClassPrinter.php b/src/Builder/Printer/ClassPrinter.php
@@ -34,7 +34,7 @@ protected function isMultiline(array $nodes): bool
             $node = current($nodes);
             $startPos = $node->getStartTokenPos() - 1;
             $endPos = $node->getEndTokenPos() + 1;
-            $text = $this->origTokens->getTokenCode($startPos, $endPos, 0);
+            $text = $this->origTokens !== null ? $this->origTokens->getTokenCode($startPos, $endPos, 0) : '';
 
             return strpos($text, "\n") !== false;
         }

diff --git a/src/Builder/Visitor/AddArrayItemToEnvConfigVisitor.php b/src/Builder/Visitor/AddArrayItemToEnvConfigVisitor.php
@@ -10,9 +10,9 @@
 namespace SprykerSdk\Integrator\Builder\Visitor;
 
 use PhpParser\Node;
+use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ArrayDimFetch;
-use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Expr\Variable;
@@ -27,7 +27,7 @@ class AddArrayItemToEnvConfigVisitor extends NodeVisitorAbstract
     protected $target;
 
     /**
-     * @var \PhpParser\Node\Expr\ArrayItem
+     * @var \PhpParser\Node\ArrayItem
      */
     protected $value;
 
@@ -48,7 +48,7 @@ class AddArrayItemToEnvConfigVisitor extends NodeVisitorAbstract
 
     /**
      * @param string $target
-     * @param \PhpParser\Node\Expr\ArrayItem $value
+     * @param \PhpParser\Node\ArrayItem $value
      */
     public function __construct(string $target, ArrayItem $value)
     {

diff --git a/src/Builder/Visitor/AddClassToClassListVisitor.php b/src/Builder/Visitor/AddClassToClassListVisitor.php
@@ -12,14 +12,14 @@
 use PhpParser\BuilderFactory;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
+use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr\Array_;
-use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\ClassMethod;
-use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor;
 use PhpParser\NodeVisitorAbstract;
 use SprykerSdk\Integrator\Helper\ClassHelper;
 
@@ -60,11 +60,6 @@ class AddClassToClassListVisitor extends NodeVisitorAbstract
      */
     protected $after;
 
-    /**
-     * @var \PhpParser\Node
-     */
-    protected $parentNode;
-
     /**
      * @param string $methodName
      * @param string $className
@@ -123,7 +118,7 @@ public function enterNode(Node $node)
      */
     protected function isArrayMergeFuncCallNode(FuncCall $node): bool
     {
-        return $node->name instanceof Name && $node->name->parts[0] === static::ARRAY_MERGE_FUNCTION;
+        return $node->name instanceof Name && $node->name->name === static::ARRAY_MERGE_FUNCTION;
     }
 
     /**
@@ -257,7 +252,7 @@ protected function addArrayElementToPosition(Node $node): array
     }
 
     /**
-     * @return \PhpParser\Node\Expr\ArrayItem
+     * @return \PhpParser\Node\ArrayItem
      */
     protected function createArrayItemWithInstanceOf(): ArrayItem
     {
@@ -273,6 +268,6 @@ protected function successfullyProcessed(): int
     {
         $this->methodFound = false;
 
-        return NodeTraverser::DONT_TRAVERSE_CHILDREN;
+        return NodeVisitor::DONT_TRAVERSE_CHILDREN;
     }
 }
diff --git a/src/Builder/Visitor/AddMethodCallToCallListVisitor.php b/src/Builder/Visitor/AddMethodCallToCallListVisitor.php
@@ -11,8 +11,8 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Arg;
+use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr\Array_;
-use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\Variable;
@@ -100,7 +100,7 @@ public function enterNode(Node $node)
      */
     protected function isArrayMergeFuncCallNode(FuncCall $node): bool
     {
-        return $node->name instanceof Name && $node->name->parts[0] === static::ARRAY_MERGE_FUNCTION;
+        return $node->name instanceof Name && $node->name->name === static::ARRAY_MERGE_FUNCTION;
     }
 
     /**
@@ -341,7 +341,7 @@ protected function addNewCallIntoArrayNodeByPosition(Array_ $node, int $position
     }
 
     /**
-     * @return \PhpParser\Node\Expr\ArrayItem
+     * @return \PhpParser\Node\ArrayItem
      */
     protected function createArrayItemWithMethodCall(): ArrayItem
     {