Skip to content

Commit 79723b7

Browse files
committed
Merge branch 'release/3.0.0'
2 parents b3b2f6c + ea5ed5b commit 79723b7

File tree

381 files changed

+48
-32436
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

381 files changed

+48
-32436
lines changed

.gitattributes

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#
2+
# Exclude files from exporting
3+
#
4+
5+
/.gitattributes export-ignore
6+
/.github export-ignore
7+
/.gitignore export-ignore
8+
/tests export-ignore
9+
/phpunit.xml export-ignore

.github/workflows/php.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: true
1616
matrix:
17-
php: [ 8.0, 7.4, 7.3, 7.2, 7.1 ]
17+
php: [ 8.0, 8.1, 8.2 ]
1818
stability: [ prefer-lowest, prefer-stable ]
1919

2020
name: PHP ${{ matrix.php }} - ${{ matrix.stability }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.idea

CHANGELOG.md

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,26 @@
1-
# 2.0.0
1+
# Changelog
2+
All notable changes to this project will be documented in this file.
23

3-
- Updated HTMLPurifier library to version 4.13.0
4-
- Minimal PHP requirement is now 7.1.3
4+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6+
7+
# [3.0.0] - 2023-11-30
8+
9+
- Replace included library code with `ezyang/htmlpurifier` (`^4.16`) composer package.
10+
11+
# [2.0.1] - 2020-05-28
12+
13+
- Update dependencies.
14+
15+
# [2.0.0] - 2020-08-18
16+
17+
- Updated HTMLPurifier library to version 4.13.0.
18+
- Minimal PHP requirement is now 7.1.3.
19+
20+
# [1.0.1] - 2018-10-26
21+
22+
- Modify LICENCE and composer.json contents.
23+
24+
# [1.0.0] - 2018-07-18
25+
26+
- Initial version.

Plugin.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22

3-
/** @noinspection PhpMissingParentCallCommonInspection */
4-
53
declare(strict_types=1);
64

75
namespace Vdlp\HtmlPurifier;

composer.json

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@
1414
}
1515
],
1616
"require": {
17-
"php": "^7.1||^8.0",
18-
"composer/installers": "^1.0"
17+
"php": "^8.0.2",
18+
"composer/installers": "^1.0 || ^2.0",
19+
"ezyang/htmlpurifier": "^4.16"
1920
},
20-
"autoload": {
21-
"psr-0": {
22-
"HTMLPurifier": "library/"
23-
},
24-
"files": [
25-
"library/HTMLPurifier.composer.php"
26-
]
21+
"config": {
22+
"allow-plugins": {
23+
"composer/installers": true
24+
}
2725
}
2826
}

library/HTMLPurifier.auto.php

Lines changed: 0 additions & 11 deletions
This file was deleted.

library/HTMLPurifier.autoload-legacy.php

Lines changed: 0 additions & 15 deletions
This file was deleted.

library/HTMLPurifier.autoload.php

Lines changed: 0 additions & 24 deletions
This file was deleted.

library/HTMLPurifier.composer.php

Lines changed: 0 additions & 4 deletions
This file was deleted.

library/HTMLPurifier.func.php

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)