Blueprint: fixed compatibility with PhpGenerator 3.6.2

nette · Oct 27, 2021 · fef5ea1 · fef5ea1
1 parent 1adde0c
commit fef5ea1
Showing 1 changed file with 39 additions and 3 deletions.
diff --git a/src/Latte/Runtime/Blueprint.php b/src/Latte/Runtime/Blueprint.php
@@ -85,7 +85,7 @@ public function addProperties(Php\ClassType $class, array $props, bool $native =
 			if ($native) {
 				$prop->setType($type);
 			} else {
-				$doctype = $printer->printType($type, false, $class->getNamespace()) ?: 'mixed';
+				$doctype = $this->printType($type, false, $class->getNamespace()) ?: 'mixed';
 				$prop->setComment("@var $doctype");
 			}
 		}
@@ -100,12 +100,48 @@ public function addFunctions(Php\ClassType $class, array $funcs): void
 		$printer = new Php\Printer;
 		foreach ($funcs as $name => $func) {
 			$method = (new Php\Factory)->fromCallable($func);
-			$type = $printer->printType($method->getReturnType(), $method->isReturnNullable(), $class->getNamespace()) ?: 'mixed';
-			$class->addComment("@method $type $name" . $printer->printParameters($method, $class->getNamespace()));
+			$type = $this->printType($method->getReturnType(), $method->isReturnNullable(), $class->getNamespace()) ?: 'mixed';
+			$class->addComment("@method $type $name" . $this->printParameters($method, $class->getNamespace()));
 		}
 	}
 
 
+	private function printType(?string $type, bool $nullable, ?Php\PhpNamespace $namespace): string
+	{
+		if ($type === null) {
+			return '';
+		}
+		if ($namespace) {
+			$type = $namespace->unresolveName($type);
+		}
+		if ($nullable && strcasecmp($type, 'mixed')) {
+			$type = strpos($type, '|') !== false
+				? $type . '|null'
+				: '?' . $type;
+		}
+		return $type;
+	}
+
+
+	/**
+	 * @param Closure|GlobalFunction|Method  $function
+	 */
+	public function printParameters($function, Php\PhpNamespace $namespace = null): string
+	{
+		$params = [];
+		$list = $function->getParameters();
+		foreach ($list as $param) {
+			$variadic = $function->isVariadic() && $param === end($list);
+			$params[] = ltrim($this->printType($param->getType(), $param->isNullable(), $namespace) . ' ')
+				. ($param->isReference() ? '&' : '')
+				. ($variadic ? '...' : '')
+				. '$' . $param->getName()
+				. ($param->hasDefaultValue() && !$variadic ? ' = ' . var_export($param->getDefaultValue(), true) : '');
+		}
+		return '(' . implode(', ', $params) . ')';
+	}
+
+
 	public function printCanvas(): string
 	{
 		echo "<div style='all:initial;position:fixed;overflow:auto;z-index:1000;left:0;right:0;top:0;bottom:0;color:black;background:white;padding:1em'>\n";