Merge latest upstream main into fragment-link fix - #2
Closed
wWzZb wants to merge 79 commits into
Closed
Conversation
The code highlighter has a number of issues, some of those were solved so bump it to the latest version to make the tests pass again.
…ion-php8.3 Upgrade scrivo/highlight.php to prevent deprecations
Currently specific Admonitions do not include text immediately following the directive indicator in the admonition content. To fix this issue, prepend a ParagraphNode with the content in front of the admonition's children.
…ler-patch-1 Fix admonition handling of text directly following indicator
Adding these templates is necessary for all possible admonition types to be rendered.
Currently, the general admonition is always rendered, disregarding if a title is given or not. To be spec-compliant the directive data can be checked for being empty. https://docutils.sourceforge.io/docs/ref/rst/directives.html#admonition
Currently specific Admonitions do not include text immediately following the directive indicator in the admonition content. To fix this issue, prepend a ParagraphNode with the content in front of the admonition's children.
…e-admonitions Add support for multiline admonitions in markdown
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 7 to 8. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](actions/download-artifact@v7...v8) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-version: '8' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…ithub_actions/actions/download-artifact-8 github-actions(deps): bump actions/download-artifact from 7 to 8
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 6 to 7. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v6...v7) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…ithub_actions/actions/upload-artifact-7 github-actions(deps): bump actions/upload-artifact from 6 to 7
Bumps [actions/cache](https://github.com/actions/cache) from 5.0.2 to 5.0.3. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v5.0.2...v5.0.3) --- updated-dependencies: - dependency-name: actions/cache dependency-version: 5.0.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…ithub_actions/actions/cache-5.0.3 github-actions(deps): bump actions/cache from 5.0.2 to 5.0.3
The lexer did have too many different patterns which caused various issues in the interpretation of escape chars. With this patch we are better compatible with sphinx. The results are validated with sphinx 7. The lexer now has a separate BACKSLASH char, which allows parsers and rules to handle them as they need. by skipping the `\` in most rules we do never have conflicts and rules are not interpreting the char after the `\`.
Fix using escape chars
`CodeBlockParser::parse()` stored the fenced code info string in
`options['caption']` via `withOptions()`, but nothing ever read that
value — `CodeNode::getCaption()` returns the typed `$caption` property,
not `getOption('caption')`. As a result, `CodeNode::getLanguage()`
always returned `null` for markdown code blocks, producing
`class="language-"` in the rendered HTML and preventing syntax
highlighting.
Replace the dead `withOptions(['caption' => ...])` call with
`setLanguage()` using `getInfoWords()[0]` from the CommonMark
`FencedCode` node, matching both the RST parser's behavior
(`CodeBlockDirective`) and league/commonmark's own `FencedCodeRenderer`.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…n-code-block-syntax-highlighting fix: set language on `CodeNode` for markdown fenced code blocks
Bumps [sorenlouv/backport-github-action](https://github.com/sorenlouv/backport-github-action) from 10.2.0 to 10.4.0. - [Release notes](https://github.com/sorenlouv/backport-github-action/releases) - [Commits](sorenlouv/backport-github-action@v10.2.0...v10.4.0) --- updated-dependencies: - dependency-name: sorenlouv/backport-github-action dependency-version: 10.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…ithub_actions/sorenlouv/backport-github-action-10.4.0 github-actions(deps): bump sorenlouv/backport-github-action from 10.2.0 to 10.4.0
Bumps [ramsey/composer-install](https://github.com/ramsey/composer-install) from 3 to 4. - [Release notes](https://github.com/ramsey/composer-install/releases) - [Commits](ramsey/composer-install@v3...v4) --- updated-dependencies: - dependency-name: ramsey/composer-install dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…ithub_actions/ramsey/composer-install-4 github-actions(deps): bump ramsey/composer-install from 3 to 4
Bumps [sorenlouv/backport-github-action](https://github.com/sorenlouv/backport-github-action) from 10.4.0 to 11.0.0. - [Release notes](https://github.com/sorenlouv/backport-github-action/releases) - [Commits](sorenlouv/backport-github-action@v10.4.0...v11.0.0) --- updated-dependencies: - dependency-name: sorenlouv/backport-github-action dependency-version: 11.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…ithub_actions/dependabot/fetch-metadata-3.1.0 github-actions(deps): bump dependabot/fetch-metadata from 3.0.0 to 3.1.0
Bumps [sorenlouv/backport-github-action](https://github.com/sorenlouv/backport-github-action) from 11.0.0 to 12.0.0. - [Release notes](https://github.com/sorenlouv/backport-github-action/releases) - [Commits](sorenlouv/backport-github-action@v11.0.0...v12.0.0) --- updated-dependencies: - dependency-name: sorenlouv/backport-github-action dependency-version: 12.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…ithub_actions/sorenlouv/backport-github-action-12.0.0 github-actions(deps): bump sorenlouv/backport-github-action from 11.0.0 to 12.0.0
Co-authored-by: Garvin Hicking <blog@garv.in>
…l-backslash Guard against null token after trailing backslash in text role
…ommand Emit a deprecation notice when phpDocumentor\Guides\FileCollector::collect() receives a Flyfinder SpecificationInterface, and avoid spuriously firing the existing ParseDirectoryCommand deprecation when no exclusion was supplied. Closes phpDocumentor#1209
…ication-interface-file-collector Deprecate SpecificationInterface in FileCollector and ParseDirectoryCommand
…-filepath Make sure the file path is taken from the context
Bumps [sorenlouv/backport-github-action](https://github.com/sorenlouv/backport-github-action) from 12.0.0 to 12.0.1. - [Release notes](https://github.com/sorenlouv/backport-github-action/releases) - [Commits](sorenlouv/backport-github-action@v12.0.0...v12.0.1) --- updated-dependencies: - dependency-name: sorenlouv/backport-github-action dependency-version: 12.0.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…ithub_actions/sorenlouv/backport-github-action-12.0.1 github-actions(deps): bump sorenlouv/backport-github-action from 12.0.0 to 12.0.1
Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v6...v7) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…ithub_actions/actions/checkout-7 github-actions(deps): bump actions/checkout from 6 to 7
Bumps [sorenlouv/backport-github-action](https://github.com/sorenlouv/backport-github-action) from 12.0.1 to 12.0.4. - [Release notes](https://github.com/sorenlouv/backport-github-action/releases) - [Commits](sorenlouv/backport-github-action@v12.0.1...v12.0.4) --- updated-dependencies: - dependency-name: sorenlouv/backport-github-action dependency-version: 12.0.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…ithub_actions/sorenlouv/backport-github-action-12.0.4 github-actions(deps): bump sorenlouv/backport-github-action from 12.0.1 to 12.0.4
Bumps [actions/cache](https://github.com/actions/cache) from 5.0.5 to 6.0.0. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v5.0.5...v6.0.0) --- updated-dependencies: - dependency-name: actions/cache dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…ithub_actions/actions/cache-6.0.0 github-actions(deps): bump actions/cache from 5.0.5 to 6.0.0
Bumps [actions/cache](https://github.com/actions/cache) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v6.0.0...v6.1.0) --- updated-dependencies: - dependency-name: actions/cache dependency-version: 6.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…ithub_actions/actions/cache-6.1.0 github-actions(deps): bump actions/cache from 6.0.0 to 6.1.0
This was referenced Aug 11, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This merges the latest phpDocumentor/guides
maininto the branch behind phpDocumentor#1300 and strengthens its regression coverage with the real PHP SDK link shape.The PHP SDK currently links from
mcp-elements.mdto anchors such asserver-builder.md#manual-capability-registrationandserver-builder.md#explicit-element-registration. On current upstreammain, these links produce an unresolved-reference warning and render as plain text. With phpDocumentor#1300 applied, they render as/server-builder.html#...links without warnings.The old PHP 8.5 / lowest-dependencies failure was unrelated to the fragment-link changes. I reproduced it on the old phpDocumentor#1300 head: PHPUnit exited non-zero because PHP 8.5 deprecations from the lowest Symfony and
scrivo/highlight.phpversions were not yet covered. Upstreammainhas since added the Symfony deprecation baseline and raised the highlighter floor, so the merged branch passes that same combination.Validation on PHP 8.5.9:
Merging this PR updates your existing phpDocumentor#1300 branch so the upstream PR can run fresh CI and be reviewed.