Update charcoal to support PHP 8.3 - 8.5

.ddev/config.yaml

@@ -0,0 +1,16 @@
+name: charcoal
+type: php
+docroot: ""
+php_version: "8.5"
+webserver_type: apache-fpm
+xdebug_enabled: true
+additional_hostnames: []
+additional_fqdns: []
+database:
+  type: mariadb
+  version: "10.11"
+use_dns_when_possible: true
+composer_version: "2"
+web_environment:
+  - XDEBUG_MODE=coverage,debug,develop
+corepack_enable: false

.ddev/php/php-xdebug.ini

@@ -0,0 +1,2 @@
+[PHP]
+xdebug.mode=coverage,debug,develop

.github/workflows/php.yml

@@ -2,7 +2,7 @@ name: PHP Testing
 
 on:
   push:
-    branches: [ main ]
+#    branches: [ main ]
   pull_request:
     branches: [ main ]
 
@@ -28,15 +28,15 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.5
           coverage: none
 
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
 
       - name: Output list of packages as JSON
         id: output_data
-        run: echo "matrix=$(vendor/bin/monorepo-builder packages-json)" >> $GITHUB_OUTPUT
+        run: echo "matrix=$(./monorepo packages -t json)" >> $GITHUB_OUTPUT
 
     outputs:
       matrix: ${{ steps.output_data.outputs.matrix }}
@@ -48,7 +48,13 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.4', '8.0']
+        php-versions:
+          - '8.3'
+          - '8.4'
+          - '8.5'
+        include:
+          - php-versions: '8.3'
+            dependencies: 'highest'
         package: ${{fromJson(needs.provide_packages_json.outputs.matrix)}}
 
     steps:
@@ -67,6 +73,8 @@ jobs:
 
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
+        with:
+          dependency-versions: ${{ matrix.dependencies }}
 
       - name: Install ImageMagick
         if: ${{ matrix.package == 'image' }}
@@ -82,4 +90,6 @@ jobs:
         run: tests/script/phpcs --ci ${{ matrix.package }}
 
       - name: Run PHPunit for all packages
+        env:
+          TEST_MODE: PACKAGE
         run: tests/script/phpunit --ci ${{ matrix.package }}

.gitignore

@@ -1,4 +1,6 @@
 .phpunit.result.cache
+phpunit.xml.dist.bak
+.phpunit.cache
 charcoal_test
 node_modules/
 packages/**/composer.lock
@@ -7,3 +9,6 @@ phpstan.neon
 phpunit.xml
 psalm.xml
 vendor/
+tests/logs
+build/report/
+packages/**/build/report

composer.json

@@ -32,33 +32,35 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.3",
         "ext-fileinfo": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-pdo": "*",
+        "ext-pdo_mysql": "*",
         "ext-simplexml": "*",
         "ext-spl": "*",
+        "assetic/framework": "^3.1",
         "barryvdh/elfinder-flysystem-driver": "^0.3",
         "erusev/parsedown": "^1.7",
         "guzzlehttp/guzzle": "^6.0 || ^7.0",
-        "kriswallsmith/assetic": "^1.4",
         "laminas/laminas-permissions-acl": "^2.8",
         "league/climate": "^3.2",
         "league/flysystem": "^1.0",
         "mcaskill/php-html-build-attributes": "^1.0",
         "monolog/monolog": "^1.17",
         "phpmailer/phpmailer": "~6.0",
         "pimple/pimple": "^3.0",
-        "psr/cache": "^1.0",
+        "psr/cache": "^2.0",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0",
         "psr/log": "^1.0",
         "seld/jsonlint": "^1.9",
-        "slim/slim": "^3.7",
-        "studio-42/elfinder": "2.1.64",
-        "symfony/translation": "^3.4",
-        "tedivm/stash": "~0.16",
+        "slim/slim": "^3.13",
+        "studio-42/elfinder": "^2.1.64",
+        "symfony/polyfill-php85": "^1.37",
+        "symfony/translation": "^7.2",
+        "tedivm/stash": "^1.1",
         "vlucas/phpdotenv": "^5.4"
     },
     "require-dev": {
@@ -68,14 +70,16 @@
         "league/flysystem-memory": "^1.0",
         "league/flysystem-sftp": "^1.0",
         "mockery/mockery": "^1.0",
-        "mustache/mustache": "^2.11",
+        "mustache/mustache": "^3.2",
         "php-coveralls/php-coveralls": "^2.2",
-        "phpstan/phpstan": "^1.6",
-        "phpunit/phpunit": "^9.5",
-        "squizlabs/php_codesniffer": "^3.5",
-        "symfony/yaml": "^3.0",
-        "symplify/monorepo-builder": "^10.2",
-        "twig/twig": "^3.4"
+        "phpstan/phpstan": "^2.0",
+        "phpunit/phpunit": "^12.5",
+        "rector/rector": "^2.4",
+        "squizlabs/php_codesniffer": "^4.0",
+        "symfony/yaml": "^7.2",
+        "symplify/monorepo-builder": "^12.7",
+        "twig/twig": "^3.4",
+        "yoast/phpunit-polyfills": "^4.0"
     },
     "autoload": {
         "psr-4": {
@@ -123,6 +127,9 @@
                 "packages/ui/tests/Charcoal",
                 "packages/user/tests/Charcoal/",
                 "packages/view/tests/Charcoal"
+            ],
+            "Charcoal\\Rector\\Property\\": [
+                "src/Rector/Property/"
             ]
         }
     },