Merge pull request #12 from pluswerk/performance

Author: Kanti

.github/workflows/tasks.yml

@@ -9,11 +9,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '8.0', '8.1', '8.2' ]
+        php: [ '8.1', '8.2', '8.3' ]
         typo3: [ '11', '12' ]
-        exclude:
-          - php: '8.0'
-            typo3: '12'
     steps:
       - name: Setup PHP with PECL extension
         uses: shivammathur/setup-php@v2

Classes/Service/MinifyService.php

@@ -48,11 +48,11 @@ public function minify(string $html): string
             $html = $htmlMin->minify($html);
         }
 
-        if (empty($html)) {
+        if (!$html) {
             return $originalHtml;
         }
 
-        return $html;
+        return $html . (str_contains($html, '</body>') ? '' : '</body>');
     }
 
 

Configuration/RequestMiddlewares.php

@@ -11,11 +11,13 @@
             'after' => [
                 'typo3/cms-frontend/output-compression',
                 'typo3/cms-frontend/content-length-headers',
+                'typo3/cms-adminpanel/renderer', // after the adminpanel render, this takes some time to process and is not neccesarly needed
             ],
             // in the request direction it is before these middlewares:
             // but in response direction it is after these middlewares:
             'before' => [
-                'typo3/cms-adminpanel/renderer',
+                'typo3/cms-adminpanel/data-persister',
+                'typo3/cms-frontend/csp-headers',
             ]
         ]
     ]

composer.json

@@ -8,16 +8,16 @@
     "source": "https://github.com/pluswerk/minify"
   },
   "require": {
-    "php": "^8.0",
+    "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
     "composer-runtime-api": "^2",
     "typo3/cms-core": "^11.5 || ^12.4",
     "voku/html-min": "^4.5"
   },
   "require-dev": {
-    "andersundsehr/ssi-include": "dev-main",
-    "pluswerk/grumphp-config": "^6",
-    "saschaegerer/phpstan-typo3": "^1.8.2",
-    "ssch/typo3-rector": "^1.1.3"
+    "andersundsehr/ssi-include": "^1.1.0",
+    "pluswerk/grumphp-config": "^7",
+    "saschaegerer/phpstan-typo3": "^1.10.0",
+    "ssch/typo3-rector": "^2.5.0"
   },
   "autoload": {
     "psr-4": {
@@ -26,12 +26,12 @@
   },
   "config": {
     "allow-plugins": {
-      "typo3/cms-composer-installers": true,
-      "typo3/class-alias-loader": true,
+      "ergebnis/composer-normalize": true,
       "phpro/grumphp": true,
-      "pluswerk/grumphp-config": true,
       "phpstan/extension-installer": true,
-      "ergebnis/composer-normalize": true
+      "pluswerk/grumphp-config": true,
+      "typo3/class-alias-loader": true,
+      "typo3/cms-composer-installers": true
     },
     "sort-packages": true
   },

rector.php

@@ -5,7 +5,6 @@
 use PLUS\GrumPHPConfig\RectorSettings;
 use Rector\Config\RectorConfig;
 use Rector\Caching\ValueObject\Storage\FileCacheStorage;
-use Rector\Privatization\Rector\Class_\FinalizeClassesWithoutChildrenRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->parallel();
@@ -22,7 +21,7 @@
     $rectorConfig->sets(
         [
             ...RectorSettings::sets(true),
-            ...RectorSettings::setsTypo3(false),
+            ...RectorSettings::setsTypo3(true),
         ]
     );
 
@@ -32,7 +31,6 @@
         [
             ...RectorSettings::skip(),
             ...RectorSettings::skipTypo3(),
-            FinalizeClassesWithoutChildrenRector::class,
             /**
              * rector should not touch these files
              */