Merge branch 'MDL-67030' of https://github.com/stronk7/moodle

mpetrowi · Nov 21, 2019 · 6f407fb · 6f407fb
2 parents 88b2d7b + 30e5aca
commit 6f407fb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/lib/htmlpurifier/HTMLPurifier/ChildDef/Custom.php b/lib/htmlpurifier/HTMLPurifier/ChildDef/Custom.php
@@ -45,7 +45,7 @@ public function __construct($dtd_regex)
     protected function _compileRegex()
     {
         $raw = str_replace(' ', '', $this->dtd_regex);
-        if ($raw{0} != '(') {
+        if ($raw[0] != '(') {
             $raw = "($raw)";
         }
         $el = '[#a-zA-Z0-9_.-]+';

diff --git a/lib/htmlpurifier/HTMLPurifier/Encoder.php b/lib/htmlpurifier/HTMLPurifier/Encoder.php
@@ -159,7 +159,7 @@ public static function cleanUTF8($str, $force_php = false)
 
         $len = strlen($str);
         for ($i = 0; $i < $len; $i++) {
-            $in = ord($str{$i});
+            $in = ord($str[$i]);
             $char .= $str[$i]; // append byte to char
             if (0 == $mState) {
                 // When mState is zero we expect either a US-ASCII character

diff --git a/lib/htmlpurifier/HTMLPurifier/TagTransform/Font.php b/lib/htmlpurifier/HTMLPurifier/TagTransform/Font.php
@@ -75,7 +75,7 @@ public function transform($tag, $config, $context)
         if (isset($attr['size'])) {
             // normalize large numbers
             if ($attr['size'] !== '') {
-                if ($attr['size']{0} == '+' || $attr['size']{0} == '-') {
+                if ($attr['size'][0] == '+' || $attr['size'][0] == '-') {
                     $size = (int)$attr['size'];
                     if ($size < -2) {
                         $attr['size'] = '-2';

diff --git a/lib/htmlpurifier/readme_moodle.txt b/lib/htmlpurifier/readme_moodle.txt
@@ -16,5 +16,8 @@ Description of HTML Purifier v4.10.0 library import into Moodle
 * add this readme_moodle.txt to /lib/htmlpurifier/
 
 Modifications:
+(verify if we need to apply them on every upgrade, remove when not needed)
 * MDL-60337 use correct IDN variant for converting domain names to ascii
   Check status of https://github.com/ezyang/htmlpurifier/pull/148
+* MDL-67030 applied https://github.com/ezyang/htmlpurifier/pull/224 towards
+  php74 compatibility.