fix PHPStan and deprecations

Author: hrach

.phpstan.neon

@@ -1,10 +1,3 @@
 includes:
 	- vendor/phpstan/phpstan-nette/extension.neon
 	- vendor/phpstan/phpstan-nette/rules.neon
-
-parameters:
-	ignoreErrors:
-		-
-			# https://github.com/phpstan/phpstan/issues/2063
-			message: '/^Ternary operator condition is always true\.$/'
-			path: %currentWorkingDirectory%/src/LatteMacros/BaseInputMacros.php

src/Renderers/Bs3FormRenderer.php

@@ -9,9 +9,9 @@
 
 namespace Nextras\FormsRendering\Renderers;
 
+use Nette\Forms\Control;
 use Nette\Forms\Controls;
 use Nette\Forms\Form;
-use Nette\Forms\IControl;
 use Nette\Forms\Rendering\DefaultFormRenderer;
 use Nette\Utils\Html;
 
@@ -21,7 +21,7 @@
  */
 class Bs3FormRenderer extends DefaultFormRenderer
 {
-	/** @var Controls\Button */
+	/** @var Controls\Button|null */
 	public $primaryButton = null;
 
 	/** @var bool */
@@ -80,7 +80,7 @@ public function renderControls($parent): string
 	}
 
 
-	public function renderPair(IControl $control): string
+	public function renderPair(Control $control): string
 	{
 		$this->controlsInit();
 		return parent::renderPair($control);
@@ -94,21 +94,21 @@ public function renderPairMulti(array $controls): string
 	}
 
 
-	public function renderLabel(IControl $control): Html
+	public function renderLabel(Control $control): Html
 	{
 		$this->controlsInit();
 		return parent::renderLabel($control);
 	}
 
 
-	public function renderControl(IControl $control): Html
+	public function renderControl(Control $control): Html
 	{
 		$this->controlsInit();
 		return parent::renderControl($control);
 	}
 
 
-	private function controlsInit()
+	private function controlsInit(): void
 	{
 		if ($this->controlsInit) {
 			return;
@@ -130,7 +130,7 @@ private function controlsInit()
 				$control->getControlPrototype()->addClass('form-control');
 			} elseif ($control instanceof Controls\Checkbox || $control instanceof Controls\CheckboxList || $control instanceof Controls\RadioList) {
 				if ($control instanceof Controls\Checkbox) {
-					$control->getSeparatorPrototype()->setName('div')->appendAttribute('class', $control->getControlPrototype()->type);
+					$control->getContainerPrototype()->setName('div')->appendAttribute('class', $control->getControlPrototype()->type);
 				} else {
 					$control->getItemLabelPrototype()->addClass($control->getControlPrototype()->type . '-inline');
 				}

src/Renderers/Bs4FormRenderer.php

@@ -9,9 +9,9 @@
 
 namespace Nextras\FormsRendering\Renderers;
 
+use Nette\Forms\Control;
 use Nette\Forms\Controls;
 use Nette\Forms\Form;
-use Nette\Forms\IControl;
 use Nette\Forms\Rendering\DefaultFormRenderer;
 use Nette\Utils\Html;
 
@@ -21,7 +21,7 @@
  */
 class Bs4FormRenderer extends DefaultFormRenderer
 {
-	/** @var Controls\Button */
+	/** @var Controls\Button|null */
 	public $primaryButton;
 
 	/** @var bool */
@@ -31,7 +31,10 @@ class Bs4FormRenderer extends DefaultFormRenderer
 	private $layout;
 
 
-	public function __construct($layout = FormLayout::HORIZONTAL)
+	/**
+	 * @param FormLayout::* $layout
+	 */
+	public function __construct(string $layout = FormLayout::HORIZONTAL)
 	{
 		$this->layout = $layout;
 
@@ -98,7 +101,7 @@ public function renderControls($parent): string
 	}
 
 
-	public function renderPair(IControl $control): string
+	public function renderPair(Control $control): string
 	{
 		$this->controlsInit();
 		return parent::renderPair($control);
@@ -112,21 +115,21 @@ public function renderPairMulti(array $controls): string
 	}
 
 
-	public function renderLabel(IControl $control): Html
+	public function renderLabel(Control $control): Html
 	{
 		$this->controlsInit();
 		return parent::renderLabel($control);
 	}
 
 
-	public function renderControl(IControl $control): Html
+	public function renderControl(Control $control): Html
 	{
 		$this->controlsInit();
 		return parent::renderControl($control);
 	}
 
 
-	private function controlsInit()
+	private function controlsInit(): void
 	{
 		if ($this->controlsInit) {
 			return;

src/Renderers/Bs5FormRenderer.php

@@ -9,9 +9,9 @@
 
 namespace Nextras\FormsRendering\Renderers;
 
+use Nette\Forms\Control;
 use Nette\Forms\Controls;
 use Nette\Forms\Form;
-use Nette\Forms\IControl;
 use Nette\Forms\Rendering\DefaultFormRenderer;
 use Nette\Utils\Html;
 
@@ -21,7 +21,7 @@
  */
 class Bs5FormRenderer extends DefaultFormRenderer
 {
-	/** @var Controls\Button */
+	/** @var Controls\Button|null */
 	public $primaryButton;
 
 	/** @var bool */
@@ -31,7 +31,10 @@ class Bs5FormRenderer extends DefaultFormRenderer
 	private $layout;
 
 
-	public function __construct($layout = FormLayout::HORIZONTAL)
+	/**
+	 * @param FormLayout::* $layout
+	 */
+	public function __construct(string $layout = FormLayout::HORIZONTAL)
 	{
 		$this->layout = $layout;
 
@@ -100,7 +103,7 @@ public function renderControls($parent): string
 	}
 
 
-	public function renderPair(IControl $control): string
+	public function renderPair(Control $control): string
 	{
 		$this->controlsInit();
 		return parent::renderPair($control);
@@ -114,21 +117,21 @@ public function renderPairMulti(array $controls): string
 	}
 
 
-	public function renderLabel(IControl $control): Html
+	public function renderLabel(Control $control): Html
 	{
 		$this->controlsInit();
 		return parent::renderLabel($control);
 	}
 
 
-	public function renderControl(IControl $control): Html
+	public function renderControl(Control $control): Html
 	{
 		$this->controlsInit();
 		return parent::renderControl($control);
 	}
 
 
-	private function controlsInit()
+	private function controlsInit(): void
 	{
 		if ($this->controlsInit) {
 			return;