Solve stubs conflicts (#467)

MartinMystikJonas · web-flow · commit ba55f39c1e03 · 2025-07-28T15:50:30.000+02:00
diff --git a/extension.neon b/extension.neon
@@ -13,7 +13,6 @@ parameters:
         - stubs/Nette/Forms/Control.stub
         - stubs/Nette/Forms/Controls/BaseControl.stub
         - stubs/Nette/Bridges/FormsLatte/Runtime.stub
-        - stubs/Nette/Application/UI/Multiplier.stub
     usePathConstantsAsConstantString: true
     latte:
         strictMode: false
diff --git a/stubs/Latte/Runtime/Helpers.stub b/stubs/Latte/Runtime/Helpers.stub
@@ -8,7 +8,7 @@ class Helpers implements HtmlStringable
     /**
      * @template A
      * @param A $value
-     * @return ?A
+     * @phpstan-return (A is string ? A|null : null)
      */
     public static function stringOrNull(mixed $value): ?string
     {
diff --git a/stubs/Nette/Application/UI/Multiplier.stub b/stubs/Nette/Application/UI/Multiplier.stub

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class Helpers implements HtmlStringable`
`8`	`8`	`/**`
`9`	`9`	`* @template A`
`10`	`10`	`* @param A $value`
`11`		`- * @return ?A`
	`11`	`+ * @phpstan-return (A is string ? A\|null : null)`
`12`	`12`	`*/`
`13`	`13`	`public static function stringOrNull(mixed $value): ?string`
`14`	`14`	`{`