Added PaginationAwareInterface

.github/workflows/backend-ci.yaml

@@ -10,13 +10,13 @@ on:
 jobs:
     cs-fix:
         name: Run code style check
-        runs-on: "ubuntu-22.04"
+        runs-on: "ubuntu-24.04"
         strategy:
             matrix:
                 php:
                     - '8.3'
         steps:
-            -   uses: actions/checkout@v4
+            -   uses: actions/checkout@v5
 
             -   name: Setup PHP Action
                 uses: shivammathur/setup-php@v2
@@ -35,21 +35,34 @@ jobs:
 
     deptrac:
         name: Deptrac
-        runs-on: ubuntu-latest
+        runs-on: "ubuntu-24.04"
         steps:
-            -   uses: actions/checkout@v4
-            -   name: Deptrac
-                uses: smoench/deptrac-action@master
+            -   uses: actions/checkout@v5
+
+            -   name: Setup PHP Action
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php }}
+                    coverage: none
+                    extensions: 'pdo_sqlite, gd'
+                    tools: cs2pr
+
+            -   uses: ramsey/composer-install@v3
+                with:
+                    dependency-versions: highest
+
+            -   name: Run deptrac
+                run: composer run-script deptrac
 
     rector:
         name: Run rector
-        runs-on: "ubuntu-22.04"
+        runs-on: "ubuntu-24.04"
         strategy:
             matrix:
                 php:
                     - '8.3'
         steps:
-            -   uses: actions/checkout@v4
+            -   uses: actions/checkout@v5
 
             -   name: Setup PHP Action
                 uses: shivammathur/setup-php@v2
@@ -68,7 +81,7 @@ jobs:
 
     tests:
         name: Tests
-        runs-on: "ubuntu-22.04"
+        runs-on: "ubuntu-24.04"
         timeout-minutes: 10
 
         strategy:
@@ -78,7 +91,7 @@ jobs:
                     - '8.3'
 
         steps:
-            -   uses: actions/checkout@v4
+            -   uses: actions/checkout@v5
 
             -   name: Setup PHP Action
                 uses: shivammathur/setup-php@v2

.github/workflows/browser-tests.yaml

@@ -14,5 +14,4 @@ jobs:
         with:
             project-edition: 'oss'
             test-suite:  '--profile=browser --suite=core-search --config=vendor/ibexa/core-search/behat_suites.yaml'
-        secrets:
-            SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        secrets: inherit

composer.json

@@ -16,15 +16,15 @@
         "symfony/yaml": "^7.3"
     },
     "require-dev": {
+        "deptrac/deptrac": "^4.2",
         "ibexa/behat": "~5.0.x-dev",
         "ibexa/code-style": "~2.0.0",
         "ibexa/doctrine-schema": "~5.0.x-dev",
         "ibexa/rector": "~5.0.x-dev",
         "phpstan/phpstan": "^2.0",
         "phpstan/phpstan-phpunit": "^2.0",
         "phpstan/phpstan-symfony": "^2.0",
-        "phpunit/phpunit": "^9.0",
-        "qossmic/deptrac-shim": "^0.24.0 || ^1.0.2"
+        "phpunit/phpunit": "^9.0"
     },
     "autoload": {
         "psr-4": {
@@ -45,7 +45,7 @@
         "check-cs": "@fix-cs --dry-run",
         "test": "phpunit -c phpunit.xml.dist",
         "phpstan": "phpstan analyse -c phpstan.neon",
-        "deptrac": "php vendor/bin/deptrac analyse"
+        "deptrac": "deptrac analyse"
     },
     "scripts-descriptions": {
         "fix-cs": "Automatically fixes code style in all files",

phpstan-baseline.neon

@@ -11,27 +11,3 @@ parameters:
 			identifier: instanceof.alwaysTrue
 			count: 1
 			path: src/contracts/Persistence/CriterionMapper/AbstractFieldCriterionMapper.php
-
-		-
-			message: '#^Method Ibexa\\CoreSearch\\CriterionMapper\\LogicalAndCriterionMapper\:\:getType\(\) never returns ''NOT'' so it can be removed from the return type\.$#'
-			identifier: return.unusedType
-			count: 1
-			path: src/lib/CriterionMapper/LogicalAndCriterionMapper.php
-
-		-
-			message: '#^Method Ibexa\\CoreSearch\\CriterionMapper\\LogicalAndCriterionMapper\:\:getType\(\) never returns ''OR'' so it can be removed from the return type\.$#'
-			identifier: return.unusedType
-			count: 1
-			path: src/lib/CriterionMapper/LogicalAndCriterionMapper.php
-
-		-
-			message: '#^Method Ibexa\\CoreSearch\\CriterionMapper\\LogicalOrCriterionMapper\:\:getType\(\) never returns ''AND'' so it can be removed from the return type\.$#'
-			identifier: return.unusedType
-			count: 1
-			path: src/lib/CriterionMapper/LogicalOrCriterionMapper.php
-
-		-
-			message: '#^Method Ibexa\\CoreSearch\\CriterionMapper\\LogicalOrCriterionMapper\:\:getType\(\) never returns ''NOT'' so it can be removed from the return type\.$#'
-			identifier: return.unusedType
-			count: 1
-			path: src/lib/CriterionMapper/LogicalOrCriterionMapper.php

src/contracts/Values/Query/AbstractCriterionQuery.php

@@ -14,7 +14,7 @@
  * @template TSortClause of \Ibexa\Contracts\CoreSearch\Values\Query\AbstractSortClause
  * @template TCriterion of \Ibexa\Contracts\CoreSearch\Values\Query\Criterion\CriterionInterface
  */
-abstract class AbstractCriterionQuery
+abstract class AbstractCriterionQuery implements PaginationAwareInterface
 {
     public const int DEFAULT_LIMIT = 25;
 

src/contracts/Values/Query/PaginationAwareInterface.php

@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Contracts\CoreSearch\Values\Query;
+
+interface PaginationAwareInterface
+{
+    public function getOffset(): int;
+
+    public function getLimit(): ?int;
+}