Merge remote-tracking branch 'yiisoft/master' into patch-1

src/BaseListView.php

@@ -243,7 +243,15 @@ public function getDataReader(): ReadableDataInterface
     }
 
     /**
-     * @psalm-return list{FilterInterface[],ValidationResult}
+     * @return array The array with format:
+     * ```
+     * [
+     *   FilterInterface[]|null, // Array of filters or `null` if there are definitely no entries for the current filter
+     *   ValidationResult, // Validation result of the filter
+     * ]
+     * ```
+     *
+     * @psalm-return list{FilterInterface[]|null,ValidationResult}
      */
     protected function makeFilters(): array
     {
@@ -550,7 +558,7 @@ protected function renderEmpty(int $colspan): Td
     public function render(): string
     {
         [$filters, $filterValidationResult] = $this->makeFilters();
-        $items = $this->prepareDataReaderAndGetItems($filters);
+        $items = $filters === null ? [] : $this->prepareDataReaderAndGetItems($filters);
 
         $content = trim(
             strtr(

src/Column/FilterableColumnRendererInterface.php

@@ -8,10 +8,14 @@
 use Yiisoft\Yii\DataView\Column\Base\Cell;
 use Yiisoft\Yii\DataView\Column\Base\FilterContext;
 use Yiisoft\Yii\DataView\Column\Base\MakeFilterContext;
+use Yiisoft\Yii\DataView\Filter\Factory\IncorrectValueException;
 
 interface FilterableColumnRendererInterface extends ColumnRendererInterface
 {
     public function renderFilter(ColumnInterface $column, Cell $cell, FilterContext $context): ?Cell;
 
+    /**
+     * @throws IncorrectValueException
+     */
     public function makeFilter(ColumnInterface $column, MakeFilterContext $context): ?FilterInterface;
 }

src/Filter/Factory/FilterFactoryInterface.php

@@ -8,5 +8,8 @@
 
 interface FilterFactoryInterface
 {
+    /**
+     * @throws IncorrectValueException
+     */
     public function create(string $property, string $value): ?FilterInterface;
 }

src/Filter/Factory/IncorrectValueException.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Yii\DataView\Filter\Factory;
+
+use Exception;
+
+final class IncorrectValueException extends Exception
+{
+}

src/GridView.php

@@ -25,6 +25,7 @@
 use Yiisoft\Yii\DataView\Column\ColumnInterface;
 use Yiisoft\Yii\DataView\Column\ColumnRendererInterface;
 use Yiisoft\Yii\DataView\Column\FilterableColumnRendererInterface;
+use Yiisoft\Yii\DataView\Filter\Factory\IncorrectValueException;
 
 /**
  * The GridView widget is used to display data in a grid.
@@ -649,7 +650,12 @@ protected function makeFilters(): array
         $filters = [];
         foreach ($columns as $i => $column) {
             if ($renderers[$i] instanceof FilterableColumnRendererInterface) {
-                $filter = $renderers[$i]->makeFilter($column, $context);
+                try {
+                    $filter = $renderers[$i]->makeFilter($column, $context);
+                } catch (IncorrectValueException) {
+                    $filters = null;
+                    break;
+                }
                 if ($filter !== null) {
                     $filters[] = $filter;
                 }