firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

PHP 8.1 지원 HTMLPurifier 패치

Browse Source
This commit is contained in:
kit rio
2022-05-23 14:13:41 +09:00
parent 0dbdef7543
commit a73cdef008
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugin/htmlpurifier/HTMLPurifier.standalone.php
View File

@ -3801,7 +3801,7 @@ class HTMLPurifier_ElementDef
if (!empty($def->content_model)) { if (!empty($def->content_model)) {
$this->content_model = $this->content_model =
str_replace("#SUPER", $this->content_model, $def->content_model); str_replace("#SUPER", (string)$this->content_model, $def->content_model);
$this->child = false; $this->child = false;
} }
if (!empty($def->content_model_type)) { if (!empty($def->content_model_type)) {
@ -7555,7 +7555,7 @@ class HTMLPurifier_Length
if ($this->n === '0' && $this->unit === false) { if ($this->n === '0' && $this->unit === false) {
return true; return true;
} }
if (!ctype_lower($this->unit)) { if ($this->unit === false || !ctype_lower($this->unit)) {
$this->unit = strtolower($this->unit); $this->unit = strtolower($this->unit);
} }
if (!isset(HTMLPurifier_Length::$allowedUnits[$this->unit])) { if (!isset(HTMLPurifier_Length::$allowedUnits[$this->unit])) {
@ -7946,8 +7946,8 @@ class HTMLPurifier_Lexer
{ {
// normalize newlines to \n // normalize newlines to \n
if ($config->get('Core.NormalizeNewlines')) { if ($config->get('Core.NormalizeNewlines')) {
$html = str_replace("\r\n", "\n", $html); $html = str_replace("\r\n", "\n", (string)$html);
$html = str_replace("\r", "\n", $html); $html = str_replace("\r", "\n", (string)$html);
} }
if ($config->get('HTML.Trusted')) { if ($config->get('HTML.Trusted')) {
@ -8337,6 +8337,7 @@ class HTMLPurifier_PropertyListIterator extends FilterIterator
/** /**
* @return bool * @return bool
*/ */
#[ReturnTypeWillChange]
public function accept() public function accept()
{ {
$key = $this->getInnerIterator()->key(); $key = $this->getInnerIterator()->key();
@ -8455,6 +8456,7 @@ class HTMLPurifier_StringHash extends ArrayObject
* @param mixed $index * @param mixed $index
* @return mixed * @return mixed
*/ */
#[\ReturnTypeWillChange]
public function offsetGet($index) public function offsetGet($index)
{ {
$this->accessed[$index] = true; $this->accessed[$index] = true;
@ -21908,11 +21910,11 @@ class HTMLPurifier_URIFilter_Munge extends HTMLPurifier_URIFilter
$string = $uri->toString(); $string = $uri->toString();
// always available // always available
$this->replace['%s'] = $string; $this->replace['%s'] = $string;
$this->replace['%r'] = $context->get('EmbeddedURI', true); $this->replace['%r'] = $context->get('EmbeddedURI', true)?: '';
$token = $context->get('CurrentToken', true); $token = $context->get('CurrentToken', true) ?: '';
$this->replace['%n'] = $token ? $token->name : null; $this->replace['%n'] = $token ? $token->name : '';
$this->replace['%m'] = $context->get('CurrentAttr', true); $this->replace['%m'] = $context->get('CurrentAttr', true) ?: '';
$this->replace['%p'] = $context->get('CurrentCSSProperty', true); $this->replace['%p'] = $context->get('CurrentCSSProperty', true) ?: '';
// not always available // not always available
if ($this->secretKey) { if ($this->secretKey) {
$this->replace['%t'] = hash_hmac("sha256", $string, $this->secretKey); $this->replace['%t'] = hash_hmac("sha256", $string, $this->secretKey);

2
plugin/htmlpurifier/standalone/HTMLPurifier/Lexer/PH5P.php
View File

@ -4410,7 +4410,7 @@ class HTML5TreeConstructer
foreach ($token['attr'] as $attr) { foreach ($token['attr'] as $attr) {
if (!$el->hasAttribute($attr['name'])) { if (!$el->hasAttribute($attr['name'])) {
$el->setAttribute($attr['name'], $attr['value']); $el->setAttribute($attr['name'], (string)$attr['value']);
} }
} }