Cakephp 5 (+ php 8.4, phpunit 11) + BEdita v6-alpha

.github/workflows/php.yml

@@ -24,21 +24,28 @@ jobs:
   cs:
     uses: bedita/github-workflows/.github/workflows/php-cs.yml@v2
     with:
-      php_versions: '["8.3"]'
+      php_versions: '["8.4"]'
 
   psalm:
     uses: bedita/github-workflows/.github/workflows/php-psalm.yml@v2
     with:
-      php_versions: '["8.3"]'
+      php_versions: '["8.4"]'
 
   stan:
     uses: bedita/github-workflows/.github/workflows/php-stan.yml@v2
     with:
-      php_versions: '["8.3"]'
+      php_versions: '["8.4"]'
 
   unit-5:
     uses: bedita/github-workflows/.github/workflows/php-unit.yml@v2
     with:
       php_versions: '["8.3"]'
       bedita_version: '5'
       coverage_min_percentage: 98
+
+  unit-6:
+    uses: bedita/github-workflows/.github/workflows/php-unit.yml@v2
+    with:
+      php_versions: '["8.4"]'
+      bedita_version: '6-alpha'
+      coverage_min_percentage: 98

.scrutinizer.yml

@@ -14,7 +14,7 @@ build:
     analysis:
       environment:
         php:
-          version: 8.3.3
+          version: 8.3.16
       tests:
         override:
           - php-scrutinizer-run

README.md

@@ -4,7 +4,7 @@
 [![Github Actions Javascript](https://github.com/bedita/manager/workflows/javascript/badge.svg)](https://github.com/bedita/manager/actions?query=workflow%3Ajavascript)
 [![codecov](https://codecov.io/gh/bedita/manager/branch/master/graph/badge.svg)](https://codecov.io/gh/bedita/manager)
 [![phpstan](https://img.shields.io/badge/PHPStan-level%205-brightgreen.svg)](https://phpstan.org)
-[![psalm](https://img.shields.io/badge/psalm-level%208-brightgreen.svg)](https://psalm.dev)
+[![psalm](https://img.shields.io/badge/psalm-level%207-brightgreen.svg)](https://psalm.dev)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/bedita/manager/badges/quality-score.png)](https://scrutinizer-ci.com/g/bedita/manager/)
 [![Version](https://img.shields.io/packagist/v/bedita/manager.svg?label=stable)](https://packagist.org/packages/bedita/manager)
 [![License](https://img.shields.io/badge/License-LGPL_v3-orange.svg)](https://github.com/bedita/manager/blob/master/LICENSE.LGPL)

composer.json

@@ -22,10 +22,10 @@
     ],
     "require": {
         "php": ">=8.3",
-        "bedita/i18n": "^5.1.0",
-        "bedita/web-tools": "^5.3.3",
-        "cakephp/authentication": "^2.9",
-        "cakephp/cakephp": "~4.5.0",
+        "bedita/i18n": "^6.0.0",
+        "bedita/web-tools": "^6.0.0",
+        "cakephp/authentication": "^3.0.3",
+        "cakephp/cakephp": "^5.0",
         "cakephp/plugin-installer": "^1.3",
         "josegonzalez/dotenv": "^4.0",
         "league/flysystem": "^3.16",
@@ -37,17 +37,17 @@
         "wikimedia/composer-merge-plugin": "^2.0.1"
     },
     "require-dev": {
-        "cakephp/bake": "^2.6",
-        "cakephp/cakephp-codesniffer": "~4.7.0",
-        "cakephp/console": "^4.4",
-        "cakephp/debug_kit": "^4.7.1",
-        "cakephp/repl": "^0.1",
-        "dereuromark/cakephp-ide-helper": "~1.17.0",
-        "phpstan/extension-installer": "^1.2",
-        "phpstan/phpstan": "^1.10",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
-        "phpunit/phpunit": "^9.6",
-        "vimeo/psalm": "^5.18"
+        "cakephp/bake": "^3.2",
+        "cakephp/cakephp-codesniffer": "^5.0",
+        "cakephp/console": "^5.0",
+        "cakephp/debug_kit": "^5.0",
+        "cakephp/repl": "^2.0",
+        "dereuromark/cakephp-ide-helper": "^2.6",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan": "^1.12",
+        "phpstan/phpstan-deprecation-rules": "^1.2",
+        "phpunit/phpunit": "^11.1.3",
+        "vimeo/psalm": "^6.8"
     },
     "autoload": {
         "psr-4": {
@@ -68,6 +68,7 @@
             "@test",
             "@cs-check"
         ],
+        "psalm": "vendor/bin/psalm",
         "stan": "vendor/bin/phpstan analyse",
         "cs-check": "vendor/bin/phpcs",
         "cs-fix": "vendor/bin/phpcbf",

config/app.php

@@ -105,9 +105,9 @@
          * Duration will be set to '+2 minutes' in bootstrap.php when debug = true
          * If you set 'className' => 'Null' core cache will be disabled.
          */
-        '_cake_core_' => [
+        '_cake_translations_' => [
             'className' => FileEngine::class,
-            'prefix' => 'manager_cake_core_',
+            'prefix' => 'manager_cake_translations_',
             'path' => CACHE . 'persistent/',
             'serialize' => true,
             'duration' => '+1 years',
@@ -263,15 +263,15 @@
             'path' => LOGS,
             'file' => 'debug',
             'url' => env('LOG_DEBUG_URL', null),
-            'scopes' => false,
+            'scopes' => null,
             'levels' => ['notice', 'info', 'debug'],
         ],
         'error' => [
             'className' => FileLog::class,
             'path' => LOGS,
             'file' => 'error',
             'url' => env('LOG_ERROR_URL', null),
-            'scopes' => false,
+            'scopes' => null,
             'levels' => ['warning', 'error', 'critical', 'alert', 'emergency'],
         ],
     ],

config/bootstrap.php

@@ -29,6 +29,8 @@
  */
 require CORE_PATH . 'config' . DS . 'bootstrap.php';
 
+require CAKE . 'functions.php';
+
 use Cake\Cache\Cache;
 use Cake\Core\Configure;
 use Cake\Core\Configure\Engine\IniConfig;
@@ -39,6 +41,8 @@
 use Cake\Log\Log;
 use Cake\Routing\Router;
 use Cake\Utility\Security;
+use Detection\MobileDetect;
+use josegonzalez\Dotenv\Loader;
 
 /*
  * See https://github.com/josegonzalez/php-dotenv for API details.
@@ -55,7 +59,7 @@
  * for more information for recommended practices.
 */
 if (!env('APP_NAME') && file_exists(CONFIG . '.env')) {
-    $dotenv = new \josegonzalez\Dotenv\Loader([CONFIG . '.env']);
+    $dotenv = new Loader([CONFIG . '.env']);
     $dotenv->parse()
         ->putenv()
         ->toEnv()
@@ -94,7 +98,7 @@
     Configure::config('ini', new IniConfig());
     Configure::load('version', 'ini');
     Configure::load('bedita-api-version', 'ini');
-} catch (\Exception $e) {
+} catch (Exception $e) {
     exit($e->getMessage() . "\n");
 }
 
@@ -112,7 +116,7 @@
  */
 if (Configure::read('debug')) {
     Configure::write('Cache._cake_model_.duration', '+2 minutes');
-    Configure::write('Cache._cake_core_.duration', '+2 minutes');
+    Configure::write('Cache._cake_translations_.duration', '+2 minutes');
     Configure::write('Cache._schema_types_.duration', '+2 minutes');
     Configure::write('Cache._project_config_.duration', '+2 minutes');
     Configure::write('Cache._thumbs_.duration', '+2 minutes');
@@ -191,12 +195,12 @@
  * and the mobiledetect package from composer.json.
  */
 ServerRequest::addDetector('mobile', function ($request) {
-    $detector = new \Detection\MobileDetect();
+    $detector = new MobileDetect();
 
     return $detector->isMobile();
 });
 ServerRequest::addDetector('tablet', function ($request) {
-    $detector = new \Detection\MobileDetect();
+    $detector = new MobileDetect();
 
     return $detector->isTablet();
 });

config/paths.php

@@ -28,7 +28,9 @@
 /**
  * The full path to the directory which holds "src", WITHOUT a trailing DS.
  */
-define('ROOT', dirname(__DIR__));
+if (!defined('ROOT')) {
+    define('ROOT', dirname(__DIR__));
+}
 
 /**
  * The actual directory name for the application directory. Normally
@@ -85,10 +87,16 @@
  *
  * CakePHP should always be installed with composer, so look there.
  */
-define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'vendor' . DS . 'cakephp' . DS . 'cakephp');
+if (!defined('CAKE_CORE_INCLUDE_PATH')) {
+    define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'vendor' . DS . 'cakephp' . DS . 'cakephp');
+}
 
 /**
  * Path to the cake directory.
  */
-define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
-define('CAKE', CORE_PATH . 'src' . DS);
+if (!defined('CORE_PATH')) {
+    define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
+}
+if (!defined('CAKE')) {
+    define('CAKE', CORE_PATH . 'src' . DS);
+}