Merge pull request #9 from pluswerk/TYPO3-12

.github/workflows/tasks.yml

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

.gitignore

@@ -2,3 +2,4 @@
 vendor
 public
 composer.lock
+var/

Classes/Middleware/MinifyMiddleware.php

@@ -20,7 +20,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         //  minimize only html
         $response = $handler->handle($request);
         foreach ($response->getHeader('Content-Type') as $contentType) {
-            if (strpos($contentType, 'text/html') !== 0) {
+            if (!str_starts_with($contentType, 'text/html')) {
                 return $response;
             }
         }
@@ -37,6 +37,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             $body->write($html);
             $response = $response->withBody($body);
         }
+
         return $response;
     }
 }

Classes/Service/MinifyService.php

@@ -29,16 +29,17 @@ public function minify(string $html): string
         $htmlMin->doRemoveOmittedQuotes($this->isFeatureActive('remove_omitted_quotes'));
         $htmlMin->doRemoveOmittedHtmlTags($this->isFeatureActive('remove_omitted_html_tags'));
         $htmlMin->doRemoveComments($this->isFeatureActive('remove_comments'));
+
         $originalHtml = $html;
 
         // Not nice but this is really hardcoded in the core.
         if ($this->isFeatureActive('remove_comments')) {
             $typo3Comment = $this->preserveTypo3Comment($html);
             $html = $htmlMin->minify($html);
             $output = [];
-            $languageMeta = preg_match_all('/<meta charset=[a-zA-Z0-9-_"]*>/', $html, $output);
+            $languageMeta = preg_match_all('#<meta charset=[a-zA-Z0-9-_"]*>#', $html, $output);
             if ($languageMeta) {
-                $insertAt = strpos($html, $output[0][0]) + strlen($output[0][0]);
+                $insertAt = strpos($html, (string)$output[0][0]) + strlen($output[0][0]);
                 $html = substr($html, 0, $insertAt) . $typo3Comment . substr($html, $insertAt);
             } else {
                 $html = $htmlMin->minify($html);
@@ -48,8 +49,9 @@ public function minify(string $html): string
         }
 
         if (empty($html)) {
-            $html = $originalHtml;
+            return $originalHtml;
         }
+
         return $html;
     }
 
@@ -66,7 +68,7 @@ protected function preserveTypo3Comment(string $html): string
             $typo3CommentStop = strpos($html, '-->', $typo3CommentStart);
             $typo3Comment = substr($html, $typo3CommentStart, $typo3CommentStop - $typo3CommentStart + 3);
 
-            if (strpos($typo3Comment, 'TYPO3') !== false) {
+            if (str_contains($typo3Comment, 'TYPO3')) {
                 return $typo3Comment;
             }
 

Configuration/RequestMiddlewares.php

@@ -1,9 +1,11 @@
 <?php
 
+use Pluswerk\PlusMinify\Middleware\MinifyMiddleware;
+
 return [
     'frontend' => [
         'minify/service/htmlminifier' => [
-            'target' => \Pluswerk\PlusMinify\Middleware\MinifyMiddleware::class,
+            'target' => MinifyMiddleware::class,
             // in the request direction it is after these middlewares:
             // but in response direction it is before these middlewares:
             'after' => [

composer.json

@@ -17,28 +17,25 @@
       "typo3/cms-composer-installers": true,
       "typo3/class-alias-loader": true,
       "phpro/grumphp": true,
-      "pluswerk/grumphp-config": true
+      "pluswerk/grumphp-config": true,
+      "phpstan/extension-installer": true
     },
     "sort-packages": true
   },
   "extra" : {
-    "typo3/cms" : {
-      "extension-key" : "minify"
-    },
-    "pluswerk/grumphp-config": {
-      "auto-setting": true
-    },
-    "grumphp": {
-      "config-default-path": "vendor/pluswerk/grumphp-config/grumphp.yml"
+    "typo3/cms": {
+      "extension-key": "minify"
     }
   },
   "require" : {
-    "php": "~7.4 || ~8.0 || ~8.1",
+    "php": "~8.0 || ~8.1 || ~8.2",
     "composer-runtime-api": "^2",
-    "typo3/cms-core": "^10.4 || ^11.5",
-    "voku/html-min": "^4"
+    "typo3/cms-core": "^11.5 || ^12.4",
+    "voku/html-min": "^4.5"
   },
   "require-dev": {
-    "pluswerk/grumphp-config": "^5"
+    "pluswerk/grumphp-config": "^6",
+    "saschaegerer/phpstan-typo3": "^1.8.2",
+    "ssch/typo3-rector": "^1.1.3"
   }
 }

ext_emconf.php

@@ -1,5 +1,7 @@
 <?php
 
+use Composer\InstalledVersions;
+
 /** @var string $_EXTKEY */
 $EM_CONF[$_EXTKEY] = [
     'title' => '+Pluswerk: Minify',
@@ -8,14 +10,10 @@
     'author' => 'Stefan Lamm',
     'author_email' => '[email protected]',
     'state' => 'stable',
-    'internal' => '',
-    'uploadfolder' => '0',
-    'createDirs' => '',
-    'clearCacheOnLoad' => false,
-    'version' => \Composer\InstalledVersions::getPrettyVersion('pluswerk/minify'),
+    'version' => InstalledVersions::getPrettyVersion('pluswerk/minify'),
     'constraints' => [
         'depends' => [
-            'typo3' => '10.4.0 - 11.99.99',
+            'typo3' => '11.5.0 - 12.99.99',
         ],
         'conflicts' => [],
         'suggests' => [],

grumphp.yml

@@ -0,0 +1,16 @@
+imports:
+  - { resource: vendor/pluswerk/grumphp-config/grumphp.yml }
+parameters:
+  convention.process_timeout: 240
+  convention.security_checker_blocking: true
+  convention.jsonlint_ignore_pattern: {  }
+  convention.xmllint_ignore_pattern: {  }
+  convention.yamllint_ignore_pattern: {  }
+  convention.phpcslint_ignore_pattern: {  }
+  convention.phpcslint_exclude: {  }
+  convention.xlifflint_ignore_pattern: {  }
+  convention.rector_ignore_pattern: {  }
+  convention.rector_enabled: true
+  convention.rector_config: rector.php
+  convention.rector_clear-cache: false
+  convention.phpstan_level: null

phpstan-baseline.neon

@@ -0,0 +1,2 @@
+parameters:
+	ignoreErrors: []

phpstan.neon

@@ -0,0 +1,7 @@
+includes:
+  - phpstan-baseline.neon
+  - vendor/andersundsehr/phpstan-git-files/extension.php
+
+parameters:
+  level: 8
+  reportUnmatchedIgnoredErrors: false

rector.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+use PLUS\GrumPHPConfig\RectorSettings;
+use Rector\Config\RectorConfig;
+use Rector\Caching\ValueObject\Storage\FileCacheStorage;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->parallel();
+    $rectorConfig->importNames();
+    $rectorConfig->importShortClasses();
+    $rectorConfig->cacheClass(FileCacheStorage::class);
+    $rectorConfig->cacheDirectory('./var/cache/rector');
+
+    $rectorConfig->paths(
+        array_filter(explode("\n", (string)shell_exec("git ls-files | xargs ls -d 2>/dev/null | grep '\.php$'")))
+    );
+
+    // define sets of rules
+    $rectorConfig->sets(
+        [
+            ...RectorSettings::sets(true),
+            ...RectorSettings::setsTypo3(false),
+        ]
+    );
+
+    // remove some rules
+    // ignore some files
+    $rectorConfig->skip(
+        [
+            ...RectorSettings::skip(),
+            ...RectorSettings::skipTypo3(),
+
+            /**
+             * rector should not touch these files
+             */
+            //__DIR__ . '/src/Example',
+            //__DIR__ . '/src/Example.php',
+        ]
+    );
+};