← All changes | vendor/composer/InstalledVersions.php +12 -19 3.10.0 → 3.7.7 View file →

		@@ -27,9 +27,9 @@
27	27	class InstalledVersions
28	28	{
29	29	/**
30	30	* @var mixed[]|null
31		- * @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
	31	+ * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
32	32	*/
33	33	private static $installed;
34	34
35	35	/**
		@@ -38,9 +38,9 @@
38	38	private static $canGetVendors;
39	39
40	40	/**
41	41	* @var array[]
42		- * @psalm-var array<string, 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[]}>}>
	42	+ * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
43	43	*/
44	44	private static $installedByVendor = array();
45	45
46	46	/**
		@@ -97,9 +97,9 @@
97	97	public static function isInstalled($packageName, $includeDevRequirements = true)
98	98	{
99	99	foreach (self::getInstalled() as $installed) {
100	100	if (isset($installed['versions'][$packageName])) {
101		- return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
	101	+ return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
102	102	}
103	103	}
104	104
105	105	return false;
		@@ -118,9 +118,9 @@
118	118	* @return bool
119	119	*/
120	120	public static function satisfies(VersionParser $parser, $packageName, $constraint)
121	121	{
122		- $constraint = $parser->parseConstraints((string) $constraint);
	122	+ $constraint = $parser->parseConstraints($constraint);
123	123	$provided = $parser->parseConstraints(self::getVersionRanges($packageName));
124	124
125	125	return $provided->matches($constraint);
126	126	}
		@@ -242,9 +242,9 @@
242	242	}
243	243
244	244	/**
245	245	* @return array
246		- * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
	246	+ * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
247	247	*/
248	248	public static function getRootPackage()
249	249	{
250	250	$installed = self::getInstalled();
		@@ -256,9 +256,9 @@
256	256	* Returns the raw installed.php data for custom implementations
257	257	*
258	258	* @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
259	259	* @return array[]
260		- * @psalm-return 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[]}>}
	260	+ * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
261	261	*/
262	262	public static function getRawData()
263	263	{
264	264	@trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
		@@ -279,9 +279,9 @@
279	279	/**
280	280	* Returns the raw data of all installed.php which are currently loaded for custom implementations
281	281	*
282	282	* @return array[]
283		- * @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[]}>}>
	283	+ * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
284	284	*/
285	285	public static function getAllRawData()
286	286	{
287	287	return self::getInstalled();
		@@ -302,9 +302,9 @@
302	302	*
303	303	* @param array[] $data A vendor/composer/installed.php data set
304	304	* @return void
305	305	*
306		- * @psalm-param 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[]}>} $data
	306	+ * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
307	307	*/
308	308	public static function reload($data)
309	309	{
310	310	self::$installed = $data;
		@@ -312,9 +312,9 @@
312	312	}
313	313
314	314	/**
315	315	* @return array[]
316		- * @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[]}>}>
	316	+ * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
317	317	*/
318	318	private static function getInstalled()
319	319	{
320	320	if (null === self::$canGetVendors) {
		@@ -327,11 +327,9 @@
327	327	foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
328	328	if (isset(self::$installedByVendor[$vendorDir])) {
329	329	$installed[] = self::$installedByVendor[$vendorDir];
330	330	} elseif (is_file($vendorDir.'/composer/installed.php')) {
331		- /** @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		- $required = require $vendorDir.'/composer/installed.php';
333		- $installed[] = self::$installedByVendor[$vendorDir] = $required;
	331	+ $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
334	332	if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
335	333	self::$installed = $installed[count($installed) - 1];
336	334	}
337	335	}
		@@ -341,19 +339,14 @@
341	339	if (null === self::$installed) {
342	340	// only require the installed.php file if this file is loaded from its dumped location,
343	341	// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
344	342	if (substr(__DIR__, -8, 1) !== 'C') {
345		- /** @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 */
346		- $required = require __DIR__ . '/installed.php';
347		- self::$installed = $required;
	343	+ self::$installed = require __DIR__ . '/installed.php';
348	344	} else {
349	345	self::$installed = array();
350	346	}
351	347	}
352		-
353		- if (self::$installed !== array()) {
354		- $installed[] = self::$installed;
355		- }
	348	+ $installed[] = self::$installed;
356	349
357	350	return $installed;
358	351	}
359	352	}