[stable34] refactor(deps): move phpseclib to 3rdparty scoped vendor#7805
Merged
Conversation
phpseclib/phpseclib is now provided by the 3rdparty scoped vendor bundle (LibreSign/3rdparty) rather than as a direct Composer dependency. Changes: - Remove phpseclib/phpseclib from composer.json/composer.lock - Remove phpseclib patcher from scoper.inc.php (now in 3rdparty) - Update all namespace imports from 'phpseclib3\' to 'OCA\Libresign\Vendor\phpseclib3\' in: - lib/Handler/SignEngine/TSA.php - lib/Handler/SignEngine/Pkcs12Handler.php - lib/Handler/CertificateEngine/AEngineHandler.php (inline FQCNs) - lib/Service/Install/SignSetupService.php - lib/Command/Developer/SignSetup.php - tests/php/Unit/Handler/SignEngine/TSATest.php The 3rdparty update is tracked in LibreSign/3rdparty#65. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
twig, mpdf, and smalot/pdfparser were migrated to the scoped 3rdparty vendor bundle. The libresign scoper only processes its local vendor/, which no longer contains these packages. The patchers were dead code. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
The Playwright container (mcr.microsoft.com/playwright:v1.59.1-noble) does not include libgd.so.3 or libc-client.so.2007e, causing PHP's gd and imap extensions to fail on startup. This prevents occ maintenance:install from running (Nextcloud requires GD). Install the system libraries before setup-php and add imap to the PHP extensions list. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
Remove manual apt install of libgd3 and libc-client2007e. shivammathur/setup-php installs system dependencies automatically when extensions are listed — gd and imap are already declared. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
setup-php reports gd/imap as Enabled because the .so files are present in the Playwright container, but does not install the underlying system libraries (libgd3, libc-client2007e) that the .so files depend on. Install them explicitly so PHP can actually load the extensions. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
All packages that required scoping (mpdf, twig, smalot/pdfparser, phpseclib) have been migrated to the LibreSign/3rdparty bundle where scoping is handled centrally. libresign's local vendor/ now only contains jeidison/signer-php (used directly with its own namespace) and psr/ (Nextcloud-provided). lib/Vendor is never built, not tracked in git, and not referenced in autoload. The scoper infrastructure is entirely dead code. Remove scoper.inc.php and vendor-bin/php-scoper/. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> [skip ci]
…ix composer.lock - Point 3rdparty submodule to stable34 (15e0e6d) which includes phpseclib/phpseclib 3.0.55 as a scoped dependency - Remove phpseclib/phpseclib from composer.lock since it is now provided by the 3rdparty scoped bundle Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
The instanceof check was using the unscoped \phpseclib3\Crypt\Common\PrivateKey but phpseclib is no longer a direct composer dependency on this branch. Use the scoped OCA\Libresign\Vendor\phpseclib3 prefix to match how the class is provided via the 3rdparty scoped vendor bundle. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
The if block was indented with 3 tabs (leftover from when it was inside a try-catch). After try-catch removal, dedent the if header to 2 tabs. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
github-project-automation
Bot
moved this from 0. Needs triage
to 4. to release
in Roadmap
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.
Backport of #7801
Warning, This backport's changes differ from the original and might be incomplete⚠️
Todo
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.