Merge branch '1.12' into 1.13

* 1.12:
  Generate changelog for v1.12.1
  [Docs] Add info about available form options on filters
  Don't remove driver options when extending a grid configuration
  Fix coding standard
  Fix Psalm errors
  Fix CI
  Fix examples with grids as service
  [docs] Add missing fields options on string filter
  Init .gitattributes to preserve the planet

Author: GSadee

Diff for: .gitattributes

@@ -0,0 +1,18 @@
+/.gitattributes export-ignore
+/.github export-ignore
+/.gitignore export-ignore
+/.php_cs.dist export-ignore
+/docs export-ignore
+/ecs.php export-ignore
+/phpspec/bootstrap.php export-ignore
+/phpspec.yml.dist export-ignore
+/phpstan.neon export-ignore
+/phpunit.xml.dist export-ignore
+/psalm.xml export-ignore
+/rector.php
+/src/Bundle/spec export-ignore
+/src/Bundle/test export-ignore
+/src/Bundle/Tests export-ignore
+/src/Component/spec export-ignore
+/src/Component/Tests export-ignore
+/src/Component/phpspec.yml.dist export-ignore

Diff for: CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## v1.12.1 (2024-01-05)
+
+#### Details
+
+- [#277](https://github.com/Sylius/SyliusGridBundle/issues/277) Fix the build ([@loic425](https://github.com/loic425))
+- [#281](https://github.com/Sylius/SyliusGridBundle/issues/281) Init .gitattributes to preserve the planet ([@loic425](https://github.com/loic425))
+- [#280](https://github.com/Sylius/SyliusGridBundle/issues/280) [docs] Add missing fields options on string filter ([@loic425](https://github.com/loic425))
+- [#298](https://github.com/Sylius/SyliusGridBundle/issues/298) Fix CI ([@loic425](https://github.com/loic425))
+- [#317](https://github.com/Sylius/SyliusGridBundle/issues/317) Fix coding standard ([@loic425](https://github.com/loic425))
+- [#315](https://github.com/Sylius/SyliusGridBundle/issues/315) [Docs] Add info about available form options ([@loic425](https://github.com/loic425))
+- [#316](https://github.com/Sylius/SyliusGridBundle/issues/316) Don't remove driver options when extending a grid configuration ([@loic425](https://github.com/loic425))
+
 ## v1.12.0 (2022-10-31)
 
 #### Details

Diff for: docs/filters.md

@@ -11,6 +11,8 @@ String
 
 Simplest filter type. It can filter by one or multiple fields.
 
+**Filter by one field**
+
 <details open><summary>Yaml</summary>
 
 ```yaml
@@ -105,6 +107,98 @@ final class UserGrid extends AbstractGrid implements ResourceAwareGridInterface
 
 </details>
 
+**Filter by multiple fields**
+
+<details open><summary>Yaml</summary>
+
+```yaml
+sylius_grid:
+    grids:
+        app_user:
+            filters:
+                search:
+                    type: string
+                    options:
+                        fields: [username, email, firstName, lastName]
+```
+
+</details>
+
+<details open><summary>PHP</summary>
+
+```php
+<?php
+
+use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
+use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
+use Sylius\Bundle\GridBundle\Builder\GridBuilder;
+use Sylius\Bundle\GridBundle\Config\GridConfig;
+
+return static function (GridConfig $grid): void {
+    $grid->addGrid(GridBuilder::create('app_user', '%app.model.user.class%')
+        ->addFilter(
+            Filter::create('username', 'string')
+                ->setOptions(['fields' => ['username', 'email', 'firstName', 'lastName']])
+        )
+    
+        // can be simplified using StringFilter
+        ->addFilter(
+            StringFilter::create('username', ['username', 'email', 'firstName', 'lastName'])
+        )
+    )
+};
+```
+
+OR
+
+```php
+<?php
+# src/Grid/UserGrid.php
+
+declare(strict_types=1);
+
+namespace App\Grid;
+
+use App\Entity\User;
+use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
+use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
+use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
+use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
+use Sylius\Bundle\GridBundle\Grid\ResourceAwareGridInterface;
+
+final class UserGrid extends AbstractGrid implements ResourceAwareGridInterface
+{
+    public static function getName(): string
+    {
+           return 'app_user';
+    }
+
+    public function buildGrid(GridBuilderInterface $gridBuilder): void
+    {
+        $gridBuilder
+            ->addFilter(
+                Filter::create('username', 'string')
+                    ->setOptions(['fields' => ['username', 'email', 'firstName', 'lastName']])
+            )
+            
+            // can be simplified using StringFilter
+            ->addFilter(
+                StringFilter::create('username', ['username', 'email', 'firstName', 'lastName'])
+            )
+        ;    
+    }
+    
+    public function getResourceClass(): string
+    {
+        return User::class;
+    }
+}
+```
+
+</details>
+
+**Search options**
+
 The filter allows the user to select following search options:
 
 -   contains
@@ -410,6 +504,9 @@ sylius_grid:
                     type: entity
                     form_options:
                         class: "%app.model.channel.class%"
+                        # You can pass any form options available in Entity Type
+                        # See https://symfony.com/doc/current/reference/forms/types/entity.html
+                        multiple: true 
                 customer:
                     type: entity
                     form_options:
@@ -432,7 +529,12 @@ return static function (GridConfig $grid): void {
     $grid->addGrid(GridBuilder::create('app_user', '%app.model.user.class%')
         ->addFilter(
             Filter::create('channel', 'entity')
-                ->setFormOptions(['class' => '%app.model.channel.class%'])
+                ->setFormOptions([
+                    'class' => '%app.model.channel.class%'
+                    // You can pass any form options available in Entity Type
+                    // See https://symfony.com/doc/current/reference/forms/types/entity.html
+                    'multiple' => true,
+                ])
         )
         ->addFilter(
             Filter::create('customer', 'entity')
@@ -442,6 +544,7 @@ return static function (GridConfig $grid): void {
         // can be simplified using EntityFilter
         ->addFilter(
             EntityFilter::create('channel', '%app.model.channel.class%')
+                ->addFormOption('multiple', true)
         )
         ->addFilter(
             EntityFilter::create('customer', '%app.model.customer.class%')

Diff for: ecs.php

@@ -2,12 +2,9 @@
 
 use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
 use PhpCsFixer\Fixer\Comment\HeaderCommentFixer;
-use PhpCsFixer\Fixer\FunctionNotation\MethodArgumentSpaceFixer;
 use PhpCsFixer\Fixer\Phpdoc\NoSuperfluousPhpdocTagsFixer;
 use SlevomatCodingStandard\Sniffs\Commenting\InlineDocCommentDeclarationSniff;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
-use Symplify\EasyCodingStandard\ValueObject\Option;
 
 return static function (ECSConfig $ecsConfig): void {
     $ecsConfig->paths([
@@ -33,7 +30,6 @@
     $ecsConfig->skip([
         InlineDocCommentDeclarationSniff::class . '.MissingVariable',
         VisibilityRequiredFixer::class => ['*Spec.php'],
-        MethodArgumentSpaceFixer::class => ['*/BoardGameBlog/*'],
         '**/var/*',
     ]);
 };

Diff for: src/Bundle/Builder/GridBuilder.php

@@ -210,8 +210,7 @@ public function toArray(): array
     {
         $output = [
             'driver' => [
-            'name' => $this->driver,
-            'options' => $this->driverConfiguration,
+                'name' => $this->driver,
             ],
             'removals' => $this->removals,
         ];
@@ -220,6 +219,10 @@ public function toArray(): array
             $output['provider'] = $this->provider;
         }
 
+        if (count($this->driverConfiguration) > 0) {
+            $output['driver']['options'] = $this->driverConfiguration;
+        }
+
         if (count($this->fields) > 0) {
             $output['fields'] = array_map(function (FieldInterface $field) { return $field->toArray(); }, $this->fields);
         }

Diff for: src/Bundle/Form/DataTransformer/DateTimeFilterTransformer.php

@@ -34,20 +34,16 @@ public function __construct(string $type)
         $this->type = $type;
     }
 
-    /**
-     * @param mixed|array $value
-     */
+    /** @param mixed|array $value */
     public function transform(mixed $value): array
     {
         return $value;
     }
 
-    /**
-     * @param mixed|array $value
-     */
+    /** @param mixed|array $value */
     public function reverseTransform(mixed $value): array
     {
-        if (!$value['date']['year']) {
+        if (!($value['date']['year'] ?? false)) {
             return $value;
         }