Skip to content

fix: Improve compatibility with PHP 8.5 #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matsuo wants to merge 2 commits into
base: master
Choose a base branch
from
+7 −3
Open

fix: Improve compatibility with PHP 8.5 #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d548e22
fix: Replace the methods of the SplObjectStorage class which have bee…
matsuo May 11, 2026
43674d5
fix: Suppress the output of the message "Using null as an array offse…
matsuo May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public function handleElement(&$token)

if ($current instanceof HTMLPurifier_Token_End && $current->name === 'span') {
// Mark closing span tag for deletion
$this->markForDeletion->attach($current);
$this->markForDeletion->offsetSet($current);
// Delete open span tag
$token = false;
}
Expand All @@ -85,8 +85,8 @@ public function handleElement(&$token)
*/
public function handleEnd(&$token)
{
if ($this->markForDeletion->contains($token)) {
$this->markForDeletion->detach($token);
if ($this->markForDeletion->offsetExists($token)) {
$this->markForDeletion->offsetUnset($token);
$token = false;
}
}
Expand Down
4 changes: 4 additions & 0 deletions library/HTMLPurifier/URISchemeRegistry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ public function getScheme($scheme, $config, $context)
$config = HTMLPurifier_Config::createDefault();
}

if ($scheme === null) {
return;
}

// important, otherwise attacker could include arbitrary file
$allowed_schemes = $config->get('URI.AllowedSchemes');
if (!$config->get('URI.OverrideAllowedSchemes') &&
Expand Down
Loading