phpstan fixes

Author: dg

composer.json

@@ -21,6 +21,7 @@
 		"nette/utils": "^3.0"
 	},
 	"require-dev": {
+		"nette/application": "^3.0",
 		"nette/di": "^3.0",
 		"nette/tester": "^2.0",
 		"latte/latte": "^2.8",

src/Forms/Controls/BaseControl.php

@@ -50,7 +50,7 @@ abstract class BaseControl extends Nette\ComponentModel\Component implements ICo
 	/** @var Html  label element template */
 	protected $label;
 
-	/** @var bool */
+	/** @var bool|bool[] */
 	protected $disabled = false;
 
 	/** @var callable[][]  extension methods */
@@ -68,7 +68,7 @@ abstract class BaseControl extends Nette\ComponentModel\Component implements ICo
 	/** @var Rules */
 	private $rules;
 
-	/** @var Nette\Localization\ITranslator */
+	/** @var Nette\Localization\ITranslator|bool|null */
 	private $translator = true; // means autodetect
 
 	/** @var array user options */
@@ -200,9 +200,10 @@ public function setDefaultValue($value)
 
 	/**
 	 * Disables or enables control.
+	 * @param  bool  $value
 	 * @return static
 	 */
-	public function setDisabled(/*bool*/ $value = true)
+	public function setDisabled($value = true)
 	{
 		if ($this->disabled = (bool) $value) {
 			$this->setValue(null);

src/Forms/Controls/Button.php

@@ -43,6 +43,7 @@ public function isFilled(): bool
 	 */
 	public function getLabel($caption = null)
 	{
+		return null;
 	}
 
 

src/Forms/Controls/Checkbox.php

@@ -66,6 +66,7 @@ public function getControl(): Html
 	 */
 	public function getLabel($caption = null)
 	{
+		return null;
 	}
 
 

src/Forms/Controls/ChoiceControl.php

@@ -51,7 +51,7 @@ public function loadHttpData(): void
 
 	/**
 	 * Sets selected item (by key).
-	 * @param  string|int  $value
+	 * @param  string|int|null  $value
 	 * @return static
 	 * @internal
 	 */
@@ -68,7 +68,7 @@ public function setValue($value)
 
 	/**
 	 * Returns selected key.
-	 * @return string|int
+	 * @return string|int|null
 	 */
 	public function getValue()
 	{

src/Forms/Controls/HiddenField.php

@@ -101,6 +101,7 @@ public function getControl(): Nette\Utils\Html
 	 */
 	public function getLabel($caption = null)
 	{
+		return null;
 	}
 
 

src/Forms/Controls/MultiChoiceControl.php

@@ -133,7 +133,7 @@ public function getSelectedItems(): array
 
 	/**
 	 * Disables or enables control or items.
-	 * @param  bool|bool[]  $value
+	 * @param  bool|array  $value
 	 * @return static
 	 */
 	public function setDisabled($value = true)

src/Forms/Form.php

@@ -102,7 +102,7 @@ class Form extends Container implements Nette\Utils\IHtmlString
 	/** @var array */
 	private $httpData;
 
-	/** @var Html  <form> element */
+	/** @var Html  element <form> */
 	private $element;
 
 	/** @var IFormRenderer */

src/Forms/Rule.php

@@ -31,9 +31,9 @@ class Rule
 	/** @var bool */
 	public $isNegative = false;
 
-	/** @var string */
+	/** @var string|null */
 	public $message;
 
-	/** @var Rules  for conditions */
+	/** @var Rules|null  for conditions */
 	public $branch;
 }

src/Forms/Rules.php

@@ -54,7 +54,7 @@ public function __construct(IControl $control)
 	public function setRequired($value = true)
 	{
 		if ($value) {
-			$this->addRule(Form::REQUIRED, $value === true ? null : $value);
+			$this->addRule(Form::FILLED, $value === true ? null : $value);
 		} else {
 			$this->required = null;
 		}
@@ -88,7 +88,7 @@ public function addRule($validator, $errorMessage = null, $arg = null)
 		$this->adjustOperation($rule);
 		$rule->arg = $arg;
 		$rule->message = $errorMessage;
-		if ($rule->validator === Form::REQUIRED) {
+		if ($rule->validator === Form::FILLED) {
 			$this->required = $rule;
 		} else {
 			$this->rules[] = $rule;
@@ -104,7 +104,7 @@ public function addRule($validator, $errorMessage = null, $arg = null)
 	 */
 	public function removeRule($validator)
 	{
-		if ($validator === Form::REQUIRED) {
+		if ($validator === Form::FILLED) {
 			$this->required = null;
 		} else {
 			foreach ($this->rules as $i => $rule) {

tests/phpstan.neon

@@ -1,2 +1,5 @@
 includes:
 	- ../vendor/phpstan/phpstan-nette/extension.neon
+
+parameters:
+	treatPhpDocTypesAsCertain: false