Page MenuHomePhorge
Differential D25142 Diff 546 externals/pear-figlet/Text/Figlet.php

Changeset View

Standalone View

View Options

externals/pear-figlet/Text/Figlet.php

Show First 20 Lines • Show All 134 Lines • ▼ Show 20 Lines function loadFont($filename, $loadgerman = true)
if (!($fp = fopen($filename, 'rb'))) { if (!($fp = fopen($filename, 'rb'))) {
return self::raiseError('Cannot open figlet font file ' . $filename, 2); return self::raiseError('Cannot open figlet font file ' . $filename, 2);
} }
if (!$compressed) { if (!$compressed) {
/* ZIPed font */ /* ZIPed font */
if (fread($fp, 2) == 'PK') { if (fread($fp, 2) == 'PK') {
if (!function_exists('zip_open')) {
return self::raiseError('Cannot load ZIP compressed fonts since'
. ' ZIP PHP extension is not available.',
5);
}
fclose($fp); fclose($fp);
if (!($fp = zip_open($filename))) { $zip = new ZipArchive();
return self::raiseError('Cannot open figlet font file ' . $filename, 2); $open_result = $zip->open($filename, ZipArchive::RDONLY);
valerio.bozzolanUnsubmitted
Not Done
Inline Actions
IMPORTANT: It seems ZipArchive::RDONLY was introduced since PHP 7.4.3

https://www.php.net/manual/en/zip.constants.php#ziparchive.constants.rdonly

valerio.bozzolan: IMPORTANT: It seems `ZipArchive::RDONLY` was introduced since PHP 7.4.3 https://www.php.
speckAuthorUnsubmitted
Done
Inline Actions

huh, good find, I didn't consider that the argument would not have also existed since ZipArchive was added in 5.2

Some things to consider

  1. PHP < 7.4 is out of support according to https://www.php.net/supported-versions.php
  2. Debian bullseye+ and Ubuntu 20.04+ package manager ships PHP 7.4+
  3. Debian buster and Ubuntu 18.04 package manager ships PHP 7.2
  4. Red Hat 8+ have PHP 7.4+ available in shipped packages (Red Hat 7 does not ship any PHP it looks like)
  5. Fedora project's EPEL registry has packages for 8.2
  6. Rocky Linux appstream includes 7.4+
speck: huh, good find, I didn't consider that the argument would not have also existed since…
valerio.bozzolanUnsubmitted
Not Done
Inline Actions
$zip = new ZipArchive();
- $open_result = $zip->open($filename, ZipArchive::RDONLY);
+ $zip_flags = 0;
+ if(defined('ZipArchive::RDONLY')) {
+ $zip_flags = ZipArchive::RDONLY;
+ }
+ $open_result = $zip->open($filename, $zip_flags);
if ($open_result !== true) {

Uhmm I'm not bold enough to raise PHP 7.4 as minimum version just for this exact line, since probably the workaround here is reasonable readable and minimal. Here an example ↑

valerio.bozzolan: Uhmm I'm not bold enough to raise PHP 7.4 as minimum version just for this exact line, since…
speckAuthorUnsubmitted
Done
Inline Actions

Yeah that should be a separate discussion. I'll copy that comment into T15047.

speck: Yeah that should be a separate discussion. I'll copy that comment into T15047.
if ($open_result !== true) {
valerio.bozzolanUnsubmitted
Done
Inline Actions

✅ The strict check is correct since it must return true on success

https://www.php.net/manual/en/ziparchive.open.php

valerio.bozzolan: ✅ The strict check is correct since it must return `true` on success https://www.php.
return self::raiseError('Cannot open figlet font file ' .
$filename . ', got error: ' . $open_result, 2);
} }
$name = zip_entry_name(zip_read($fp)); $name = $zip->getNameIndex(0);
zip_close($fp); $zip->close();
if (!($fp = fopen('zip://' . realpath($filename) . '#' . $name, 'rb'))) { if (!($fp = fopen('zip://' . realpath($filename) . '#' . $name, 'rb'))) {
return self::raiseError('Cannot open figlet font file ' . $filename, 2); return self::raiseError('Cannot open figlet font file ' . $filename, 2);
} }
$compressed = true; $compressed = true;
} else { } else {
flock($fp, LOCK_SH); flock($fp, LOCK_SH);
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Lines function loadFont($filename, $loadgerman = true)
if (preg_match('/^\-0x/i', $i)) { if (preg_match('/^\-0x/i', $i)) {
$this->_skip($fp); $this->_skip($fp);
} else { } else {
// If Unicode // If Unicode
if (preg_match('/^0x/i', $i)) { if (preg_match('/^0x/i', $i)) {
$i = hexdec(substr($i, 2)); $i = hexdec(substr($i, 2));
} else { } else {
// If octal // If octal
if ($i{0} === '0' && $i !== '0' || substr($i, 0, 2) == '-0') { if ($i[0] === '0' && $i !== '0' || substr($i, 0, 2) == '-0') {
$i = octdec($i); $i = octdec($i);
} }
} }
$letter = $this->_char($fp); $letter = $this->_char($fp);
// Invalid character but main font is loaded and I can use it // Invalid character but main font is loaded and I can use it
if ($letter === false) { if ($letter === false) {
Show All 26 Lines function lineEcho($str, $inhtml = false)
$out = array(); $out = array();
for ($i = 0; $i<strlen($str); $i++) { for ($i = 0; $i<strlen($str); $i++) {
// Pseudo Unicode support // Pseudo Unicode support
if (substr($str, $i, 2) == '%u') { if (substr($str, $i, 2) == '%u') {
$lt = hexdec(substr($str, $i+2, 4)); $lt = hexdec(substr($str, $i+2, 4));
$i += 5; $i += 5;
} else { } else {
$lt = ord($str{$i}); $lt = ord($str[$i]);
} }
$hb = preg_quote($this->hardblank, '/'); $hb = preg_quote($this->hardblank, '/');
$sp = "$hb\\x00\\s"; $sp = "$hb\\x00\\s";
// If chosen character not found try to use default // If chosen character not found try to use default
// If default character is not defined skip it // If default character is not defined skip it
▲ Show 20 Lines • Show All 215 Lines • Show Last 20 Lines
Content licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) unless otherwise noted; code licensed under Apache 2.0 or other open source licenses. · CC BY-SA 4.0 · Apache 2.0