Update symfony

composer.json

@@ -1,6 +1,8 @@
 {
  "repositories": [],
  "require": {
- "symfony/var-dumper": "^5.1"
+ "php": "^7.4.14",
+ "symfony/polyfill-php74": "^1.17",
+ "symfony/var-dumper": "^5.2"
  }
 }

vendor/bin/var-dump-server

@@ -1,63 +1,24 @@
 #!/usr/bin/env php
 <?php
 
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 /**
- * Starts a dump server to collect and output dumps on a single place with multiple formats support.
+ * Proxy PHP file generated by Composer
  *
- * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ * This file includes the referenced bin path (../symfony/var-dumper/Resources/bin/var-dump-server) using eval to remove the shebang if present
+ *
+ * @generated
  */
 
-use Psr\Log\LoggerInterface;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Logger\ConsoleLogger;
-use Symfony\Component\Console\Output\ConsoleOutput;
-use Symfony\Component\VarDumper\Command\ServerDumpCommand;
-use Symfony\Component\VarDumper\Server\DumpServer;
-
-function includeIfExists(string $file): bool
-{
- return file_exists($file) && include $file;
-}
-
-if (
- !includeIfExists(__DIR__ . '/../../../../autoload.php') &&
- !includeIfExists(__DIR__ . '/../../vendor/autoload.php') &&
- !includeIfExists(__DIR__ . '/../../../../../../vendor/autoload.php')
-) {
- fwrite(STDERR, 'Install dependencies using Composer.'.PHP_EOL);
- exit(1);
-}
-
-if (!class_exists(Application::class)) {
- fwrite(STDERR, 'You need the "symfony/console" component in order to run the VarDumper server.'.PHP_EOL);
- exit(1);
+$binPath = realpath(__DIR__ . "/" . '../symfony/var-dumper/Resources/bin/var-dump-server');
+$contents = file_get_contents($binPath);
+$contents = preg_replace('{^#!/.+\r?\n<\?(php)?}', '', $contents, 1, $replaced);
+if ($replaced) {
+ $contents = strtr($contents, array(
+ '__FILE__' => var_export($binPath, true),
+ '__DIR__' => var_export(dirname($binPath), true),
+ ));
+
+ eval($contents);
+ exit(0);
 }
-
-$input = new ArgvInput();
-$output = new ConsoleOutput();
-$defaultHost = '127.0.0.1:9912';
-$host = $input->getParameterOption(['--host'], $_SERVER['VAR_DUMPER_SERVER'] ?? $defaultHost, true);
-$logger = interface_exists(LoggerInterface::class) ? new ConsoleLogger($output->getErrorOutput()) : null;
-
-$app = new Application();
-
-$app->getDefinition()->addOption(
- new InputOption('--host', null, InputOption::VALUE_REQUIRED, 'The address the server should listen to', $defaultHost)
-);
-
-$app->add($command = new ServerDumpCommand(new DumpServer($host, $logger)))
- ->getApplication()
- ->setDefaultCommand($command->getName(), true)
- ->run($input, $output)
-;
+include $binPath;

vendor/bin/var-dump-server.bat

@@ -0,0 +1,4 @@
+@ECHO OFF
+setlocal DISABLEDELAYEDEXPANSION
+SET BIN_TARGET=%~dp0/../symfony/var-dumper/Resources/bin/var-dump-server
+php "%BIN_TARGET%" %*

vendor/composer/ClassLoader.php

@@ -42,6 +42,8 @@
  */
 class ClassLoader
 {
+ private $vendorDir;
+
  // PSR-4
  private $prefixLengthsPsr4 = array();
  private $prefixDirsPsr4 = array();
@@ -57,6 +59,13 @@ class ClassLoader
  private $missingClasses = array();
  private $apcuPrefix;
 
+ private static $registeredLoaders = array();
+
+ public function __construct($vendorDir = null)
+ {
+ $this->vendorDir = $vendorDir;
+ }
+
  public function getPrefixes()
  {
  if (!empty($this->prefixesPsr0)) {
@@ -300,6 +309,17 @@ public function getApcuPrefix()
  public function register($prepend = false)
  {
  spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+ if (null === $this->vendorDir) {
+ return;
+ }
+
+ if ($prepend) {
+ self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+ } else {
+ unset(self::$registeredLoaders[$this->vendorDir]);
+ self::$registeredLoaders[$this->vendorDir] = $this;
+ }
  }
 
  /**
@@ -308,6 +328,10 @@ public function register($prepend = false)
  public function unregister()
  {
  spl_autoload_unregister(array($this, 'loadClass'));
+
+ if (null !== $this->vendorDir) {
+ unset(self::$registeredLoaders[$this->vendorDir]);
+ }
  }
 
  /**
@@ -367,6 +391,16 @@ public function findFile($class)
  return $file;
  }
 
+ /**
+ * Returns the currently registered loaders indexed by their corresponding vendor directories.
+ *
+ * @return self[]
+ */
+ public static function getRegisteredLoaders()
+ {
+ return self::$registeredLoaders;
+ }
+
  private function findFileWithExtension($class, $ext)
  {
  // PSR-4 lookup