strict fixes

Author: dg

src/PhpGenerator/Dumper.php

@@ -100,7 +100,7 @@ private function dumpArray(array &$var, array $parents, int $level, int $column)
 		if (empty($var)) {
 			return '[]';
 
-		} elseif ($level > $this->maxDepth || in_array($var, $parents ?? [], true)) {
+		} elseif ($level > $this->maxDepth || in_array($var, $parents, true)) {
 			throw new Nette\InvalidArgumentException('Nesting level too deep or recursive dependency.');
 		}
 
@@ -160,7 +160,7 @@ private function dumpObject($var, array $parents, int $level): string
 		$arr = (array) $var;
 		$space = str_repeat($this->indentation, $level);
 
-		if ($level > $this->maxDepth || in_array($var, $parents ?? [], true)) {
+		if ($level > $this->maxDepth || in_array($var, $parents, true)) {
 			throw new Nette\InvalidArgumentException('Nesting level too deep or recursive dependency.');
 		}
 

src/PhpGenerator/Extractor.php

@@ -166,6 +166,9 @@ public function extractAll(): PhpFile
 		$phpFile = new PhpFile;
 		$namespace = '';
 		$visitor = new class extends PhpParser\NodeVisitorAbstract {
+			public $callback;
+
+
 			public function enterNode(Node $node)
 			{
 				return ($this->callback)($node);
@@ -177,7 +180,9 @@ public function enterNode(Node $node)
 				return PhpParser\NodeTraverser::DONT_TRAVERSE_CHILDREN;
 			}
 			match (true) {
-				$node instanceof Node\Stmt\DeclareDeclare && $node->key->name === 'strict_types' => $phpFile->setStrictTypes((bool) $node->value->value),
+				$node instanceof Node\Stmt\DeclareDeclare
+					&& $node->key->name === 'strict_types'
+					&& $node->value instanceof Node\Scalar\LNumber => $phpFile->setStrictTypes((bool) $node->value->value),
 				$node instanceof Node\Stmt\Namespace_ => $namespace = $node->name?->toString(),
 				$node instanceof Node\Stmt\Use_ => $this->addUseToNamespace($node, $phpFile->addNamespace($namespace)),
 				$node instanceof Node\Stmt\Class_ => $class = $this->addClassToFile($phpFile, $node),
@@ -385,7 +390,7 @@ private function setupFunction(GlobalFunction|Method $function, Node\FunctionLik
 	{
 		$function->setReturnReference($node->returnsByRef());
 		$function->setReturnType($node->getReturnType() ? $this->toPhp($node->getReturnType()) : null);
-		foreach ($node->params as $item) {
+		foreach ($node->getParams() as $item) {
 			$param = $function->addParameter($item->var->name);
 			$param->setType($item->type ? $this->toPhp($item->type) : null);
 			$param->setReference($item->byRef);
@@ -398,8 +403,8 @@ private function setupFunction(GlobalFunction|Method $function, Node\FunctionLik
 		}
 
 		$this->addCommentAndAttributes($function, $node);
-		if ($node->stmts) {
-			$function->setBody($this->getReformattedContents($node->stmts, 2));
+		if ($node->getStmts()) {
+			$function->setBody($this->getReformattedContents($node->getStmts(), 2));
 		}
 	}
 

src/PhpGenerator/Helpers.php

@@ -37,10 +37,10 @@ final class Helpers
 		'endforeach' => 1, 'declare' => 1, 'enddeclare' => 1, 'as' => 1, 'try' => 1, 'catch' => 1, 'finally' => 1,
 		'throw' => 1, 'use' => 1, 'insteadof' => 1, 'global' => 1, 'var' => 1, 'unset' => 1, 'isset' => 1, 'empty' => 1,
 		'continue' => 1, 'goto' => 1, 'function' => 1, 'const' => 1, 'return' => 1, 'print' => 1, 'yield' => 1, 'list' => 1,
-		'switch' => 1, 'endswitch' => 1, 'case' => 1, 'default' => 1, 'break' => 1, 'array' => 1, 'callable' => 1,
+		'switch' => 1, 'endswitch' => 1, 'case' => 1, 'default' => 1, 'break' => 1,
 		'extends' => 1, 'implements' => 1, 'namespace' => 1, 'trait' => 1, 'interface' => 1, 'class' => 1, '__CLASS__' => 1,
 		'__TRAIT__' => 1, '__FUNCTION__' => 1, '__METHOD__' => 1, '__LINE__' => 1, '__FILE__' => 1, '__DIR__' => 1,
-		'__NAMESPACE__' => 1, 'fn' => 1, 'match' => 1, 'enum' => 1, 'static' => 1, 'abstract' => 1, 'final' => 1,
+		'__NAMESPACE__' => 1, 'fn' => 1, 'match' => 1, 'enum' => 1, 'abstract' => 1, 'final' => 1,
 		'private' => 1, 'protected' => 1, 'public' => 1, 'readonly' => 1,
 
 		// additional reserved class names