mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2024-12-22 16:31:53 +00:00
1db36fb09d
* Define HTMLPurifier_Lexer::$_entity_parser property This fixes a PHP 8.2 deprecation. * Define HTMLPurifier_URIFilterHarness::$filter property This fixes a PHP 8.2 deprecation. * Define HTMLPurifier_AttrTransform_NameSync::$idDef property This fixes a PHP 8.2 deprecation. * Define HTMLPurifier_AttrTransform_NameSyncTest::$accumulator property This fixes a PHP 8.2 deprecation. * Define HTMLPurifier_AttrValidator_ErrorsTest::$language property This fixes a PHP 8.2 deprecation. * Define HTMLPurifier_ChildDef_List::$whitespace property This fixes a PHP 8.2 deprecation. * Do not modify incoming tokens in RemoveSpansWithoutAttributes Previously the undefined property `->markForDeletion` was added to the incoming tokens. This causes a deprecation in PHP 8.2. Fix this by storing to-be-deleted tokens inside SplObjectStorage. In PHP 8 a WeakMap would be preferable, as that prevents leaks if `handleEnd` is never called for the token.
96 lines
2.2 KiB
PHP
96 lines
2.2 KiB
PHP
<?php
|
|
|
|
/**
|
|
* Injector that removes spans with no attributes
|
|
*/
|
|
class HTMLPurifier_Injector_RemoveSpansWithoutAttributes extends HTMLPurifier_Injector
|
|
{
|
|
/**
|
|
* @type string
|
|
*/
|
|
public $name = 'RemoveSpansWithoutAttributes';
|
|
|
|
/**
|
|
* @type array
|
|
*/
|
|
public $needed = array('span');
|
|
|
|
/**
|
|
* @type HTMLPurifier_AttrValidator
|
|
*/
|
|
private $attrValidator;
|
|
|
|
/**
|
|
* Used by AttrValidator.
|
|
* @type HTMLPurifier_Config
|
|
*/
|
|
private $config;
|
|
|
|
/**
|
|
* @type HTMLPurifier_Context
|
|
*/
|
|
private $context;
|
|
|
|
/**
|
|
* @type SplObjectStorage
|
|
*/
|
|
private $markForDeletion;
|
|
|
|
public function __construct()
|
|
{
|
|
$this->markForDeletion = new SplObjectStorage();
|
|
}
|
|
|
|
public function prepare($config, $context)
|
|
{
|
|
$this->attrValidator = new HTMLPurifier_AttrValidator();
|
|
$this->config = $config;
|
|
$this->context = $context;
|
|
return parent::prepare($config, $context);
|
|
}
|
|
|
|
/**
|
|
* @param HTMLPurifier_Token $token
|
|
*/
|
|
public function handleElement(&$token)
|
|
{
|
|
if ($token->name !== 'span' || !$token instanceof HTMLPurifier_Token_Start) {
|
|
return;
|
|
}
|
|
|
|
// We need to validate the attributes now since this doesn't normally
|
|
// happen until after MakeWellFormed. If all the attributes are removed
|
|
// the span needs to be removed too.
|
|
$this->attrValidator->validateToken($token, $this->config, $this->context);
|
|
$token->armor['ValidateAttributes'] = true;
|
|
|
|
if (!empty($token->attr)) {
|
|
return;
|
|
}
|
|
|
|
$nesting = 0;
|
|
while ($this->forwardUntilEndToken($i, $current, $nesting)) {
|
|
}
|
|
|
|
if ($current instanceof HTMLPurifier_Token_End && $current->name === 'span') {
|
|
// Mark closing span tag for deletion
|
|
$this->markForDeletion->attach($current);
|
|
// Delete open span tag
|
|
$token = false;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @param HTMLPurifier_Token $token
|
|
*/
|
|
public function handleEnd(&$token)
|
|
{
|
|
if ($this->markForDeletion->contains($token)) {
|
|
$this->markForDeletion->detach($token);
|
|
$token = false;
|
|
}
|
|
}
|
|
}
|
|
|
|
// vim: et sw=4 sts=4
|