Skip to content

[Improvement]: Allow filter definition's page limit to be int as well #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2025
Merged

[Improvement]: Allow filter definition's page limit to be int as well #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/ci/files/var/classes/DataObject/FilterDefinition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ public static function create(array $values = []): static

/**
* Get pageLimit - Results per Page
* @return float|null
* @return int|null
*/
public function getPageLimit(): ?float
public function getPageLimit(): ?int
{
if ($this instanceof PreGetValueHookInterface && !\Pimcore::inAdmin()) {
$preValue = $this->preGetValue("pageLimit");
Expand Down Expand Up @@ -122,10 +122,10 @@ public function getPageLimit(): ?float

/**
* Set pageLimit - Results per Page
* @param float|null $pageLimit
* @param int|null $pageLimit
* @return $this
*/
public function setPageLimit(?float $pageLimit): static
public function setPageLimit(?int $pageLimit): static
{
/** @var \Pimcore\Model\DataObject\ClassDefinition\Data\Numeric $fd */
$fd = $this->getClass()->getFieldDefinition("pageLimit");
Expand Down Expand Up @@ -682,4 +682,3 @@ public function setSimilarityFields(?\Pimcore\Model\DataObject\Fieldcollection $
}

}

4 changes: 2 additions & 2 deletions src/Model/AbstractFilterDefinition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ abstract class AbstractFilterDefinition extends DataObject\Concrete implements D
/**
* returns page limit for product list
*
*
* @todo Convert return typehint to ?int in the next major update.
*/
abstract public function getPageLimit(): ?float;
abstract public function getPageLimit(): float|int|null;

/**
* returns list of available fields for sorting ascending
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/install/class_sources/class_FilterDefinition_export.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"defaultValue": null,
"queryColumnType": "double",
"columnType": "double",
"integer": false,
"integer": true,
"unsigned": false,
"minValue": null,
"maxValue": null,
Expand Down