fix: Deprecated: preg_replace(): Passing null to parameter #3 ($subject) o… (#421)

nikkii94 · ezyang · web-flow · commit 5d154a239367 · 2024-11-09T22:06:41.000-05:00
Co-authored-by: Edward Z. Yang &lt;ezyang@meta.com&gt;
diff --git a/library/HTMLPurifier/Filter/YouTube.php b/library/HTMLPurifier/Filter/YouTube.php
@@ -19,7 +19,7 @@ public function preFilter($html, $config, $context)
         $pre_regex = '#<object[^>]+>.+?' .
             '(?:http:)?//www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s';
         $pre_replace = '<span class="youtube-embed">\1</span>';
-        return preg_replace($pre_regex, $pre_replace, $html);
+        return preg_replace($pre_regex, $pre_replace, (string)$html);
     }
 
     /**
@@ -31,7 +31,7 @@ public function preFilter($html, $config, $context)
     public function postFilter($html, $config, $context)
     {
         $post_regex = '#<span class="youtube-embed">((?:v|cp)/[A-Za-z0-9\-_=]+)</span>#';
-        return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html);
+        return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), (string)$html);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public function preFilter($html, $config, $context)`
`19`	`19`	`$pre_regex = '#<object[^>]+>.+?' .`
`20`	`20`	`'(?:http:)?//www.youtube.com/((?:v\|cp)/[A-Za-z0-9\-_=]+).+?</object>#s';`
`21`	`21`	`$pre_replace = '<span class="youtube-embed">\1</span>';`
`22`		`- return preg_replace($pre_regex, $pre_replace, $html);`
	`22`	`+ return preg_replace($pre_regex, $pre_replace, (string)$html);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`/**`
`@@ -31,7 +31,7 @@ public function preFilter($html, $config, $context)`
`31`	`31`	`public function postFilter($html, $config, $context)`
`32`	`32`	`{`
`33`	`33`	`$post_regex = '#<span class="youtube-embed">((?:v\|cp)/[A-Za-z0-9\-_=]+)</span>#';`
`34`		`- return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html);`
	`34`	`+ return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), (string)$html);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/**`