Skip to content

fix the build, again #758

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

Merged
shish merged 1 commit into from
Oct 4, 2026
Merged

fix the build, again #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions generated/8.6/functionsList.php
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions generated/8.6/pcntl.php
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions generated/8.6/pgsql.php
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions generated/8.6/rector-migrate.php
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 33 additions & 0 deletions generated/8.6/ssh2.php
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 32 additions & 13 deletions generator/src/XmlDocParser/DocPage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use Safe\Generator\FileCreator;

use function explode;
use function strpos;

class DocPage
{
Expand Down Expand Up @@ -113,15 +112,19 @@ public function loadAndResolveFile(): \SimpleXMLElement
}

// Load entity definitions from .ent files and build entity replacement map
$entityReplacements = []; // Map of entity name => replacement value

$entityReplacements = [
'false' => 'false',
'true' => 'true',
'null' => 'null',
]; // Map of entity name => replacement value

// Load DTD-format entity files
$patterns = [
'/php/doc-base/entities/*.ent',
'/php/doc-en/*.ent',
'/php/doc-en/entities/*.ent',
];

foreach ($patterns as $pattern) {
$files = glob(PathHelper::docsDirectory() . $pattern);
if ($files !== false) {
Expand All @@ -130,7 +133,7 @@ public function loadAndResolveFile(): \SimpleXMLElement
}
}
}

// Also handle XML-format entity files (newer format)
$xmlFiles = glob(PathHelper::docsDirectory() . '/php/doc-en/entities/*.ent');
if ($xmlFiles !== false) {
Expand All @@ -155,6 +158,22 @@ public function loadAndResolveFile(): \SimpleXMLElement
}
}

// If php-base and php-en are out-of-sync, we get other undefined entities,
// let's strip those here
$content = (string)\preg_replace_callback(
'/&([a-zA-Z_][a-zA-Z0-9._-]*);/',
static function ($matches) {
$entity = $matches[1];
// Preserve standard XML entities
if (\in_array($entity, ['lt', 'gt', 'amp', 'quot', 'apos'], true)) {
return $matches[0];
}
// Render "undefined &url.mersenne;" as "url.mersenne"
return $entity;
},
$content
);

libxml_use_internal_errors(true);
$elem = \simplexml_load_string($content, \SimpleXMLElement::class, LIBXML_DTDLOAD | LIBXML_NOENT);
if ($elem === false) {
Expand Down Expand Up @@ -182,20 +201,20 @@ private static function parseEntityFile(string $filePath, array &$entityReplacem
if ($content === false) {
return;
}

// Remove XML declaration and comments before wrapping in DOCTYPE
$content = (string)\preg_replace('/<\?xml[^?]*\?>/', '', $content);
$content = (string)\preg_replace('/<!--[\s\S]*?-->/', '', $content);

// Wrap the entity declarations in a DOCTYPE so we can parse them
// This allows libxml2 to properly parse the entity declarations
$doctype = '<!DOCTYPE entities [' . $content . ']>';
$wrappedXml = '<?xml version="1.0" encoding="utf-8"?>' . $doctype . '<root/>';

// Use DOMDocument to load the wrapped XML, which will parse the DTD entities
$dom = new \DOMDocument('1.0', 'utf-8');
$dom->preserveWhiteSpace = true;

libxml_use_internal_errors(true);
if ($dom->loadXML($wrappedXml)) {
// Get the internal DTD subset which contains the entity definitions
Expand All @@ -207,7 +226,7 @@ private static function parseEntityFile(string $filePath, array &$entityReplacem
}
libxml_use_internal_errors(false);
}

/**
* Extract entity definitions from a DTD internal subset string.
*
Expand All @@ -229,7 +248,7 @@ private static function extractEntitiesFromDtd(string $dtdSubset, array &$entity
}
}
}

/**
* Parse XML-format entity file (newer PHP doc format).
* These files contain <entity name="...">...</entity> elements.
Expand All @@ -244,11 +263,11 @@ private static function parseXmlEntityFile(string $filePath, array &$entityRepla
if ($content === false) {
return;
}

// Remove XML declaration and comments
$content = (string)\preg_replace('/<\?xml[^?]*\?>/', '', $content);
$content = (string)\preg_replace('/<!--[\s\S]*?-->/', '', $content);

// Extract entity elements using regex: <entity name="...">...</entity>
// This avoids XML parsing issues with undefined entities
if (\preg_match_all('/<entity\s+name="([^"]+)"[^>]*>([\s\S]*?)<\/entity>/s', $content, $matches, PREG_SET_ORDER)) {
Expand Down