Merge pull request #164 from RobinDev/patch-3

Update thecodingmachine/safe for php 8
WyriHaximus · Aug 12, 2022 · 3c23ba5 · 3c23ba5
2 parents d5ab3f2 + 416adfe
commit 3c23ba5
Show file tree

Hide file tree

Showing 2 changed files with 597 additions and 519 deletions.
diff --git a/composer.json b/composer.json
@@ -1,11 +1,11 @@
 {
     "name": "wyrihaximus/html-compress",
     "description": "Compress/minify your HTML",
+    "license": "MIT",
     "keywords": [
         "html",
         "compress"
     ],
-    "license": "MIT",
     "authors": [
         {
             "name": "Cees-Jan Kiewiet",
@@ -15,7 +15,7 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "thecodingmachine/safe": "^1.1",
+        "thecodingmachine/safe": "^1.1 || ^2.2",
         "voku/html-min": "^4.4.8",
         "voku/simple_html_dom": "^4.7.17",
         "wyrihaximus/compress": "^1.1 || ^2.0",
@@ -24,11 +24,21 @@
         "wyrihaximus/css-compress": "^2",
         "wyrihaximus/js-compress": "^5"
     },
+    "require-dev": {
+        "wyrihaximus/test-utilities": "^3.7.6"
+    },
     "conflict": {
         "voku/simple_html_dom": "<4.7.28"
     },
-    "require-dev": {
-        "wyrihaximus/test-utilities": "^3.7.6"
+    "autoload": {
+        "psr-4": {
+            "WyriHaximus\\HtmlCompress\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "WyriHaximus\\HtmlCompress\\Tests\\": "tests/"
+        }
     },
     "config": {
         "allow-plugins": {
@@ -48,16 +58,6 @@
             "slevomat/coding-standard"
         ]
     },
-    "autoload": {
-        "psr-4": {
-            "WyriHaximus\\HtmlCompress\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "WyriHaximus\\HtmlCompress\\Tests\\": "tests/"
-        }
-    },
     "scripts": {
         "post-install-cmd": [
             "composer normalize"