diff --git a/.editorconfig b/.editorconfig --- a/.editorconfig +++ b/.editorconfig @@ -10,25 +10,25 @@ 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 --- a/externals/pear-figlet/Text/Figlet.php +++ b/externals/pear-figlet/Text/Figlet.php @@ -143,7 +143,12 @@ 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 --- a/src/infrastructure/markup/interpreter/PhabricatorRemarkupCowsayBlockInterpreter.php +++ b/src/infrastructure/markup/interpreter/PhabricatorRemarkupCowsayBlockInterpreter.php @@ -15,6 +15,7 @@ $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 --- a/src/infrastructure/markup/interpreter/PhabricatorRemarkupFigletBlockInterpreter.php +++ b/src/infrastructure/markup/interpreter/PhabricatorRemarkupFigletBlockInterpreter.php @@ -14,6 +14,7 @@ $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 --- a/src/infrastructure/markup/remarkup/PhutilRemarkupEngine.php +++ b/src/infrastructure/markup/remarkup/PhutilRemarkupEngine.php @@ -232,7 +232,9 @@ $lines = ''; for ($ii = $min; $ii < $max; $ii++) { - $lines .= $text[$ii]; + if (isset($text[$ii])) { + $lines .= $text[$ii]; + } } $blocks[$key]['text'] = $lines;