Merge branch '6.1' into 6.2

nicolas-grekas · nicolas-grekas · commit bf27ed7b4317 · 2023-01-20T18:45:48.000+01:00
* 6.1:
  Update ComposerPlugin.php
  [Notifier] [OvhCloud] handle invalid receiver
  [Cache] fix collecting cache stats when nesting computations
  [VarDumper] Fix JS to expand / collapse
  [Validator] Fix Email validator logic
  Fix user_identifier support after username has been deprecated in favor of it.
  [Tests] Remove `$this` occurrences in future static data providers
  [PropertyInfo] Fixes constructor extractor for mixed type
  use method_exists() instead of catching reflection exceptions
diff --git a/Internal/ComposerPlugin.php b/Internal/ComposerPlugin.php
@@ -58,7 +58,7 @@ public function uninstall(Composer $composer, IOInterface $io): void
 
     public function updateAutoloadFile(): void
     {
-        $vendorDir = $this->composer->getConfig()->get('vendor-dir');
+        $vendorDir = realpath($this->composer->getConfig()->get('vendor-dir'));
 
         if (!is_file($autoloadFile = $vendorDir.'/autoload.php')
             || false === $extra = $this->composer->getPackage()->getExtra()['runtime'] ?? []

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function uninstall(Composer $composer, IOInterface $io): void`
`58`	`58`
`59`	`59`	`public function updateAutoloadFile(): void`
`60`	`60`	`{`
`61`		`- $vendorDir = $this->composer->getConfig()->get('vendor-dir');`
	`61`	`+ $vendorDir = realpath($this->composer->getConfig()->get('vendor-dir'));`
`62`	`62`
`63`	`63`	`if (!is_file($autoloadFile = $vendorDir.'/autoload.php')`
`64`	`64`	`\|\| false === $extra = $this->composer->getPackage()->getExtra()['runtime'] ?? []`