Merge pull request #64 from TangoMan75/master

Replaced idle 'sanitized' variable in 'sanitizeString' method
shaarli · Jan 18, 2021 · 691a571 · 691a571
2 parents d01129a + ae5879b
commit 691a571
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/NetscapeBookmarkParser.php b/NetscapeBookmarkParser.php
@@ -318,49 +318,47 @@ public function parseBoolean($value)
      */
     public static function sanitizeString(string $bookmarkString): string
     {
-        $sanitized = $bookmarkString;
-
         // trim comments
-        $sanitized = preg_replace('@<!--.*?-->@mis', '', $sanitized);
+        $bookmarkString = preg_replace('@<!--.*?-->@mis', '', $bookmarkString);
 
         // keep one XML element per line to prepare for linear parsing
-        $sanitized = preg_replace('@>(\s*?)<@mis', ">\n<", $sanitized);
+        $bookmarkString = preg_replace('@>(\s*?)<@mis', ">\n<", $bookmarkString);
 
         // trim unused metadata
-        $sanitized = preg_replace('@(<!DOCTYPE|<META|<TITLE|<H1|<P).*\n@i', '', $sanitized);
+        $bookmarkString = preg_replace('@(<!DOCTYPE|<META|<TITLE|<H1|<P).*\n@i', '', $bookmarkString);
 
         // trim whitespace
-        $sanitized = trim($sanitized);
+        $bookmarkString = trim($bookmarkString);
 
         // trim carriage returns
-        $sanitized = str_replace("\r", '', $sanitized);
+        $bookmarkString = str_replace("\r", '', $bookmarkString);
 
         // convert multiline descriptions to one-line descriptions
         // line feeds are converted to <br>
-        $sanitized = preg_replace_callback(
+        $bookmarkString = preg_replace_callback(
             '@<DD>(.*?)(</?(:?DT|DD|DL))@mis',
             function ($match) {
                 return '<DD>' . str_replace("\n", '<br>', trim($match[1])) . PHP_EOL . $match[2];
             },
-            $sanitized
+            $bookmarkString
         );
 
         // convert multiline descriptions inside <A> tags to one-line descriptions
         // line feeds are converted to <br>
-        $sanitized = preg_replace_callback(
+        $bookmarkString = preg_replace_callback(
             '@<A(.*?)</A>@mis',
             function ($match) {
                 return '<A ' . str_replace("\n", '<br>', trim($match[1])) . '</A>';
             },
-            $sanitized
+            $bookmarkString
         );
 
         // concatenate all information related to the same entry on the same line
         // e.g. <A HREF="...">My Link</A><DD>List<br>- item1<br>- item2
-        $sanitized = preg_replace('@\n<br>@mis', "<br>", $sanitized);
-        $sanitized = preg_replace('@\n<DD@i', '<DD', $sanitized);
+        $bookmarkString = preg_replace('@\n<br>@mis', "<br>", $bookmarkString);
+        $bookmarkString = preg_replace('@\n<DD@i', '<DD', $bookmarkString);
 
-        return $sanitized;
+        return $bookmarkString;
     }
 
     /**