Merge branch 'feature/remove-library-and-upgrade' into develop

vdlp · Nov 30, 2023 · ea5ed5b · ea5ed5b
2 parents 85f0704 + 1c9e671
commit ea5ed5b
Show file tree

Hide file tree

Showing 381 changed files with 48 additions and 32,436 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,9 @@
+#
+# Exclude files from exporting
+#
+
+/.gitattributes     export-ignore
+/.github            export-ignore
+/.gitignore         export-ignore
+/tests              export-ignore
+/phpunit.xml        export-ignore
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.0, 7.4, 7.3, 7.2, 7.1 ]
+        php: [ 8.0, 8.1, 8.2 ]
         stability: [ prefer-lowest, prefer-stable ]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}

diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,26 @@
-# 2.0.0
+# Changelog
+All notable changes to this project will be documented in this file.
 
-- Updated HTMLPurifier library to version 4.13.0
-- Minimal PHP requirement is now 7.1.3
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+# [3.0.0] - 2023-11-30
+
+- Replace included library code with `ezyang/htmlpurifier` (`^4.16`) composer package.
+
+# [2.0.1] - 2020-05-28
+
+- Update dependencies.
+
+# [2.0.0] - 2020-08-18
+
+- Updated HTMLPurifier library to version 4.13.0.
+- Minimal PHP requirement is now 7.1.3.
+
+# [1.0.1] - 2018-10-26
+
+- Modify LICENCE and composer.json contents.
+
+# [1.0.0] - 2018-07-18
+
+- Initial version.
diff --git a/Plugin.php b/Plugin.php
@@ -1,7 +1,5 @@
 <?php
 
-/** @noinspection PhpMissingParentCallCommonInspection */
-
 declare(strict_types=1);
 
 namespace Vdlp\HtmlPurifier;

diff --git a/composer.json b/composer.json
@@ -14,15 +14,13 @@
         }
     ],
     "require": {
-        "php": "^7.1||^8.0",
-        "composer/installers": "^1.0"
+        "php": "^8.0.2",
+        "composer/installers": "^1.0 || ^2.0",
+        "ezyang/htmlpurifier": "^4.16"
     },
-    "autoload": {
-        "psr-0": {
-            "HTMLPurifier": "library/"
-        },
-        "files": [
-            "library/HTMLPurifier.composer.php"
-        ]
+    "config": {
+        "allow-plugins": {
+            "composer/installers": true
+        }
     }
 }
diff --git a/library/HTMLPurifier.auto.php b/library/HTMLPurifier.auto.php
diff --git a/library/HTMLPurifier.autoload-legacy.php b/library/HTMLPurifier.autoload-legacy.php
diff --git a/library/HTMLPurifier.autoload.php b/library/HTMLPurifier.autoload.php
diff --git a/library/HTMLPurifier.composer.php b/library/HTMLPurifier.composer.php
diff --git a/library/HTMLPurifier.func.php b/library/HTMLPurifier.func.php