Add Statamic 6 / Laravel 12 support (#46)

ito-ito-ito-ito · el-schneider · web-flow · commit f598ac77c994 · 2026-02-16T16:41:18.000+01:00
* feat: add Statamic 6 support - Update composer.json constraints for statamic/cms ^6.0, symfony/* ^8.0 - Update TestCase for Statamic 6 compatibility (Manifest class moved) - Resolves #45 * docs: add Statamic 6 badge and requirement to README, simplify editions config in tests --------- Co-authored-by: Jonas List <jonas.list@visuellverstehen.de>
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 [![Statamic 4](https://img.shields.io/badge/Statamic-v4-FF269E?style=for-the-badge&link=https://statamic.com)](https://statamic.com/addons/visuellverstehen/classify) 
 [![Statamic 5](https://img.shields.io/badge/Statamic-v5-FF269E?style=for-the-badge&link=https://statamic.com)](https://statamic.com/addons/visuellverstehen/classify) 
+[![Statamic 6](https://img.shields.io/badge/Statamic-v6-FF269E?style=for-the-badge&link=https://statamic.com)](https://statamic.com/addons/visuellverstehen/classify) 
 [![Latest version on Packagist](https://img.shields.io/packagist/v/visuellverstehen/statamic-classify.svg?style=for-the-badge)](https://packagist.org/packages/visuellverstehen/statamic-classify)
 
 # Classify
@@ -9,7 +10,7 @@ Classify is a useful helper to add CSS classes to all HTML tags generated by the
 
 ## Requirements
 
-- Statamic v4 || v5
+- Statamic v4 || v5 || v6
 - Laravel 10 || 11 || 12
 - PHP 8.2+
 
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "visuellverstehen/statamic-classify",
   "description": "A useful helper to add CSS classes to all HTML tags generated by the bard editor.",
-  "keywords": [ "statamic", "addon", "bard", "css", "prose", "typography", "v4", "v5" ],
+  "keywords": [ "statamic", "addon", "bard", "css", "prose", "typography", "v4", "v5", "v6" ],
   "license": "MIT",
   "type": "statamic-addon",
   "autoload": {
@@ -25,9 +25,9 @@
   "require": {
     "php": "^8.2 || ^8.3 || ^8.4",
     "laravel/framework": "^10.0 || ^11.0 || ^12.0",
-    "statamic/cms": "^4.0 || ^5.0",
-    "symfony/dom-crawler": "^6.0 || ^7.0",
-    "symfony/css-selector": "^5.4 || ^6.0 || ^7.0"
+    "statamic/cms": "^4.0 || ^5.0 || ^6.0",
+    "symfony/dom-crawler": "^6.0 || ^7.0 || ^8.0",
+    "symfony/css-selector": "^5.4 || ^6.0 || ^7.0 || ^8.0"
   },
   "require-dev": {
     "orchestra/testbench": "^8 || ^9 || ^10",
diff --git a/src/HtmlParser.php b/src/HtmlParser.php
@@ -32,12 +32,13 @@ public function parse(Tag $tag, string $value): string
             $node->setAttribute('class', $tag->classes);
         }
 
-        // Generate the HTML with our class adjustments made.
-        $result = $crawler->html();
+        // DomCrawler wraps fragments in head/body; return the body contents when present.
+        $body = $crawler->filter('body');
 
-        // Removes the <body> and </body> tags that get added since it's a fragment.
-        $result = substr($result, 6);
+        if ($body->count() > 0) {
+            return $body->html();
+        }
 
-        return substr($result, 0, -7);
+        return $crawler->html();
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -3,7 +3,6 @@
 namespace VV\Classify\Tests;
 
 use Orchestra\Testbench\TestCase as OrchestraTestCase;
-use Statamic\Extend\Manifest;
 use Statamic\Statamic;
 
 class TestCase extends OrchestraTestCase
@@ -58,7 +57,11 @@ protected function getEnvironmentSetUp($app)
     {
         parent::getEnvironmentSetUp($app);
 
-        $app->make(Manifest::class)->manifest = [
+        $manifestClass = class_exists(\Statamic\Addons\Manifest::class)
+            ? \Statamic\Addons\Manifest::class
+            : \Statamic\Extend\Manifest::class;
+
+        $app->make($manifestClass)->manifest = [
             'visuellverstehen/statamic-classify' => [
                 'id'        => 'visuellverstehen/statamic-classify',
                 'namespace' => 'VV\\Classify\\',
@@ -75,24 +78,18 @@ protected function resolveApplicationConfiguration($app)
     {
         parent::resolveApplicationConfiguration($app);
 
-        $configs = [
-            'assets', 'cp', 'forms', 'routes', 'static_caching',
-            'sites', 'stache', 'system', 'users',
-        ];
+        $configDirectory = __DIR__.'/../vendor/statamic/cms/config';
+        $configPaths = glob($configDirectory.'/*.php') ?: [];
 
-        foreach ($configs as $config) {
-            $path = __DIR__."/../vendor/statamic/cms/config/{$config}.php";
-            
-            // Statamic 5 does not have a `sites` config anymore, so we better check first
-            if (file_exists($path)) {
-                $app['config']->set("statamic.$config", require($path));
-            }
+        foreach ($configPaths as $path) {
+            $config = basename($path, '.php');
+            $app['config']->set("statamic.$config", require $path);
         }
 
         // Setting the user repository to the default flat file system
         $app['config']->set('statamic.users.repository', 'file');
 
-        // Assume the pro edition within tests
+        // Assume the free edition within tests
         $app['config']->set('statamic.editions.pro', false);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,13 @@ public function parse(Tag $tag, string $value): string`
`32`	`32`	`$node->setAttribute('class', $tag->classes);`
`33`	`33`	`}`
`34`	`34`
`35`		`- // Generate the HTML with our class adjustments made.`
`36`		`- $result = $crawler->html();`
	`35`	`+ // DomCrawler wraps fragments in head/body; return the body contents when present.`
	`36`	`+ $body = $crawler->filter('body');`
`37`	`37`
`38`		`- // Removes the <body> and </body> tags that get added since it's a fragment.`
`39`		`- $result = substr($result, 6);`
	`38`	`+ if ($body->count() > 0) {`
	`39`	`+ return $body->html();`
	`40`	`+ }`
`40`	`41`
`41`		`- return substr($result, 0, -7);`
	`42`	`+ return $crawler->html();`
`42`	`43`	`}`
`43`	`44`	`}`