BE 6, cakephp 5, phpunit 11/12

.editorconfig

@@ -1,5 +1,5 @@
 ; This file is for unifying the coding style for different editors and IDEs.
-; More information at http://editorconfig.org
+; More information at https://editorconfig.org
 
 root = true
 
@@ -19,5 +19,8 @@ indent_size = 2
 [*.twig]
 insert_final_newline = false
 
+[*.neon]
+indent_style = tab
+
 [Makefile]
 indent_style = tab

.gitattributes

@@ -1,7 +1,6 @@
 # Define the line ending behavior of the different file extensions
 # Set default behavior, in case users don't have core.autocrlf set.
-* text=auto
-* text eol=lf
+* text text=auto eol=lf
 
 # Explicitly declare text files we want to always be normalized and converted
 # to native line endings on checkout.
@@ -33,6 +32,7 @@
 *.jpeg binary
 *.gif binary
 *.webp binary
+*.avif binary
 *.ico binary
 *.mo binary
 *.pdf binary
@@ -41,6 +41,7 @@
 *.phar binary
 *.woff binary
 *.woff2 binary
+*.ttc binary
 *.ttf binary
 *.otf binary
 *.eot binary

.github/workflows/php.yml

@@ -6,22 +6,30 @@ on:
       - '**/*.php'
       - '.github/workflows/php.yml'
       - '**/composer.json'
+      - 'phpcs.xml'
+      - 'phpstan.neon.dist'
+      - 'phpunit.xml.dist'
+      - 'psalm.xml'
   push:
     paths:
       - '**/*.php'
       - '.github/workflows/php.yml'
       - '**/composer.json'
+      - 'phpcs.xml'
+      - 'phpstan.neon.dist'
+      - 'phpunit.xml.dist'
+      - 'psalm.xml'
 
 jobs:
   cs:
     uses: bedita/github-workflows/.github/workflows/php-cs.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:
     name: 'Run unit tests'
@@ -31,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [8.3]
+        php-version: [8.3, 8.4]
     env:
       PHP_VERSION: '${{ matrix.php-version }}'
 

.github/workflows/release.yml

@@ -9,4 +9,4 @@ jobs:
     uses: bedita/github-workflows/.github/workflows/release.yml@v2
     with:
       main_branch: 'master'
-      dist_branches: '["master"]'
+      dist_branches: '["master", "2.x"]'

.gitignore

@@ -1,5 +1,5 @@
-# User specific & automatically generated files #
-#################################################
+# CakePHP specific files #
+##########################
 /config/app_local.php
 /config/.env
 /logs/*
@@ -29,7 +29,7 @@ Thumbs.db
 # Tool specific files #
 #######################
 # PHPUnit
-.phpunit.result.cache
+.phpunit.cache
 tests.sqlite
 # vim
 *~

composer.json

@@ -6,23 +6,28 @@
     "license": "MIT",
     "require": {
         "php": ">=8.3",
-        "bedita/api": "^5.43",
-        "bedita/aws": "^3.0.5",
-        "bedita/core": "^5.43",
-        "cakephp/cakephp": "^4.5.0",
-        "cakephp/plugin-installer": "^1.3.1"
+        "bedita/api": "^6.0",
+        "bedita/aws": "^5.0",
+        "bedita/core": "^6.0",
+        "cakephp/cakephp": "~5.2.9",
+        "cakephp/plugin-installer": "^2.0"
     },
-
     "require-dev": {
-        "bedita/dev-tools": "^2",
-        "cakephp/bake": "^2.8",
-        "cakephp/cakephp-codesniffer": "~4.7.0",
-        "cakephp/debug_kit": "^4.9.3",
-        "cakephp/repl": "^0.1",
-        "dereuromark/cakephp-ide-helper": "^1.18",
-        "josegonzalez/dotenv": "^3.2",
+        "bedita/dev-tools": "^3.2",
+        "cakephp/bake": "^3.5.0",
+        "cakephp/cakephp-codesniffer": "^5.0",
+        "cakephp/debug_kit": "^5.3.0",
+        "cakephp/repl": "^2.0.1",
+        "dereuromark/cakephp-ide-helper": "^2.5.3",
+        "josegonzalez/dotenv": "^4.0",
         "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^9.6"
+        "phpstan/extension-installer": "^1.0",
+        "phpstan/phpstan-deprecation-rules": "^1.0",
+        "phpunit/phpunit": "^11.5 || ^12.1"
+    },
+    "minimum-stability": "dev",
+    "suggest": {
+        "markstory/asset_compress": "An asset compression plugin which provides file concatenation and a flexible filter system for preprocessing and minification."
     },
     "autoload": {
         "psr-4": {
@@ -45,8 +50,8 @@
             "@stan"
         ],
         "stan": "vendor/bin/phpstan analyse",
-        "cs-check": "vendor/bin/phpcs -n -p --extensions=php src/ tests/ config/*.php",
-        "cs-fix": "vendor/bin/phpcbf -p --extensions=php src/ tests/ config/*.php",
+        "cs-check": "vendor/bin/phpcs -n -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/ config/*.php",
+        "cs-fix": "vendor/bin/phpcbf -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/ config/*.php",
         "test": "vendor/bin/phpunit --colors=always",
         "migrate": [
             "@cache-clear",
@@ -67,8 +72,9 @@
     "config": {
         "sort-packages": true,
         "allow-plugins": {
+            "cakephp/plugin-installer": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "cakephp/plugin-installer": true
+            "phpstan/extension-installer": true
         }
     }
 }

config/.env.example

@@ -23,7 +23,7 @@ export SECURITY_SALT="__SALT__"
 # Uncomment these to define cache configuration via environment variables.
 #export CACHE_DURATION="+2 minutes"
 #export CACHE_DEFAULT_URL="file:///path/to/tmp/cache/?prefix=${APP_NAME}_default_&duration=${CACHE_DURATION}"
-#export CACHE_CAKECORE_URL="file:///path/to/tmp/cache/persistent?prefix=${APP_NAME}_cake_core_&serialize=true&duration=${CACHE_DURATION}"
+#export CACHE_CAKECORE_URL="file:///path/to/tmp/cache/persistent?prefix=${APP_NAME}_cake_translations_&serialize=true&duration=${CACHE_DURATION}"
 #export CACHE_CAKEMODEL_URL="file:///path/to/tmp/cache/models?prefix=${APP_NAME}_cake_model_&serialize=true&duration=${CACHE_DURATION}"
 
 # Uncomment these to define email transport configuration via environment variables.