Cleanup

src/BaseListView.php

@@ -143,7 +143,7 @@
     protected UrlParameterProviderInterface|null $urlParameterProvider = null;
 
     private bool $ignoreMissingPage = true;
-    protected bool $enableMultiSort = false;
+    protected bool $multiSort = false;
 
     /**
      * @psalm-var PageNotFoundExceptionCallback|null
@@ -170,7 +170,7 @@
 
     final public function ignoreMissingPage(bool $enabled): static
     {
         $new = clone $this;
         $new->ignoreMissingPage = $enabled;
         return $new;
     }
@@ -218,15 +218,15 @@
 
     final public function urlParameterProvider(?UrlParameterProviderInterface $provider): static
     {
         $new = clone $this;
         $new->urlParameterProvider = $provider;
         return $new;
     }
 
-    final public function enableMultiSort(bool $enable = true): static
+    final public function multiSort(bool $enable = true): static
     {
         $new = clone $this;
-        $new->enableMultiSort = $enable;
+        $new->multiSort = $enable;
         return $new;
     }
 
@@ -412,7 +412,7 @@
      */
     final public function offsetPaginationConfig(array $config): static
     {
         $new = clone $this;
         $new->offsetPaginationConfig = $config;
         return $new;
     }
@@ -425,7 +425,7 @@
      */
     final public function keysetPaginationConfig(array $config): static
     {
         $new = clone $this;
         $new->keysetPaginationConfig = $config;
         return $new;
     }
@@ -599,7 +599,7 @@
      *
      * @psalm-return list{FilterInterface[]|null,ValidationResult}
      */
     protected function makeFilters(): array
     {
         return [[], new ValidationResult()];
     }
@@ -768,11 +768,11 @@
             }
         }
 
         if (!empty($sort) && $dataReader->isSortable()) {
             $sortObject = $dataReader->getSort();
             if ($sortObject !== null) {
                 $order = OrderHelper::stringToArray($sort);
-                if (!$this->enableMultiSort) {
+                if (!$this->multiSort) {
                     $order = array_slice($order, 0, 1, true);
                 }
                 $dataReader = $dataReader->withSort(
@@ -783,7 +783,7 @@
             }
         }
 
         if (!empty($filters) && $dataReader->isFilterable()) {
             $dataReader = $dataReader->withFilter(new All(...$filters));
         }
 
@@ -927,7 +927,7 @@
         $currentPage = $dataReader->getCurrentPage();
 
         // The starting row number (1-based) currently being displayed
         $begin = ($currentPage - 1) * $dataReader->getPageSize() + 1;
 
         // The number of rows currently being displayed
         $count = $dataReader->getCurrentPageSize();

src/Column/Base/HeaderContext.php

@@ -46,7 +46,7 @@ final class HeaderContext
      * @param string|null $sortableLinkDescClass CSS class for descending sort links.
      * @param PageToken|null $pageToken Current page token for pagination.
      * @param int|null $pageSize Number of items per page.
-     * @param bool $enableMultiSort Whether multiple column sorting is enabled.
+     * @param bool $multiSort Whether multiple column sorting is enabled.
      * @param UrlConfig $urlConfig URL configuration settings.
      * @param UrlCreator|null $urlCreator Callback for creating sort URLs.
      * @param TranslatorInterface $translator Translator service for header content.
@@ -75,7 +75,7 @@ public function __construct(
         public readonly ?string $sortableLinkDescClass,
         private readonly ?PageToken $pageToken,
         private readonly int|null $pageSize,
-        private readonly bool $enableMultiSort,
+        private readonly bool $multiSort,
         private readonly UrlConfig $urlConfig,
         private $urlCreator,
         private readonly TranslatorInterface $translator,
@@ -177,7 +177,7 @@ private function getLinkSortValue(
         $order = $sort->getOrder();
 
         if (isset($order[$property])) {
-            if ($this->enableMultiSort) {
+            if ($this->multiSort) {
                 if ($order[$property] === 'asc') {
                     $order[$property] = 'desc';
                 } elseif (!empty($originalOrder) && count($order) === 1) {
@@ -196,7 +196,7 @@ private function getLinkSortValue(
             } else {
                 unset($order[$property]);
             }
-        } elseif ($this->enableMultiSort) {
+        } elseif ($this->multiSort) {
             $order[$property] = 'asc';
         } else {
             $order = [$property => 'asc'];

src/GridView.php

@@ -71,7 +71,7 @@ final class GridView extends BaseListView
     /**
      * @var bool Whether column grouping is enabled.
      */
-    private bool $isColumnGroupingEnabled = false;
+    private bool $columnGrouping = false;
 
     /**
      * @var string HTML content for empty cells.
@@ -398,10 +398,10 @@ public function columns(ColumnInterface ...$columns): self
      *
      * @return self New instance with the column grouping enabled.
      */
-    public function enableColumnGrouping(bool $enabled = true): self
+    public function columnGrouping(bool $enabled = true): self
     {
         $new = clone $this;
-        $new->isColumnGroupingEnabled = $enabled;
+        $new->columnGrouping = $enabled;
         return $new;
     }
 
@@ -444,7 +444,7 @@ public function emptyCellAttributes(array $attributes): self
      *
      * @return self New instance with the footer section visibility setting.
      */
-    public function enableFooter(bool $enabled): self
+    public function enableFooter(bool $enabled = true): self
     {
         $new = clone $this;
         $new->isFooterEnabled = $enabled;
@@ -814,7 +814,7 @@ protected function renderItems(
             $filterRow = null;
         }
 
-        if ($this->isColumnGroupingEnabled) {
+        if ($this->columnGrouping) {
             $tags = [];
             foreach ($columns as $i => $column) {
                 $cell = $renderers[$i]->renderColumn($column, new Cell(), $globalContext);
@@ -842,7 +842,7 @@ protected function renderItems(
                 $this->sortableLinkDescClass,
                 $this->keepPageOnSort ? $pageToken : null,
                 $pageSize,
-                $this->enableMultiSort,
+                $this->multiSort,
                 $this->urlConfig,
                 $this->urlCreator,
                 $this->translator,

tests/Column/DataColumnTest.php

@@ -543,7 +543,7 @@ public function testColumnClasses(): void
                         bodyClass: 'bodyClass'
                     ),
                 )
-                ->enableColumnGrouping()
+                ->columnGrouping()
                 ->dataReader(new IterableDataReader($this->data))
                 ->render()
         );

tests/GridView/BaseTest.php

@@ -119,7 +119,7 @@ public function testColumnGroupEnabled(): void
                     new DataColumn(property: 'id', columnAttributes: ['class' => 'bg-primary']),
                     new DataColumn(property: 'name', columnAttributes: ['class' => 'bg-success']),
                 )
-                ->enableColumnGrouping()
+                ->columnGrouping()
                 ->id('w1-grid')
                 ->dataReader($this->createOffsetPaginator($this->data, 10))
                 ->render()
@@ -171,7 +171,7 @@ public function testColumnGroupEnabledEmpty(): void
                     new DataColumn(property: 'name'),
                     new DataColumn(property: 'age'),
                 )
-                ->enableColumnGrouping()
+                ->columnGrouping()
                 ->id('w1-grid')
                 ->dataReader($this->createOffsetPaginator($this->data, 10))
                 ->render()

tests/GridView/ImmutableTest.php

@@ -56,7 +56,7 @@ public function testGridView(): void
         $this->assertNotSame($gridView, $gridView->afterRow(null));
         $this->assertNotSame($gridView, $gridView->beforeRow(null));
         $this->assertNotSame($gridView, $gridView->columns(new DataColumn()));
-        $this->assertNotSame($gridView, $gridView->enableColumnGrouping(false));
+        $this->assertNotSame($gridView, $gridView->columnGrouping(false));
         $this->assertNotSame($gridView, $gridView->emptyCell(''));
         $this->assertNotSame($gridView, $gridView->enableFooter(false));
         $this->assertNotSame($gridView, $gridView->footerRowAttributes([]));