Merge remote-tracking branch 'origin/MAGETWO-93764' into 2.3-develop-pr2

Author: serhii-balko

app/code/Magento/Ui/Component/Filters/Type/Input.php

@@ -29,7 +29,7 @@ class Input extends AbstractFilter
      *
      * @return void
      */
-    public function prepare()
+    public function prepare(): void
     {
         $this->wrappedComponent = $this->uiComponentFactory->create(
             $this->getName(),
@@ -62,12 +62,12 @@ public function prepare()
      *
      * @return void
      */
-    protected function applyFilter()
+    protected function applyFilter(): void
     {
         if (isset($this->filterData[$this->getName()])) {
             $value = str_replace(['%', '_'], ['\%', '\_'], $this->filterData[$this->getName()]);
 
-            if (!empty($value)) {
+            if ($value || $value === '0') {
                 $filter = $this->filterBuilder->setConditionType('like')
                     ->setField($this->getName())
                     ->setValue(sprintf('%%%s%%', $value))

app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php

@@ -6,7 +6,6 @@
 namespace Magento\Ui\Test\Unit\Component\Filters\Type;
 
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface as UiContext;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Ui\Component\Filters\Type\Input;
@@ -37,18 +36,18 @@ class InputTest extends \PHPUnit\Framework\TestCase
     protected $filterModifierMock;
 
     /**
-     * Set up
+     * @inheritdoc
      */
     protected function setUp()
     {
         $this->contextMock = $this->getMockForAbstractClass(
-            \Magento\Framework\View\Element\UiComponent\ContextInterface::class,
+            ContextInterface::class,
             [],
             '',
             false
         );
         $this->uiComponentFactory = $this->createPartialMock(
-            \Magento\Framework\View\Element\UiComponentFactory::class,
+            UiComponentFactory::class,
             ['create']
         );
         $this->filterBuilderMock = $this->createMock(\Magento\Framework\Api\FilterBuilder::class);
@@ -63,7 +62,7 @@ protected function setUp()
      *
      * @return void
      */
-    public function testGetComponentName()
+    public function testGetComponentName(): void
     {
         $this->contextMock->expects($this->never())->method('getProcessor');
         $date = new Input(
@@ -86,15 +85,15 @@ public function testGetComponentName()
      * @dataProvider getPrepareDataProvider
      * @return void
      */
-    public function testPrepare($name, $filterData, $expectedCondition)
+    public function testPrepare(string $name, array $filterData, ?array $expectedCondition): void
     {
         $processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->contextMock->expects($this->atLeastOnce())->method('getProcessor')->willReturn($processor);
         /** @var UiComponentInterface $uiComponent */
         $uiComponent = $this->getMockForAbstractClass(
-            \Magento\Framework\View\Element\UiComponentInterface::class,
+            UiComponentInterface::class,
             [],
             '',
             false
@@ -169,14 +168,24 @@ public function testPrepare($name, $filterData, $expectedCondition)
     /**
      * @return array
      */
-    public function getPrepareDataProvider()
+    public function getPrepareDataProvider(): array
     {
         return [
             [
                 'test_date',
                 ['test_date' => ''],
                 null,
             ],
+            [
+                'test_date',
+                ['test_date' => null],
+                null,
+            ],
+            [
+                'test_date',
+                ['test_date' => '0'],
+                ['like' => '%0%'],
+            ],
             [
                 'test_date',
                 ['test_date' => 'some_value'],