replace queryProperty to field

src/Column/DataColumn.php

@@ -24,8 +24,6 @@
  */
 final class DataColumn implements ColumnInterface
 {
-    public readonly ?QueryProperty $queryProperty;
-
     /**
      * @var bool|callable|null
      * @psalm-var bool|FilterEmptyCallable|null
@@ -39,8 +37,7 @@ final class DataColumn implements ColumnInterface
      */
     public function __construct(
         public readonly ?string $property = null,
-        ?string $queryProperty = null,
-        ?string $queryField = null,
+        public readonly ?string $field = null,
         public readonly ?string $header = null,
         public readonly bool $encodeHeader = true,
         public readonly ?string $footer = null,
@@ -56,11 +53,6 @@ public function __construct(
         bool|callable|null $filterEmpty = null,
         private readonly bool $visible = true,
     ) {
-        $queryProperty ??= $property;
-        $this->queryProperty = $queryProperty === null
-            ? null
-            : new QueryProperty($queryProperty, $queryField ?? $queryProperty);
-
         $this->filterEmpty = $filterEmpty;
     }
 

src/Column/DataColumnRenderer.php

@@ -72,11 +72,11 @@ public function renderHeader(ColumnInterface $column, Cell $cell, HeaderContext
         }
         $cell = $cell->content($label);
 
-        if (!$column->withSorting || $column->queryProperty === null) {
+        if (!$column->withSorting || $column->property === null) {
             return $cell;
         }
 
-        [$cell, $link, $prepend, $append] = $context->prepareSortable($cell, $column->queryProperty->property);
+        [$cell, $link, $prepend, $append] = $context->prepareSortable($cell, $column->property);
         if ($link !== null) {
             $link = $link->content($label)->encode(false);
         }
@@ -88,7 +88,7 @@ public function renderFilter(ColumnInterface $column, Cell $cell, FilterContext
     {
         $this->checkColumn($column);
 
-        if ($column->queryProperty === null || $column->filter === false) {
+        if ($column->property === null || $column->filter === false) {
             return null;
         }
 
@@ -103,14 +103,14 @@ public function renderFilter(ColumnInterface $column, Cell $cell, FilterContext
         $content = [
             $widget->withContext(
                 new Context(
-                    $column->queryProperty->property,
-                    $context->getQueryValue($column->queryProperty->property),
+                    $column->property,
+                    $context->getQueryValue($column->property),
                     $context->formId
                 )
             ),
         ];
 
-        $errors = $context->validationResult->getAttributeErrorMessages($column->queryProperty->property);
+        $errors = $context->validationResult->getAttributeErrorMessages($column->property);
         if (!empty($errors)) {
             $cell = $cell->addClass($context->cellInvalidClass);
             $content[] = Html::div(attributes: $context->errorsContainerAttributes)
@@ -123,11 +123,11 @@ public function renderFilter(ColumnInterface $column, Cell $cell, FilterContext
     public function makeFilter(ColumnInterface $column, MakeFilterContext $context): ?FilterInterface
     {
         $this->checkColumn($column);
-        if ($column->queryProperty === null) {
+        if ($column->property === null) {
             return null;
         }
 
-        $value = $context->getQueryValue($column->queryProperty->property);
+        $value = $context->getQueryValue($column->property);
         if ($value === null) {
             return null;
         }
@@ -144,7 +144,7 @@ public function makeFilter(ColumnInterface $column, MakeFilterContext $context):
                     $context->validationResult->addError(
                         $error->getMessage(),
                         $error->getParameters(),
-                        [$column->queryProperty->property]
+                        [$column->property]
                     );
                 }
                 return null;
@@ -163,7 +163,7 @@ public function makeFilter(ColumnInterface $column, MakeFilterContext $context):
             $factory = $column->filterFactory;
         }
 
-        return $factory->create($column->queryProperty->field, $value);
+        return $factory->create($column->field ?? $column->property, $value);
     }
 
     public function renderBody(ColumnInterface $column, Cell $cell, DataContext $context): Cell
@@ -249,10 +249,13 @@ public function getOverrideOrderFields(ColumnInterface $column): array
     {
         $this->checkColumn($column);
 
-        if ($column->queryProperty === null || $column->queryProperty->hasEqualField()) {
+        if ($column->property === null
+            || $column->field === null
+            || $column->property === $column->field
+        ) {
             return [];
         }
 
-        return [$column->queryProperty->property => $column->queryProperty->field];
+        return [$column->property => $column->field];
     }
 }