ci: add check to ensure composer-bin is not accidentally committed #52080
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,11 @@ class InstalledVersions | |
| */ | ||
| private static $installed; | ||
|
|
||
| /** | ||
| * @var bool | ||
| */ | ||
| private static $installedIsLocalDir; | ||
|
Contributor
Author
There was a problem hiding this comment. This change is coming in from the latest composer 2.8 update (composer/composer#12269). |
||
|
|
||
| /** | ||
| * @var bool|null | ||
| */ | ||
|
|
@@ -309,6 +314,12 @@ public static function reload($data) | |
| { | ||
| self::$installed = $data; | ||
| self::$installedByVendor = array(); | ||
|
|
||
| // when using reload, we disable the duplicate protection to ensure that self::$installed data is | ||
| // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not, | ||
| // so we have to assume it does not, and that may result in duplicate data being returned when listing | ||
| // all installed packages for example | ||
| self::$installedIsLocalDir = false; | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -322,19 +333,27 @@ private static function getInstalled() | |
| } | ||
|
|
||
| $installed = array(); | ||
| $copiedLocalDir = false; | ||
|
|
||
| if (self::$canGetVendors) { | ||
| $selfDir = strtr(__DIR__, '\\', '/'); | ||
| foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { | ||
| $vendorDir = strtr($vendorDir, '\\', '/'); | ||
| if (isset(self::$installedByVendor[$vendorDir])) { | ||
| $installed[] = self::$installedByVendor[$vendorDir]; | ||
| } elseif (is_file($vendorDir.'/composer/installed.php')) { | ||
| /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */ | ||
| $required = require $vendorDir.'/composer/installed.php'; | ||
| self::$installedByVendor[$vendorDir] = $required; | ||
| $installed[] = $required; | ||
| if (self::$installed === null && $vendorDir.'/composer' === $selfDir) { | ||
| self::$installed = $required; | ||
| self::$installedIsLocalDir = true; | ||
| } | ||
| } | ||
| if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) { | ||
| $copiedLocalDir = true; | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -350,7 +369,7 @@ private static function getInstalled() | |
| } | ||
| } | ||
|
|
||
| if (self::$installed !== array() && !$copiedLocalDir) { | ||
| $installed[] = self::$installed; | ||
| } | ||
|
|
||
|
|
||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,68 +1,5 @@ | ||
| { | ||
| "packages": [], | ||
| "dev": false, | ||
| "dev-package-names": [] | ||
| } |
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Running composer install will install the dev dependencies again and therefore needs to go. I'm not so sure anymore, but still think that our state in github should not contain the composer-bin-plugin.
The drone workflow did not run composer install (see #43514 and https://github.com/nextcloud/server/blob/master/autotest-checkers.sh).
Requested @susnux as reviewer for a third look if that makes sense.