small fixes

Author: dg

src/PhpGenerator/Extractor.php

@@ -70,7 +70,6 @@ public function extractMethodBodies(string $className): array
 
 		$res = [];
 		foreach ($nodeFinder->findInstanceOf($classNode, Node\Stmt\ClassMethod::class) as $methodNode) {
-			assert($methodNode instanceof Node\Stmt\ClassMethod);
 			if ($methodNode->stmts) {
 				$res[$methodNode->name->toString()] = $this->getReformattedContents($methodNode->stmts, 2);
 			}
@@ -110,7 +109,7 @@ public function extractPropertyHookBodies(string $className): array
 	}
 
 
-	public function extractFunctionBody(string $name): ?string
+	public function extractFunctionBody(string $name): string
 	{
 		$functionNode = (new NodeFinder)->findFirst(
 			$this->statements,
@@ -250,7 +249,6 @@ public function extractAll(): PhpFile
 		$namespaces = ['' => $this->statements];
 		foreach ($this->statements as $node) {
 			if ($node instanceof Node\Stmt\Declare_
-				&& $node->declares[0] instanceof Node\Stmt\DeclareDeclare
 				&& $node->declares[0]->key->name === 'strict_types'
 				&& $node->declares[0]->value instanceof Node\Scalar\LNumber
 			) {
@@ -344,6 +342,7 @@ private function addTraitToClass(ClassLike $class, Node\Stmt\TraitUse $node): vo
 		foreach ($node->traits as $item) {
 			$trait = $class->addTrait($item->toString());
 		}
+		assert($trait instanceof TraitUse);
 
 		foreach ($node->adaptations as $item) {
 			$trait->addResolution(rtrim($this->getReformattedContents([$item], 0), ';'));
@@ -528,10 +527,7 @@ private function toValue(Node\Expr $node): mixed
 					return new Literal($this->getReformattedContents([$node], 0));
 
 				} elseif ($item->key) {
-					$key = $item->key instanceof Node\Identifier
-						? $item->key->name
-						: $this->toValue($item->key);
-
+					$key = $this->toValue($item->key);
 					if ($key instanceof Literal) {
 						return new Literal($this->getReformattedContents([$node], 0));
 					}

src/PhpGenerator/Factory.php

@@ -128,7 +128,10 @@ public function fromClassReflection(
 		$class->setMethods($methods);
 
 		foreach ($from->getTraitNames() as $trait) {
-			$class->addTrait($trait, $resolutions);
+			$trait = $class->addTrait($trait);
+			foreach ($resolutions as $resolution) {
+				$trait->addResolution($resolution);
+			}
 			$resolutions = [];
 		}
 

src/PhpGenerator/PhpNamespace.php

@@ -167,7 +167,7 @@ public function getUses(string $of = self::NameNormal): array
 		uasort($this->aliases[$of], fn(string $a, string $b): int => strtr($a, '\\', ' ') <=> strtr($b, '\\', ' '));
 		return array_filter(
 			$this->aliases[$of],
-			fn($name, $alias) => strcasecmp(($this->name ? $this->name . '\\' : '') . $alias, $name),
+			fn($name, $alias) => (bool) strcasecmp(($this->name ? $this->name . '\\' : '') . $alias, $name),
 			ARRAY_FILTER_USE_BOTH,
 		);
 	}

src/PhpGenerator/Printer.php

@@ -480,7 +480,7 @@ private function printHooks(Property|PromotedParameter $property, bool $isInterf
 		}
 
 		$simple = true;
-		foreach ($property->getHooks() as $type => $hook) {
+		foreach ($hooks as $type => $hook) {
 			$simple = $simple && ($hook->isAbstract() || $isInterface);
 			$hooks[$type] = $this->printDocComment($hook)
 				. $this->printAttributes($hook->getAttributes())

tests/PhpGenerator/Extractor.extractPropertyHookBodies.phpt

@@ -7,6 +7,9 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
+if (!class_exists(PhpParser\Node\PropertyHook::class)) {
+	Tester\Environment::skip('Requires newer PhpParser.');
+}
 
 $extractor = new Extractor(<<<'XX'
 	<?php