[7.x] phpstan-deprecation-rules (#1061)

phpstan.neon

@@ -1,5 +1,5 @@
 includes:
-#	- vendor/phpstan/phpstan-deprecation-rules/rules.neon
+	- vendor/phpstan/phpstan-deprecation-rules/rules.neon
 	- vendor/phpstan/phpstan-nette/extension.neon
 	- vendor/phpstan/phpstan-nette/rules.neon
 	- vendor/phpstan/phpstan-strict-rules/rules.neon

src/DataGrid.php

@@ -15,9 +15,9 @@
 use Nette\Bridges\ApplicationLatte\Template;
 use Nette\ComponentModel\IContainer;
 use Nette\Forms\Container;
+use Nette\Forms\Control as FormControl;
 use Nette\Forms\Controls\SubmitButton as FormsSubmitButton;
 use Nette\Forms\Form as NetteForm;
-use Nette\Forms\IControl;
 use Nette\Http\SessionSection;
 use Nette\Localization\Translator;
 use Nette\Utils\ArrayHash;
@@ -1146,7 +1146,7 @@ public function createComponentFilter(): Form
 				->setValidationScope([$inlineAddContainer]);
 			$inlineAddContainer->addSubmit('cancel', 'ublaboo_datagrid.cancel')
 				->setValidationScope(null)
-				->setAttribute('data-datagrid-cancel-inline-add', true);
+				->setHtmlAttribute('data-datagrid-cancel-inline-add', true);
 
 			$this->inlineAdd->onControlAdd($inlineAddContainer);
 			$this->inlineAdd->onControlAfterAdd($inlineAddContainer);
@@ -1233,7 +1233,7 @@ public function setFilterContainerDefaults(Container $container, array $values,
 			}
 
 			try {
-				if (!$control instanceof IControl) {
+				if (!$control instanceof FormControl) {
 					throw new UnexpectedValueException();
 				}
 

src/Filter/Filter.php

@@ -157,9 +157,9 @@ public function getAttributes(): array
 	protected function addAttributes(BaseControl $input): BaseControl
 	{
 		if ($this->grid->hasAutoSubmit()) {
-			$input->setAttribute('data-autosubmit', true);
+			$input->setHtmlAttribute('data-autosubmit', true);
 		} else {
-			$input->setAttribute('data-datagrid-manualsubmit', true);
+			$input->setHtmlAttribute('data-datagrid-manualsubmit', true);
 		}
 
 		foreach ($this->attributes as $key => $value) {
@@ -168,7 +168,7 @@ protected function addAttributes(BaseControl $input): BaseControl
 				$value = implode(' ', $value);
 			}
 
-			$input->setAttribute($key, $value);
+			$input->setHtmlAttribute($key, $value);
 		}
 
 		return $input;

src/Filter/FilterDate.php

@@ -18,20 +18,20 @@ public function addToFormContainer(Container $container): void
 	{
 		$control = $container->addText($this->key, $this->name);
 
-		$control->setAttribute('data-provide', 'datepicker')
-			->setAttribute('data-date-orientation', 'bottom')
-			->setAttribute('data-date-format', $this->getJsFormat())
-			->setAttribute('data-date-today-highlight', 'true')
-			->setAttribute('data-date-autoclose', 'true');
+		$control->setHtmlAttribute('data-provide', 'datepicker')
+			->setHtmlAttribute('data-date-orientation', 'bottom')
+			->setHtmlAttribute('data-date-format', $this->getJsFormat())
+			->setHtmlAttribute('data-date-today-highlight', 'true')
+			->setHtmlAttribute('data-date-autoclose', 'true');
 
 		$this->addAttributes($control);
 
 		if ($this->grid->hasAutoSubmit()) {
-			$control->setAttribute('data-autosubmit-change', true);
+			$control->setHtmlAttribute('data-autosubmit-change', true);
 		}
 
 		if ($this->getPlaceholder() !== null) {
-			$control->setAttribute('placeholder', $this->getPlaceholder());
+			$control->setHtmlAttribute('placeholder', $this->getPlaceholder());
 		}
 	}
 

src/Filter/FilterDateRange.php

@@ -23,26 +23,26 @@ public function addToFormContainer(Container $container): void
 
 		$from = $container->addText('from', $this->name);
 
-		$from->setAttribute('data-provide', 'datepicker')
-			->setAttribute('data-date-orientation', 'bottom')
-			->setAttribute('data-date-format', $this->getJsFormat())
-			->setAttribute('data-date-today-highlight', 'true')
-			->setAttribute('data-date-autoclose', 'true');
+		$from->setHtmlAttribute('data-provide', 'datepicker')
+			->setHtmlAttribute('data-date-orientation', 'bottom')
+			->setHtmlAttribute('data-date-format', $this->getJsFormat())
+			->setHtmlAttribute('data-date-today-highlight', 'true')
+			->setHtmlAttribute('data-date-autoclose', 'true');
 
 		$to = $container->addText('to', $this->nameSecond);
 
-		$to->setAttribute('data-provide', 'datepicker')
-			->setAttribute('data-date-orientation', 'bottom')
-			->setAttribute('data-date-format', $this->getJsFormat())
-			->setAttribute('data-date-today-highlight', 'true')
-			->setAttribute('data-date-autoclose', 'true');
+		$to->setHtmlAttribute('data-provide', 'datepicker')
+			->setHtmlAttribute('data-date-orientation', 'bottom')
+			->setHtmlAttribute('data-date-format', $this->getJsFormat())
+			->setHtmlAttribute('data-date-today-highlight', 'true')
+			->setHtmlAttribute('data-date-autoclose', 'true');
 
 		$this->addAttributes($from);
 		$this->addAttributes($to);
 
 		if ($this->grid->hasAutoSubmit()) {
-			$from->setAttribute('data-autosubmit-change', true);
-			$to->setAttribute('data-autosubmit-change', true);
+			$from->setHtmlAttribute('data-autosubmit-change', true);
+			$to->setHtmlAttribute('data-autosubmit-change', true);
 		}
 
 		$placeholders = $this->getPlaceholders();
@@ -51,13 +51,13 @@ public function addToFormContainer(Container $container): void
 			$textFrom = reset($placeholders);
 
 			if ($textFrom) {
-				$from->setAttribute('placeholder', $textFrom);
+				$from->setHtmlAttribute('placeholder', $textFrom);
 			}
 
 			$textTo = end($placeholders);
 
 			if ($textTo && ($textTo !== $textFrom)) {
-				$to->setAttribute('placeholder', $textTo);
+				$to->setHtmlAttribute('placeholder', $textTo);
 			}
 		}
 	}

src/Filter/FilterRange.php

@@ -42,13 +42,13 @@ public function addToFormContainer(Container $container): void
 			$text_from = reset($placeholders);
 
 			if ($text_from) {
-				$from->setAttribute('placeholder', $text_from);
+				$from->setHtmlAttribute('placeholder', $text_from);
 			}
 
 			$text_to = end($placeholders);
 
 			if ($text_to && ($text_to !== $text_from)) {
-				$to->setAttribute('placeholder', $text_to);
+				$to->setHtmlAttribute('placeholder', $text_to);
 			}
 		}
 	}

src/Filter/FilterText.php

@@ -39,7 +39,7 @@ public function addToFormContainer(Container $container): void
 		$this->addAttributes($control);
 
 		if ($this->getPlaceholder() !== null) {
-			$control->setAttribute('placeholder', $this->getPlaceholder());
+			$control->setHtmlAttribute('placeholder', $this->getPlaceholder());
 		}
 	}
 

src/GroupAction/GroupActionCollection.php

@@ -45,13 +45,13 @@ public function addToFormContainer(Container $container): void
 				/**
 				 * User may set a class to the form control
 				 */
-				$control->setAttribute('class', $action->getClass());
+				$control->setHtmlAttribute('class', $action->getClass());
 
 				/**
 				 * User may set additional attribtues to the form control
 				 */
 				foreach ($action->getAttributes() as $name => $value) {
-					$control->setAttribute($name, $value);
+					$control->setHtmlAttribute($name, $value);
 				}
 			}
 		}
@@ -78,27 +78,27 @@ public function addToFormContainer(Container $container): void
 				if ($action->hasOptions()) {
 					if ($action instanceof GroupMultiSelectAction) {
 						$control = $container->addMultiSelect((string) $id, '', $action->getOptions());
-						$control->setAttribute('data-datagrid-multiselect-id', $lookupPath . self::ID_ATTRIBUTE_PREFIX . $id);
-						$control->setAttribute('data-style', 'hidden');
-						$control->setAttribute('data-selected-icon-check', DataGrid::$iconPrefix . 'check');
+						$control->setHtmlAttribute('data-datagrid-multiselect-id', $lookupPath . self::ID_ATTRIBUTE_PREFIX . $id);
+						$control->setHtmlAttribute('data-style', 'hidden');
+						$control->setHtmlAttribute('data-selected-icon-check', DataGrid::$iconPrefix . 'check');
 					} else {
 						$control = $container->addSelect((string) $id, '', $action->getOptions());
 					}
 
-					$control->setAttribute('id', $lookupPath . self::ID_ATTRIBUTE_PREFIX . $id);
+					$control->setHtmlAttribute('id', $lookupPath . self::ID_ATTRIBUTE_PREFIX . $id);
 				}
 			} elseif ($action instanceof GroupTextAction) {
 				$control = $container->addText((string) $id, '');
 
-				$control->setAttribute('id', $lookupPath . self::ID_ATTRIBUTE_PREFIX . $id)
+				$control->setHtmlAttribute('id', $lookupPath . self::ID_ATTRIBUTE_PREFIX . $id)
 					->addConditionOn($groupActionSelect, Form::EQUAL, $id)
 					->setRequired('ublaboo_datagrid.choose_input_required')
 					->endCondition();
 
 			} elseif ($action instanceof GroupTextareaAction) {
 				$control = $container->addTextArea((string) $id, '');
 
-				$control->setAttribute('id', $lookupPath . self::ID_ATTRIBUTE_PREFIX . $id)
+				$control->setHtmlAttribute('id', $lookupPath . self::ID_ATTRIBUTE_PREFIX . $id)
 					->addConditionOn($groupActionSelect, Form::EQUAL, $id)
 					->setRequired('ublaboo_datagrid.choose_input_required');
 			}
@@ -107,13 +107,13 @@ public function addToFormContainer(Container $container): void
 				/**
 				 * User may set a class to the form control
 				 */
-				$control->setAttribute('class', $action->getClass());
+				$control->setHtmlAttribute('class', $action->getClass());
 
 				/**
 				 * User may set additional attribtues to the form control
 				 */
 				foreach ($action->getAttributes() as $name => $value) {
-					$control->setAttribute($name, $value);
+					$control->setHtmlAttribute($name, $value);
 				}
 			}
 		}
@@ -131,7 +131,7 @@ public function addToFormContainer(Container $container): void
 
 			$container->addSubmit('submit', 'ublaboo_datagrid.execute')
 				->setValidationScope([$container])
-				->setAttribute(
+				->setHtmlAttribute(
 					'id',
 					strtolower($this->datagrid->getFullName()) . 'group_action_submit'
 				);

src/Utils/ItemDetailForm.php

@@ -64,7 +64,7 @@ private function getHttpData(): mixed
 				throw new UnexpectedValueException();
 			}
 
-			$path = explode(self::NAME_SEPARATOR, $lookupPath);
+			$path = explode(self::NameSeparator, $lookupPath);
 
 			$this->httpPost = Arrays::get($form->getHttpData(), $path, null);
 		}

src/Utils/NetteDatabaseSelectionHelper.php

@@ -2,14 +2,14 @@
 
 namespace Ublaboo\DataGrid\Utils;
 
-use Nette\Database\ISupplementalDriver;
+use Nette\Database\Driver;
 use Nette\Database\Table\Selection;
 use ReflectionClass;
 
 final class NetteDatabaseSelectionHelper
 {
 
-	public static function getDriver(Selection $selection): ISupplementalDriver
+	public static function getDriver(Selection $selection): Driver
 	{
 		$connection = self::getContext($selection)->getConnection();
 

tests/Files/TestPresenter.php

@@ -3,8 +3,8 @@
 namespace Ublaboo\DataGrid\Tests\Files;
 
 use Mockery;
-use Nette\Application\UI\ITemplate;
 use Nette\Application\UI\Presenter;
+use Nette\Application\UI\Template;
 
 final class TestPresenter extends Presenter
 {
@@ -14,9 +14,9 @@ protected function createComponentGrid(): TestGridControl
 		return new TestGridControl();
 	}
 
-	protected function createTemplate(): ITemplate
+	protected function createTemplate(): Template
 	{
-		return Mockery::mock(ITemplate::class)
+		return Mockery::mock(Template::class)
 			->shouldReceive('getFile')
 			->andReturn(__DIR__ . '/template.latte')
 			->getMock();