Merge 4.x into 5.x

sonata-project · Apr 11, 2024 · cd66f0f · cd66f0f
2 parents 7ffc123 + 143fbb1
commit cd66f0f
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.16.1](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/4.16.0...4.16.1) - 2024-04-10
+### Fixed
+- [[#1803](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1803)] UidFilter `global_search` default value ([@VincentLanglet](https://github.com/VincentLanglet))
+- [[#1800](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1800)] Catch possible null value error in `ModelFilter` ([@core23](https://github.com/core23))
+
 ## [4.16.0](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/4.15.0...4.16.0) - 2024-02-26
 ### Added
 - [[#1796](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1796)] Compatibility with `doctrine/dbal` 4 and `doctrine/orm` 3 ([@dmaicher](https://github.com/dmaicher))

diff --git a/src/Filter/ModelFilter.php b/src/Filter/ModelFilter.php
@@ -94,7 +94,9 @@ protected function handleMultiple(ProxyQueryInterface $query, string $alias, Fil
             );
         }
 
-        $this->applyWhere($query, $inExpression);
+        if ($inExpression->count() > 0) {
+            $this->applyWhere($query, $inExpression);
+        }
     }
 
     protected function association(ProxyQueryInterface $query, FilterData $data): array
@@ -147,6 +149,10 @@ private function buildInExpression(ProxyQueryInterface $query, string $alias, Fi
         $orX = $queryBuilder->expr()->orX();
 
         foreach ($data->getValue() as $value) {
+            if (!\is_object($value)) {
+                continue;
+            }
+
             $andX = $queryBuilder->expr()->andX();
 
             foreach ($metadata->getIdentifierValues($value) as $fieldName => $identifierValue) {

diff --git a/src/Filter/UidFilter.php b/src/Filter/UidFilter.php
@@ -59,6 +59,7 @@ public function getDefaultOptions(): array
             'field_type' => TextType::class,
             'operator_type' => EqualOperatorType::class,
             'operator_options' => [],
+            'global_search' => false,
         ];
     }
 

diff --git a/tests/Filter/FilterTestCase.php b/tests/Filter/FilterTestCase.php
@@ -26,7 +26,7 @@ abstract class FilterTestCase extends TestCase
      * @param string[]           $expected
      * @param ProxyQuery<object> $proxyQuery
      */
-    final protected function assertSameQuery(array $expected, ProxyQuery $proxyQuery): void
+    final protected static function assertSameQuery(array $expected, ProxyQuery $proxyQuery): void
     {
         $queryBuilder = $proxyQuery->getQueryBuilder();
         if (!$queryBuilder instanceof TestQueryBuilder) {
@@ -40,7 +40,7 @@ final protected function assertSameQuery(array $expected, ProxyQuery $proxyQuery
      * @param mixed[]            $expected
      * @param ProxyQuery<object> $proxyQuery
      */
-    final protected function assertSameQueryParameters(array $expected, ProxyQuery $proxyQuery): void
+    final protected static function assertSameQueryParameters(array $expected, ProxyQuery $proxyQuery): void
     {
         $queryBuilder = $proxyQuery->getQueryBuilder();
         if (!$queryBuilder instanceof TestQueryBuilder) {

diff --git a/tests/Filter/ModelFilterTest.php b/tests/Filter/ModelFilterTest.php
@@ -53,6 +53,24 @@ public function testFilterArray(): void
         static::assertTrue($filter->isActive());
     }
 
+    public function testFilterNonObject(): void
+    {
+        $filter = new ModelFilter();
+        $filter->initialize('field_name', ['field_options' => ['class' => 'FooBar']]);
+
+        $proxyQuery = new ProxyQuery($this->createQueryBuilderStub());
+
+        $filter->filter($proxyQuery, 'alias', 'field', FilterData::fromArray([
+            'type' => EqualOperatorType::TYPE_EQUAL,
+            'value' => null,
+        ]));
+
+        // the alias is now computer by the entityJoin method
+        self::assertSameQuery([], $proxyQuery);
+        self::assertSameQueryParameters([], $proxyQuery);
+        static::assertFalse($filter->isActive());
+    }
+
     public function testFilterArrayTypeIsNotEqual(): void
     {
         $filter = new ModelFilter();

diff --git a/tests/Filter/UidFilterTest.php b/tests/Filter/UidFilterTest.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\DoctrineORMAdminBundle\Tests\Filter;
+
+use Sonata\AdminBundle\Filter\Model\FilterData;
+use Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQuery;
+use Sonata\DoctrineORMAdminBundle\Filter\UidFilter;
+
+final class UidFilterTest extends FilterTestCase
+{
+    public function testSearchEnabled(): void
+    {
+        $filter = new UidFilter();
+        $filter->initialize('field_name');
+        static::assertFalse($filter->isSearchEnabled());
+
+        $filter = new UidFilter();
+        $filter->initialize('field_name', ['global_search' => true]);
+        static::assertTrue($filter->isSearchEnabled());
+    }
+
+    public function testEmpty(): void
+    {
+        $filter = new UidFilter();
+        $filter->initialize('field_name');
+
+        $proxyQuery = new ProxyQuery($this->createQueryBuilderStub());
+
+        $filter->filter($proxyQuery, 'alias', 'field', FilterData::fromArray([]));
+        $filter->filter($proxyQuery, 'alias', 'field', FilterData::fromArray(['value' => '']));
+
+        self::assertSameQuery([], $proxyQuery);
+        static::assertFalse($filter->isActive());
+    }
+}