Merge branch 'release/v1.0.4'

araise-dev · Oct 12, 2023 · a3f8719 · a3f8719
2 parents 3054cce + 5458f05
commit a3f8719
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 2 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
          colors="true"
          bootstrap="tests/bootstrap.php"
          failOnRisky="true"

diff --git a/src/DataLoader/AbstractDataLoader.php b/src/DataLoader/AbstractDataLoader.php
@@ -17,6 +17,11 @@ public function setOptions(array $options): void
         $this->options = $resolver->resolve($options);
     }
 
+    public function setOption(string $option, mixed $value): void
+    {
+        $this->options[$option] = $value;
+    }
+
     public function configureOptions(OptionsResolver $resolver): void
     {
     }

diff --git a/src/DataLoader/DataLoaderInterface.php b/src/DataLoader/DataLoaderInterface.php
@@ -14,6 +14,8 @@ public function configureOptions(OptionsResolver $resolver): void;
 
     public function setOptions(array $options): void;
 
+    public function setOption(string $option, mixed $value): void;
+
     public function getResults(): iterable;
 
     public function getOption(string $option);

diff --git a/src/DataLoader/DoctrineDataLoader.php b/src/DataLoader/DoctrineDataLoader.php
@@ -57,6 +57,8 @@ public function getResults(): iterable
                 'param' => $param,
                 'entity' => $qbSave->getDQLPart('from')[0]->getFrom(),
             ]));
+        } elseif ($this->requestStack->getCurrentRequest()?->hasSession()) {
+            $this->requestStack->getSession()->remove(self::LAST_TABLE_QUERY);
         }
 
         if ($this->paginationExtension->getLimit()) {
@@ -133,6 +135,7 @@ protected function getSessionNextPrevData(mixed $current): ?array
         if (!$this->requestStack->getCurrentRequest()?->hasSession()) {
             return null;
         }
+
         $lastQuery = $this->requestStack?->getSession()->get(self::LAST_TABLE_QUERY);
         if ($lastQuery === null) {
             return null;

diff --git a/src/Resources/views/tailwind_2/_table.html.twig b/src/Resources/views/tailwind_2/_table.html.twig
@@ -109,7 +109,7 @@
                 {% endif %}
                 {% for column in table.columns %}
                     <th class="px-3 py-3 align-top whitespace-nowrap">
-                        {{ column.option('label')|trans }}
+                        {{ column.option('label_html')|raw }} {{ column.option('label')|trans }}
 
                         {% if table.option('sortable') and table.sortExtension and column.option('sortable') %}
                             {% set currentOrder = table.sortExtension.order(column) %}

diff --git a/src/Table/Column.php b/src/Table/Column.php
@@ -14,6 +14,8 @@ class Column extends AbstractColumn implements FormattableColumnInterface
 {
     public const OPT_LABEL = 'label';
 
+    public const OPT_LABEL_HTML = 'label_html';
+
     public const OPT_ACCESSOR_PATH = 'accessor_path';
 
     public const OPT_CALLABLE = 'callable';
@@ -42,6 +44,7 @@ public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             self::OPT_LABEL => $this->identifier,
+            self::OPT_LABEL_HTML => null,
             self::OPT_ACCESSOR_PATH => $this->identifier,
             self::OPT_CALLABLE => null,
             self::OPT_LINK_THE_COLUMN_CONTENT => false,