Merge remote-tracking branch 'origin/master' into cake5

# Conflicts:
#	.github/workflows/ci.yml
#	README.md
#	composer.json

Author: dereuromark

README.md

@@ -11,8 +11,7 @@ This is more a **design pattern** and **conceptual idea** than a lot of code and
 
 ## Supported CakePHP Versions
 
-* For CakePHP **3.x** use the 1.x branch and versions
-* For CakePHP **4.x** use the 2.x branch and versions
+This branch is for use with **CakePHP 4.4+**. For details see [version map](https://github.com/burzum/cakephp-service-layer/wiki#cakephp-version-map).
 
 ## Introduction
 

src/Service/ServicePaginatorTrait.php

@@ -15,8 +15,8 @@
 
 namespace Burzum\CakeServiceLayer\Service;
 
-use Cake\Datasource\Paginator;
-use Cake\Datasource\PaginatorInterface;
+use Cake\Datasource\Paging\NumericPaginator;
+use Cake\Datasource\Paging\PaginatorInterface;
 use Cake\Event\EventDispatcherTrait;
 use Cake\Http\ServerRequest;
 
@@ -30,22 +30,22 @@ trait ServicePaginatorTrait
     /**
      * Paginator instance
      *
-     * @var \Cake\Datasource\PaginatorInterface
+     * @var \Cake\Datasource\Paging\PaginatorInterface
      */
     protected $_paginator;
 
     /**
      * Default paginator class
      *
-     * @phpstan-var class-string<\Cake\Datasource\PaginatorInterface>
+     * @phpstan-var class-string<\Cake\Datasource\Paging\PaginatorInterface>
      * @var string
      */
-    protected $_defaultPaginatorClass = Paginator::class;
+    protected $_defaultPaginatorClass = NumericPaginator::class;
 
     /**
      * Set paginator instance.
      *
-     * @param \Cake\Datasource\PaginatorInterface $paginator Paginator instance.
+     * @param \Cake\Datasource\Paging\PaginatorInterface $paginator Paginator instance.
      * @return static
      */
     public function setPaginator(PaginatorInterface $paginator)
@@ -58,7 +58,7 @@ public function setPaginator(PaginatorInterface $paginator)
     /**
      * Get paginator instance.
      *
-     * @return \Cake\Datasource\PaginatorInterface
+     * @return \Cake\Datasource\Paging\PaginatorInterface
      */
     public function getPaginator()
     {