PHP 8+ Support

.ddev/config.yaml

@@ -0,0 +1,15 @@
+name: charcoal
+type: php
+docroot: ""
+php_version: "8.3"
+webserver_type: apache-fpm
+xdebug_enabled: false
+additional_hostnames: []
+additional_fqdns: []
+database:
+    type: mariadb
+    version: "10.11"
+use_dns_when_possible: true
+composer_version: "2"
+web_environment: []
+corepack_enable: false

.github/workflows/php.yml

@@ -28,15 +28,15 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.4
           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=$(find ./packages -maxdepth 1 -type d -not -name 'packages' | jq -Rsc '[. | split("\n") | .[] | select(length > 0) | ltrimstr("./packages/")]')" >> $GITHUB_OUTPUT
 
     outputs:
       matrix: ${{ steps.output_data.outputs.matrix }}
@@ -48,7 +48,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.4', '8.0']
+        php-versions: ['8.3', '8.4', '8.5']
         package: ${{fromJson(needs.provide_packages_json.outputs.matrix)}}
 
     steps:

.github/workflows/release.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.4
           coverage: none
 
       # semantic release local configuration needs to call ./vendor/bin/monorepo-builder

.github/workflows/split-monorepo.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.4
           coverage: none
 
       - name: Install Dependencies
@@ -32,7 +32,7 @@ jobs:
       # get package json list
       - name: Output list packages as JSON
         id: output_data
-        run: echo "matrix=$(vendor/bin/monorepo-builder packages-json)" >> $GITHUB_OUTPUT
+        run: echo "matrix=$(find ./packages -maxdepth 1 -type d -not -name 'packages' | jq -Rsc '[. | split("\n") | .[] | select(length > 0) | ltrimstr("./packages/")]')" >> $GITHUB_OUTPUT
 
     # this step is needed, so the output gets to the next defined job
     outputs:

.gitignore

@@ -1,4 +1,6 @@
 .phpunit.result.cache
+.phpunit.cache
+tests/logs/*
 charcoal_test
 node_modules/
 packages/**/composer.lock

bin/charcoal

@@ -6,7 +6,9 @@ declare(strict_types=1);
 use Charcoal\App\App;
 use Charcoal\App\AppConfig;
 use Charcoal\App\AppContainer;
-use Slim\Http\Environment as SlimEnvironment;
+use Nyholm\Psr7\Factory\Psr17Factory;
+use Psr\Http\Message\ServerRequestInterface;
+use Slim\Factory\ServerRequestCreatorFactory;
 
 // Ensure this is being used via a CLI
 if (PHP_SAPI !== 'cli') {
@@ -52,6 +54,10 @@ if (!isset($argv[1])) {
 
 $path = '/' . ltrim($argv[1], '/');
 
+// Set up fake HTTP environment for CLI
+$_SERVER['REQUEST_URI'] = $path;
+$_SERVER['PATH_INFO'] = $path;
+
 // Default file path
 $confFile = $baseDir . '/config/config.php';
 if (!file_exists($confFile)) {
@@ -62,43 +68,50 @@ $config = new AppConfig([
     'base_path' => $baseDir,
 ]);
 $config->addFile($confFile);
+
+$serverRequestCreator = ServerRequestCreatorFactory::create();
+$request = $serverRequestCreator->createServerRequestFromGlobals();
+
 // Create container and configure it (with charcoal-config)
 $container = new AppContainer([
     'config' => $config,
+    'request' => $request,
 ]);
 
+// Set legacy 'environment' container item for compatibility
+$container->set('environment', function () use ($path) {
+    return [
+        'PATH_INFO'   => $path,
+        'REQUEST_URI' => $path,
+    ];
+});
+
 // Convert HTTP 404 Not Found to CLI-friendly error
-$container['notFoundHandler'] = function ($container) {
-    return function ($request, $response) use ($container) {
-        return $container['response']
-            ->withStatus(404)
-            ->write(sprintf(
-                'Script "%s" not found' . "\n",
-                $container['request']->getUri()->getPath()
-            ));
+$container->set('notFoundHandler', function ($container) {
+    return function (ServerRequestInterface $request, Throwable $exception) {
+        $response = (new Psr17Factory())->createResponse(404, sprintf(
+            'Script "%s" not found' . "\n",
+            $exception->getMessage()
+        ));
+        echo $response->getBody();
+        return $response;
     };
-};
+});
 
 // Convert HTTP 500 Server Error to CLI-friendly error
-$container['errorHandler'] = function ($container) {
-    return function ($request, $response, $exception) use ($container) {
-        return $container['response']
-            ->withStatus(500)
-            ->write(sprintf(
-                'Something went wrong! [%s]' . "\n",
-                $exception->getMessage()
-            ));
+$container->set('errorHandler', function ($container) {
+    return function (ServerRequestInterface $request, Throwable $exception) {
+        $response = (new Psr17Factory())->createResponse(500, sprintf(
+            'Something went wrong! [%s]' . "\n",
+            $exception->getMessage()
+        ));
+        echo $response->getBody();
+        return $response;
     };
-};
-
-// Create a fake HTTP environment from the first CLI argument
-$container['environment'] = function ($container) use ($path) {
-    return SlimEnvironment::mock([
-        'PATH_INFO'   => $path,
-        'REQUEST_URI' => $path,
-    ]);
-};
+});
 
 // Charcoal / Slim is the main app
 $app = App::instance($container);
-$app->run();
+$app->setConfig($config);
+$app->setBasePath('');
+$app->run($request);

build/script/migrate-project

@@ -12,7 +12,7 @@ cd $CHARCOAL_BASE
 
 echo Fetching and parsing charcoal packages
 
-PACKAGES="$(vendor/bin/monorepo-builder packages-json)"
+PACKAGES="$(find ./packages -maxdepth 1 -type d -not -name 'packages' | jq -Rsc '[. | split("\n") | .[] | select(length > 0) | ltrimstr("./packages/")]')"
 
 PACKAGES=$(sed -Ee 's/(\[|\]|")//g' <<< $PACKAGES)
 PACKAGES=$(sed -Ee 's/,/|/g' <<< $PACKAGES)

composer.json

@@ -32,34 +32,39 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "ext-fileinfo": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-pdo": "*",
         "ext-simplexml": "*",
         "ext-spl": "*",
         "barryvdh/elfinder-flysystem-driver": "^0.3",
-        "erusev/parsedown": "^1.7",
+        "erusev/parsedown": "dev-master#6ae0128",
         "guzzlehttp/guzzle": "^6.0 || ^7.0",
-        "kriswallsmith/assetic": "^1.4",
-        "laminas/laminas-permissions-acl": "^2.8",
+        "laminas/laminas-permissions-acl": "^2.18",
         "league/climate": "^3.2",
         "league/flysystem": "^1.0",
         "mcaskill/php-html-build-attributes": "^1.0",
         "monolog/monolog": "^1.17",
+        "nyholm/psr7": "^1.4",
+        "php-di/php-di": "^7.0",
+        "php81_bc/strftime": "^0.7.6",
         "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",
-        "vlucas/phpdotenv": "^5.4"
+        "slim/slim": "^4.0",
+        "studio-42/elfinder": "2.1.66",
+        "symfony/asset": "^7.0",
+        "symfony/console": "^7.0",
+        "symfony/translation": "^7.0",
+        "tedivm/stash": "^1.2",
+        "vlucas/phpdotenv": "^5.4",
+        "zeuxisoo/slim-whoops": "^0.7.3"
     },
     "require-dev": {
         "cache/void-adapter": "^1.0",
@@ -71,10 +76,10 @@
         "mustache/mustache": "^2.11",
         "php-coveralls/php-coveralls": "^2.2",
         "phpstan/phpstan": "^1.6",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.5 || ^11.0",
         "squizlabs/php_codesniffer": "^3.5",
-        "symfony/yaml": "^3.0",
-        "symplify/monorepo-builder": "^10.2",
+        "symfony/yaml": "^7.0",
+        "symplify/monorepo-builder": "^12.0.0",
         "twig/twig": "^3.4"
     },
     "autoload": {