CakeDC · ajibarra · Apr 28, 2026
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1', '8.2', '8.3']
+        php-version: ['8.2', '8.3', '8.4']
         db-type: [sqlite, mysql, pgsql]
         prefer-lowest: ['']
 
@@ -59,22 +59,22 @@ jobs:
         fi
 
     - name: Setup problem matchers for PHPUnit
-      if: matrix.php-version == '8.1' && matrix.db-type == 'mysql'
+      if: matrix.php-version == '8.2' && matrix.db-type == 'mysql'
       run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
     - name: Run PHPUnit
       run: |
         if [[ ${{ matrix.db-type }} == 'sqlite' ]]; then export DB_URL='sqlite:///:memory:'; fi
         if [[ ${{ matrix.db-type }} == 'mysql' ]]; then export DB_URL='mysql://root:root@127.0.0.1/cakephp?encoding=utf8'; fi
         if [[ ${{ matrix.db-type }} == 'pgsql' ]]; then export DB_URL='postgres://postgres:postgres@127.0.0.1/postgres'; fi
-        if [[ ${{ matrix.php-version }} == '8.1' ]]; then
+        if [[ ${{ matrix.php-version }} == '8.2' ]]; then
           export CODECOVERAGE=1 && vendor/bin/phpunit --display-deprecations --display-incomplete --display-skipped --coverage-clover=coverage.xml
         else
           vendor/bin/phpunit
         fi
 
     - name: Submit code coverage
-      if: matrix.php-version == '8.1'
+      if: matrix.php-version == '8.2'
       uses: codecov/codecov-action@v5
 
   cs-stan:
@@ -87,7 +87,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.1'
+        php-version: '8.2'
         extensions: mbstring, intl, apcu
         coverage: none
 

diff --git a/composer.json b/composer.json
@@ -27,15 +27,16 @@
         "source": "https://github.com/CakeDC/cakephp-api"
     },
     "require": {
-        "php": ">=8.1",
+        "php": ">=8.2",
         "ext-json": "*",
-        "cakephp/cakephp": "^5.0",
-        "cakedc/users": "^15.1",
+        "cakephp/cakephp": "^5.1",
+        "cakedc/users": "^16.0",
         "lcobucci/jwt": "^5.5.0",
-        "firebase/php-jwt": "^6.3"
+        "firebase/php-jwt": "^6.3 || ^7.0"
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^4.5",
+        "cweagans/composer-patches": "^1.7",
         "endroid/qr-code": "^4",
         "google/recaptcha": "@stable",
         "laminas/laminas-diactoros": "^3.0",
@@ -59,9 +60,17 @@
         }
     },
     "prefer-stable": true,
+    "extra": {
+        "patches": {
+            "league/flysystem-vfs": {
+                "Fix null passed to str_replace in PHP 8.1+": "patches/flysystem-vfs-null-str-replace.patch"
+            }
+        }
+    },
     "config": {
         "sort-packages": true,
         "allow-plugins": {
+            "cweagans/composer-patches": true,
             "dealerdirect/phpcodesniffer-composer-installer": true
         }
     },

diff --git a/config/Migrations/20180313201241_initial_jwt_auth.php b/config/Migrations/20180313201241_initial_jwt_auth.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Copyright 2018 - 2020, Cake Development Corporation (https://www.cakedc.com)
  *
@@ -9,11 +11,11 @@
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-use Migrations\AbstractMigration;
+use Migrations\BaseMigration;
 
-class InitialJwtAuth extends AbstractMigration
+class InitialJwtAuth extends BaseMigration
 {
-    public function change()
+    public function change(): void
     {
         $this->table('jwt_refresh_tokens', ['id' => false, 'primary_key' => ['id']])
             ->addColumn('id', 'uuid', [

diff --git a/config/Migrations/20231003201241_auth_store.php b/config/Migrations/20231003201241_auth_store.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Copyright 2018 - 2020, Cake Development Corporation (https://www.cakedc.com)
  *
@@ -9,11 +11,11 @@
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-use Migrations\AbstractMigration;
+use Migrations\BaseMigration;
 
-class AuthStore extends AbstractMigration
+class AuthStore extends BaseMigration
 {
-    public function change()
+    public function change(): void
     {
         $this->table('auth_store', ['id' => false, 'primary_key' => ['id']])
             ->addColumn('id', 'string', [

diff --git a/patches/flysystem-vfs-null-str-replace.patch b/patches/flysystem-vfs-null-str-replace.patch
@@ -0,0 +1,11 @@
+--- a/src/VfsAdapter.php
++++ b/src/VfsAdapter.php
+@@ -106,7 +106,7 @@ class VfsAdapter extends Local
+     protected function wrapPath($path)
+     {
+         $scheme = $this->vfs->scheme().'://';
+-        $path   = str_replace($scheme, null, $path);
++        $path   = str_replace($scheme, '', $path ?? '');
+
+         return $scheme.$path;
+     }
diff --git a/src/ApiInitializer.php b/src/ApiInitializer.php
@@ -35,28 +35,39 @@ class ApiInitializer implements AuthorizationServiceProviderInterface
     public function getAuthenticationService(): AuthenticationService
     {
         $service = new AuthenticationService();
-        $service->loadIdentifier('Authentication.JwtSubject', []);
-        $service->loadIdentifier('Authentication.Password', [
-            'resolver' => [
-                'className' => 'Authentication.Orm',
-                'userModel' => 'CakeDC/Users.Users',
-                'finder' => 'active',
-            ],
-        ]);
 
         $service->loadAuthenticator('Authentication.Session', [
             'sessionKey' => 'Auth',
+            'identifier' => [
+                'Authentication.Password' => [
+                    'resolver' => [
+                        'className' => 'Authentication.Orm',
+                        'userModel' => 'CakeDC/Users.Users',
+                        'finder' => 'active',
+                    ],
+                ],
+            ],
         ]);
         $service->loadAuthenticator('CakeDC/Auth.Form', [
-            // 'sessionKey' => 'Auth',
+            'identifier' => [
+                'Authentication.Password' => [
+                    'resolver' => [
+                        'className' => 'Authentication.Orm',
+                        'userModel' => 'CakeDC/Users.Users',
+                        'finder' => 'active',
+                    ],
+                ],
+            ],
         ]);
 
-        $service->loadIdentifier('Authentication.Token', [
-            'dataField' => 'token',
-            'tokenField' => 'api_token',
-        ]);
         $service->loadAuthenticator('Authentication.Token', [
             'queryParam' => 'token',
+            'identifier' => [
+                'Authentication.Token' => [
+                    'dataField' => 'token',
+                    'tokenField' => 'api_token',
+                ],
+            ],
         ]);
 
         $service->loadAuthenticator('Authentication.Jwt', [
@@ -66,6 +77,9 @@ public function getAuthenticationService(): AuthenticationService
             'algorithm' => 'HS512',
             'returnPayload' => false,
             'secretKey' => Configure::read('Api.Jwt.AccessToken.secret'),
+            'identifier' => [
+                'Authentication.JwtSubject' => [],
+            ],
         ]);
 
         return $service;

diff --git a/src/ApiPlugin.php b/src/ApiPlugin.php
@@ -0,0 +1,99 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Copyright 2016 - 2019, Cake Development Corporation (http://cakedc.com)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright Copyright 2016 - 2019, Cake Development Corporation (http://cakedc.com)
+ * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+namespace CakeDC\Api;
+
+use Cake\Console\CommandCollection;
+use Cake\Core\BasePlugin;
+use Cake\Core\Configure;
+use Cake\Core\ContainerInterface;
+use CakeDC\Api\Command\ServiceRoutesCommand;
+
+/**
+ * Api plugin
+ */
+class ApiPlugin extends BasePlugin
+{
+    protected array $middlewares = [];
+
+    /**
+     * @inheritDoc
+     */
+    public function routes($routes): void
+    {
+        $middlewares = Configure::read('Api.Middleware', []);
+        foreach ($middlewares as $alias => $middleware) {
+            $class = $middleware['class'];
+            if (array_key_exists('request', $middleware)) {
+                $requestClass = $middleware['request'];
+                $request = new $requestClass();
+                if (array_key_exists('method', $middleware)) {
+                    $request = $request->{$middleware['method']}();
+                }
+                if (array_key_exists('params', $middleware)) {
+                    $options = $middleware['params'];
+                    $this->registerMiddleware($routes, $alias, new $class($request, $options));
+                } else {
+                    $this->registerMiddleware($routes, $alias, new $class($request));
+                }
+            } else {
+                if (array_key_exists('params', $middleware)) {
+                    $options = $middleware['params'];
+                    $this->registerMiddleware($routes, $alias, new $class($options));
+                } else {
+                    $this->registerMiddleware($routes, $alias, new $class());
+                }
+            }
+        }
+
+        parent::routes($routes);
+    }
+
+    /**
+     * Middleware registrator and holder.
+     *
+     * @param \Cake\Routing\RouteBuilder $routes Routes.
+     * @param string $alias Middleware alias.
+     * @param string $class Middleware class instance.
+     * @return void
+     */
+    protected function registerMiddleware($routes, $alias, $class)
+    {
+        $routes->registerMiddleware($alias, $class);
+        $this->middlewares[$alias] = $class;
+    }
+
+    /**
+     * Register container services for this plugin.
+     *
+     * @param \Cake\Core\ContainerInterface $container The container to add services to.
+     * @return void
+     */
+    public function services(ContainerInterface $container): void
+    {
+        if (array_key_exists('apiParser', $this->middlewares)) {
+            $this->middlewares['apiParser']->setContainer($container);
+        }
+    }
+
+    /**
+     * Add console commands for the plugin.
+     *
+     * @param \Cake\Console\CommandCollection $commands The command collection to update
+     * @return \Cake\Console\CommandCollection
+     */
+    public function console(CommandCollection $commands): CommandCollection
+    {
+        return $commands->add('service routes', ServiceRoutesCommand::class);
+    }
+}
diff --git a/src/Model/Entity/AuthStore.php b/src/Model/Entity/AuthStore.php
@@ -10,8 +10,8 @@
  *
  * @property string $id
  * @property array|null $store
- * @property \Cake\I18n\FrozenTime $created
- * @property \Cake\I18n\FrozenTime $modified
+ * @property \Cake\I18n\DateTime $created
+ * @property \Cake\I18n\DateTime $modified
  */
 class AuthStore extends Entity
 {