Addressing some PHP 8 incompatibilities - Remarkup

neandrake · neandrake · commit ec9ebe532e52 · 2023-05-28T23:11:56.000-04:00
Summary: Updating compatibility for PHP 8.2 for remarkup-related functionality. This also resolves an issue introduced by https://secure.phabricator.com/D21860. Of all the flags when opening the zip the one I chose was not introduced in 5.2 but in 7.4 Test Plan: I rendered comments using figlet, cowsay, images, object references. Reviewers: #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: Korvin, epriestley Differential Revision: https://secure.phabricator.com/D21866
diff --git a/.editorconfig b/.editorconfig
@@ -10,25 +10,25 @@ insert_final_newline = true
 max_line_length = 80
 
 [.arclint]
-max_line_length =
+max_line_length = unset
 
 [resources/sql/**.sql]
-max_line_length =
+max_line_length = unset
 
 [scripts/install/install_*.sh]
-max_line_length =
+max_line_length = unset
 
 [src/applications/differential/parser/__tests__/data/*.diff]
 trim_trailing_whitespace = false
 
 [src/applications/differential/parser/__tests__/messages/long-title.txt]
-max_line_length =
+max_line_length = unset
 
 [src/applications/diffusion/ssh/__tests__/hgwiredata/*.txt]
-max_line_length =
+max_line_length = unset
 
 [externals/**]
-indent_style =
-indent_size =
+indent_style = unset
+indent_size = unset
 trim_trailing_whitespace = false
 insert_final_newline = false
diff --git a/externals/pear-figlet/Text/Figlet.php b/externals/pear-figlet/Text/Figlet.php
@@ -143,7 +143,12 @@ function loadFont($filename, $loadgerman = true)
                 fclose($fp);
 
                 $zip = new ZipArchive();
-                $open_result = $zip->open($filename, ZipArchive::RDONLY);
+                $open_flag = 0;
+                // The RDONLY flag was only introduced in 7.4.3.
+                if (defined('ZipArchive::RDONLY')) {
+                  $open_flag = ZipArchive::RDONLY;
+                } 
+                $open_result = $zip->open($filename, $open_flag);
                 if ($open_result !== true) {
                     return self::raiseError('Cannot open figlet font file ' .
                         $filename . ', got error: ' . $open_result, 2);
diff --git a/src/infrastructure/markup/interpreter/PhabricatorRemarkupCowsayBlockInterpreter.php b/src/infrastructure/markup/interpreter/PhabricatorRemarkupCowsayBlockInterpreter.php
@@ -15,6 +15,7 @@ public function markupContent($content, array $argv) {
     $map = self::getCowMap();
 
     $cow = idx($argv, 'cow');
+    $cow = ($cow === null ? '' : $cow);
     $cow = phutil_utf8_strtolower($cow);
     if (empty($map[$cow])) {
       $cow = 'default';
diff --git a/src/infrastructure/markup/interpreter/PhabricatorRemarkupFigletBlockInterpreter.php b/src/infrastructure/markup/interpreter/PhabricatorRemarkupFigletBlockInterpreter.php
@@ -14,6 +14,7 @@ public function markupContent($content, array $argv) {
     $map = self::getFigletMap();
 
     $font = idx($argv, 'font');
+    $font = ($font === null ? '' : $font);
     $font = phutil_utf8_strtolower($font);
     if (empty($map[$font])) {
       $font = 'standard';
diff --git a/src/infrastructure/markup/remarkup/PhutilRemarkupEngine.php b/src/infrastructure/markup/remarkup/PhutilRemarkupEngine.php
@@ -232,7 +232,9 @@ private function splitTextIntoBlocks($text, $depth = 0) {
 
       $lines = '';
       for ($ii = $min; $ii < $max; $ii++) {
-        $lines .= $text[$ii];
+        if (isset($text[$ii])) {
+          $lines .= $text[$ii];
+        }
       }
 
       $blocks[$key]['text'] = $lines;

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,9 @@ private function splitTextIntoBlocks($text, $depth = 0) {`
`232`	`232`
`233`	`233`	`$lines = '';`
`234`	`234`	`for ($ii = $min; $ii < $max; $ii++) {`
`235`		`- $lines .= $text[$ii];`
	`235`	`+ if (isset($text[$ii])) {`
	`236`	`+ $lines .= $text[$ii];`
	`237`	`+ }`
`236`	`238`	`}`
`237`	`239`
`238`	`240`	`$blocks[$key]['text'] = $lines;`