Open
Conversation
## Summary - Adds PHP 8.5 (stable since Nov 2025, current: 8.5.3) to the CI test matrix - Tests unit and integration suites against PHP 8.5 - No dependency or config changes needed (`platform.php: 8.1.27` ensures locked install works) ## Changes - `.github/workflows/main.yaml`: Added `'8.5'` to `matrix.php` in the `tests` job ## Context PHP 8.5 has been GA since November 2025. The existing `composer.json` constraint (`^8.1`) already allows 8.5. The `config.platform.php: 8.1.27` setting ensures `composer install --locked` succeeds regardless of runtime PHP version. ## Test plan - [ ] CI runs unit tests on PHP 8.5 - [ ] CI runs integration tests on PHP 8.5 - [ ] Existing PHP 8.1-8.4 jobs unaffected
league/flysystem v1 has been abandoned since 2022. Migrate to v3 API: - Replace Adapter\Local with Local\LocalFilesystemAdapter - Replace League\Flysystem\Exception with FilesystemException - Remove readStream false-check (v3 throws instead of returning false) - Remove outdated @throws FileNotFoundException docblocks - Update integration test expectations for v3 path traversal message - Upstream phpdocumentor/guides 1.9.5 already supports flysystem v3
There was a problem hiding this comment.
Pull request overview
Upgrades the project from the abandoned league/flysystem v1 to v3, aligning the docs theme + guides integration with the newer Flysystem API and updating integration test fixtures to match new exception messages.
Changes:
- Bump Flysystem to v3 (and related dependency updates via
composer.lock). - Migrate theme code to Flysystem v3 classes/exceptions (
LocalFilesystemAdapter,FilesystemException). - Update integration test expected logs for Flysystem v3 path traversal error wording.
Reviewed changes
Copilot reviewed 6 out of 9 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
composer.json |
Updates league/flysystem constraint to v3. |
composer.lock |
Locks Flysystem v3 and related dependency updates (incl. league/flysystem-local). |
packages/typo3-docs-theme/src/EventListeners/CopyResources.php |
Switches local adapter class; updates stream read logic for v3 behavior. |
packages/typo3-docs-theme/src/Twig/TwigExtension.php |
Updates Flysystem exception type used in catch clause. |
packages/typo3-docs-theme/src/Directives/IncludeDirective.php |
Removes obsolete Flysystem v1 @throws FileNotFoundException docblocks. |
packages/typo3-docs-theme/src/Directives/SiteSetSettingsDirective.php |
Removes obsolete Flysystem v1 @throws FileNotFoundException docblock. |
tests/Integration/tests/site-set-failure/expected/logs/error.log |
Adjusts expected error message to “Path traversal detected”. |
tests/Integration/tests/site-set-failure/expected/logs/warning.log |
Adjusts expected warning message to “Path traversal detected”. |
.github/workflows/main.yaml |
Adds a PHP version to the CI test matrix. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
45
to
47
| foreach ($finder as $file) { | ||
| $stream = $source->readStream($file->getRelativePathname()); | ||
| if ($stream === false) { | ||
| $this->logger->warning(sprintf('Cannot read stream from "%s"', $file->getRealPath())); | ||
| continue; | ||
| } | ||
|
|
There was a problem hiding this comment.
With Flysystem v3, readStream() throws a FilesystemException on failure rather than returning false. This loop currently doesn’t catch those exceptions, so a single unreadable file (or a write failure) can abort the entire post-render step; additionally, if an exception is thrown after opening $stream, fclose() may be skipped. Consider wrapping readStream + putStream in try/catch (FilesystemException) and using a finally block to always close the stream while continuing with remaining files.
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
1 participant
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.
Summary
Changes
composer.json/composer.lock- constraint^1.1.10->^3.29, pulls inleague/flysystem-localCopyResources.php-Adapter\Local->Local\LocalFilesystemAdapter, remove v1 false-check onreadStreamTwigExtension.php-League\Flysystem\Exception->League\Flysystem\FilesystemExceptionIncludeDirective.php- remove@throws \League\Flysystem\FileNotFoundExceptiondocblocksSiteSetSettingsDirective.php- remove@throws \League\Flysystem\FileNotFoundExceptiondocblocksite-set-failuretest expectations - v3 error message changed from "Path is outside of the defined root" to "Path traversal detected"Test plan