← All changes | vendor/composer/InstalledVersions.php +36 -2 1.6.3 → trunk View file →

		@@ -26,8 +26,14 @@
26	26	*/
27	27	class InstalledVersions
28	28	{
29	29	/**
	30	+ * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
	31	+ * @internal
	32	+ */
	33	+ private static $selfDir = null;
	34	+
	35	+ /**
30	36	* @var mixed[]|null
31	37	* @psalm-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[]}>}|array{}|null
32	38	*/
33	39	private static $installed;
		@@ -32,8 +38,13 @@
32	38	*/
33	39	private static $installed;
34	40
35	41	/**
	42	+ * @var bool
	43	+ */
	44	+ private static $installedIsLocalDir;
	45	+
	46	+ /**
36	47	* @var bool|null
37	48	*/
38	49	private static $canGetVendors;
39	50
		@@ -308,11 +319,29 @@
308	319	public static function reload($data)
309	320	{
310	321	self::$installed = $data;
311	322	self::$installedByVendor = array();
	323	+
	324	+ // when using reload, we disable the duplicate protection to ensure that self::$installed data is
	325	+ // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
	326	+ // so we have to assume it does not, and that may result in duplicate data being returned when listing
	327	+ // all installed packages for example
	328	+ self::$installedIsLocalDir = false;
312	329	}
313	330
314	331	/**
	332	+ * @return string
	333	+ */
	334	+ private static function getSelfDir()
	335	+ {
	336	+ if (self::$selfDir === null) {
	337	+ self::$selfDir = strtr(__DIR__, '\\', '/');
	338	+ }
	339	+
	340	+ return self::$selfDir;
	341	+ }
	342	+
	343	+ /**
315	344	* @return array[]
316	345	* @psalm-return list<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[]}>}>
317	346	*/
318	347	private static function getInstalled()
		@@ -324,9 +353,11 @@
324	353	$installed = array();
325	354	$copiedLocalDir = false;
326	355
327	356	if (self::$canGetVendors) {
	357	+ $selfDir = self::getSelfDir();
328	358	foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
	359	+ $vendorDir = strtr($vendorDir, '\\', '/');
329	360	if (isset(self::$installedByVendor[$vendorDir])) {
330	361	$installed[] = self::$installedByVendor[$vendorDir];
331	362	} elseif (is_file($vendorDir.'/composer/installed.php')) {
332	363	/** @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 */
		@@ -332,12 +363,15 @@
332	363	/** @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 */
333	364	$required = require $vendorDir.'/composer/installed.php';
334	365	self::$installedByVendor[$vendorDir] = $required;
335	366	$installed[] = $required;
336		- if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
	367	+ if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
337	368	self::$installed = $required;
338		- $copiedLocalDir = true;
	369	+ self::$installedIsLocalDir = true;
339	370	}
	371	+ }
	372	+ if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
	373	+ $copiedLocalDir = true;
340	374	}
341	375	}
342	376	}
343	377