Skip to content

Emit no notices on PHP 7.4 #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Emit no notices on PHP 7.4 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31cad91
Fixes a problem with php 7.4
LinkingYou Dec 19, 2019
d8dbf5a
Do not emit E_NOTICEs on r/w errors
Piskvor Jan 16, 2020
d89107b
indentation fix
Piskvor Apr 29, 2020
1e9dd5c
remove PHPStorm's @noinspection
Piskvor Apr 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/FontLib/AdobeFontMetrics.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ function write($file, $encoding = null) {
$this->endSection("CharMetrics");

$kern = $font->getData("kern", "subtable");
$tree = $kern["tree"];
$tree = is_array($kern) ? $kern["tree"] : null;

if (!$encoding && is_array($tree)) {
$this->startSection("KernData");
Expand Down
23 changes: 13 additions & 10 deletions src/FontLib/BinaryStream.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,17 @@ class BinaryStream {
const modeReadWrite = "rb+";

static function backtrace() {
var_dump(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS));
var_dump(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS));
}

/**
* Open a font file in read mode
*
* @param string $filename The file name of the font to open
*
* @return bool
*/
/**
* Open a font file in read mode
*
* @param string $filename The file name of the font to open
*
* @return bool
* @throws \Exception
*/
public function load($filename) {
return $this->open($filename, self::modeRead);
}
Expand Down Expand Up @@ -142,15 +143,17 @@ public function read($n) {
return "";
}

return fread($this->f, $n);
// handle the return data, DO NOT spew E_NOTICEs
return @fread($this->f, $n);
}

public function write($data, $length = null) {
if ($data === null || $data === "" || $data === false) {
return 0;
}

return fwrite($this->f, $data, $length);
// handle the return data, DO NOT spew E_NOTICEs
return @fwrite($this->f, $data, $length);
}

public function readUInt8() {
Expand Down