Fix cs & phpstan

contributte · Mar 11, 2024 · a135d53 · a135d53
1 parent 976291a
commit a135d53
Show file tree

Hide file tree

Showing 24 changed files with 12 additions and 57 deletions.
diff --git a/src/Column/Action.php b/src/Column/Action.php
@@ -27,13 +27,10 @@ class Action extends Column
 
 	protected ?IConfirmation $confirmation = null;
 
-	/** @var array */
 	protected array $dataAttributes = [];
 
-	/** @var array */
 	protected array $attributes = [];
 
-	/** @var array */
 	protected array $parameters = [];
 
 	/** @var string|callable|null */

diff --git a/src/Column/Column.php b/src/Column/Column.php
@@ -33,7 +33,6 @@ abstract class Column extends FilterableColumn
 
 	protected ?string $align = null;
 
-	/** @var array */
 	protected array $templateVariables = [];
 
 	/** @var callable|null */
@@ -42,7 +41,6 @@ abstract class Column extends FilterableColumn
 	/** @var callable|null */
 	protected $editableConditionCallback = null;
 
-	/** @var array */
 	protected array $editableElement = ['textarea', ['class' => 'form-control']];
 
 	protected bool $defaultHide = false;

diff --git a/src/Column/ColumnLink.php b/src/Column/ColumnLink.php
@@ -16,12 +16,10 @@ class ColumnLink extends Column
 
 	protected ?string $icon = null;
 
-	/** @var array */
 	protected array $dataAttributes = [];
 
 	protected bool $openInNewTab = false;
 
-	/** @var array */
 	protected array $parameters = [];
 
 	public function __construct(

diff --git a/src/Column/ColumnNumber.php b/src/Column/ColumnNumber.php
@@ -9,7 +9,6 @@ class ColumnNumber extends Column
 
 	protected ?string $align = 'end';
 
-	/** @var array */
 	protected array $numberFormat = [
 		0, // Decimals
 		'.', // Decimal point

diff --git a/src/Column/ColumnStatus.php b/src/Column/ColumnStatus.php
@@ -25,7 +25,6 @@ class ColumnStatus extends Column
 
 	protected string $key;
 
-	/** @var array */
 	protected array $options = [];
 
 	public function __construct(

diff --git a/src/Column/MultiAction.php b/src/Column/MultiAction.php
@@ -29,7 +29,6 @@ class MultiAction extends Column
 
 	protected string $name;
 
-	/** @var array */
 	protected array $actions = [];
 
 	/** @var array|callable[] */

diff --git a/src/ColumnsSummary.php b/src/ColumnsSummary.php
@@ -13,7 +13,6 @@ class ColumnsSummary
 	/** @var array|int[] */
 	protected array $summary;
 
-	/** @var array */
 	protected array $format = [];
 
 	/** @var callable|null */

diff --git a/src/DataSource/ApiDataSource.php b/src/DataSource/ApiDataSource.php
@@ -8,7 +8,6 @@
 class ApiDataSource implements IDataSource
 {
 
-	/** @var array */
 	protected array $data = [];
 
 	protected ?string $sortColumn = null;
@@ -21,7 +20,6 @@ class ApiDataSource implements IDataSource
 
 	protected int $filterOne = 0;
 
-	/** @var array */
 	protected array $filter = [];
 
 	public function __construct(protected string $url, protected array $queryParams = [])

diff --git a/src/DataSource/ArrayDataSource.php b/src/DataSource/ArrayDataSource.php
@@ -21,7 +21,6 @@
 class ArrayDataSource implements IDataSource
 {
 
-	/** @var array */
 	protected array $data = [];
 
 	protected int $count = 0;

diff --git a/src/DataSource/DibiFluentDataSource.php b/src/DataSource/DibiFluentDataSource.php
@@ -21,7 +21,6 @@
 class DibiFluentDataSource extends FilterableDataSource implements IDataSource, IAggregatable
 {
 
-	/** @var array */
 	protected array $data = [];
 
 	public function __construct(protected Fluent $dataSource, protected string $primaryKey)

diff --git a/src/DataSource/DibiFluentMssqlDataSource.php b/src/DataSource/DibiFluentMssqlDataSource.php
@@ -16,7 +16,6 @@
 class DibiFluentMssqlDataSource extends DibiFluentDataSource
 {
 
-	/** @var array */
 	protected array $data = [];
 
 	public function __construct(Fluent $dataSource, string $primaryKey)

diff --git a/src/DataSource/NetteDatabaseTableDataSource.php b/src/DataSource/NetteDatabaseTableDataSource.php
@@ -19,7 +19,6 @@
 class NetteDatabaseTableDataSource extends FilterableDataSource implements IDataSource
 {
 
-	/** @var array */
 	protected array $data = [];
 
 	public function __construct(protected Selection $dataSource, protected string $primaryKey)

diff --git a/src/DataSource/NextrasDataSource.php b/src/DataSource/NextrasDataSource.php
@@ -22,7 +22,6 @@
 class NextrasDataSource extends FilterableDataSource implements IDataSource, IAggregatable
 {
 
-	/** @var array */
 	protected array $data = [];
 
 	public function __construct(protected ICollection $dataSource, protected string $primaryKey)

diff --git a/src/Datagrid.php b/src/Datagrid.php
@@ -136,26 +136,18 @@ class Datagrid extends Control
 	/** @persistent */
 	public string|int|null $perPage = null;
 
-	/**
-	 * @var array
-	 * @persistent
-	 */
+	/** @persistent */
 	public array $sort = [];
 
-	/** @var array */
 	public array $defaultSort = [];
 
-	/** @var array */
 	public array $defaultFilter = [];
 
 	public bool $defaultFilterUseOnReset = true;
 
 	public bool $defaultSortUseOnReset = true;
 
-	/**
-	 * @var array
-	 * @persistent
-	 */
+	/** @persistent */
 	public array $filter = [];
 
 	/** @var callable|null */
@@ -166,7 +158,6 @@ class Datagrid extends Control
 	/** @var callable */
 	protected $rowCallback;
 
-	/** @var array */
 	protected array $itemsPerPageList = [10, 20, 50, 'all'];
 
 	protected ?int $defaultPerPage = null;
@@ -208,7 +199,6 @@ class Datagrid extends Control
 
 	protected ?string $originalTemplate = null;
 
-	/** @var array */
 	protected array $redrawItem = [];
 
 	protected ?Translator $translator = null;
@@ -242,18 +232,15 @@ class Datagrid extends Control
 
 	protected ?ItemDetail $itemsDetail = null;
 
-	/** @var array */
 	protected array $rowConditions = [
 		'group_action' => false,
 		'action' => [],
 	];
 
-	/** @var array */
 	protected array $columnCallbacks = [];
 
 	protected bool $canHideColumns = false;
 
-	/** @var array */
 	protected array $columnsVisibility = [];
 
 	protected ?InlineEdit $inlineEdit = null;
@@ -1311,8 +1298,8 @@ public function filterSucceeded(NetteForm $form): void
 			}
 
 			if ($edit['submit']->isSubmittedBy() || $edit['cancel']->isSubmittedBy()) {
-				$id = $form->getHttpData(Form::DATA_LINE, 'inline_edit[_id]');
-				$primaryWhereColumn = $form->getHttpData(Form::DATA_LINE, 'inline_edit[_primary_where_column]');
+				$id = $form->getHttpData(Form::DataLine, 'inline_edit[_id]');
+				$primaryWhereColumn = $form->getHttpData(Form::DataLine, 'inline_edit[_primary_where_column]');
 
 				if ($edit['submit']->isSubmittedBy() && $edit->getErrors() === []) {
 					$this->inlineEdit->onSubmit($id, $values['inline_edit']);

diff --git a/src/Export/Export.php b/src/Export/Export.php
@@ -27,7 +27,6 @@ class Export
 
 	protected ?Link $link = null;
 
-	/** @var array */
 	protected array $columns = [];
 
 	protected ?string $confirmDialog = null;

diff --git a/src/Filter/FilterDate.php b/src/Filter/FilterDate.php
@@ -9,7 +9,6 @@ class FilterDate extends OneColumnFilter implements IFilterDate
 
 	protected ?string $template = 'datagrid_filter_date.latte';
 
-	/** @var array */
 	protected array $format = ['j. n. Y', 'd. m. yyyy'];
 
 	protected ?string $type = 'date';

diff --git a/src/Filter/FilterDateRange.php b/src/Filter/FilterDateRange.php
@@ -9,7 +9,6 @@ class FilterDateRange extends FilterRange implements IFilterDate
 
 	protected ?string $template = 'datagrid_filter_daterange.latte';
 
-	/** @var array */
 	protected array $format = ['j. n. Y', 'd. m. yyyy'];
 
 	protected ?string $type = 'date-range';

diff --git a/src/Filter/FilterRange.php b/src/Filter/FilterRange.php
@@ -8,7 +8,6 @@
 class FilterRange extends OneColumnFilter
 {
 
-	/** @var array */
 	protected array $placeholders = [];
 
 	protected ?string $template = 'datagrid_filter_range.latte';

diff --git a/src/Filter/SubmitButton.php b/src/Filter/SubmitButton.php
@@ -10,6 +10,7 @@
 use Contributte\Datagrid\Traits\TButtonTryAddIcon;
 use Nette\Forms\Controls\Button;
 use Nette\Utils\Html;
+use Stringable;
 
 class SubmitButton extends Button
 {
@@ -31,8 +32,7 @@ public function __construct(protected Datagrid $grid)
 		$this->control = Html::el('button', ['type' => 'submit', 'name' => 'submit']);
 	}
 
-	/** @inheritdoc */
-	public function getControl($caption = null): Html
+	public function getControl(Stringable|string|null $caption = null): Html
 	{
 		$el = parent::getControl($caption);
 

diff --git a/src/GroupAction/GroupActionCollection.php b/src/GroupAction/GroupActionCollection.php
@@ -91,15 +91,15 @@ public function addToFormContainer(Container $container): void
 				$control = $container->addText((string) $id, '');
 
 				$control->setHtmlAttribute('id', $lookupPath . self::ID_ATTRIBUTE_PREFIX . $id)
-					->addConditionOn($groupActionSelect, Form::EQUAL, $id)
+					->addConditionOn($groupActionSelect, Form::Equal, $id)
 					->setRequired('contributte_datagrid.choose_input_required')
 					->endCondition();
 
 			} elseif ($action instanceof GroupTextareaAction) {
 				$control = $container->addTextArea((string) $id, '');
 
 				$control->setHtmlAttribute('id', $lookupPath . self::ID_ATTRIBUTE_PREFIX . $id)
-					->addConditionOn($groupActionSelect, Form::EQUAL, $id)
+					->addConditionOn($groupActionSelect, Form::Equal, $id)
 					->setRequired('contributte_datagrid.choose_input_required');
 			}
 
@@ -120,11 +120,11 @@ public function addToFormContainer(Container $container): void
 
 		if ($main_options !== []) {
 			foreach (array_keys($this->groupActions) as $id) {
-				$groupActionSelect->addCondition(Form::EQUAL, $id)
+				$groupActionSelect->addCondition(Form::Equal, $id)
 					->toggle($lookupPath . self::ID_ATTRIBUTE_PREFIX . $id);
 			}
 
-			$groupActionSelect->addCondition(Form::FILLED)
+			$groupActionSelect->addCondition(Form::Filled)
 				->toggle(
 					strtolower($this->datagrid->getFullName()) . 'group_action_submit'
 				);
@@ -165,7 +165,7 @@ public function submitted(NetteForm $form): void
 		}
 
 		$httpIds = $form->getHttpData(
-			Form::DATA_LINE | Form::DATA_KEYS,
+			Form::DataLine | Form::DataKeys,
 			strtolower($this->datagrid->getFullName()) . '_group_action_item[]'
 		);
 

diff --git a/src/Toolbar/ToolbarButton.php b/src/Toolbar/ToolbarButton.php
@@ -24,7 +24,6 @@ class ToolbarButton
 	use TButtonTitle;
 	use TLink;
 
-	/** @var array */
 	protected array $attributes = [];
 
 	protected ?string $confirmDialog = null;

diff --git a/src/Traits/TButtonRenderer.php b/src/Traits/TButtonRenderer.php
@@ -12,7 +12,6 @@ trait TButtonRenderer
 
 	protected ?Renderer $renderer = null;
 
-	/** @var array */
 	protected array $replacements = [];
 
 	/**

diff --git a/src/Traits/TLink.php b/src/Traits/TLink.php
@@ -51,7 +51,7 @@ protected function createLink(
 				if (
 					str_starts_with($link, '#error') ||
 					(strrpos($href, '!') !== false && str_starts_with($link, '#')) ||
-					(in_array($presenter->invalidLinkMode, [Presenter::INVALID_LINK_WARNING, Presenter::INVALID_LINK_SILENT], true) && str_starts_with($link, '#'))
+					(in_array($presenter->invalidLinkMode, [Presenter::InvalidLinkWarning, Presenter::InvalidLinkSilent], true) && str_starts_with($link, '#'))
 				) {
 					continue; // Did not find signal handler
 				}

diff --git a/src/Utils/ItemDetailForm.php b/src/Utils/ItemDetailForm.php
@@ -60,10 +60,6 @@ private function getHttpData(): mixed
 			$lookupPath = $this->lookupPath(Form::class);
 			$form = $this->getForm();
 
-			if ($lookupPath === null || $form === null) {
-				throw new UnexpectedValueException();
-			}
-
 			$path = explode(self::NameSeparator, $lookupPath);
 
 			$this->httpPost = Arrays::get($form->getHttpData(), $path, null);
@@ -79,10 +75,6 @@ private function loadHttpData(): void
 	{
 		$form = $this->getForm();
 
-		if ($form === null) {
-			throw new UnexpectedValueException();
-		}
-
 		if ($form->isSubmitted() === false) {
 			return;
 		}