Skip to content

Fix namespace hardcode #148

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix namespace hardcode #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83692dd
fix: namespace hardcode
0zd0 Jun 27, 2025
a8c59da
fix: hardcode namespaces for table type
0zd0 Oct 8, 2025
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/Font.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public static function load($file) {
}

if ($class) {
$class = "FontLib\\$class";
$class = __NAMESPACE__ . "\\$class";

/** @var TrueType\File $obj */
$obj = new $class;
Expand Down
21 changes: 10 additions & 11 deletions src/FontLib/TrueType/File.php
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does strauss automatically handle namespace references in use statements? What about the strings containing \FontLib\Table\... references around line 400 in this file?

Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ function getUnicodeCharMap() {
return $glyphIndexArray;
}
}

return null;
}

Expand Down Expand Up @@ -380,11 +380,6 @@ function parseHeader() {
$this->header->parse();
}

function getFontType(){
$class_parts = explode("\\", get_class($this));
return $class_parts[1];
}

function parseTableEntries() {
$this->parseHeader();

Expand All @@ -396,9 +391,7 @@ function parseTableEntries() {
return;
}


$type = $this->getFontType();
$class = "FontLib\\$type\\TableDirectoryEntry";
$class = __NAMESPACE__ . "\\TableDirectoryEntry";

for ($i = 0; $i < $this->header->data["numTables"]; $i++) {
/** @var TableDirectoryEntry $entry */
Expand All @@ -413,20 +406,26 @@ function normalizeFUnit($value, $base = 1000) {
return round($value * ($base / $this->getData("head", "unitsPerEm")));
}

private function tableClass(string $name_canon): string {
$root = __NAMESPACE__;
$root = substr($root, 0, strrpos($root, '\\'));
return $root . '\\Table\\Type\\' . $name_canon;
}

protected function readTable($tag) {
$this->parseTableEntries();

if (!self::$raw) {
$name_canon = preg_replace("/[^a-z0-9]/", "", strtolower($tag));

$class = "FontLib\\Table\\Type\\$name_canon";
$class = $this->tableClass($name_canon);

if (!isset($this->directory[$tag]) || !@class_exists($class)) {
return;
}
}
else {
$class = "FontLib\\Table\\Table";
$class = Table::class;
}

/** @var Table $table */
Expand Down