diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 72ea7cfa3e9c0..f7b87a1ce8cd4 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | 6.3 for features / 5.4 or 6.2 for bug fixes <!-- see below -->
+| Branch?       | 6.4 for features / 5.4, 6.2, or 6.3 for bug fixes <!-- see below -->
 | Bug fix?      | yes/no
 | New feature?  | yes/no <!-- please update src/**/CHANGELOG.md files -->
 | Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 87cd21cf0d442..b66e1b53b60f4 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -6,7 +6,7 @@ on:
   schedule:
     - cron: '34 4 * * 6'
   push:
-    branches: [ "6.3" ]
+    branches: [ "6.4" ]
 
 # Declare default permissions as read only.
 permissions: read-all
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 001231e1acf12..e9bc06a077a73 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -64,7 +64,7 @@ jobs:
 
           echo COLUMNS=120 >> $GITHUB_ENV
           echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data,integration" >> $GITHUB_ENV
-          echo COMPOSER_UP='composer update --no-progress --ansi'$([[ "${{ matrix.php }}" = "8.2" ]] && echo ' --ignore-platform-req=php+') >> $GITHUB_ENV
+          echo COMPOSER_UP='composer update --no-progress --ansi'$([[ "${{ matrix.mode }}" = experimental ]] && echo ' --ignore-platform-req=php+') >> $GITHUB_ENV
 
           SYMFONY_VERSIONS=$(git ls-remote -q --heads | cut -f2 | grep -o '/[1-9][0-9]*\.[0-9].*' | sort -V)
           SYMFONY_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | cut -d "'" -f2 | cut -d '.' -f 1-2)
diff --git a/CHANGELOG-6.3.md b/CHANGELOG-6.3.md
index 7e4cfd89e2440..73ef0487e49f5 100644
--- a/CHANGELOG-6.3.md
+++ b/CHANGELOG-6.3.md
@@ -7,6 +7,19 @@ in 6.3 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v6.3.0...v6.3.1
 
+* 6.3.0-RC2 (2023-05-27)
+
+ * feature #50445 [AssetMapper] Add "=alias" syntax to importmap:require (weaverryan)
+ * bug #50442 [SecurityBundle] Update security-1.0.xsd to include missing access-token definition (aegypius)
+ * bug #50440 [DependencyInjection] Revert "Use weak references in the container" (nicolas-grekas)
+ * bug #50429 [Console] block input stream if needed (joelwurtz)
+ * bug #50397 [HttpKernel][VarDumper] Fix dumping with labels (nicolas-grekas)
+ * bug #50408 [AssetMapper] Change default importmap "provider" to JsDelivr+esm (weaverryan, nicolas-grekas)
+ * bug #50394 [AssetMapper] Avoid loading potentially ALL assets in dev server (weaverryan)
+ * bug #50400 [AssetMapper] Sometimes asset contents are built from non-asset files (weaverryan)
+ * bug #50406 [VarDumper] Fix `dd()` showing line with `null` (HypeMC)
+ * bug #50393 [AssetMapper] Fixing incorrect exception & adding allowing more realistic error mode (weaverryan)
+
 * 6.3.0-RC1 (2023-05-22)
 
  * bug #49817 [Scheduler] Improve triggers performance when possible (fabpot)
diff --git a/composer.json b/composer.json
index 4f81d054cd008..cb477380a304a 100644
--- a/composer.json
+++ b/composer.json
@@ -150,7 +150,7 @@
         "psr/http-client": "^1.0",
         "psr/simple-cache": "^1.0|^2.0|^3.0",
         "symfony/mercure-bundle": "^0.3",
-        "symfony/phpunit-bridge": "^5.4|^6.0",
+        "symfony/phpunit-bridge": "^5.4|^6.0|^7.0",
         "symfony/runtime": "self.version",
         "symfony/security-acl": "~2.8|~3.0",
         "twig/cssinliner-extra": "^2.12|^3",
@@ -168,7 +168,7 @@
         "masterminds/html5": "<2.6",
         "phpdocumentor/reflection-docblock": "<5.2",
         "phpdocumentor/type-resolver": "<1.5.1",
-        "phpunit/phpunit": "<5.4.3"
+        "phpunit/phpunit": "<7.5|9.1.2"
     },
     "config": {
         "allow-plugins": {
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 98721385f4e5e..d17933b31a901 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -55,7 +55,6 @@
         "doctrine/dbal": "<2.13.1",
         "doctrine/lexer": "<1.1",
         "doctrine/orm": "<2.12",
-        "phpunit/phpunit": "<5.4.3",
         "symfony/cache": "<5.4",
         "symfony/dependency-injection": "<6.2",
         "symfony/form": "<5.4.21|>=6,<6.2.7",
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
index fd610860f534f..3747d896bccd9 100644
--- a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
+++ b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -61,16 +61,15 @@ public function getProxyFactoryCode(Definition $definition, string $id, string $
 
         return <<<EOF
         if (true === \$lazyLoad) {
-            $instantiation \$container->createProxy('$proxyClass', static function () use (\$containerRef) {
-                return \\$proxyClass::staticProxyConstructor(static function (&\$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface \$proxy) use (\$containerRef) {
-                    \$container = \$containerRef->get();
+            $instantiation \$container->createProxy('$proxyClass', static fn () => \\$proxyClass::staticProxyConstructor(
+                static function (&\$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface \$proxy) use (\$container) {
                     \$wrappedInstance = $factoryCode;
 
                     \$proxy->setProxyInitializer(null);
 
                     return true;
-                });
-            });
+                }
+            ));
         }
 
 
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt
index 84995384157b6..ad7a803cb6e8a 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt
@@ -5,19 +5,16 @@ class LazyServiceProjectServiceContainer extends Container
 {%a
     protected static function getFooService($container, $lazyLoad = true)
     {
-        $containerRef = $container->ref;
-
         if (true === $lazyLoad) {
-            return $container->services['foo'] = $container->createProxy('stdClass_%s', static function () use ($containerRef) {
-                return %S\stdClass_%s(static function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($containerRef) {
-                    $container = $containerRef->get();
-                    $wrappedInstance = self::getFooService($containerRef->get(), false);
+            return $container->services['foo'] = $container->createProxy('stdClass_%s', static fn () => %S\stdClass_%s(
+                static function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($container) {
+                    $wrappedInstance = self::getFooService($container, false);
 
                     $proxy->setProxyInitializer(null);
 
                     return true;
-                });
-            });
+                }
+            ));
         }
 
         return new \stdClass();
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-factory.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-factory.php
index 12a7de3483761..c0399ae3340f3 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-factory.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-factory.php
@@ -8,19 +8,17 @@
     public function getFooService($lazyLoad = true)
     {
         $container = $this;
-        $containerRef = \WeakReference::create($this);
 
         if (true === $lazyLoad) {
-            return $container->privates['foo'] = $container->createProxy('SunnyInterface_1eff735', static function () use ($containerRef) {
-                return \SunnyInterface_1eff735::staticProxyConstructor(static function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($containerRef) {
-                    $container = $containerRef->get();
+            return $container->privates['foo'] = $container->createProxy('SunnyInterface_1eff735', static fn () => \SunnyInterface_1eff735::staticProxyConstructor(
+                static function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($container) {
                     $wrappedInstance = $container->getFooService(false);
 
                     $proxy->setProxyInitializer(null);
 
                     return true;
-                });
-            });
+                }
+            ));
         }
 
         return new Symfony\Bridge\ProxyManager\Tests\LazyProxy\PhpDumper\DummyClass();
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
index ea376464fc925..3652275c2bb65 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -130,7 +130,6 @@ public function testGetProxyFactoryCodeForInterface()
     public function getFooService(\$lazyLoad = true)
     {
         \$container = \$this;
-        \$containerRef = \\WeakReference::create(\$this);
 
 {$factory}        return new {$class}();
     }
diff --git a/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig b/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig
index 04b694955051e..e98e524748f48 100644
--- a/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig
+++ b/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig
@@ -11,6 +11,9 @@
             {% for dump in collector.getDumps('html') %}
                 <div class="sf-toolbar-info-piece">
                     <span>
+                    {% if dump.label is defined and '' != dump.label %}
+                        <span class="sf-toolbar-file-line"><strong>{{ dump.label }}</strong> in </span>
+                    {% endif %}
                     {% if dump.file %}
                         {% set link = dump.file|file_link(dump.line) %}
                         {% if link %}
@@ -45,7 +48,12 @@
 
     {% for dump in collector.getDumps('html') %}
         <div class="sf-dump sf-reset">
-            <span class="metadata">In
+            <span class="metadata">
+                {% if dump.label is defined and '' != dump.label %}
+                    <strong>{{ dump.label }}</strong> in
+                {% else %}
+                    In
+                {% endif %}
                 {% if dump.line %}
                     {% set link = dump.file|file_link(dump.line) %}
                     {% if link %}
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
index a76b84ad8337c..b40c759eb4d37 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -25,6 +25,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'annotations.cached_reader',
         'assets.package',
         'asset_mapper.compiler',
+        'asset_mapper.importmap.resolver',
         'auto_alias',
         'cache.pool',
         'cache.pool.clearer',
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 51f41c93cd957..8518f1be57316 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -870,9 +870,10 @@ private function addAssetMapperSection(ArrayNodeDefinition $rootNode, callable $
                             ->info('The public path where the assets will be written to (and served from when "server" is true)')
                             ->defaultValue('/assets/')
                         ->end()
-                        ->booleanNode('strict_mode')
-                            ->info('If true, an exception will be thrown if an asset cannot be found when imported from JavaScript or CSS files - e.g. "import \'./non-existent.js\'"')
-                            ->defaultValue(true)
+                        ->enumNode('missing_import_mode')
+                            ->values(['strict', 'warn', 'ignore'])
+                            ->info('Behavior if an asset cannot be found when imported from JavaScript or CSS files - e.g. "import \'./non-existent.js\'". "strict" means an exception is thrown, "warn" means a warning is logged, "ignore" means the import is left as-is.')
+                            ->defaultValue('warn')
                         ->end()
                         ->arrayNode('extensions')
                             ->info('Key-value pair of file extensions set to their mime type.')
@@ -901,8 +902,8 @@ private function addAssetMapperSection(ArrayNodeDefinition $rootNode, callable $
                             ->defaultValue('%kernel.project_dir%/assets/vendor')
                         ->end()
                         ->scalarNode('provider')
-                            ->info('The provider (CDN) to use', class_exists(ImportMapManager::class) ? sprintf(' (e.g.: "%s").', implode('", "', ImportMapManager::PROVIDERS)) : '.')
-                            ->defaultValue('jspm')
+                            ->info('The provider (CDN) to use'.(class_exists(ImportMapManager::class) ? sprintf(' (e.g.: "%s").', implode('", "', ImportMapManager::PROVIDERS)) : '.'))
+                            ->defaultValue('jsdelivr.esm')
                         ->end()
                     ->end()
                 ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index d209d9902b914..ff09beae59aa4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -34,6 +34,7 @@
 use Symfony\Component\AssetMapper\AssetMapper;
 use Symfony\Component\AssetMapper\Compiler\AssetCompilerInterface;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\PackageResolverInterface;
 use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
@@ -1305,16 +1306,20 @@ private function registerAssetMapperConfiguration(array $config, ContainerBuilde
         }
 
         $container->getDefinition('asset_mapper.compiler.css_asset_url_compiler')
-            ->setArgument(0, $config['strict_mode']);
+            ->setArgument(0, $config['missing_import_mode']);
 
         $container->getDefinition('asset_mapper.compiler.javascript_import_path_compiler')
-            ->setArgument(0, $config['strict_mode']);
+            ->setArgument(0, $config['missing_import_mode']);
 
         $container
             ->getDefinition('asset_mapper.importmap.manager')
             ->replaceArgument(2, $config['importmap_path'])
             ->replaceArgument(3, $config['vendor_dir'])
-            ->replaceArgument(4, $config['provider'])
+        ;
+
+        $container
+            ->getDefinition('asset_mapper.importmap.resolver')
+            ->replaceArgument(0, $config['provider'])
         ;
 
         $container
@@ -1322,6 +1327,9 @@ private function registerAssetMapperConfiguration(array $config, ContainerBuilde
             ->replaceArgument(2, $config['importmap_polyfill'] ?? ImportMapManager::POLYFILL_URL)
             ->replaceArgument(3, $config['importmap_script_attributes'])
         ;
+
+        $container->registerForAutoconfiguration(PackageResolverInterface::class)
+            ->addTag('asset_mapper.importmap.resolver');
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php
index 487fdac0e2618..b73d70fcfcd11 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php
@@ -29,6 +29,9 @@
 use Symfony\Component\AssetMapper\Factory\MappedAssetFactory;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapRenderer;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\JsDelivrEsmResolver;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\JspmResolver;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\PackageResolver;
 use Symfony\Component\AssetMapper\MapperAwareAssetPackage;
 use Symfony\Component\AssetMapper\Path\PublicAssetsPathResolver;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
@@ -83,6 +86,7 @@
                 service('asset_mapper'),
                 abstract_arg('asset public prefix'),
                 abstract_arg('extensions map'),
+                service('cache.asset_mapper'),
             ])
             ->tag('kernel.event_subscriber', ['event' => RequestEvent::class])
 
@@ -114,18 +118,22 @@
 
         ->set('asset_mapper.compiler.css_asset_url_compiler', CssAssetUrlCompiler::class)
             ->args([
-                abstract_arg('strict mode'),
+                abstract_arg('missing import mode'),
+                service('logger'),
             ])
             ->tag('asset_mapper.compiler')
+            ->tag('monolog.logger', ['channel' => 'asset_mapper'])
 
         ->set('asset_mapper.compiler.source_mapping_urls_compiler', SourceMappingUrlsCompiler::class)
             ->tag('asset_mapper.compiler')
 
         ->set('asset_mapper.compiler.javascript_import_path_compiler', JavaScriptImportPathCompiler::class)
             ->args([
-                abstract_arg('strict mode'),
+                abstract_arg('missing import mode'),
+                service('logger'),
             ])
             ->tag('asset_mapper.compiler')
+            ->tag('monolog.logger', ['channel' => 'asset_mapper'])
 
         ->set('asset_mapper.importmap.manager', ImportMapManager::class)
             ->args([
@@ -133,10 +141,40 @@
                 service('asset_mapper.public_assets_path_resolver'),
                 abstract_arg('importmap.php path'),
                 abstract_arg('vendor directory'),
-                abstract_arg('provider'),
+                service('asset_mapper.importmap.resolver'),
             ])
         ->alias(ImportMapManager::class, 'asset_mapper.importmap.manager')
 
+        ->set('asset_mapper.importmap.resolver', PackageResolver::class)
+            ->args([
+                abstract_arg('provider'),
+                tagged_locator('asset_mapper.importmap.resolver'),
+            ])
+
+        ->set('asset_mapper.importmap.resolver.jsdelivr_esm', JsDelivrEsmResolver::class)
+            ->args([service('http_client')])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_JSDELIVR_ESM])
+
+        ->set('asset_mapper.importmap.resolver.jspm', JspmResolver::class)
+            ->args([service('http_client'), ImportMapManager::PROVIDER_JSPM])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_JSPM])
+
+        ->set('asset_mapper.importmap.resolver.jspm_system', JspmResolver::class)
+            ->args([service('http_client'), ImportMapManager::PROVIDER_JSPM_SYSTEM])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_JSPM_SYSTEM])
+
+        ->set('asset_mapper.importmap.resolver.skypack', JspmResolver::class)
+            ->args([service('http_client'), ImportMapManager::PROVIDER_SKYPACK])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_SKYPACK])
+
+        ->set('asset_mapper.importmap.resolver.jsdelivr', JspmResolver::class)
+            ->args([service('http_client'), ImportMapManager::PROVIDER_JSDELIVR])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_JSDELIVR])
+
+        ->set('asset_mapper.importmap.resolver.unpkg', JspmResolver::class)
+            ->args([service('http_client'), ImportMapManager::PROVIDER_UNPKG])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_UNPKG])
+
         ->set('asset_mapper.importmap.renderer', ImportMapRenderer::class)
             ->args([
                 service('asset_mapper.importmap.manager'),
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.php
index 2ea62a0b71882..87207cf95c59e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.php
@@ -66,6 +66,11 @@
             ->private()
             ->tag('cache.pool')
 
+        ->set('cache.asset_mapper')
+            ->parent('cache.system')
+            ->private()
+            ->tag('cache.pool')
+
         ->set('cache.messenger.restart_workers_signal')
             ->parent('cache.app')
             ->private()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
index e65871046ee07..a2abb5bc0c42a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -197,7 +197,7 @@
         <xsd:attribute name="enabled" type="xsd:boolean" />
         <xsd:attribute name="server" type="xsd:boolean" />
         <xsd:attribute name="public-prefix" type="xsd:string" />
-        <xsd:attribute name="strict-mode" type="xsd:boolean" />
+        <xsd:attribute name="missing-import-mode" type="missing-import-mode" />
         <xsd:attribute name="importmap-path" type="xsd:string" />
         <xsd:attribute name="importmap-polyfill" type="xsd:string" />
         <xsd:attribute name="vendor-dir" type="xsd:string" />
@@ -216,6 +216,14 @@
         <xsd:attribute name="key" type="xsd:string" use="required" />
     </xsd:complexType>
 
+    <xsd:simpleType name="missing-import-mode">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="strict" />
+            <xsd:enumeration value="warn" />
+            <xsd:enumeration value="ignore" />
+        </xsd:restriction>
+    </xsd:simpleType>
+
     <xsd:complexType name="translator">
         <xsd:sequence>
             <xsd:element name="fallback" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
index 81157ff6137ae..e3ecd982d3cc8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -107,12 +107,12 @@ public function testAssetMapperCanBeEnabled()
             'excluded_patterns' => [],
             'server' => true,
             'public_prefix' => '/assets/',
-            'strict_mode' => true,
+            'missing_import_mode' => 'warn',
             'extensions' => [],
             'importmap_path' => '%kernel.project_dir%/importmap.php',
             'importmap_polyfill' => null,
             'vendor_dir' => '%kernel.project_dir%/assets/vendor',
-            'provider' => 'jspm',
+            'provider' => 'jsdelivr.esm',
             'importmap_script_attributes' => [],
         ];
 
@@ -619,12 +619,12 @@ protected static function getBundleDefaultConfig()
                 'excluded_patterns' => [],
                 'server' => true,
                 'public_prefix' => '/assets/',
-                'strict_mode' => true,
+                'missing_import_mode' => 'warn',
                 'extensions' => [],
                 'importmap_path' => '%kernel.project_dir%/importmap.php',
                 'importmap_polyfill' => null,
                 'vendor_dir' => '%kernel.project_dir%/assets/vendor',
-                'provider' => 'jspm',
+                'provider' => 'jsdelivr.esm',
                 'importmap_script_attributes' => [],
             ],
             'cache' => [
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/asset_mapper.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/asset_mapper.xml
index 3be798b70088b..3b6f149c85d2d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/asset_mapper.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/asset_mapper.xml
@@ -11,7 +11,7 @@
             enabled="true"
             server="true"
             public-prefix="/assets_path/"
-            strict-mode="true"
+            missing-import-mode="strict"
             importmap-path="%kernel.project_dir%/importmap.php"
             importmap-polyfill="https://cdn.example.com/polyfill.js"
             vendor-dir="%kernel.project_dir%/assets/vendor"
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
index 421404722c9e0..36d3f5e379d3e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
@@ -89,5 +89,8 @@ public function testAssetMapper()
 
         $definition = $container->getDefinition('asset_mapper.repository');
         $this->assertSame(['assets/' => '', 'assets2/' => 'my_namespace'], $definition->getArgument(0));
+
+        $definition = $container->getDefinition('asset_mapper.compiler.css_asset_url_compiler');
+        $this->assertSame('strict', $definition->getArgument(0));
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 572353b5d7efd..9f594f254f035 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -77,7 +77,6 @@
         "doctrine/persistence": "<1.3",
         "phpdocumentor/reflection-docblock": "<3.2.2",
         "phpdocumentor/type-resolver": "<1.4.0",
-        "phpunit/phpunit": "<5.4.3",
         "symfony/asset": "<5.4",
         "symfony/clock": "<6.3",
         "symfony/console": "<5.4",
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/schema/security-1.0.xsd b/src/Symfony/Bundle/SecurityBundle/Resources/config/schema/security-1.0.xsd
index f0835052a6848..23fe45e243fbf 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/schema/security-1.0.xsd
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/schema/security-1.0.xsd
@@ -140,6 +140,7 @@
             <xsd:element name="form-login" type="form_login" minOccurs="0" maxOccurs="1" />
             <xsd:element name="form-login-ldap" type="form_login_ldap" minOccurs="0" maxOccurs="1" />
             <xsd:element name="guard" type="guard" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="access-token" type="access_token" minOccurs="0" maxOccurs="1" />
             <xsd:element name="http-basic" type="http_basic" minOccurs="0" maxOccurs="1" />
             <xsd:element name="http-basic-ldap" type="http_basic_ldap" minOccurs="0" maxOccurs="1" />
             <xsd:element name="json-login" type="json_login" minOccurs="0" maxOccurs="1" />
@@ -305,6 +306,17 @@
         <xsd:attribute name="provider" type="xsd:string" />
     </xsd:complexType>
 
+    <xsd:complexType name="access_token">
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="token-extractor" type="xsd:string" />
+        </xsd:choice>
+        <xsd:attribute name="token-handler" type="xsd:string" />
+        <xsd:attribute name="realm" type="xsd:string" />
+        <xsd:attribute name="success-handler" type="xsd:string" />
+        <xsd:attribute name="failure-handler" type="xsd:string" />
+        <xsd:attribute name="provider" type="xsd:string" />
+    </xsd:complexType>
+
     <xsd:complexType name="login_throttling">
         <xsd:attribute name="limiter" type="xsd:string" />
         <xsd:attribute name="max-attempts" type="xsd:integer" />
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
index c97abef4d6c90..ddc6964e3d89d 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
@@ -154,7 +154,7 @@
                     {% else %}
                         {{ caller.name }}
                     {% endif %}
-                    line <a class="text-small sf-toggle" data-toggle-selector="#sf-trace-{{ discr }}-{{ loop.index0 }}" style="cursor: pointer">{{ caller.line }}</a>
+                    line <button type="button" class="btn-link text-small sf-toggle" data-toggle-selector="#sf-trace-{{ discr }}-{{ loop.index0 }}">{{ caller.line }}</button>
 
                     <div class="hidden" id="sf-trace-{{ discr }}-{{ loop.index0 }}">
                         <div class="trace">
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/validator.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/validator.html.twig
index 331c8ca3f2791..02ac27dfe5dea 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/validator.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/validator.html.twig
@@ -83,7 +83,7 @@
                 {% else %}
                     {{ caller.name }}
                 {% endif %}
-                line <a class="text-small sf-toggle" data-toggle-selector="#sf-trace-{{ loop.index0 }}" style="cursor: pointer">{{ caller.line }}</a> (<a class="text-small sf-toggle" data-toggle-selector="#sf-context-{{ loop.index0 }}" style="cursor: pointer">context</a>):
+                line <button type="button" class="btn-link text-small sf-toggle" data-toggle-selector="#sf-trace-{{ loop.index0 }}">{{ caller.line }}</button> (<button type="button" class="btn-link text-small sf-toggle" data-toggle-selector="#sf-context-{{ loop.index0 }}">context</button>):
             </span>
 
             <div class="sf-validator-compact hidden" id="sf-trace-{{ loop.index0 }}">
diff --git a/src/Symfony/Component/AssetMapper/AssetMapper.php b/src/Symfony/Component/AssetMapper/AssetMapper.php
index bc9b8dbbeedd4..6fbbf1bf0c818 100644
--- a/src/Symfony/Component/AssetMapper/AssetMapper.php
+++ b/src/Symfony/Component/AssetMapper/AssetMapper.php
@@ -44,21 +44,15 @@ public function getAsset(string $logicalPath): ?MappedAsset
         return $this->mappedAssetFactory->createMappedAsset($logicalPath, $filePath);
     }
 
-    /**
-     * @return MappedAsset[]
-     */
-    public function allAssets(): array
+    public function allAssets(): iterable
     {
-        $assets = [];
         foreach ($this->mapperRepository->all() as $logicalPath => $filePath) {
             $asset = $this->getAsset($logicalPath);
             if (null === $asset) {
                 throw new \LogicException(sprintf('Asset "%s" could not be found.', $logicalPath));
             }
-            $assets[] = $asset;
+            yield $asset;
         }
-
-        return $assets;
     }
 
     public function getAssetFromSourcePath(string $sourcePath): ?MappedAsset
@@ -80,7 +74,7 @@ public function getPublicPath(string $logicalPath): ?string
 
         $asset = $this->getAsset($logicalPath);
 
-        return $asset?->getPublicPath();
+        return $asset?->publicPath;
     }
 
     private function loadManifest(): array
diff --git a/src/Symfony/Component/AssetMapper/AssetMapperCompiler.php b/src/Symfony/Component/AssetMapper/AssetMapperCompiler.php
index 02151421227c3..eb4ff7a992384 100644
--- a/src/Symfony/Component/AssetMapper/AssetMapperCompiler.php
+++ b/src/Symfony/Component/AssetMapper/AssetMapperCompiler.php
@@ -32,14 +32,14 @@ public function __construct(private readonly iterable $assetCompilers, private r
     {
     }
 
-    public function compile(string $content, MappedAsset $mappedAsset): string
+    public function compile(string $content, MappedAsset $asset): string
     {
         foreach ($this->assetCompilers as $compiler) {
-            if (!$compiler->supports($mappedAsset)) {
+            if (!$compiler->supports($asset)) {
                 continue;
             }
 
-            $content = $compiler->compile($content, $mappedAsset, $this->assetMapper ??= ($this->assetMapperFactory)());
+            $content = $compiler->compile($content, $asset, $this->assetMapper ??= ($this->assetMapperFactory)());
         }
 
         return $content;
diff --git a/src/Symfony/Component/AssetMapper/AssetMapperDevServerSubscriber.php b/src/Symfony/Component/AssetMapper/AssetMapperDevServerSubscriber.php
index 152289c34da89..9b82408814f47 100644
--- a/src/Symfony/Component/AssetMapper/AssetMapperDevServerSubscriber.php
+++ b/src/Symfony/Component/AssetMapper/AssetMapperDevServerSubscriber.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\AssetMapper;
 
+use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
@@ -104,6 +105,7 @@ public function __construct(
         private readonly AssetMapperInterface $assetMapper,
         string $publicPrefix = '/assets/',
         array $extensionsMap = [],
+        private readonly ?CacheItemPoolInterface $cacheMapCache = null,
     ) {
         $this->publicPrefix = rtrim($publicPrefix, '/').'/';
         $this->extensionsMap = array_merge(self::EXTENSIONS_MAP, $extensionsMap);
@@ -120,27 +122,21 @@ public function onKernelRequest(RequestEvent $event): void
             return;
         }
 
-        $asset = null;
-        foreach ($this->assetMapper->allAssets() as $assetCandidate) {
-            if ($pathInfo === $assetCandidate->getPublicPath()) {
-                $asset = $assetCandidate;
-                break;
-            }
-        }
+        $asset = $this->findAssetFromCache($pathInfo);
 
         if (!$asset) {
             throw new NotFoundHttpException(sprintf('Asset with public path "%s" not found.', $pathInfo));
         }
 
-        $mediaType = $this->getMediaType($asset->getPublicPath());
+        $mediaType = $this->getMediaType($asset->publicPath);
         $response = (new Response(
-            $asset->getContent(),
+            $asset->content,
             headers: $mediaType ? ['Content-Type' => $mediaType] : [],
         ))
             ->setPublic()
             ->setMaxAge(604800)
             ->setImmutable()
-            ->setEtag($asset->getDigest())
+            ->setEtag($asset->digest)
         ;
 
         $event->setResponse($response);
@@ -160,4 +156,37 @@ private function getMediaType(string $path): ?string
 
         return $this->extensionsMap[$extension] ?? null;
     }
+
+    private function findAssetFromCache(string $pathInfo): ?MappedAsset
+    {
+        $cachedAsset = null;
+        if (null !== $this->cacheMapCache) {
+            $cachedAsset = $this->cacheMapCache->getItem(hash('xxh128', $pathInfo));
+            $asset = $cachedAsset->isHit() ? $this->assetMapper->getAsset($cachedAsset->get()) : null;
+
+            if (null !== $asset && $asset->publicPath === $pathInfo) {
+                return $asset;
+            }
+        }
+
+        // we did not find a match
+        $asset = null;
+        foreach ($this->assetMapper->allAssets() as $assetCandidate) {
+            if ($pathInfo === $assetCandidate->publicPath) {
+                $asset = $assetCandidate;
+                break;
+            }
+        }
+
+        if (null === $asset) {
+            return null;
+        }
+
+        if (null !== $cachedAsset) {
+            $cachedAsset->set($asset->logicalPath);
+            $this->cacheMapCache->save($cachedAsset);
+        }
+
+        return $asset;
+    }
 }
diff --git a/src/Symfony/Component/AssetMapper/AssetMapperInterface.php b/src/Symfony/Component/AssetMapper/AssetMapperInterface.php
index 72805eaf78bb5..b89204197e141 100644
--- a/src/Symfony/Component/AssetMapper/AssetMapperInterface.php
+++ b/src/Symfony/Component/AssetMapper/AssetMapperInterface.php
@@ -28,9 +28,9 @@ public function getAsset(string $logicalPath): ?MappedAsset;
     /**
      * Returns all mapped assets.
      *
-     * @return MappedAsset[]
+     * @return iterable<MappedAsset>
      */
-    public function allAssets(): array;
+    public function allAssets(): iterable;
 
     /**
      * Fetches the asset given its source path (i.e. filesystem path).
diff --git a/src/Symfony/Component/AssetMapper/Command/AssetMapperCompileCommand.php b/src/Symfony/Component/AssetMapper/Command/AssetMapperCompileCommand.php
index 355f465deb1e0..9979694e7fd6c 100644
--- a/src/Symfony/Component/AssetMapper/Command/AssetMapperCompileCommand.php
+++ b/src/Symfony/Component/AssetMapper/Command/AssetMapperCompileCommand.php
@@ -118,20 +118,21 @@ private function createManifestAndWriteFiles(SymfonyStyle $io, string $publicDir
     {
         $allAssets = $this->assetMapper->allAssets();
 
-        $io->comment(sprintf('Compiling <info>%d</info> assets to <info>%s%s</info>', \count($allAssets), $publicDir, $this->publicAssetsPathResolver->resolvePublicPath('')));
+        $io->comment(sprintf('Compiling assets to <info>%s%s</info>', $publicDir, $this->publicAssetsPathResolver->resolvePublicPath('')));
         $manifest = [];
         foreach ($allAssets as $asset) {
             // $asset->getPublicPath() will start with a "/"
-            $targetPath = $publicDir.$asset->getPublicPath();
+            $targetPath = $publicDir.$asset->publicPath;
 
             if (!is_dir($dir = \dirname($targetPath))) {
                 $this->filesystem->mkdir($dir);
             }
 
-            $this->filesystem->dumpFile($targetPath, $asset->getContent());
-            $manifest[$asset->getLogicalPath()] = $asset->getPublicPath();
+            $this->filesystem->dumpFile($targetPath, $asset->content);
+            $manifest[$asset->logicalPath] = $asset->publicPath;
         }
         ksort($manifest);
+        $io->comment(sprintf('Compiled <info>%d</info> assets', \count($manifest)));
 
         return $manifest;
     }
diff --git a/src/Symfony/Component/AssetMapper/Command/DebugAssetMapperCommand.php b/src/Symfony/Component/AssetMapper/Command/DebugAssetMapperCommand.php
index ac5e9e2799b5c..9a73de6493382 100644
--- a/src/Symfony/Component/AssetMapper/Command/DebugAssetMapperCommand.php
+++ b/src/Symfony/Component/AssetMapper/Command/DebugAssetMapperCommand.php
@@ -70,8 +70,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $rows = [];
         foreach ($allAssets as $asset) {
-            $logicalPath = $asset->getLogicalPath();
-            $sourcePath = $this->relativizePath($asset->getSourcePath());
+            $logicalPath = $asset->logicalPath;
+            $sourcePath = $this->relativizePath($asset->sourcePath);
 
             if (!$input->getOption('full')) {
                 $logicalPath = $this->shortenPath($logicalPath);
diff --git a/src/Symfony/Component/AssetMapper/Command/ImportMapRequireCommand.php b/src/Symfony/Component/AssetMapper/Command/ImportMapRequireCommand.php
index 98f2eb7075e7e..636a03b706d79 100644
--- a/src/Symfony/Component/AssetMapper/Command/ImportMapRequireCommand.php
+++ b/src/Symfony/Component/AssetMapper/Command/ImportMapRequireCommand.php
@@ -56,6 +56,14 @@ protected function configure(): void
     <info>php %command.full_name% lodash --preload</info>
     <info>php %command.full_name% "lodash@^4.15"</info>
 
+You can also require specific paths of a package:
+
+    <info>php %command.full_name% "chart.js/auto"</info>
+
+Or download one package/file, but alias its name in your import map:
+
+    <info>php %command.full_name% "vue/dist/vue.esm-bundler.js=vue"</info>
+
 The <info>preload</info> option will set the <info>preload</info> option in the importmap,
 which will tell the browser to preload the package. This should be used for all
 critical packages that are needed on page load.
@@ -114,12 +122,16 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $parts['version'] ?? null,
                 $input->getOption('download'),
                 $input->getOption('preload'),
-                null,
+                $parts['alias'] ?? $parts['package'],
                 isset($parts['registry']) && $parts['registry'] ? $parts['registry'] : null,
                 $path,
             );
         }
 
+        if ($input->getOption('download')) {
+            $io->warning(sprintf('The --download option is experimental. It should work well with the default %s provider but check your browser console for 404 errors.', ImportMapManager::PROVIDER_JSDELIVR_ESM));
+        }
+
         $newPackages = $this->importMapManager->require($packages);
         if (1 === \count($newPackages)) {
             $newPackage = $newPackages[0];
@@ -129,7 +141,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $application = $this->getApplication();
                 if ($application instanceof Application) {
                     $projectDir = $application->getKernel()->getProjectDir();
-                    $downloadedPath = $downloadedAsset->getSourcePath();
+                    $downloadedPath = $downloadedAsset->sourcePath;
                     if (str_starts_with($downloadedPath, $projectDir)) {
                         $downloadedPath = substr($downloadedPath, \strlen($projectDir) + 1);
                     }
diff --git a/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerInterface.php b/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerInterface.php
index 52dfe0e880460..9f3d12de2da49 100644
--- a/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerInterface.php
+++ b/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerInterface.php
@@ -23,6 +23,10 @@
  */
 interface AssetCompilerInterface
 {
+    public const MISSING_IMPORT_STRICT = 'strict';
+    public const MISSING_IMPORT_WARN = 'warn';
+    public const MISSING_IMPORT_IGNORE = 'ignore';
+
     public function supports(MappedAsset $asset): bool;
 
     /**
diff --git a/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerPathResolverTrait.php b/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerPathResolverTrait.php
index 764e4401d3366..1c134ea8d08c8 100644
--- a/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerPathResolverTrait.php
+++ b/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerPathResolverTrait.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\AssetMapper\Compiler;
 
-use Symfony\Component\Asset\Exception\RuntimeException;
+use Symfony\Component\AssetMapper\Exception\RuntimeException;
 
 /**
  * Helps resolve "../" and "./" in paths.
diff --git a/src/Symfony/Component/AssetMapper/Compiler/CssAssetUrlCompiler.php b/src/Symfony/Component/AssetMapper/Compiler/CssAssetUrlCompiler.php
index cc7043dc007f1..535304841133c 100644
--- a/src/Symfony/Component/AssetMapper/Compiler/CssAssetUrlCompiler.php
+++ b/src/Symfony/Component/AssetMapper/Compiler/CssAssetUrlCompiler.php
@@ -11,8 +11,11 @@
 
 namespace Symfony\Component\AssetMapper\Compiler;
 
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use Symfony\Component\AssetMapper\AssetDependency;
 use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\Exception\RuntimeException;
 use Symfony\Component\AssetMapper\MappedAsset;
 
 /**
@@ -26,30 +29,39 @@ final class CssAssetUrlCompiler implements AssetCompilerInterface
 {
     use AssetCompilerPathResolverTrait;
 
+    private readonly LoggerInterface $logger;
+
     // https://regex101.com/r/BOJ3vG/1
     public const ASSET_URL_PATTERN = '/url\(\s*["\']?(?!(?:\/|\#|%23|data|http|\/\/))([^"\'\s?#)]+)([#?][^"\')]+)?\s*["\']?\)/';
 
-    public function __construct(private readonly bool $strictMode = true)
-    {
+    public function __construct(
+        private readonly string $missingImportMode = self::MISSING_IMPORT_WARN,
+        LoggerInterface $logger = null,
+    ) {
+        $this->logger = $logger ?? new NullLogger();
     }
 
     public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string
     {
         return preg_replace_callback(self::ASSET_URL_PATTERN, function ($matches) use ($asset, $assetMapper) {
-            $resolvedPath = $this->resolvePath(\dirname($asset->getLogicalPath()), $matches[1]);
+            try {
+                $resolvedPath = $this->resolvePath(\dirname($asset->logicalPath), $matches[1]);
+            } catch (RuntimeException $e) {
+                $this->handleMissingImport(sprintf('Error processing import in "%s": ', $asset->sourcePath).$e->getMessage(), $e);
+
+                return $matches[0];
+            }
             $dependentAsset = $assetMapper->getAsset($resolvedPath);
 
             if (null === $dependentAsset) {
-                if ($this->strictMode) {
-                    throw new \RuntimeException(sprintf('Unable to find asset "%s" referenced in "%s".', $resolvedPath, $asset->getSourcePath()));
-                }
+                $this->handleMissingImport(sprintf('Unable to find asset "%s" referenced in "%s".', $matches[1], $asset->sourcePath));
 
                 // return original, unchanged path
                 return $matches[0];
             }
 
             $asset->addDependency(new AssetDependency($dependentAsset));
-            $relativePath = $this->createRelativePath($asset->getPublicPathWithoutDigest(), $dependentAsset->getPublicPath());
+            $relativePath = $this->createRelativePath($asset->publicPathWithoutDigest, $dependentAsset->publicPath);
 
             return 'url("'.$relativePath.'")';
         }, $content);
@@ -57,6 +69,15 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
 
     public function supports(MappedAsset $asset): bool
     {
-        return 'css' === $asset->getPublicExtension();
+        return 'css' === $asset->publicExtension;
+    }
+
+    private function handleMissingImport(string $message, \Throwable $e = null): void
+    {
+        match ($this->missingImportMode) {
+            AssetCompilerInterface::MISSING_IMPORT_IGNORE => null,
+            AssetCompilerInterface::MISSING_IMPORT_WARN => $this->logger->warning($message),
+            AssetCompilerInterface::MISSING_IMPORT_STRICT => throw new RuntimeException($message, 0, $e),
+        };
     }
 }
diff --git a/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php b/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php
index a6ec58b6eeff3..8ca018f0f13c4 100644
--- a/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php
+++ b/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php
@@ -11,8 +11,11 @@
 
 namespace Symfony\Component\AssetMapper\Compiler;
 
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use Symfony\Component\AssetMapper\AssetDependency;
 use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\Exception\RuntimeException;
 use Symfony\Component\AssetMapper\MappedAsset;
 
 /**
@@ -26,38 +29,51 @@ final class JavaScriptImportPathCompiler implements AssetCompilerInterface
 {
     use AssetCompilerPathResolverTrait;
 
+    private readonly LoggerInterface $logger;
+
     // https://regex101.com/r/VFdR4H/1
     private const IMPORT_PATTERN = '/(?:import\s+(?:(?:\*\s+as\s+\w+|[\w\s{},*]+)\s+from\s+)?|\bimport\()\s*[\'"`](\.\/[^\'"`]+|(\.\.\/)+[^\'"`]+)[\'"`]\s*[;\)]?/m';
 
-    public function __construct(private readonly bool $strictMode = true)
-    {
+    public function __construct(
+        private readonly string $missingImportMode = self::MISSING_IMPORT_WARN,
+        LoggerInterface $logger = null,
+    ) {
+        $this->logger = $logger ?? new NullLogger();
     }
 
     public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string
     {
         return preg_replace_callback(self::IMPORT_PATTERN, function ($matches) use ($asset, $assetMapper) {
-            $resolvedPath = $this->resolvePath(\dirname($asset->getLogicalPath()), $matches[1]);
+            try {
+                $resolvedPath = $this->resolvePath(\dirname($asset->logicalPath), $matches[1]);
+            } catch (RuntimeException $e) {
+                $this->handleMissingImport(sprintf('Error processing import in "%s": ', $asset->sourcePath).$e->getMessage(), $e);
+
+                return $matches[0];
+            }
 
             $dependentAsset = $assetMapper->getAsset($resolvedPath);
 
-            if (!$dependentAsset && $this->strictMode) {
-                $message = sprintf('Unable to find asset "%s" imported from "%s".', $resolvedPath, $asset->getSourcePath());
+            if (!$dependentAsset) {
+                $message = sprintf('Unable to find asset "%s" imported from "%s".', $matches[1], $asset->sourcePath);
 
                 if (null !== $assetMapper->getAsset(sprintf('%s.js', $resolvedPath))) {
-                    $message .= sprintf(' Try adding ".js" to the end of the import - i.e. "%s.js".', $resolvedPath);
+                    $message .= sprintf(' Try adding ".js" to the end of the import - i.e. "%s.js".', $matches[1]);
                 }
 
-                throw new \RuntimeException($message);
+                $this->handleMissingImport($message);
+
+                return $matches[0];
             }
 
-            if ($dependentAsset && $this->supports($dependentAsset)) {
+            if ($this->supports($dependentAsset)) {
                 // If we found the path and it's a JavaScript file, list it as a dependency.
                 // This will cause the asset to be included in the importmap.
                 $isLazy = str_contains($matches[0], 'import(');
 
                 $asset->addDependency(new AssetDependency($dependentAsset, $isLazy, false));
 
-                $relativeImportPath = $this->createRelativePath($asset->getPublicPathWithoutDigest(), $dependentAsset->getPublicPathWithoutDigest());
+                $relativeImportPath = $this->createRelativePath($asset->publicPathWithoutDigest, $dependentAsset->publicPathWithoutDigest);
                 $relativeImportPath = $this->makeRelativeForJavaScript($relativeImportPath);
 
                 return str_replace($matches[1], $relativeImportPath, $matches[0]);
@@ -69,7 +85,7 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
 
     public function supports(MappedAsset $asset): bool
     {
-        return 'js' === $asset->getPublicExtension();
+        return 'js' === $asset->publicExtension;
     }
 
     private function makeRelativeForJavaScript(string $path): string
@@ -80,4 +96,13 @@ private function makeRelativeForJavaScript(string $path): string
 
         return './'.$path;
     }
+
+    private function handleMissingImport(string $message, \Throwable $e = null): void
+    {
+        match ($this->missingImportMode) {
+            AssetCompilerInterface::MISSING_IMPORT_IGNORE => null,
+            AssetCompilerInterface::MISSING_IMPORT_WARN => $this->logger->warning($message),
+            AssetCompilerInterface::MISSING_IMPORT_STRICT => throw new RuntimeException($message, 0, $e),
+        };
+    }
 }
diff --git a/src/Symfony/Component/AssetMapper/Compiler/SourceMappingUrlsCompiler.php b/src/Symfony/Component/AssetMapper/Compiler/SourceMappingUrlsCompiler.php
index e1d534555d395..e87f4ef89e427 100644
--- a/src/Symfony/Component/AssetMapper/Compiler/SourceMappingUrlsCompiler.php
+++ b/src/Symfony/Component/AssetMapper/Compiler/SourceMappingUrlsCompiler.php
@@ -30,13 +30,13 @@ final class SourceMappingUrlsCompiler implements AssetCompilerInterface
 
     public function supports(MappedAsset $asset): bool
     {
-        return \in_array($asset->getPublicExtension(), ['css', 'js'], true);
+        return \in_array($asset->publicExtension, ['css', 'js'], true);
     }
 
     public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string
     {
         return preg_replace_callback(self::SOURCE_MAPPING_PATTERN, function ($matches) use ($asset, $assetMapper) {
-            $resolvedPath = $this->resolvePath(\dirname($asset->getLogicalPath()), $matches[2]);
+            $resolvedPath = $this->resolvePath(\dirname($asset->logicalPath), $matches[2]);
 
             $dependentAsset = $assetMapper->getAsset($resolvedPath);
             if (!$dependentAsset) {
@@ -45,7 +45,7 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
             }
 
             $asset->addDependency(new AssetDependency($dependentAsset));
-            $relativePath = $this->createRelativePath($asset->getPublicPathWithoutDigest(), $dependentAsset->getPublicPath());
+            $relativePath = $this->createRelativePath($asset->publicPathWithoutDigest, $dependentAsset->publicPath);
 
             return $matches[1].'# sourceMappingURL='.$relativePath;
         }, $content);
diff --git a/src/Symfony/Component/AssetMapper/Exception/ExceptionInterface.php b/src/Symfony/Component/AssetMapper/Exception/ExceptionInterface.php
new file mode 100644
index 0000000000000..63a3761524d8f
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Exception/ExceptionInterface.php
@@ -0,0 +1,16 @@
+<?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.
+ */
+
+namespace Symfony\Component\AssetMapper\Exception;
+
+interface ExceptionInterface extends \Throwable
+{
+}
diff --git a/src/Symfony/Component/AssetMapper/Exception/RuntimeException.php b/src/Symfony/Component/AssetMapper/Exception/RuntimeException.php
new file mode 100644
index 0000000000000..b7f80fa409c81
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Exception/RuntimeException.php
@@ -0,0 +1,16 @@
+<?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.
+ */
+
+namespace Symfony\Component\AssetMapper\Exception;
+
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/AssetMapper/Factory/CachedMappedAssetFactory.php b/src/Symfony/Component/AssetMapper/Factory/CachedMappedAssetFactory.php
index c4245d686858d..cc5e41be27fb8 100644
--- a/src/Symfony/Component/AssetMapper/Factory/CachedMappedAssetFactory.php
+++ b/src/Symfony/Component/AssetMapper/Factory/CachedMappedAssetFactory.php
@@ -59,7 +59,8 @@ private function getCacheFilePath(string $logicalPath, string $sourcePath): stri
      */
     private function collectResourcesFromAsset(MappedAsset $mappedAsset): array
     {
-        $resources = [new FileResource($mappedAsset->getSourcePath())];
+        $resources = array_map(fn (string $path) => new FileResource($path), $mappedAsset->getFileDependencies());
+        $resources[] = new FileResource($mappedAsset->sourcePath);
 
         foreach ($mappedAsset->getDependencies() as $dependency) {
             if (!$dependency->isContentDependency) {
diff --git a/src/Symfony/Component/AssetMapper/Factory/MappedAssetFactory.php b/src/Symfony/Component/AssetMapper/Factory/MappedAssetFactory.php
index 03253649902a5..b6fdb3debaa2d 100644
--- a/src/Symfony/Component/AssetMapper/Factory/MappedAssetFactory.php
+++ b/src/Symfony/Component/AssetMapper/Factory/MappedAssetFactory.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\AssetMapper\Factory;
 
 use Symfony\Component\AssetMapper\AssetMapperCompiler;
+use Symfony\Component\AssetMapper\Exception\RuntimeException;
 use Symfony\Component\AssetMapper\MappedAsset;
 use Symfony\Component\AssetMapper\Path\PublicAssetsPathResolverInterface;
 
@@ -35,22 +36,29 @@ public function __construct(
     public function createMappedAsset(string $logicalPath, string $sourcePath): ?MappedAsset
     {
         if (\in_array($logicalPath, $this->assetsBeingCreated, true)) {
-            throw new \RuntimeException(sprintf('Circular reference detected while creating asset for "%s": "%s".', $logicalPath, implode(' -> ', $this->assetsBeingCreated).' -> '.$logicalPath));
+            throw new RuntimeException(sprintf('Circular reference detected while creating asset for "%s": "%s".', $logicalPath, implode(' -> ', $this->assetsBeingCreated).' -> '.$logicalPath));
         }
 
         if (!isset($this->assetsCache[$logicalPath])) {
             $this->assetsBeingCreated[] = $logicalPath;
 
-            $asset = new MappedAsset($logicalPath);
-            $this->assetsCache[$logicalPath] = $asset;
-            $asset->setSourcePath($sourcePath);
+            $asset = new MappedAsset($logicalPath, $sourcePath, $this->assetsPathResolver->resolvePublicPath($logicalPath));
 
-            $asset->setPublicPathWithoutDigest($this->assetsPathResolver->resolvePublicPath($logicalPath));
-            $publicPath = $this->getPublicPath($asset);
-            $asset->setPublicPath($publicPath);
             [$digest, $isPredigested] = $this->getDigest($asset);
-            $asset->setDigest($digest, $isPredigested);
-            $asset->setContent($this->calculateContent($asset));
+
+            $asset = new MappedAsset(
+                $asset->logicalPath,
+                $asset->sourcePath,
+                $asset->publicPathWithoutDigest,
+                $this->getPublicPath($asset),
+                $this->calculateContent($asset),
+                $digest,
+                $isPredigested,
+                $asset->getDependencies(),
+                $asset->getFileDependencies(),
+            );
+
+            $this->assetsCache[$logicalPath] = $asset;
 
             array_pop($this->assetsBeingCreated);
         }
@@ -66,7 +74,7 @@ public function createMappedAsset(string $logicalPath, string $sourcePath): ?Map
     private function getDigest(MappedAsset $asset): array
     {
         // check for a pre-digested file
-        if (preg_match(self::PREDIGESTED_REGEX, $asset->getLogicalPath(), $matches)) {
+        if (preg_match(self::PREDIGESTED_REGEX, $asset->logicalPath, $matches)) {
             return [$matches[1], true];
         }
 
@@ -78,18 +86,18 @@ private function getDigest(MappedAsset $asset): array
 
     private function calculateContent(MappedAsset $asset): string
     {
-        if (isset($this->fileContentsCache[$asset->getLogicalPath()])) {
-            return $this->fileContentsCache[$asset->getLogicalPath()];
+        if (isset($this->fileContentsCache[$asset->logicalPath])) {
+            return $this->fileContentsCache[$asset->logicalPath];
         }
 
-        if (!is_file($asset->getSourcePath())) {
-            throw new \RuntimeException(sprintf('Asset source path "%s" could not be found.', $asset->getSourcePath()));
+        if (!is_file($asset->sourcePath)) {
+            throw new RuntimeException(sprintf('Asset source path "%s" could not be found.', $asset->sourcePath));
         }
 
-        $content = file_get_contents($asset->getSourcePath());
+        $content = file_get_contents($asset->sourcePath);
         $content = $this->compiler->compile($content, $asset);
 
-        $this->fileContentsCache[$asset->getLogicalPath()] = $content;
+        $this->fileContentsCache[$asset->logicalPath] = $content;
 
         return $content;
     }
@@ -99,10 +107,10 @@ private function getPublicPath(MappedAsset $asset): ?string
         [$digest, $isPredigested] = $this->getDigest($asset);
 
         if ($isPredigested) {
-            return $this->assetsPathResolver->resolvePublicPath($asset->getLogicalPath());
+            return $this->assetsPathResolver->resolvePublicPath($asset->logicalPath);
         }
 
-        $digestedPath = preg_replace_callback('/\.(\w+)$/', fn ($matches) => "-{$digest}{$matches[0]}", $asset->getLogicalPath());
+        $digestedPath = preg_replace_callback('/\.(\w+)$/', fn ($matches) => "-{$digest}{$matches[0]}", $asset->logicalPath);
 
         return $this->assetsPathResolver->resolvePublicPath($digestedPath);
     }
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php
index 15c76054fb485..849273b247626 100644
--- a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php
+++ b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php
@@ -13,10 +13,9 @@
 
 use Symfony\Component\AssetMapper\AssetDependency;
 use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\PackageResolverInterface;
 use Symfony\Component\AssetMapper\Path\PublicAssetsPathResolverInterface;
-use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Component\VarExporter\VarExporter;
-use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
  * @experimental
@@ -32,12 +31,14 @@ class ImportMapManager
     public const PROVIDER_JSPM_SYSTEM = 'jspm.system';
     public const PROVIDER_SKYPACK = 'skypack';
     public const PROVIDER_JSDELIVR = 'jsdelivr';
+    public const PROVIDER_JSDELIVR_ESM = 'jsdelivr.esm';
     public const PROVIDER_UNPKG = 'unpkg';
     public const PROVIDERS = [
         self::PROVIDER_JSPM,
         self::PROVIDER_JSPM_SYSTEM,
         self::PROVIDER_SKYPACK,
         self::PROVIDER_JSDELIVR,
+        self::PROVIDER_JSDELIVR_ESM,
         self::PROVIDER_UNPKG,
     ];
 
@@ -61,10 +62,8 @@ public function __construct(
         private readonly PublicAssetsPathResolverInterface $assetsPathResolver,
         private readonly string $importMapConfigPath,
         private readonly string $vendorDir,
-        private readonly string $provider = self::PROVIDER_JSPM,
-        private ?HttpClientInterface $httpClient = null,
+        private readonly PackageResolverInterface $resolver,
     ) {
-        $this->httpClient = $httpClient ?? HttpClient::create(['base_uri' => 'https://api.jspm.io/']);
     }
 
     public function getModulesToPreload(): array
@@ -116,10 +115,18 @@ public function update(): array
      */
     public static function parsePackageName(string $packageName): ?array
     {
-        // https://regex101.com/r/d99BEc/1
-        $regex = '/(?:(?P<registry>[^:\n]+):)?((?P<package>@?[^@\n]+))(?:@(?P<version>[^\s\n]+))?/';
+        // https://regex101.com/r/MDz0bN/1
+        $regex = '/(?:(?P<registry>[^:\n]+):)?((?P<package>@?[^=@\n]+))(?:@(?P<version>[^=\s\n]+))?(?:=(?P<alias>[^\s\n]+))?/';
 
-        return preg_match($regex, $packageName, $matches) ? $matches : null;
+        if (!preg_match($regex, $packageName, $matches)) {
+            return null;
+        }
+
+        if (isset($matches['version']) && '' === $matches['version']) {
+            unset($matches['version']);
+        }
+
+        return $matches;
     }
 
     private function buildImportMapJson(): void
@@ -219,88 +226,46 @@ private function requirePackages(array $packagesToRequire, array &$importMapEntr
             return [];
         }
 
-        $installData = [];
-        $packageRequiresByName = [];
         $addedEntries = [];
-        foreach ($packagesToRequire as $requireOptions) {
-            if (null !== $requireOptions->path) {
-                $newEntry = new ImportMapEntry(
-                    $requireOptions->packageName,
-                    $requireOptions->path,
-                    $requireOptions->preload,
-                );
-                $importMapEntries[$requireOptions->packageName] = $newEntry;
-                $addedEntries[] = $newEntry;
-
+        // handle local packages
+        foreach ($packagesToRequire as $key => $requireOptions) {
+            if (null === $requireOptions->path) {
                 continue;
             }
 
-            $constraint = $requireOptions->packageName;
-            if (null !== $requireOptions->versionConstraint) {
-                $constraint .= '@'.$requireOptions->versionConstraint;
-            }
-            if (null !== $requireOptions->registryName) {
-                $constraint = sprintf('%s:%s', $requireOptions->registryName, $constraint);
-            }
-            $installData[] = $constraint;
-            $packageRequiresByName[$requireOptions->packageName] = $requireOptions;
+            $newEntry = new ImportMapEntry(
+                $requireOptions->packageName,
+                $requireOptions->path,
+                $requireOptions->preload,
+            );
+            $importMapEntries[$requireOptions->packageName] = $newEntry;
+            $addedEntries[] = $newEntry;
+            unset($packagesToRequire[$key]);
         }
 
-        if (!$installData) {
+        if (!$packagesToRequire) {
             return $addedEntries;
         }
 
-        $json = [
-            'install' => $installData,
-            'flattenScope' => true,
-            // always grab production-ready assets
-            'env' => ['browser', 'module', 'production'],
-        ];
-        if (self::PROVIDER_JSPM !== $this->provider) {
-            $json['provider'] = $this->provider;
-        }
-
-        $response = $this->httpClient->request('POST', 'generate', [
-            'json' => $json,
-        ]);
-
-        if (200 !== $response->getStatusCode()) {
-            $data = $response->toArray(false);
-
-            if (isset($data['error'])) {
-                throw new \RuntimeException('Error requiring JavaScript package: '.$data['error']);
-            }
-
-            // Throws the original HttpClient exception
-            $response->getHeaders();
-        }
-
-        // if we're requiring just one package, in case it has any peer deps, match the preload
-        $defaultPreload = 1 === \count($packagesToRequire) ? $packagesToRequire[0]->preload : false;
-
-        foreach ($response->toArray()['map']['imports'] as $packageName => $url) {
-            $requireOptions = $packageRequiresByName[$packageName] ?? null;
-            $importName = $requireOptions && $requireOptions->importName ? $requireOptions->importName : $packageName;
-            $preload = $requireOptions ? $requireOptions->preload : $defaultPreload;
-            $download = $requireOptions ? $requireOptions->download : false;
+        $resolvedPackages = $this->resolver->resolvePackages($packagesToRequire);
+        foreach ($resolvedPackages as $resolvedPackage) {
+            $importName = $resolvedPackage->requireOptions->importName ?: $resolvedPackage->requireOptions->packageName;
             $path = null;
-
-            if ($download) {
-                $vendorPath = $this->vendorDir.'/'.$packageName.'.js';
-
-                @mkdir(\dirname($vendorPath), 0777, true);
-                file_put_contents($vendorPath, $this->httpClient->request('GET', $url)->getContent());
-
-                $mappedAsset = $this->assetMapper->getAssetFromSourcePath($vendorPath);
-                if (null === $mappedAsset) {
-                    unlink($vendorPath);
-
-                    throw new \LogicException(sprintf('The package was downloaded to "%s", but this path does not appear to be in any of your asset paths.', $vendorPath));
+            if ($resolvedPackage->requireOptions->download) {
+                if (null === $resolvedPackage->content) {
+                    throw new \LogicException(sprintf('The contents of package "%s" were not downloaded.', $resolvedPackage->requireOptions->packageName));
                 }
-                $path = $mappedAsset->getLogicalPath();
+
+                $path = $this->downloadPackage($importName, $resolvedPackage->content);
             }
 
-            $newEntry = new ImportMapEntry($importName, $path, $url, $download, $preload);
+            $newEntry = new ImportMapEntry(
+                $importName,
+                $path,
+                $resolvedPackage->url,
+                $resolvedPackage->requireOptions->download,
+                $resolvedPackage->requireOptions->preload,
+            );
             $importMapEntries[$importName] = $newEntry;
             $addedEntries[] = $newEntry;
         }
@@ -316,8 +281,8 @@ private function cleanupPackageFiles(ImportMapEntry $entry): void
 
         $asset = $this->assetMapper->getAsset($entry->path);
 
-        if (is_file($asset->getSourcePath())) {
-            @unlink($asset->getSourcePath());
+        if (is_file($asset->sourcePath)) {
+            @unlink($asset->sourcePath);
         }
     }
 
@@ -363,11 +328,10 @@ private function writeImportMapConfig(array $entries): void
                 $path = $entry->path;
                 // if the path is an absolute path, convert it to an asset path
                 if (is_file($path)) {
-                    $asset = $this->assetMapper->getAssetFromSourcePath($path);
-                    if (null === $asset) {
+                    if (null === $asset = $this->assetMapper->getAssetFromSourcePath($path)) {
                         throw new \LogicException(sprintf('The "%s" importmap entry contains the path "%s" but it does not appear to be in any of your asset paths.', $entry->importName, $path));
                     }
-                    $path = $asset->getLogicalPath();
+                    $path = $asset->logicalPath;
                 }
                 $config[$entry->isDownloaded ? 'downloaded_to' : 'path'] = $path;
             }
@@ -381,7 +345,25 @@ private function writeImportMapConfig(array $entries): void
         }
 
         $map = class_exists(VarExporter::class) ? VarExporter::export($importMapConfig) : var_export($importMapConfig, true);
-        file_put_contents($this->importMapConfigPath, "<?php\n\nreturn {$map};\n");
+        file_put_contents($this->importMapConfigPath, <<<EOF
+        <?php
+
+        /**
+         * Returns the import map for this application.
+         *
+         * - "path" is a path inside the asset mapper system. Use the
+         *     "debug:asset-map" command to see the full list of paths.
+         *
+         * - "preload" set to true for any modules that are loaded on the initial
+         *     page load to help the browser download them earlier.
+         *
+         * The "importmap:require" command can be used to add new entries to this file.
+         *
+         * This file has been auto-generated by the importmap commands.
+         */
+        return $map;
+
+        EOF);
     }
 
     /**
@@ -399,11 +381,10 @@ private function convertEntriesToImports(array $entries): array
             $dependencies = [];
 
             if (null !== $entryOptions->path) {
-                $asset = $this->assetMapper->getAsset($entryOptions->path);
-                if (!$asset) {
+                if (!$asset = $this->assetMapper->getAsset($entryOptions->path)) {
                     throw new \InvalidArgumentException(sprintf('The asset "%s" mentioned in "%s" cannot be found in any asset map paths.', $entryOptions->path, basename($this->importMapConfigPath)));
                 }
-                $path = $asset->getPublicPath();
+                $path = $asset->publicPath;
                 $dependencies = $asset->getDependencies();
             } elseif (null !== $entryOptions->url) {
                 $path = $entryOptions->url;
@@ -419,8 +400,8 @@ private function convertEntriesToImports(array $entries): array
 
             $dependencyImportMapEntries = array_map(function (AssetDependency $dependency) use ($entryOptions) {
                 return new ImportMapEntry(
-                    $dependency->asset->getPublicPathWithoutDigest(),
-                    $dependency->asset->getLogicalPath(),
+                    $dependency->asset->publicPathWithoutDigest,
+                    $dependency->asset->logicalPath,
                     preload: $entryOptions->preload && !$dependency->isLazy,
                 );
             }, $dependencies);
@@ -429,4 +410,20 @@ private function convertEntriesToImports(array $entries): array
 
         return $imports;
     }
+
+    private function downloadPackage(string $packageName, string $packageContents): string
+    {
+        $vendorPath = $this->vendorDir.'/'.$packageName.'.js';
+
+        @mkdir(\dirname($vendorPath), 0777, true);
+        file_put_contents($vendorPath, $packageContents);
+
+        if (null === $mappedAsset = $this->assetMapper->getAssetFromSourcePath($vendorPath)) {
+            unlink($vendorPath);
+
+            throw new \LogicException(sprintf('The package was downloaded to "%s", but this path does not appear to be in any of your asset paths.', $vendorPath));
+        }
+
+        return $mappedAsset->logicalPath;
+    }
 }
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php
new file mode 100644
index 0000000000000..99747047cf635
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php
@@ -0,0 +1,145 @@
+<?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.
+ */
+
+namespace Symfony\Component\AssetMapper\ImportMap\Resolver;
+
+use Symfony\Component\AssetMapper\Exception\RuntimeException;
+use Symfony\Component\AssetMapper\ImportMap\PackageRequireOptions;
+use Symfony\Component\HttpClient\HttpClient;
+use Symfony\Contracts\HttpClient\Exception\HttpExceptionInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * @experimental
+ */
+final class JsDelivrEsmResolver implements PackageResolverInterface
+{
+    public const URL_PATTERN_VERSION = 'https://data.jsdelivr.com/v1/packages/npm/%s/resolved?specifier=%s';
+    public const URL_PATTERN_DIST = 'https://cdn.jsdelivr.net/npm/%s@%s%s/+esm';
+
+    private HttpClientInterface $httpClient;
+
+    public function __construct(
+        HttpClientInterface $httpClient = null,
+        private readonly string $versionUrlPattern = self::URL_PATTERN_VERSION,
+        private readonly string $distUrlPattern = self::URL_PATTERN_DIST,
+    ) {
+        $this->httpClient = $httpClient ?? HttpClient::create();
+    }
+
+    public function resolvePackages(array $packagesToRequire): array
+    {
+        $resolvedPackages = [];
+
+        resolve_packages:
+
+        $requiredPackages = [];
+        foreach ($packagesToRequire as $options) {
+            $packageName = trim($options->packageName, '/');
+            $constraint = $options->versionConstraint ?? '*';
+
+            // avoid resolving the same package twice
+            if (isset($resolvedPackages[$packageName])) {
+                continue;
+            }
+
+            $filePath = '';
+            $i = strpos($packageName, '/');
+
+            if ($i && (!str_starts_with($packageName, '@') || $i = strpos($packageName, '/', $i + 1))) {
+                // @vendor/package/filepath or package/filepath
+                $filePath = substr($packageName, $i);
+                $packageName = substr($packageName, 0, $i);
+            }
+
+            $response = $this->httpClient->request('GET', sprintf($this->versionUrlPattern, $packageName, urlencode($constraint)));
+            $requiredPackages[] = [$options, $response, $packageName, $filePath, $options];
+        }
+
+        $errors = [];
+        foreach ($requiredPackages as $i => [$options, $response, $packageName, $filePath]) {
+            if (200 !== $response->getStatusCode()) {
+                $errors[] = [$options->packageName, $response];
+                continue;
+            }
+
+            $version = $response->toArray()['version'];
+            $requiredPackages[$i][1] = $this->httpClient->request('GET', sprintf($this->distUrlPattern, $packageName, $version, $filePath));
+        }
+
+        try {
+            ($errors[0][1] ?? null)?->getHeaders();
+        } catch (HttpExceptionInterface $e) {
+            $response = $e->getResponse();
+            $packages = implode('", "', array_column($errors, 0));
+
+            throw new RuntimeException(sprintf('Error %d finding version from jsDelivr for "%s". Check your package names. Response: ', $response->getStatusCode(), $packages).$response->getContent(false), 0, $e);
+        }
+
+        $packagesToRequire = [];
+        foreach ($requiredPackages as [$options, $response]) {
+            if (200 !== $response->getStatusCode()) {
+                $errors[] = [$options->packageName, $response];
+                continue;
+            }
+
+            // final URL where it was redirected to
+            $url = $response->getInfo('url');
+            $content = null;
+
+            if ($options->download) {
+                $content = $this->parseJsDelivrImports($response->getContent(), $packagesToRequire, $options->download, $options->preload);
+            }
+
+            $packageName = trim($options->packageName, '/');
+            $resolvedPackages[$packageName] = new ResolvedImportMapPackage($options, $url, $content);
+        }
+
+        try {
+            ($errors[0][1] ?? null)?->getHeaders();
+        } catch (HttpExceptionInterface $e) {
+            $response = $e->getResponse();
+            $packages = implode('", "', array_column($errors, 0));
+
+            throw new RuntimeException(sprintf('Error %d requiring packages from jsDelivr for "%s". Check your package names. Response: ', $response->getStatusCode(), $packages).$response->getContent(false), 0, $e);
+        }
+
+        if ($packagesToRequire) {
+            goto resolve_packages;
+        }
+
+        return array_values($resolvedPackages);
+    }
+
+    /**
+     * Parses the very specific import syntax used by jsDelivr.
+     *
+     * Replaces those with normal import "package/name" statements and
+     * records the package as a dependency, so it can be downloaded and
+     * added to the importmap.
+     */
+    private function parseJsDelivrImports(string $content, array &$dependencies, bool $download, bool $preload): string
+    {
+        // imports from jsdelivr follow a predictable format
+        $regex = '{from"/npm/([^@]*@?[^@]+)@([^/]+)/\+esm"}';
+        $content = preg_replace_callback($regex, function ($matches) use (&$dependencies, $download, $preload) {
+            $packageName = $matches[1];
+            $version = $matches[2];
+
+            $dependencies[] = new PackageRequireOptions($packageName, $version, $download, $preload);
+
+            return sprintf('from"%s"', $packageName);
+        }, $content);
+
+        // source maps are not also downloaded - so remove the sourceMappingURL
+        return preg_replace('{//# sourceMappingURL=.*$}m', '', $content);
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JspmResolver.php b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JspmResolver.php
new file mode 100644
index 0000000000000..cb13383b57c63
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JspmResolver.php
@@ -0,0 +1,102 @@
+<?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.
+ */
+
+namespace Symfony\Component\AssetMapper\ImportMap\Resolver;
+
+use Symfony\Component\AssetMapper\Exception\RuntimeException;
+use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
+use Symfony\Component\AssetMapper\ImportMap\PackageRequireOptions;
+use Symfony\Component\HttpClient\HttpClient;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * @experimental
+ */
+final class JspmResolver implements PackageResolverInterface
+{
+    public const BASE_URI = 'https://api.jspm.io/';
+
+    private HttpClientInterface $httpClient;
+
+    public function __construct(
+        HttpClientInterface $httpClient = null,
+        private readonly string $provider = ImportMapManager::PROVIDER_JSPM,
+        private readonly string $baseUri = self::BASE_URI,
+    ) {
+        $this->httpClient = $httpClient ?? HttpClient::create();
+    }
+
+    public function resolvePackages(array $packagesToRequire): array
+    {
+        if (!$packagesToRequire) {
+            return [];
+        }
+
+        $installData = [];
+        $packageRequiresByName = [];
+        foreach ($packagesToRequire as $options) {
+            $constraint = $options->packageName;
+            if (null !== $options->versionConstraint) {
+                $constraint .= '@'.$options->versionConstraint;
+            }
+            if (null !== $options->registryName) {
+                $constraint = sprintf('%s:%s', $options->registryName, $constraint);
+            }
+            $installData[] = $constraint;
+            $packageRequiresByName[$options->packageName] = $options;
+        }
+
+        $json = [
+            'install' => $installData,
+            'flattenScope' => true,
+            // always grab production-ready assets
+            'env' => ['browser', 'module', 'production'],
+        ];
+        if (ImportMapManager::PROVIDER_JSPM !== $this->provider) {
+            $json['provider'] = $this->provider;
+        }
+
+        $response = $this->httpClient->request('POST', 'generate', [
+            'base_uri' => $this->baseUri,
+            'json' => $json,
+        ]);
+
+        if (200 !== $response->getStatusCode()) {
+            $data = $response->toArray(false);
+
+            if (isset($data['error'])) {
+                throw new RuntimeException('Error requiring JavaScript package: '.$data['error']);
+            }
+
+            // Throws the original HttpClient exception
+            $response->getHeaders();
+        }
+
+        // if we're requiring just one package, in case it has any peer deps, match the preload
+        $defaultOptions = $packagesToRequire[0];
+
+        $resolvedPackages = [];
+        foreach ($response->toArray()['map']['imports'] as $packageName => $url) {
+            $options = $packageRequiresByName[$packageName] ?? new PackageRequireOptions($packageName, null, $defaultOptions->download, $defaultOptions->preload);
+            $resolvedPackages[] = [$options, $url, $options->download ? $this->httpClient->request('GET', $url, ['base_uri' => $this->baseUri]) : null];
+        }
+
+        try {
+            return array_map(fn ($args) => new ResolvedImportMapPackage($args[0], $args[1], $args[2]?->getContent()), $resolvedPackages);
+        } catch (\Throwable $e) {
+            foreach ($resolvedPackages as $args) {
+                $args[2]?->cancel();
+            }
+
+            throw $e;
+        }
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/Resolver/PackageResolver.php b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/PackageResolver.php
new file mode 100644
index 0000000000000..0a9d5bbf91892
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/PackageResolver.php
@@ -0,0 +1,32 @@
+<?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.
+ */
+
+namespace Symfony\Component\AssetMapper\ImportMap\Resolver;
+
+use Psr\Container\ContainerInterface;
+
+/**
+ * @experimental
+ */
+final class PackageResolver implements PackageResolverInterface
+{
+    public function __construct(
+        private readonly string $provider,
+        private readonly ContainerInterface $locator,
+    ) {
+    }
+
+    public function resolvePackages(array $packagesToRequire): array
+    {
+        return $this->locator->get($this->provider)
+            ->resolvePackages($packagesToRequire);
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/Resolver/PackageResolverInterface.php b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/PackageResolverInterface.php
new file mode 100644
index 0000000000000..70fd7a5ab607f
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/PackageResolverInterface.php
@@ -0,0 +1,32 @@
+<?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.
+ */
+
+namespace Symfony\Component\AssetMapper\ImportMap\Resolver;
+
+use Symfony\Component\AssetMapper\ImportMap\PackageRequireOptions;
+
+/**
+ * @experimental
+ */
+interface PackageResolverInterface
+{
+    /**
+     * Grabs the URLs for the given packages and converts them to ImportMapEntry objects.
+     *
+     * If "download" is specified in PackageRequireOptions, the resolved package
+     * contents should be included.
+     *
+     * @param PackageRequireOptions[] $packagesToRequire
+     *
+     * @return ResolvedImportMapPackage[] The import map entries that should be added
+     */
+    public function resolvePackages(array $packagesToRequire): array;
+}
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/Resolver/ResolvedImportMapPackage.php b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/ResolvedImportMapPackage.php
new file mode 100644
index 0000000000000..4297cbdd29ccf
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/ResolvedImportMapPackage.php
@@ -0,0 +1,27 @@
+<?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.
+ */
+
+namespace Symfony\Component\AssetMapper\ImportMap\Resolver;
+
+use Symfony\Component\AssetMapper\ImportMap\PackageRequireOptions;
+
+/**
+ * @experimental
+ */
+final class ResolvedImportMapPackage
+{
+    public function __construct(
+        public readonly PackageRequireOptions $requireOptions,
+        public readonly string $url,
+        public readonly ?string $content = null,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/MappedAsset.php b/src/Symfony/Component/AssetMapper/MappedAsset.php
index ef9e0ef3d216e..bca97bc8f207e 100644
--- a/src/Symfony/Component/AssetMapper/MappedAsset.php
+++ b/src/Symfony/Component/AssetMapper/MappedAsset.php
@@ -20,109 +20,72 @@
  */
 final class MappedAsset
 {
-    private string $publicPath;
-    private string $publicPathWithoutDigest;
+    public readonly string $sourcePath;
+    public readonly string $publicPath;
+    public readonly string $publicPathWithoutDigest;
+    public readonly string $publicExtension;
+    public readonly string $content;
+    public readonly string $digest;
+    public readonly bool $isPredigested;
+
     /**
-     * @var string the filesystem path to the source file
+     * @var AssetDependency[]
      */
-    private string $sourcePath;
-    private string $content;
-    private string $digest;
-    private bool $isPredigested;
-    /** @var AssetDependency[] */
     private array $dependencies = [];
 
-    public function __construct(private readonly string $logicalPath)
-    {
-    }
-
-    public function getLogicalPath(): string
-    {
-        return $this->logicalPath;
-    }
-
-    public function getPublicPath(): string
-    {
-        return $this->publicPath;
-    }
-
-    public function getPublicExtension(): string
-    {
-        return pathinfo($this->publicPathWithoutDigest, \PATHINFO_EXTENSION);
-    }
-
-    public function getSourcePath(): string
-    {
-        return $this->sourcePath;
-    }
-
-    public function getContent(): string
-    {
-        return $this->content;
-    }
-
-    public function getDigest(): string
-    {
-        return $this->digest;
-    }
-
-    public function isPredigested(): bool
-    {
-        return $this->isPredigested;
-    }
-
     /**
-     * @return AssetDependency[]
+     * @var string[]
      */
-    public function getDependencies(): array
-    {
-        return $this->dependencies;
-    }
+    private array $fileDependencies = [];
 
-    public function setPublicPath(string $publicPath): void
-    {
-        if (isset($this->publicPath)) {
-            throw new \LogicException('Cannot set public path: it was already set on the asset.');
+    /**
+     * @param AssetDependency[] $dependencies
+     * @param string[]          $fileDependencies
+     */
+    public function __construct(
+        public readonly string $logicalPath,
+        string $sourcePath = null,
+        string $publicPathWithoutDigest = null,
+        string $publicPath = null,
+        string $content = null,
+        string $digest = null,
+        bool $isPredigested = null,
+        array $dependencies = [],
+        array $fileDependencies = [],
+    ) {
+        if (null !== $sourcePath) {
+            $this->sourcePath = $sourcePath;
         }
-
-        $this->publicPath = $publicPath;
-    }
-
-    public function setPublicPathWithoutDigest(string $publicPathWithoutDigest): void
-    {
-        if (isset($this->publicPathWithoutDigest)) {
-            throw new \LogicException('Cannot set public path without digest: it was already set on the asset.');
+        if (null !== $publicPath) {
+            $this->publicPath = $publicPath;
         }
-
-        $this->publicPathWithoutDigest = $publicPathWithoutDigest;
-    }
-
-    public function setSourcePath(string $sourcePath): void
-    {
-        if (isset($this->sourcePath)) {
-            throw new \LogicException('Cannot set source path: it was already set on the asset.');
+        if (null !== $publicPathWithoutDigest) {
+            $this->publicPathWithoutDigest = $publicPathWithoutDigest;
+            $this->publicExtension = pathinfo($publicPathWithoutDigest, \PATHINFO_EXTENSION);
         }
-
-        $this->sourcePath = $sourcePath;
-    }
-
-    public function setDigest(string $digest, bool $isPredigested): void
-    {
-        if (isset($this->digest)) {
-            throw new \LogicException('Cannot set digest: it was already set on the asset.');
+        if (null !== $content) {
+            $this->content = $content;
+        }
+        if (null !== $digest) {
+            $this->digest = $digest;
+        }
+        if (null !== $isPredigested) {
+            $this->isPredigested = $isPredigested;
+        }
+        foreach ($dependencies as $dependency) {
+            $this->addDependency($dependency);
+        }
+        foreach ($fileDependencies as $fileDependency) {
+            $this->addFileDependency($fileDependency);
         }
-
-        $this->digest = $digest;
-        $this->isPredigested = $isPredigested;
     }
 
-    public function setContent(string $content): void
+    /**
+     * @return AssetDependency[]
+     */
+    public function getDependencies(): array
     {
-        if (isset($this->content)) {
-            throw new \LogicException('Cannot set content: it was already set on the asset.');
-        }
-
-        $this->content = $content;
+        return $this->dependencies;
     }
 
     public function addDependency(AssetDependency $assetDependency): void
@@ -130,8 +93,16 @@ public function addDependency(AssetDependency $assetDependency): void
         $this->dependencies[] = $assetDependency;
     }
 
-    public function getPublicPathWithoutDigest(): string
+    /**
+     * @return string[]
+     */
+    public function getFileDependencies(): array
+    {
+        return $this->fileDependencies;
+    }
+
+    public function addFileDependency(string $sourcePath): void
     {
-        return $this->publicPathWithoutDigest;
+        $this->fileDependencies[] = $sourcePath;
     }
 }
diff --git a/src/Symfony/Component/AssetMapper/Tests/AssetMapperCompilerTest.php b/src/Symfony/Component/AssetMapper/Tests/AssetMapperCompilerTest.php
index e31805453e67c..be36574c1bdac 100644
--- a/src/Symfony/Component/AssetMapper/Tests/AssetMapperCompilerTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/AssetMapperCompilerTest.php
@@ -24,7 +24,7 @@ public function testCompile()
         $compiler1 = new class() implements AssetCompilerInterface {
             public function supports(MappedAsset $asset): bool
             {
-                return 'css' === $asset->getPublicExtension();
+                return 'css' === $asset->publicExtension;
             }
 
             public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string
@@ -36,7 +36,7 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
         $compiler2 = new class() implements AssetCompilerInterface {
             public function supports(MappedAsset $asset): bool
             {
-                return 'js' === $asset->getPublicExtension();
+                return 'js' === $asset->publicExtension;
             }
 
             public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string
@@ -48,7 +48,7 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
         $compiler3 = new class() implements AssetCompilerInterface {
             public function supports(MappedAsset $asset): bool
             {
-                return 'js' === $asset->getPublicExtension();
+                return 'js' === $asset->publicExtension;
             }
 
             public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string
@@ -61,8 +61,7 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
             [$compiler1, $compiler2, $compiler3],
             fn () => $this->createMock(AssetMapperInterface::class),
         );
-        $asset = new MappedAsset('foo.js');
-        $asset->setPublicPathWithoutDigest('/assets/foo.js');
+        $asset = new MappedAsset('foo.js', publicPathWithoutDigest: '/assets/foo.js');
         $actualContents = $compiler->compile('starting contents', $asset, $this->createMock(AssetMapperInterface::class));
         $this->assertSame('starting contents compiler2 called compiler3 called', $actualContents);
     }
diff --git a/src/Symfony/Component/AssetMapper/Tests/AssetMapperTest.php b/src/Symfony/Component/AssetMapper/Tests/AssetMapperTest.php
index 68192fbbceede..9705be5b0d1ef 100644
--- a/src/Symfony/Component/AssetMapper/Tests/AssetMapperTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/AssetMapperTest.php
@@ -21,7 +21,7 @@
 
 class AssetMapperTest extends TestCase
 {
-    private MappedAssetFactoryInterface|MockObject $mappedAssetFactory;
+    private MappedAssetFactoryInterface&MockObject $mappedAssetFactory;
 
     public function testGetAsset()
     {
@@ -43,8 +43,7 @@ public function testGetPublicPath()
     {
         $assetMapper = $this->createAssetMapper();
 
-        $file1Asset = new MappedAsset('file1.css');
-        $file1Asset->setPublicPath('/final-assets/file1-the-checksum.css');
+        $file1Asset = new MappedAsset('file1.css', publicPath: '/final-assets/file1-the-checksum.css');
         $this->mappedAssetFactory->expects($this->once())
             ->method('createMappedAsset')
             ->willReturn($file1Asset);
@@ -62,13 +61,14 @@ public function testAllAssets()
         $this->mappedAssetFactory->expects($this->exactly(8))
             ->method('createMappedAsset')
             ->willReturnCallback(function (string $logicalPath, string $filePath) {
-                $asset = new MappedAsset($logicalPath);
-                $asset->setPublicPath('/final-assets/'.$logicalPath);
+                $asset = new MappedAsset($logicalPath, publicPath: '/final-assets/'.$logicalPath);
 
                 return $asset;
             });
 
         $assets = $assetMapper->allAssets();
+        $this->assertIsIterable($assets);
+        $assets = iterator_to_array($assets);
         $this->assertCount(8, $assets);
         $this->assertInstanceOf(MappedAsset::class, $assets[0]);
     }
@@ -83,7 +83,7 @@ public function testGetAssetFromFilesystemPath()
             ->willReturn(new MappedAsset('file1.css'));
 
         $asset = $assetMapper->getAssetFromSourcePath(__DIR__.'/fixtures/dir1/file1.css');
-        $this->assertSame('file1.css', $asset->getLogicalPath());
+        $this->assertSame('file1.css', $asset->logicalPath);
     }
 
     private function createAssetMapper(): AssetMapper
diff --git a/src/Symfony/Component/AssetMapper/Tests/Command/AssetsMapperCompileCommandTest.php b/src/Symfony/Component/AssetMapper/Tests/Command/AssetsMapperCompileCommandTest.php
index 6475a9110276f..d78544cf9c888 100644
--- a/src/Symfony/Component/AssetMapper/Tests/Command/AssetsMapperCompileCommandTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/Command/AssetsMapperCompileCommandTest.php
@@ -52,7 +52,7 @@ public function testAssetsAreCompiled()
         $res = $tester->execute([]);
         $this->assertSame(0, $res);
         // match Compiling \d+ assets
-        $this->assertMatchesRegularExpression('/Compiling \d+ assets/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/Compiled \d+ assets/', $tester->getDisplay());
 
         $this->assertFileExists($targetBuildDir.'/subdir/file5-f4fdc37375c7f5f2629c5659a0579967.js');
         $this->assertSame(<<<EOF
diff --git a/src/Symfony/Component/AssetMapper/Tests/Compiler/AssetCompilerPathResolverTraitTest.php b/src/Symfony/Component/AssetMapper/Tests/Compiler/AssetCompilerPathResolverTraitTest.php
index bb9e9d5dc39f4..c55c2fb9702a0 100644
--- a/src/Symfony/Component/AssetMapper/Tests/Compiler/AssetCompilerPathResolverTraitTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/Compiler/AssetCompilerPathResolverTraitTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\AssetMapper\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Asset\Exception\RuntimeException;
 use Symfony\Component\AssetMapper\Compiler\AssetCompilerPathResolverTrait;
+use Symfony\Component\AssetMapper\Exception\RuntimeException;
 
 class AssetCompilerPathResolverTraitTest extends TestCase
 {
diff --git a/src/Symfony/Component/AssetMapper/Tests/Compiler/CssAssetUrlCompilerTest.php b/src/Symfony/Component/AssetMapper/Tests/Compiler/CssAssetUrlCompilerTest.php
index 08bf918edcfba..d2818b3857467 100644
--- a/src/Symfony/Component/AssetMapper/Tests/Compiler/CssAssetUrlCompilerTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/Compiler/CssAssetUrlCompilerTest.php
@@ -12,8 +12,10 @@
 namespace Symfony\Component\AssetMapper\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\AssetMapper\AssetDependency;
 use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\Compiler\AssetCompilerInterface;
 use Symfony\Component\AssetMapper\Compiler\CssAssetUrlCompiler;
 use Symfony\Component\AssetMapper\MappedAsset;
 
@@ -24,11 +26,10 @@ class CssAssetUrlCompilerTest extends TestCase
      */
     public function testCompile(string $sourceLogicalName, string $input, string $expectedOutput, array $expectedDependencies)
     {
-        $compiler = new CssAssetUrlCompiler(false);
-        $asset = new MappedAsset($sourceLogicalName);
-        $asset->setPublicPathWithoutDigest('/assets/'.$sourceLogicalName);
+        $compiler = new CssAssetUrlCompiler(AssetCompilerInterface::MISSING_IMPORT_IGNORE, $this->createMock(LoggerInterface::class));
+        $asset = new MappedAsset($sourceLogicalName, 'anything', '/assets/'.$sourceLogicalName);
         $this->assertSame($expectedOutput, $compiler->compile($input, $asset, $this->createAssetMapper()));
-        $assetDependencyLogicalPaths = array_map(fn (AssetDependency $dependency) => $dependency->asset->getLogicalPath(), $asset->getDependencies());
+        $assetDependencyLogicalPaths = array_map(fn (AssetDependency $dependency) => $dependency->asset->logicalPath, $asset->getDependencies());
         $this->assertSame($expectedDependencies, $assetDependencyLogicalPaths);
         if ($expectedDependencies) {
             $this->assertTrue($asset->getDependencies()[0]->isContentDependency);
@@ -114,10 +115,9 @@ public function testStrictMode(string $sourceLogicalName, string $input, ?string
             $this->expectExceptionMessage($expectedExceptionMessage);
         }
 
-        $asset = new MappedAsset($sourceLogicalName);
-        $asset->setSourcePath('/path/to/styles.css');
+        $asset = new MappedAsset($sourceLogicalName, '/path/to/styles.css');
 
-        $compiler = new CssAssetUrlCompiler(true);
+        $compiler = new CssAssetUrlCompiler(AssetCompilerInterface::MISSING_IMPORT_STRICT, $this->createMock(LoggerInterface::class));
         $this->assertSame($input, $compiler->compile($input, $asset, $this->createAssetMapper()));
     }
 
@@ -154,22 +154,17 @@ private function createAssetMapper(): AssetMapperInterface
         $assetMapper->expects($this->any())
             ->method('getAsset')
             ->willReturnCallback(function ($path) {
-                switch ($path) {
-                    case 'images/foo.png':
-                        $asset = new MappedAsset('images/foo.png');
-                        $asset->setPublicPathWithoutDigest('/assets/images/foo.png');
-                        $asset->setPublicPath('/assets/images/foo.123456.png');
-
-                        return $asset;
-                    case 'more-styles.css':
-                        $asset = new MappedAsset('more-styles.css');
-                        $asset->setPublicPathWithoutDigest('/assets/more-styles.css');
-                        $asset->setPublicPath('/assets/more-styles.abcd123.css');
-
-                        return $asset;
-                    default:
-                        return null;
-                }
+                return match ($path) {
+                    'images/foo.png' => new MappedAsset('images/foo.png',
+                        publicPathWithoutDigest: '/assets/images/foo.png',
+                        publicPath: '/assets/images/foo.123456.png',
+                    ),
+                    'more-styles.css' => new MappedAsset('more-styles.css',
+                        publicPathWithoutDigest: '/assets/more-styles.css',
+                        publicPath: '/assets/more-styles.abcd123.css',
+                    ),
+                    default => null,
+                };
             });
 
         return $assetMapper;
diff --git a/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php b/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php
index 84dff82bf9a0f..4c04a70ba78b4 100644
--- a/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php
@@ -12,8 +12,11 @@
 namespace Symfony\Component\AssetMapper\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\Compiler\AssetCompilerInterface;
 use Symfony\Component\AssetMapper\Compiler\JavaScriptImportPathCompiler;
+use Symfony\Component\AssetMapper\Exception\RuntimeException;
 use Symfony\Component\AssetMapper\MappedAsset;
 
 class JavaScriptImportPathCompilerTest extends TestCase
@@ -23,15 +26,14 @@ class JavaScriptImportPathCompilerTest extends TestCase
      */
     public function testCompile(string $sourceLogicalName, string $input, array $expectedDependencies)
     {
-        $asset = new MappedAsset($sourceLogicalName);
-        $asset->setPublicPathWithoutDigest('/assets/'.$sourceLogicalName);
+        $asset = new MappedAsset($sourceLogicalName, 'anything', '/assets/'.$sourceLogicalName);
 
-        $compiler = new JavaScriptImportPathCompiler(false);
+        $compiler = new JavaScriptImportPathCompiler(AssetCompilerInterface::MISSING_IMPORT_IGNORE, $this->createMock(LoggerInterface::class));
         // compile - and check that content doesn't change
         $this->assertSame($input, $compiler->compile($input, $asset, $this->createAssetMapper()));
         $actualDependencies = [];
         foreach ($asset->getDependencies() as $dependency) {
-            $actualDependencies[$dependency->asset->getLogicalPath()] = $dependency->isLazy;
+            $actualDependencies[$dependency->asset->logicalPath] = $dependency->isLazy;
         }
         $this->assertEquals($expectedDependencies, $actualDependencies);
         if ($expectedDependencies) {
@@ -165,17 +167,15 @@ public static function provideCompileTests(): iterable
      */
     public function testImportPathsCanUpdate(string $sourceLogicalName, string $input, string $sourcePublicPath, string $importedPublicPath, string $expectedOutput)
     {
-        $asset = new MappedAsset($sourceLogicalName);
-        $asset->setPublicPathWithoutDigest($sourcePublicPath);
+        $asset = new MappedAsset($sourceLogicalName, publicPathWithoutDigest: $sourcePublicPath);
 
         $assetMapper = $this->createMock(AssetMapperInterface::class);
-        $importedAsset = new MappedAsset('anything');
-        $importedAsset->setPublicPathWithoutDigest($importedPublicPath);
+        $importedAsset = new MappedAsset('anything', publicPathWithoutDigest: $importedPublicPath);
         $assetMapper->expects($this->once())
             ->method('getAsset')
             ->willReturn($importedAsset);
 
-        $compiler = new JavaScriptImportPathCompiler(false);
+        $compiler = new JavaScriptImportPathCompiler(AssetCompilerInterface::MISSING_IMPORT_IGNORE, $this->createMock(LoggerInterface::class));
         $this->assertSame($expectedOutput, $compiler->compile($input, $asset, $assetMapper));
     }
 
@@ -231,34 +231,37 @@ public static function providePathsCanUpdateTests(): iterable
     }
 
     /**
-     * @dataProvider provideStrictModeTests
+     * @dataProvider provideMissingImportModeTests
      */
-    public function testStrictMode(string $sourceLogicalName, string $input, ?string $expectedExceptionMessage)
+    public function testMissingImportMode(string $sourceLogicalName, string $input, ?string $expectedExceptionMessage)
     {
         if (null !== $expectedExceptionMessage) {
-            $this->expectException(\RuntimeException::class);
+            $this->expectException(RuntimeException::class);
             $this->expectExceptionMessage($expectedExceptionMessage);
         }
 
-        $asset = new MappedAsset($sourceLogicalName);
-        $asset->setSourcePath('/path/to/app.js');
+        $asset = new MappedAsset($sourceLogicalName, '/path/to/app.js');
 
-        $compiler = new JavaScriptImportPathCompiler(true);
+        $logger = $this->createMock(LoggerInterface::class);
+        $compiler = new JavaScriptImportPathCompiler(
+            AssetCompilerInterface::MISSING_IMPORT_STRICT,
+            $logger
+        );
         $this->assertSame($input, $compiler->compile($input, $asset, $this->createAssetMapper()));
     }
 
-    public static function provideStrictModeTests(): iterable
+    public static function provideMissingImportModeTests(): iterable
     {
         yield 'importing_non_existent_file_throws_exception' => [
             'sourceLogicalName' => 'app.js',
             'input' => "import './non-existent.js';",
-            'expectedExceptionMessage' => 'Unable to find asset "non-existent.js" imported from "/path/to/app.js".',
+            'expectedExceptionMessage' => 'Unable to find asset "./non-existent.js" imported from "/path/to/app.js".',
         ];
 
         yield 'importing_file_just_missing_js_extension_adds_extra_info' => [
             'sourceLogicalName' => 'app.js',
             'input' => "import './other';",
-            'expectedExceptionMessage' => 'Unable to find asset "other" imported from "/path/to/app.js". Try adding ".js" to the end of the import - i.e. "other.js".',
+            'expectedExceptionMessage' => 'Unable to find asset "./other" imported from "/path/to/app.js". Try adding ".js" to the end of the import - i.e. "./other.js".',
         ];
 
         yield 'importing_absolute_file_path_is_ignored' => [
@@ -280,25 +283,12 @@ private function createAssetMapper(): AssetMapperInterface
         $assetMapper->expects($this->any())
             ->method('getAsset')
             ->willReturnCallback(function ($path) {
-                switch ($path) {
-                    case 'other.js':
-                        $asset = new MappedAsset('other.js');
-                        $asset->setPublicPathWithoutDigest('/assets/other.js');
-
-                        return $asset;
-                    case 'subdir/foo.js':
-                        $asset = new MappedAsset('subdir/foo.js');
-                        $asset->setPublicPathWithoutDigest('/assets/subdir/foo.js');
-
-                        return $asset;
-                    case 'styles.css':
-                        $asset = new MappedAsset('styles.css');
-                        $asset->setPublicPathWithoutDigest('/assets/styles.css');
-
-                        return $asset;
-                    default:
-                        return null;
-                }
+                return match ($path) {
+                    'other.js' => new MappedAsset('other.js', publicPathWithoutDigest: '/assets/other.js'),
+                    'subdir/foo.js' => new MappedAsset('subdir/foo.js', publicPathWithoutDigest: '/assets/subdir/foo.js'),
+                    'styles.css' => new MappedAsset('styles.css', publicPathWithoutDigest: '/assets/styles.css'),
+                    default => null,
+                };
             });
 
         return $assetMapper;
diff --git a/src/Symfony/Component/AssetMapper/Tests/Compiler/SourceMappingUrlsCompilerTest.php b/src/Symfony/Component/AssetMapper/Tests/Compiler/SourceMappingUrlsCompilerTest.php
index 451289518413c..22d0059339c57 100644
--- a/src/Symfony/Component/AssetMapper/Tests/Compiler/SourceMappingUrlsCompilerTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/Compiler/SourceMappingUrlsCompilerTest.php
@@ -28,35 +28,29 @@ public function testCompile(string $sourceLogicalName, string $input, string $ex
         $assetMapper->expects($this->any())
             ->method('getAsset')
             ->willReturnCallback(function ($path) {
-                switch ($path) {
-                    case 'foo.js.map':
-                        $asset = new MappedAsset('foo.js.map');
-                        $asset->setPublicPathWithoutDigest('/assets/foo.js.map');
-                        $asset->setPublicPath('/assets/foo.123456.js.map');
-
-                        return $asset;
-                    case 'styles/bar.css.map':
-                        $asset = new MappedAsset('styles/bar.css.map');
-                        $asset->setPublicPathWithoutDigest('/assets/styles/bar.css.map');
-                        $asset->setPublicPath('/assets/styles/bar.abcd123.css.map');
-
-                        return $asset;
-                    case 'sourcemaps/baz.css.map':
-                        $asset = new MappedAsset('sourcemaps/baz.css.map');
-                        $asset->setPublicPathWithoutDigest('/assets/sourcemaps/baz.css.map');
-                        $asset->setPublicPath('/assets/sourcemaps/baz.987fedc.css.map');
-
-                        return $asset;
-                    default:
-                        return null;
-                }
+                return match ($path) {
+                    'foo.js.map' => new MappedAsset($path,
+                        publicPathWithoutDigest: '/assets/foo.js.map',
+                        publicPath: '/assets/foo.123456.js.map',
+                    ),
+                    'styles/bar.css.map' => new MappedAsset($path,
+                        publicPathWithoutDigest: '/assets/styles/bar.css.map',
+                        publicPath: '/assets/styles/bar.abcd123.css.map',
+                    ),
+                    'sourcemaps/baz.css.map' => new MappedAsset($path,
+                        publicPathWithoutDigest: '/assets/sourcemaps/baz.css.map',
+                        publicPath: '/assets/sourcemaps/baz.987fedc.css.map',
+                    ),
+                    default => null,
+                };
             });
 
         $compiler = new SourceMappingUrlsCompiler();
-        $asset = new MappedAsset($sourceLogicalName);
-        $asset->setPublicPathWithoutDigest('/assets/'.$sourceLogicalName);
+        $asset = new MappedAsset($sourceLogicalName,
+            publicPathWithoutDigest: '/assets/'.$sourceLogicalName,
+        );
         $this->assertSame($expectedOutput, $compiler->compile($input, $asset, $assetMapper));
-        $assetDependencyLogicalPaths = array_map(fn (AssetDependency $dependency) => $dependency->asset->getLogicalPath(), $asset->getDependencies());
+        $assetDependencyLogicalPaths = array_map(fn (AssetDependency $dependency) => $dependency->asset->logicalPath, $asset->getDependencies());
         $this->assertSame($expectedDependencies, $assetDependencyLogicalPaths);
         if ($expectedDependencies) {
             $this->assertTrue($asset->getDependencies()[0]->isContentDependency);
diff --git a/src/Symfony/Component/AssetMapper/Tests/Factory/CachedMappedAssetFactoryTest.php b/src/Symfony/Component/AssetMapper/Tests/Factory/CachedMappedAssetFactoryTest.php
index fe72b94a3a975..311fd52fdcc1e 100644
--- a/src/Symfony/Component/AssetMapper/Tests/Factory/CachedMappedAssetFactoryTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/Factory/CachedMappedAssetFactoryTest.php
@@ -45,8 +45,7 @@ public function testCreateMappedAssetCallsInsideWhenNoCache()
             true
         );
 
-        $mappedAsset = new MappedAsset('file1.css');
-        $mappedAsset->setSourcePath(__DIR__.'/../fixtures/dir1/file1.css');
+        $mappedAsset = new MappedAsset('file1.css', __DIR__.'/../fixtures/dir1/file1.css');
 
         $factory->expects($this->once())
             ->method('createMappedAsset')
@@ -59,16 +58,14 @@ public function testCreateMappedAssetCallsInsideWhenNoCache()
         // and, the objects will be equal, but not identical
         $secondActualAsset = $cachedFactory->createMappedAsset('file1.css', '/anything/file1.css');
         $this->assertNotSame($mappedAsset, $secondActualAsset);
-        $this->assertSame('file1.css', $secondActualAsset->getLogicalPath());
-        $this->assertSame(__DIR__.'/../fixtures/dir1/file1.css', $secondActualAsset->getSourcePath());
+        $this->assertSame('file1.css', $secondActualAsset->logicalPath);
+        $this->assertSame(__DIR__.'/../fixtures/dir1/file1.css', $secondActualAsset->sourcePath);
     }
 
     public function testAssetIsNotBuiltWhenCached()
     {
-        $mappedAsset = new MappedAsset('file1.css');
         $sourcePath = __DIR__.'/../fixtures/dir1/file1.css';
-        $mappedAsset->setSourcePath($sourcePath);
-        $mappedAsset->setContent('cached content');
+        $mappedAsset = new MappedAsset('file1.css', $sourcePath, content: 'cached content');
         $this->saveConfigCache($mappedAsset);
 
         $factory = $this->createMock(MappedAssetFactoryInterface::class);
@@ -82,30 +79,31 @@ public function testAssetIsNotBuiltWhenCached()
             ->method('createMappedAsset');
 
         $actualAsset = $cachedFactory->createMappedAsset('file1.css', $sourcePath);
-        $this->assertSame($mappedAsset->getLogicalPath(), $actualAsset->getLogicalPath());
-        $this->assertSame($mappedAsset->getContent(), $actualAsset->getContent());
+        $this->assertSame($mappedAsset->logicalPath, $actualAsset->logicalPath);
+        $this->assertSame($mappedAsset->content, $actualAsset->content);
     }
 
     public function testAssetConfigCacheResourceContainsDependencies()
     {
-        $mappedAsset = new MappedAsset('file1.css');
         $sourcePath = realpath(__DIR__.'/../fixtures/dir1/file1.css');
-        $mappedAsset->setSourcePath($sourcePath);
-        $mappedAsset->setContent('cached content');
+        $mappedAsset = new MappedAsset('file1.css', $sourcePath, content: 'cached content');
 
-        $dependentOnContentAsset = new MappedAsset('file3.css');
-        $dependentOnContentAsset->setSourcePath(realpath(__DIR__.'/../fixtures/dir2/file3.css'));
+        $dependentOnContentAsset = new MappedAsset('file3.css', realpath(__DIR__.'/../fixtures/dir2/file3.css'));
 
-        $deeplyNestedAsset = new MappedAsset('file4.js');
-        $deeplyNestedAsset->setSourcePath(realpath(__DIR__.'/../fixtures/dir2/file4.js'));
+        $deeplyNestedAsset = new MappedAsset('file4.js', realpath(__DIR__.'/../fixtures/dir2/file4.js'));
 
         $dependentOnContentAsset->addDependency(new AssetDependency($deeplyNestedAsset, isContentDependency: true));
         $mappedAsset->addDependency(new AssetDependency($dependentOnContentAsset, isContentDependency: true));
 
-        $notDependentOnContentAsset = new MappedAsset('already-abcdefVWXYZ0123456789.digested.css');
-        $notDependentOnContentAsset->setSourcePath(__DIR__.'/../fixtures/dir2/already-abcdefVWXYZ0123456789.digested.css');
+        $notDependentOnContentAsset = new MappedAsset(
+            'already-abcdefVWXYZ0123456789.digested.css',
+            __DIR__.'/../fixtures/dir2/already-abcdefVWXYZ0123456789.digested.css',
+        );
         $mappedAsset->addDependency(new AssetDependency($notDependentOnContentAsset, isContentDependency: false));
 
+        // just adding any file as an example
+        $mappedAsset->addFileDependency(__DIR__.'/../fixtures/importmap.php');
+
         $factory = $this->createMock(MappedAssetFactoryInterface::class);
         $factory->expects($this->once())
             ->method('createMappedAsset')
@@ -119,12 +117,13 @@ public function testAssetConfigCacheResourceContainsDependencies()
         $cachedFactory->createMappedAsset('file1.css', $sourcePath);
 
         $configCacheMetadata = $this->loadConfigCacheMetadataFor($mappedAsset);
-        $this->assertCount(3, $configCacheMetadata);
+        $this->assertCount(4, $configCacheMetadata);
         $this->assertInstanceOf(FileResource::class, $configCacheMetadata[0]);
         $this->assertInstanceOf(FileResource::class, $configCacheMetadata[1]);
-        $this->assertSame($mappedAsset->getSourcePath(), $configCacheMetadata[0]->getResource());
-        $this->assertSame($dependentOnContentAsset->getSourcePath(), $configCacheMetadata[1]->getResource());
-        $this->assertSame($deeplyNestedAsset->getSourcePath(), $configCacheMetadata[2]->getResource());
+        $this->assertSame(realpath(__DIR__.'/../fixtures/importmap.php'), $configCacheMetadata[0]->getResource());
+        $this->assertSame($mappedAsset->sourcePath, $configCacheMetadata[1]->getResource());
+        $this->assertSame($dependentOnContentAsset->sourcePath, $configCacheMetadata[2]->getResource());
+        $this->assertSame($deeplyNestedAsset->sourcePath, $configCacheMetadata[3]->getResource());
     }
 
     private function loadConfigCacheMetadataFor(MappedAsset $mappedAsset): array
@@ -137,11 +136,11 @@ private function loadConfigCacheMetadataFor(MappedAsset $mappedAsset): array
     private function saveConfigCache(MappedAsset $mappedAsset): void
     {
         $configCache = new ConfigCache($this->getConfigCachePath($mappedAsset), true);
-        $configCache->write(serialize($mappedAsset), [new FileResource($mappedAsset->getSourcePath())]);
+        $configCache->write(serialize($mappedAsset), [new FileResource($mappedAsset->sourcePath)]);
     }
 
     private function getConfigCachePath(MappedAsset $mappedAsset): string
     {
-        return $this->cacheDir.'/'.hash('xxh128', $mappedAsset->getLogicalPath().':'.$mappedAsset->getSourcePath()).'.php';
+        return $this->cacheDir.'/'.hash('xxh128', $mappedAsset->logicalPath.':'.$mappedAsset->sourcePath).'.php';
     }
 }
diff --git a/src/Symfony/Component/AssetMapper/Tests/Factory/MappedAssetFactoryTest.php b/src/Symfony/Component/AssetMapper/Tests/Factory/MappedAssetFactoryTest.php
index f0509287203a4..955a37bbda85a 100644
--- a/src/Symfony/Component/AssetMapper/Tests/Factory/MappedAssetFactoryTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/Factory/MappedAssetFactoryTest.php
@@ -18,32 +18,33 @@
 use Symfony\Component\AssetMapper\Compiler\AssetCompilerInterface;
 use Symfony\Component\AssetMapper\Compiler\CssAssetUrlCompiler;
 use Symfony\Component\AssetMapper\Compiler\JavaScriptImportPathCompiler;
+use Symfony\Component\AssetMapper\Exception\RuntimeException;
 use Symfony\Component\AssetMapper\Factory\MappedAssetFactory;
 use Symfony\Component\AssetMapper\MappedAsset;
 use Symfony\Component\AssetMapper\Path\PublicAssetsPathResolverInterface;
 
 class MappedAssetFactoryTest extends TestCase
 {
-    private AssetMapperInterface|MockObject $assetMapper;
+    private AssetMapperInterface&MockObject $assetMapper;
 
     public function testCreateMappedAsset()
     {
         $factory = $this->createFactory();
 
         $asset = $factory->createMappedAsset('file2.js', __DIR__.'/../fixtures/dir1/file2.js');
-        $this->assertSame('file2.js', $asset->getLogicalPath());
-        $this->assertMatchesRegularExpression('/^\/final-assets\/file2-[a-zA-Z0-9]{7,128}\.js$/', $asset->getPublicPath());
-        $this->assertSame('/final-assets/file2.js', $asset->getPublicPathWithoutDigest());
+        $this->assertSame('file2.js', $asset->logicalPath);
+        $this->assertMatchesRegularExpression('/^\/final-assets\/file2-[a-zA-Z0-9]{7,128}\.js$/', $asset->publicPath);
+        $this->assertSame('/final-assets/file2.js', $asset->publicPathWithoutDigest);
     }
 
     public function testCreateMappedAssetRespectsPreDigestedPaths()
     {
         $assetMapper = $this->createFactory();
         $asset = $assetMapper->createMappedAsset('already-abcdefVWXYZ0123456789.digested.css', __DIR__.'/../fixtures/dir2/already-abcdefVWXYZ0123456789.digested.css');
-        $this->assertSame('already-abcdefVWXYZ0123456789.digested.css', $asset->getLogicalPath());
-        $this->assertSame('/final-assets/already-abcdefVWXYZ0123456789.digested.css', $asset->getPublicPath());
+        $this->assertSame('already-abcdefVWXYZ0123456789.digested.css', $asset->logicalPath);
+        $this->assertSame('/final-assets/already-abcdefVWXYZ0123456789.digested.css', $asset->publicPath);
         // for pre-digested files, the digest *is* part of the public path
-        $this->assertSame('/final-assets/already-abcdefVWXYZ0123456789.digested.css', $asset->getPublicPathWithoutDigest());
+        $this->assertSame('/final-assets/already-abcdefVWXYZ0123456789.digested.css', $asset->publicPathWithoutDigest);
     }
 
     public function testCreateMappedAssetWithContentBasic()
@@ -56,18 +57,18 @@ public function testCreateMappedAssetWithContentBasic()
         EOF;
 
         $asset = $assetMapper->createMappedAsset('file1.css', __DIR__.'/../fixtures/dir1/file1.css');
-        $this->assertSame($expected, $asset->getContent());
+        $this->assertSame($expected, $asset->content);
 
         // verify internal caching doesn't cause issues
         $asset = $assetMapper->createMappedAsset('file1.css', __DIR__.'/../fixtures/dir1/file1.css');
-        $this->assertSame($expected, $asset->getContent());
+        $this->assertSame($expected, $asset->content);
     }
 
     public function testCreateMappedAssetWithContentErrorsOnCircularReferences()
     {
         $factory = $this->createFactory();
 
-        $this->expectException(\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Circular reference detected while creating asset for "circular1.css": "circular1.css -> circular2.css -> circular1.css".');
         $factory->createMappedAsset('circular1.css', __DIR__.'/../fixtures/circular_dir/circular1.css');
     }
@@ -82,7 +83,7 @@ public function supports(MappedAsset $asset): bool
 
             public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string
             {
-                if ('subdir/file6.js' === $asset->getLogicalPath()) {
+                if ('subdir/file6.js' === $asset->logicalPath) {
                     return $content.'/* compiled */';
                 }
 
@@ -92,23 +93,23 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
 
         $factory = $this->createFactory();
         $asset = $factory->createMappedAsset('subdir/file6.js', __DIR__.'/../fixtures/dir2/subdir/file6.js');
-        $this->assertSame('7f983f4053a57f07551fed6099c0da4e', $asset->getDigest());
-        $this->assertFalse($asset->isPredigested());
+        $this->assertSame('7f983f4053a57f07551fed6099c0da4e', $asset->digest);
+        $this->assertFalse($asset->isPredigested);
 
         // trigger the compiler, which will change file5.js
         // since file6.js imports file5.js, the digest for file6 should change,
         // because, internally, the file path in file6.js to file5.js will need to change
         $factory = $this->createFactory($file6Compiler);
         $asset = $factory->createMappedAsset('subdir/file6.js', __DIR__.'/../fixtures/dir2/subdir/file6.js');
-        $this->assertSame('7e4f24ebddd4ab2a3bcf0d89270b9f30', $asset->getDigest());
+        $this->assertSame('7e4f24ebddd4ab2a3bcf0d89270b9f30', $asset->digest);
     }
 
     public function testCreateMappedAssetWithPredigested()
     {
         $assetMapper = $this->createFactory();
         $asset = $assetMapper->createMappedAsset('already-abcdefVWXYZ0123456789.digested.css', __DIR__.'/../fixtures/dir2/already-abcdefVWXYZ0123456789.digested.css');
-        $this->assertSame('abcdefVWXYZ0123456789.digested', $asset->getDigest());
-        $this->assertTrue($asset->isPredigested());
+        $this->assertSame('abcdefVWXYZ0123456789.digested', $asset->digest);
+        $this->assertTrue($asset->isPredigested);
     }
 
     private function createFactory(AssetCompilerInterface $extraCompiler = null): MappedAssetFactory
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php
index 55358553430c3..c947d334909e4 100644
--- a/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\AssetMapper\Tests\ImportMap;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\AssetMapper\AssetMapper;
 use Symfony\Component\AssetMapper\AssetMapperCompiler;
@@ -20,17 +21,17 @@
 use Symfony\Component\AssetMapper\Factory\MappedAssetFactory;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
 use Symfony\Component\AssetMapper\ImportMap\PackageRequireOptions;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\PackageResolverInterface;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\ResolvedImportMapPackage;
 use Symfony\Component\AssetMapper\Path\PublicAssetsPathResolver;
 use Symfony\Component\AssetMapper\Path\PublicAssetsPathResolverInterface;
 use Symfony\Component\Filesystem\Filesystem;
-use Symfony\Component\HttpClient\MockHttpClient;
-use Symfony\Component\HttpClient\Response\MockResponse;
 
 class ImportMapManagerTest extends TestCase
 {
-    private MockHttpClient $httpClient;
     private Filesystem $filesystem;
     private AssetMapperInterface $assetMapper;
+    private PackageResolverInterface&MockObject $packageResolver;
 
     protected function setUp(): void
     {
@@ -102,42 +103,26 @@ public function testGetImportMapJsonUsesDumpedFile()
     /**
      * @dataProvider getRequirePackageTests
      */
-    public function testRequire(array $packages, array $expectedInstallRequest, array $responseMap, array $expectedImportMap, array $expectedDownloadedFiles)
+    public function testRequire(array $packages, int $expectedProviderPackageArgumentCount, array $resolvedPackages, array $expectedImportMap, array $expectedDownloadedFiles)
     {
         $rootDir = __DIR__.'/../fixtures/importmaps_for_writing';
         $manager = $this->createImportMapManager(['assets' => ''], $rootDir);
 
-        $expectedRequestBody = [
-            'install' => $expectedInstallRequest,
-            'flattenScope' => true,
-            'env' => ['browser', 'module', 'production'],
-        ];
-        $responseData = [
-            'map' => [
-                'imports' => $responseMap,
-            ],
-        ];
-        $responses = [];
-        $responses[] = function ($method, $url, $options) use ($responseData, $expectedRequestBody) {
-            $this->assertSame('POST', $method);
-            $this->assertSame('https://example.com/generate', $url);
-            $this->assertSame($expectedRequestBody, json_decode($options['body'], true));
-
-            return new MockResponse(json_encode($responseData));
-        };
-        // mock the "file download" requests
-        foreach ($expectedDownloadedFiles as $file) {
-            $responses[] = new MockResponse(sprintf('contents of %s', $file));
-        }
-        $this->httpClient->setResponseFactory($responses);
+        $this->packageResolver->expects($this->exactly(0 === $expectedProviderPackageArgumentCount ? 0 : 1))
+            ->method('resolvePackages')
+            ->with($this->callback(function (array $packages) use ($expectedProviderPackageArgumentCount) {
+                return \count($packages) === $expectedProviderPackageArgumentCount;
+            }))
+            ->willReturn($resolvedPackages)
+        ;
 
         $manager->require($packages);
         $actualImportMap = require $rootDir.'/importmap.php';
         $this->assertEquals($expectedImportMap, $actualImportMap);
-        foreach ($expectedDownloadedFiles as $file) {
+        foreach ($expectedDownloadedFiles as $file => $expectedContents) {
             $this->assertFileExists($rootDir.'/'.$file);
             $actualContents = file_get_contents($rootDir.'/'.$file);
-            $this->assertSame(sprintf('contents of %s', $file), $actualContents);
+            $this->assertSame($expectedContents, $actualContents);
         }
     }
 
@@ -145,9 +130,9 @@ public static function getRequirePackageTests(): iterable
     {
         yield 'require single lodash package' => [
             'packages' => [new PackageRequireOptions('lodash')],
-            'expectedInstallRequest' => ['lodash'],
-            'responseMap' => [
-                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+            'expectedProviderPackageArgumentCount' => 1,
+            'resolvedPackages' => [
+                self::resolvedPackage('lodash', 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js'),
             ],
             'expectedImportMap' => [
                 'lodash' => [
@@ -159,10 +144,10 @@ public static function getRequirePackageTests(): iterable
 
         yield 'require two packages' => [
             'packages' => [new PackageRequireOptions('lodash'), new PackageRequireOptions('cowsay')],
-            'expectedInstallRequest' => ['lodash', 'cowsay'],
-            'responseMap' => [
-                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
-                'cowsay' => 'https://ga.jspm.io/npm:cowsay@4.5.6/cowsay.js',
+            'expectedProviderPackageArgumentCount' => 2,
+            'resolvedPackages' => [
+                self::resolvedPackage('lodash', 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js'),
+                self::resolvedPackage('cowsay', 'https://ga.jspm.io/npm:cowsay@4.5.6/cowsay.js'),
             ],
             'expectedImportMap' => [
                 'lodash' => [
@@ -177,10 +162,10 @@ public static function getRequirePackageTests(): iterable
 
         yield 'single_package_that_returns_as_two' => [
             'packages' => [new PackageRequireOptions('lodash')],
-            'expectedInstallRequest' => ['lodash'],
-            'responseMap' => [
-                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
-                'lodash-dependency' => 'https://ga.jspm.io/npm:lodash-dependency@9.8.7/lodash-dependency.js',
+            'expectedProviderPackageArgumentCount' => 1,
+            'resolvedPackages' => [
+                self::resolvedPackage('lodash', 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js'),
+                self::resolvedPackage('lodash-dependency', 'https://ga.jspm.io/npm:lodash-dependency@9.8.7/lodash-dependency.js'),
             ],
             'expectedImportMap' => [
                 'lodash' => [
@@ -195,9 +180,9 @@ public static function getRequirePackageTests(): iterable
 
         yield 'single_package_with_version_constraint' => [
             'packages' => [new PackageRequireOptions('lodash', '^1.2.3')],
-            'expectedInstallRequest' => ['lodash@^1.2.3'],
-            'responseMap' => [
-                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.7/lodash.js',
+            'expectedProviderPackageArgumentCount' => 1,
+            'resolvedPackages' => [
+                self::resolvedPackage('lodash', 'https://ga.jspm.io/npm:lodash@1.2.7/lodash.js'),
             ],
             'expectedImportMap' => [
                 'lodash' => [
@@ -209,9 +194,9 @@ public static function getRequirePackageTests(): iterable
 
         yield 'single_package_that_downloads' => [
             'packages' => [new PackageRequireOptions('lodash', download: true)],
-            'expectedInstallRequest' => ['lodash'],
-            'responseMap' => [
-                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+            'expectedProviderPackageArgumentCount' => 1,
+            'resolvedPackages' => [
+                self::resolvedPackage('lodash', 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js', download: true, content: 'the code in lodash.js'),
             ],
             'expectedImportMap' => [
                 'lodash' => [
@@ -220,15 +205,15 @@ public static function getRequirePackageTests(): iterable
                 ],
             ],
             'expectedDownloadedFiles' => [
-                'assets/vendor/lodash.js',
+                'assets/vendor/lodash.js' => 'the code in lodash.js',
             ],
         ];
 
         yield 'single_package_that_preloads' => [
             'packages' => [new PackageRequireOptions('lodash', preload: true)],
-            'expectedInstallRequest' => ['lodash'],
-            'responseMap' => [
-                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+            'expectedProviderPackageArgumentCount' => 1,
+            'resolvedPackages' => [
+                self::resolvedPackage('lodash', 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js', preload: true),
             ],
             'expectedImportMap' => [
                 'lodash' => [
@@ -241,9 +226,9 @@ public static function getRequirePackageTests(): iterable
 
         yield 'single_package_with_custom_import_name' => [
             'packages' => [new PackageRequireOptions('lodash', importName: 'lodash-es')],
-            'expectedInstallRequest' => ['lodash'],
-            'responseMap' => [
-                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+            'expectedProviderPackageArgumentCount' => 1,
+            'resolvedPackages' => [
+                self::resolvedPackage('lodash', 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js', importName: 'lodash-es'),
             ],
             'expectedImportMap' => [
                 'lodash-es' => [
@@ -253,24 +238,10 @@ public static function getRequirePackageTests(): iterable
             'expectedDownloadedFiles' => [],
         ];
 
-        yield 'single_package_with_jspm_custom_registry' => [
-            'packages' => [new PackageRequireOptions('lodash', registryName: 'jspm')],
-            'expectedInstallRequest' => ['jspm:lodash'],
-            'responseMap' => [
-                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
-            ],
-            'expectedImportMap' => [
-                'lodash' => [
-                    'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
-                ],
-            ],
-            'expectedDownloadedFiles' => [],
-        ];
-
         yield 'single_package_with_a_path' => [
             'packages' => [new PackageRequireOptions('some/module', path: __DIR__.'/../fixtures/importmaps_for_writing/assets/some_file.js')],
-            'expectedInstallRequest' => [],
-            'responseMap' => [],
+            'expectedProviderPackageArgumentCount' => 0,
+            'resolvedPackages' => [],
             'expectedImportMap' => [
                 'some/module' => [
                     'path' => 'some_file.js',
@@ -336,8 +307,8 @@ public function testUpdate()
                 'url' => 'https://ga.jspm.io/npm:cowsay@4.5.6/cowsay.umd.js',
                 'downloaded_to' => 'vendor/moo.js',
             ],
-            'canvas-confetti' => [
-                'url' => 'https://cdn.skypack.dev/pin/canvas-confetti@v1.5.0-t438JJTXIbBReqvLtDua/mode=imports,min/optimized/canvas-confetti.js',
+            'bootstrap' => [
+                'url' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.esm.js',
                 'preload' => true,
             ],
             'app' => [
@@ -350,24 +321,31 @@ public function testUpdate()
         file_put_contents($rootDir.'/assets/vendor/moo.js', 'moo.js contents');
         file_put_contents($rootDir.'/assets/app.js', 'app.js contents');
 
-        $responses = [];
-        $responses[] = function ($method, $url, $options) {
-            $this->assertSame('POST', $method);
-            $this->assertSame('https://example.com/generate', $url);
-
-            return new MockResponse(json_encode([
-                'map' => [
-                    'imports' => [
-                        'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.9/lodash.js',
-                        'cowsay' => 'https://ga.jspm.io/npm:cowsay@4.5.9/cowsay.umd.js',
-                        'canvas-confetti' => 'https://cdn.skypack.dev/pin/canvas-confetti@v1.6.0-t438JJTXIbBReqvLtDua/mode=imports,min/optimized/canvas-confetti.js',
-                    ],
-                ],
-            ]));
-        };
-        // 1 file will be downloaded
-        $responses[] = new MockResponse('contents of cowsay.js');
-        $this->httpClient->setResponseFactory($responses);
+        $this->packageResolver->expects($this->once())
+            ->method('resolvePackages')
+            ->with($this->callback(function ($packages) {
+                $this->assertInstanceOf(PackageRequireOptions::class, $packages[0]);
+                /* @var PackageRequireOptions[] $packages */
+                $this->assertCount(3, $packages);
+
+                $this->assertSame('lodash', $packages[0]->packageName);
+                $this->assertFalse($packages[0]->download);
+                $this->assertFalse($packages[0]->preload);
+
+                $this->assertSame('cowsay', $packages[1]->packageName);
+                $this->assertTrue($packages[1]->download);
+
+                $this->assertSame('bootstrap', $packages[2]->packageName);
+                $this->assertTrue($packages[2]->preload);
+
+                return true;
+            }))
+            ->willReturn([
+                self::resolvedPackage('lodash', 'https://ga.jspm.io/npm:lodash@1.2.9/lodash.js'),
+                self::resolvedPackage('cowsay', 'https://ga.jspm.io/npm:cowsay@4.5.9/cowsay.umd.js', download: true, content: 'contents of cowsay.js'),
+                self::resolvedPackage('bootstrap', 'https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.esm.js', preload: true),
+            ])
+        ;
 
         $manager->update();
         $actualImportMap = require $rootDir.'/importmap.php';
@@ -380,8 +358,8 @@ public function testUpdate()
                 'downloaded_to' => 'vendor/cowsay.js',
             ],
             // a non-jspm URL so we can make sure it updates
-            'canvas-confetti' => [
-                'url' => 'https://cdn.skypack.dev/pin/canvas-confetti@v1.6.0-t438JJTXIbBReqvLtDua/mode=imports,min/optimized/canvas-confetti.js',
+            'bootstrap' => [
+                'url' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.esm.js',
                 'preload' => true,
             ],
             'app' => [
@@ -401,14 +379,17 @@ public function testUpdate()
     public function testParsePackageName(string $packageName, array $expectedReturn)
     {
         $parsed = ImportMapManager::parsePackageName($packageName);
-        // remove integer keys - they're noise
+        $this->assertIsArray($parsed);
 
-        if (\is_array($parsed)) {
-            $parsed = array_filter($parsed, function ($key) {
-                return !\is_int($key);
-            }, \ARRAY_FILTER_USE_KEY);
-        }
+        // remove integer keys - they're noise
+        $parsed = array_filter($parsed, fn ($key) => !\is_int($key), \ARRAY_FILTER_USE_KEY);
         $this->assertEquals($expectedReturn, $parsed);
+
+        $parsedWithAlias = ImportMapManager::parsePackageName($packageName.'=some_alias');
+        $this->assertIsArray($parsedWithAlias);
+        $parsedWithAlias = array_filter($parsedWithAlias, fn ($key) => !\is_int($key), \ARRAY_FILTER_USE_KEY);
+        $expectedReturnWithAlias = $expectedReturn + ['alias' => 'some_alias'];
+        $this->assertEquals($expectedReturnWithAlias, $parsedWithAlias, 'Asserting with alias');
     }
 
     public static function getPackageNameTests(): iterable
@@ -464,7 +445,7 @@ public static function getPackageNameTests(): iterable
             ],
         ];
 
-        yield 'namespaced_package_with_registry' => [
+        yield 'namespaced_package_with_registry_no_version' => [
             'npm:@hotwired/stimulus',
             [
                 'package' => '@hotwired/stimulus',
@@ -487,15 +468,14 @@ private function createImportMapManager(array $dirs, string $rootDir, string $pu
         $pathResolver = new PublicAssetsPathResolver($rootDir, $publicPrefix, $publicDirName);
 
         $mapper = $this->createAssetMapper($pathResolver, $dirs, $rootDir);
-        $this->httpClient = new MockHttpClient();
+        $this->packageResolver = $this->createMock(PackageResolverInterface::class);
 
         return new ImportMapManager(
             $mapper,
             $pathResolver,
             $rootDir.'/importmap.php',
             $rootDir.'/assets/vendor',
-            ImportMapManager::PROVIDER_JSPM,
-            $this->httpClient
+            $this->packageResolver,
         );
     }
 
@@ -517,4 +497,13 @@ private function createAssetMapper(PublicAssetsPathResolverInterface $pathResolv
 
         return $this->assetMapper;
     }
+
+    private static function resolvedPackage(string $packageName, string $url, bool $download = false, bool $preload = false, string $importName = null, string $content = null)
+    {
+        return new ResolvedImportMapPackage(
+            new PackageRequireOptions($packageName, download: $download, preload: $preload, importName: $importName),
+            $url,
+            $content,
+        );
+    }
 }
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php
new file mode 100644
index 0000000000000..643bee15da278
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php
@@ -0,0 +1,237 @@
+<?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.
+ */
+
+namespace ImportMap\Providers;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\AssetMapper\ImportMap\PackageRequireOptions;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\JsDelivrEsmResolver;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
+
+class JsDelivrEsmResolverTest extends TestCase
+{
+    /**
+     * @dataProvider provideResolvePackagesTests
+     */
+    public function testResolvePackages(array $packages, array $expectedRequests, array $expectedResolvedPackages)
+    {
+        $responses = [];
+        foreach ($expectedRequests as $expectedRequest) {
+            $responses[] = function ($method, $url) use ($expectedRequest) {
+                $this->assertSame('GET', $method);
+                $this->assertStringEndsWith($expectedRequest['url'], $url);
+
+                $body = 'any body';
+                if (isset($expectedRequest['response']['body'])) {
+                    $body = \is_array($expectedRequest['response']['body']) ? json_encode($expectedRequest['response']['body']) : $expectedRequest['response']['body'];
+                }
+
+                return new MockResponse($body, [
+                    'url' => $expectedRequest['response']['url'] ?? '/anything',
+                ]);
+            };
+        }
+
+        $httpClient = new MockHttpClient($responses);
+
+        $provider = new JsDelivrEsmResolver($httpClient);
+        $actualResolvedPackages = $provider->resolvePackages($packages);
+        $this->assertCount(\count($expectedResolvedPackages), $actualResolvedPackages);
+        foreach ($actualResolvedPackages as $package) {
+            $packageName = $package->requireOptions->packageName;
+            $this->assertArrayHasKey($packageName, $expectedResolvedPackages);
+            $this->assertSame($expectedResolvedPackages[$packageName]['url'], $package->url);
+            if (isset($expectedResolvedPackages[$packageName]['content'])) {
+                $this->assertSame($expectedResolvedPackages[$packageName]['content'], $package->content);
+            }
+        }
+    }
+
+    public static function provideResolvePackagesTests(): iterable
+    {
+        yield 'require single lodash package' => [
+            'packages' => [new PackageRequireOptions('lodash')],
+            'expectedRequests' => [
+                [
+                    'url' => '/v1/packages/npm/lodash/resolved?specifier=%2A',
+                    'response' => ['body' => ['version' => '1.2.3']],
+                ],
+                [
+                    'url' => '/lodash@1.2.3/+esm',
+                    'response' => ['url' => 'https://cdn.jsdelivr.net/npm/lodash.js@1.2.3/+esm'],
+                ],
+            ],
+            'expectedResolvedPackages' => [
+                'lodash' => [
+                    'url' => 'https://cdn.jsdelivr.net/npm/lodash.js@1.2.3/+esm',
+                ],
+            ],
+        ];
+
+        yield 'require non-scoped package with version' => [
+            'packages' => [new PackageRequireOptions('lodash', '^2')],
+            'expectedRequests' => [
+                [
+                    'url' => '/v1/packages/npm/lodash/resolved?specifier=%5E2',
+                    'response' => ['body' => ['version' => '2.1.3']],
+                ],
+                [
+                    'url' => '/lodash@2.1.3/+esm',
+                    'response' => ['url' => 'https://cdn.jsdelivr.net/npm/lodash.js@2.1.3/+esm'],
+                ],
+            ],
+            'expectedResolvedPackages' => [
+                'lodash' => [
+                    'url' => 'https://cdn.jsdelivr.net/npm/lodash.js@2.1.3/+esm',
+                ],
+            ],
+        ];
+
+        yield 'require scoped package with version' => [
+            'packages' => [new PackageRequireOptions('@hotwired/stimulus', '^3')],
+            'expectedRequests' => [
+                [
+                    'url' => '/v1/packages/npm/@hotwired/stimulus/resolved?specifier=%5E3',
+                    'response' => ['body' => ['version' => '3.1.3']],
+                ],
+                [
+                    'url' => '/@hotwired/stimulus@3.1.3/+esm',
+                    'response' => ['url' => 'https://cdn.jsdelivr.net/npm/@hotwired/stimulus.js@3.1.3/+esm'],
+                ],
+            ],
+            'expectedResolvedPackages' => [
+                '@hotwired/stimulus' => [
+                    'url' => 'https://cdn.jsdelivr.net/npm/@hotwired/stimulus.js@3.1.3/+esm',
+                ],
+            ],
+        ];
+
+        yield 'require non-scoped package with path' => [
+            'packages' => [new PackageRequireOptions('chart.js/auto', '^3')],
+            'expectedRequests' => [
+                [
+                    'url' => '/v1/packages/npm/chart.js/resolved?specifier=%5E3',
+                    'response' => ['body' => ['version' => '3.0.1']],
+                ],
+                [
+                    'url' => '/chart.js@3.0.1/auto/+esm',
+                    'response' => ['url' => 'https://cdn.jsdelivr.net/npm/chart.js@3.0.1/auto/+esm'],
+                ],
+            ],
+            'expectedResolvedPackages' => [
+                'chart.js/auto' => [
+                    'url' => 'https://cdn.jsdelivr.net/npm/chart.js@3.0.1/auto/+esm',
+                ],
+            ],
+        ];
+
+        yield 'require scoped package with path' => [
+            'packages' => [new PackageRequireOptions('@chart/chart.js/auto', '^3')],
+            'expectedRequests' => [
+                [
+                    'url' => '/v1/packages/npm/@chart/chart.js/resolved?specifier=%5E3',
+                    'response' => ['body' => ['version' => '3.0.1']],
+                ],
+                [
+                    'url' => '/@chart/chart.js@3.0.1/auto/+esm',
+                    'response' => ['url' => 'https://cdn.jsdelivr.net/npm/@chart/chart.js@3.0.1/auto/+esm'],
+                ],
+            ],
+            'expectedResolvedPackages' => [
+                '@chart/chart.js/auto' => [
+                    'url' => 'https://cdn.jsdelivr.net/npm/@chart/chart.js@3.0.1/auto/+esm',
+                ],
+            ],
+        ];
+
+        yield 'require package with simple download' => [
+            'packages' => [new PackageRequireOptions('lodash', download: true)],
+            'expectedRequests' => [
+                [
+                    'url' => '/v1/packages/npm/lodash/resolved?specifier=%2A',
+                    'response' => ['body' => ['version' => '1.2.3']],
+                ],
+                [
+                    'url' => '/lodash@1.2.3/+esm',
+                    'response' => [
+                        'url' => 'https://cdn.jsdelivr.net/npm/lodash.js@1.2.3/+esm',
+                        'body' => 'contents of file',
+                    ],
+                ],
+            ],
+            'expectedResolvedPackages' => [
+                'lodash' => [
+                    'url' => 'https://cdn.jsdelivr.net/npm/lodash.js@1.2.3/+esm',
+                    'content' => 'contents of file',
+                ],
+            ],
+        ];
+
+        yield 'require package download with import dependencies' => [
+            'packages' => [new PackageRequireOptions('lodash', download: true)],
+            'expectedRequests' => [
+                // lodash
+                [
+                    'url' => '/v1/packages/npm/lodash/resolved?specifier=%2A',
+                    'response' => ['body' => ['version' => '1.2.3']],
+                ],
+                [
+                    'url' => '/lodash@1.2.3/+esm',
+                    'response' => [
+                        'url' => 'https://cdn.jsdelivr.net/npm/lodash.js@1.2.3/+esm',
+                        'body' => 'import{Color as t}from"/npm/@kurkle/color@0.3.2/+esm";console.log("yo");',
+                    ],
+                ],
+                // @kurkle/color
+                [
+                    'url' => '/v1/packages/npm/@kurkle/color/resolved?specifier=0.3.2',
+                    'response' => ['body' => ['version' => '0.3.2']],
+                ],
+                [
+                    'url' => '/@kurkle/color@0.3.2/+esm',
+                    'response' => [
+                        'url' => 'https://cdn.jsdelivr.net/npm/@kurkle/color@0.3.2/+esm',
+                        'body' => 'import*as t from"/npm/@popperjs/core@2.11.7/+esm";// hello world',
+                    ],
+                ],
+                // @popperjs/core
+                [
+                    'url' => '/v1/packages/npm/@popperjs/core/resolved?specifier=2.11.7',
+                    'response' => ['body' => ['version' => '2.11.7']],
+                ],
+                [
+                    'url' => '/@popperjs/core@2.11.7/+esm',
+                    'response' => [
+                        'url' => 'https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.7/+esm',
+                        // point back to the original to try to confuse things or cause extra work
+                        'body' => 'import*as t from"/npm/lodash@1.2.9/+esm";// hello from popper',
+                    ],
+                ],
+            ],
+            'expectedResolvedPackages' => [
+                'lodash' => [
+                    'url' => 'https://cdn.jsdelivr.net/npm/lodash.js@1.2.3/+esm',
+                    // file was updated correctly
+                    'content' => 'import{Color as t}from"@kurkle/color";console.log("yo");',
+                ],
+                '@kurkle/color' => [
+                    'url' => 'https://cdn.jsdelivr.net/npm/@kurkle/color@0.3.2/+esm',
+                    'content' => 'import*as t from"@popperjs/core";// hello world',
+                ],
+                '@popperjs/core' => [
+                    'url' => 'https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.7/+esm',
+                    'content' => 'import*as t from"lodash";// hello from popper',
+                ],
+            ],
+        ];
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JspmResolverTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JspmResolverTest.php
new file mode 100644
index 0000000000000..5c3c5a4cab85d
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JspmResolverTest.php
@@ -0,0 +1,182 @@
+<?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.
+ */
+
+namespace ImportMap\Providers;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
+use Symfony\Component\AssetMapper\ImportMap\PackageRequireOptions;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\JspmResolver;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
+
+class JspmResolverTest extends TestCase
+{
+    /**
+     * @dataProvider provideResolvePackagesTests
+     */
+    public function testResolvePackages(array $packages, array $expectedInstallRequest, array $responseMap, array $expectedResolvedPackages, array $expectedDownloadedFiles)
+    {
+        $expectedRequestBody = [
+            'install' => $expectedInstallRequest,
+            'flattenScope' => true,
+            'env' => ['browser', 'module', 'production'],
+        ];
+        $responseData = [
+            'map' => [
+                'imports' => $responseMap,
+            ],
+        ];
+
+        $responses = [];
+        $responses[] = function ($method, $url, $options) use ($responseData, $expectedRequestBody) {
+            $this->assertSame('POST', $method);
+            $this->assertSame('https://api.jspm.io/generate', $url);
+            $this->assertSame($expectedRequestBody, json_decode($options['body'], true));
+
+            return new MockResponse(json_encode($responseData));
+        };
+        // mock the "file download" requests
+        foreach ($expectedDownloadedFiles as $file) {
+            $responses[] = new MockResponse(sprintf('contents of %s', $file));
+        }
+
+        $httpClient = new MockHttpClient($responses);
+
+        $provider = new JspmResolver($httpClient, ImportMapManager::PROVIDER_JSPM);
+        $actualResolvedPackages = $provider->resolvePackages($packages);
+        $this->assertCount(\count($expectedResolvedPackages), $actualResolvedPackages);
+        foreach ($actualResolvedPackages as $package) {
+            $packageName = $package->requireOptions->packageName;
+            $this->assertArrayHasKey($packageName, $expectedResolvedPackages);
+            $this->assertSame($expectedResolvedPackages[$packageName]['url'], $package->url);
+        }
+    }
+
+    public static function provideResolvePackagesTests(): iterable
+    {
+        yield 'require single lodash package' => [
+            'packages' => [new PackageRequireOptions('lodash')],
+            'expectedInstallRequest' => ['lodash'],
+            'responseMap' => [
+                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+            ],
+            'expectedResolvedPackages' => [
+                'lodash' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                ],
+            ],
+            'expectedDownloadedFiles' => [],
+        ];
+
+        yield 'require two packages' => [
+            'packages' => [new PackageRequireOptions('lodash'), new PackageRequireOptions('cowsay')],
+            'expectedInstallRequest' => ['lodash', 'cowsay'],
+            'responseMap' => [
+                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                'cowsay' => 'https://ga.jspm.io/npm:cowsay@4.5.6/cowsay.js',
+            ],
+            'expectedResolvedPackages' => [
+                'lodash' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                ],
+                'cowsay' => [
+                    'url' => 'https://ga.jspm.io/npm:cowsay@4.5.6/cowsay.js',
+                ],
+            ],
+            'expectedDownloadedFiles' => [],
+        ];
+
+        yield 'single_package_that_returns_as_two' => [
+            'packages' => [new PackageRequireOptions('lodash')],
+            'expectedInstallRequest' => ['lodash'],
+            'responseMap' => [
+                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                'lodash-dependency' => 'https://ga.jspm.io/npm:lodash-dependency@9.8.7/lodash-dependency.js',
+            ],
+            'expectedResolvedPackages' => [
+                'lodash' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                ],
+                'lodash-dependency' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash-dependency@9.8.7/lodash-dependency.js',
+                ],
+            ],
+            'expectedDownloadedFiles' => [],
+        ];
+
+        yield 'single_package_with_version_constraint' => [
+            'packages' => [new PackageRequireOptions('lodash', '^1.2.3')],
+            'expectedInstallRequest' => ['lodash@^1.2.3'],
+            'responseMap' => [
+                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.7/lodash.js',
+            ],
+            'expectedResolvedPackages' => [
+                'lodash' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash@1.2.7/lodash.js',
+                ],
+            ],
+            'expectedDownloadedFiles' => [],
+        ];
+
+        yield 'single_package_that_downloads' => [
+            'packages' => [new PackageRequireOptions('lodash', download: true)],
+            'expectedInstallRequest' => ['lodash'],
+            'responseMap' => [
+                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+            ],
+            'expectedResolvedPackages' => [
+                'lodash' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                    'downloaded_to' => 'vendor/lodash.js',
+                ],
+            ],
+            'expectedDownloadedFiles' => [
+                'assets/vendor/lodash.js',
+            ],
+        ];
+
+        yield 'single_package_that_preloads' => [
+            'packages' => [new PackageRequireOptions('lodash', preload: true)],
+            'expectedInstallRequest' => ['lodash'],
+            'responseMap' => [
+                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                'lodash_dep' => 'https://ga.jspm.io/npm:dep@1.0.0/lodash_dep.js',
+            ],
+            'expectedResolvedPackages' => [
+                'lodash' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                    'preload' => true,
+                ],
+                'lodash_dep' => [
+                    'url' => 'https://ga.jspm.io/npm:dep@1.0.0/lodash_dep.js',
+                    // shares the preload - even though it wasn't strictly required
+                    'preload' => true,
+                ],
+            ],
+            'expectedDownloadedFiles' => [],
+        ];
+
+        yield 'single_package_with_jspm_custom_registry' => [
+            'packages' => [new PackageRequireOptions('lodash', registryName: 'jspm')],
+            'expectedInstallRequest' => ['jspm:lodash'],
+            'responseMap' => [
+                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+            ],
+            'expectedResolvedPackages' => [
+                'lodash' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                ],
+            ],
+            'expectedDownloadedFiles' => [],
+        ];
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/MappedAssetTest.php b/src/Symfony/Component/AssetMapper/Tests/MappedAssetTest.php
index 2cd0bc733ba1c..42531faac2010 100644
--- a/src/Symfony/Component/AssetMapper/Tests/MappedAssetTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/MappedAssetTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\AssetMapper\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\AssetMapper\AssetDependency;
 use Symfony\Component\AssetMapper\MappedAsset;
 
 class MappedAssetTest extends TestCase
@@ -20,23 +21,7 @@ public function testGetLogicalPath()
     {
         $asset = new MappedAsset('foo.css');
 
-        $this->assertSame('foo.css', $asset->getLogicalPath());
-    }
-
-    public function testGetPublicPath()
-    {
-        $asset = new MappedAsset('anything');
-        $asset->setPublicPath('/assets/foo.1234567.css');
-
-        $this->assertSame('/assets/foo.1234567.css', $asset->getPublicPath());
-    }
-
-    public function testGetPublicPathWithoutDigest()
-    {
-        $asset = new MappedAsset('anything');
-        $asset->setPublicPathWithoutDigest('/assets/foo.css');
-
-        $this->assertSame('/assets/foo.css', $asset->getPublicPathWithoutDigest());
+        $this->assertSame('foo.css', $asset->logicalPath);
     }
 
     /**
@@ -44,10 +29,9 @@ public function testGetPublicPathWithoutDigest()
      */
     public function testGetExtension(string $filename, string $expectedExtension)
     {
-        $asset = new MappedAsset('anything');
-        $asset->setPublicPathWithoutDigest($filename);
+        $asset = new MappedAsset('anything', publicPathWithoutDigest: $filename);
 
-        $this->assertSame($expectedExtension, $asset->getPublicExtension());
+        $this->assertSame($expectedExtension, $asset->publicExtension);
     }
 
     public static function getExtensionTests(): iterable
@@ -57,25 +41,16 @@ public static function getExtensionTests(): iterable
         yield 'with_directory' => ['foo/bar.css', 'css'];
     }
 
-    public function testGetSourcePath()
+    public function testAddDependencies()
     {
-        $asset = new MappedAsset('foo.css');
-        $asset->setSourcePath('/path/to/source.css');
-        $this->assertSame('/path/to/source.css', $asset->getSourcePath());
-    }
+        $mainAsset = new MappedAsset('file.js');
 
-    public function testGetDigest()
-    {
-        $asset = new MappedAsset('foo.css');
-        $asset->setDigest('1234567', false);
-        $this->assertSame('1234567', $asset->getDigest());
-        $this->assertFalse($asset->isPredigested());
-    }
+        $assetFoo = new MappedAsset('foo.js');
+        $dependency = new AssetDependency($assetFoo, false, false);
+        $mainAsset->addDependency($dependency);
+        $mainAsset->addFileDependency('/path/to/foo.js');
 
-    public function testGetContent()
-    {
-        $asset = new MappedAsset('foo.css');
-        $asset->setContent('body { color: red; }');
-        $this->assertSame('body { color: red; }', $asset->getContent());
+        $this->assertSame([$dependency], $mainAsset->getDependencies());
+        $this->assertSame(['/path/to/foo.js'], $mainAsset->getFileDependencies());
     }
 }
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/AssetMapperTestAppKernel.php b/src/Symfony/Component/AssetMapper/Tests/fixtures/AssetMapperTestAppKernel.php
index 8225efdfb24fd..05a4272b0ed11 100644
--- a/src/Symfony/Component/AssetMapper/Tests/fixtures/AssetMapperTestAppKernel.php
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/AssetMapperTestAppKernel.php
@@ -37,6 +37,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
         $loader->load(static function (ContainerBuilder $container) {
             $container->loadFromExtension('framework', [
                 'http_method_override' => false,
+                'http_client' => true,
                 'assets' => null,
                 'asset_mapper' => [
                     'paths' => ['dir1', 'dir2'],
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
index d83bee17ef38e..f32813c6c5093 100644
--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -123,7 +123,18 @@ private function doAsk(OutputInterface $output, Question $question): mixed
             }
 
             if (false === $ret) {
+                $isBlocked = stream_get_meta_data($inputStream)['blocked'] ?? true;
+
+                if (!$isBlocked) {
+                    stream_set_blocking($inputStream, true);
+                }
+
                 $ret = $this->readInput($inputStream, $question);
+
+                if (!$isBlocked) {
+                    stream_set_blocking($inputStream, false);
+                }
+
                 if (false === $ret) {
                     throw new MissingInputException('Aborted.');
                 }
diff --git a/src/Symfony/Component/Console/Input/InputArgument.php b/src/Symfony/Component/Console/Input/InputArgument.php
index 0db0c7709b8d4..5cb151488dc56 100644
--- a/src/Symfony/Component/Console/Input/InputArgument.php
+++ b/src/Symfony/Component/Console/Input/InputArgument.php
@@ -37,7 +37,7 @@ class InputArgument
 
     /**
      * @param string                                                                        $name            The argument name
-     * @param int|null                                                                      $mode            The argument mode: self::REQUIRED or self::OPTIONAL
+     * @param int|null                                                                      $mode            The argument mode: a bit mask of self::REQUIRED, self::OPTIONAL and self::IS_ARRAY
      * @param string                                                                        $description     A description text
      * @param string|bool|int|float|array|null                                              $default         The default value (for self::OPTIONAL mode only)
      * @param array|\Closure(CompletionInput,CompletionSuggestions):list<string|Suggestion> $suggestedValues The values used for input completion
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index 44df682ebcb6f..a7a9c145aabac 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -141,8 +141,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      */
     private array $removedBindingIds = [];
 
-    private \WeakReference $containerRef;
-
     private const INTERNAL_TYPES = [
         'int' => true,
         'float' => true,
@@ -1064,9 +1062,8 @@ private function createService(Definition $definition, array &$inlineServices, b
                 $callable[0] instanceof Reference
                 || $callable[0] instanceof Definition && !isset($inlineServices[spl_object_hash($callable[0])])
             )) {
-                $containerRef = $this->containerRef ??= \WeakReference::create($this);
-                $initializer = static function () use ($containerRef, $callable, &$inlineServices) {
-                    return $containerRef->get()->doResolveServices($callable[0], $inlineServices);
+                $initializer = function () use ($callable, &$inlineServices) {
+                    return $this->doResolveServices($callable[0], $inlineServices);
                 };
 
                 $proxy = eval('return '.LazyClosure::getCode('$initializer', $callable, $definition, $this, $id).';');
@@ -1079,14 +1076,13 @@ private function createService(Definition $definition, array &$inlineServices, b
         if (true === $tryProxy && $definition->isLazy() && ['Closure', 'fromCallable'] !== $definition->getFactory()
             && !$tryProxy = !($proxy = $this->proxyInstantiator ??= new LazyServiceInstantiator()) || $proxy instanceof RealServiceInstantiator
         ) {
-            $containerRef = $this->containerRef ??= \WeakReference::create($this);
             $proxy = $proxy->instantiateProxy(
                 $this,
                 (clone $definition)
                     ->setClass($class)
                     ->setTags(($definition->hasTag('proxy') ? ['proxy' => $parameterBag->resolveValue($definition->getTag('proxy'))] : []) + $definition->getTags()),
-                $id, static function ($proxy = false) use ($containerRef, $definition, &$inlineServices, $id) {
-                    return $containerRef->get()->createService($definition, $inlineServices, true, $id, $proxy);
+                $id, function ($proxy = false) use ($definition, &$inlineServices, $id) {
+                    return $this->createService($definition, $inlineServices, true, $id, $proxy);
                 }
             );
             $this->shareService($definition, $proxy, $id, $inlineServices);
@@ -1214,38 +1210,34 @@ private function doResolveServices(mixed $value, array &$inlineServices = [], bo
                 $value[$k] = $this->doResolveServices($v, $inlineServices, $isConstructorArgument);
             }
         } elseif ($value instanceof ServiceClosureArgument) {
-            $containerRef = $this->containerRef ??= \WeakReference::create($this);
             $reference = $value->getValues()[0];
-            $value = static fn () => $containerRef->get()->resolveServices($reference);
+            $value = fn () => $this->resolveServices($reference);
         } elseif ($value instanceof IteratorArgument) {
-            $containerRef = $this->containerRef ??= \WeakReference::create($this);
-            $value = new RewindableGenerator(static function () use ($containerRef, $value, &$inlineServices) {
-                $container = $containerRef->get();
+            $value = new RewindableGenerator(function () use ($value, &$inlineServices) {
                 foreach ($value->getValues() as $k => $v) {
                     foreach (self::getServiceConditionals($v) as $s) {
-                        if (!$container->has($s)) {
+                        if (!$this->has($s)) {
                             continue 2;
                         }
                     }
                     foreach (self::getInitializedConditionals($v) as $s) {
-                        if (!$container->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE, $inlineServices)) {
+                        if (!$this->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE, $inlineServices)) {
                             continue 2;
                         }
                     }
 
-                    yield $k => $container->doResolveServices($v, $inlineServices);
+                    yield $k => $this->doResolveServices($v, $inlineServices);
                 }
-            }, static function () use ($containerRef, $value): int {
-                $container = $containerRef->get();
+            }, function () use ($value): int {
                 $count = 0;
                 foreach ($value->getValues() as $v) {
                     foreach (self::getServiceConditionals($v) as $s) {
-                        if (!$container->has($s)) {
+                        if (!$this->has($s)) {
                             continue 2;
                         }
                     }
                     foreach (self::getInitializedConditionals($v) as $s) {
-                        if (!$container->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)) {
+                        if (!$this->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)) {
                             continue 2;
                         }
                     }
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index a2964dd618d3f..ac477728badad 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -69,7 +69,7 @@ class PhpDumper extends Dumper
     private int $variableCount;
     private ?\SplObjectStorage $inlinedDefinitions = null;
     private ?array $serviceCalls = null;
-    private array $reservedVariables = ['instance', 'class', 'this', 'container', 'containerRef'];
+    private array $reservedVariables = ['instance', 'class', 'this', 'container'];
     private ExpressionLanguage $expressionLanguage;
     private ?string $targetDirRegex = null;
     private int $targetDirMaxMatches;
@@ -87,7 +87,6 @@ class PhpDumper extends Dumper
     private array $singleUsePrivateIds = [];
     private array $preload = [];
     private bool $addGetService = false;
-    private bool $addContainerRef = false;
     private array $locatedIds = [];
     private string $serviceLocatorTag;
     private array $exportedVariables = [];
@@ -247,8 +246,8 @@ public function dump(array $options = []): string|array
 
         if ($this->addGetService) {
             $code = preg_replace(
-                "/(\r?\n\r?\n    public function __construct.+?\\{\r?\n) ++([^\r\n]++)/s",
-                "\n    protected \Closure \$getService;$1        \$containerRef = $2\n        \$this->getService = static function () use (\$containerRef) { return \$containerRef->get()->getService(...\\func_get_args()); };",
+                "/\r?\n\r?\n    public function __construct.+?\\{\r?\n/s",
+                "\n    protected \Closure \$getService;$0",
                 $code,
                 1
             );
@@ -862,7 +861,6 @@ private function addService(string $id, Definition $definition): array
         } else {
             $lazyInitialization = '';
         }
-        $this->addContainerRef = false;
 
         $code = <<<EOF
 
@@ -875,7 +873,7 @@ private function addService(string $id, Definition $definition): array
 
      */
     protected static function {$methodName}(\$container$lazyInitialization)
-    {%container_ref%
+    {
 
 EOF;
 
@@ -921,9 +919,8 @@ protected static function {$methodName}(\$container$lazyInitialization)
                     }
                 }
                 $lazyLoad = $asGhostObject ? '$proxy' : 'false';
-                $this->addContainerRef = true;
 
-                $factoryCode = $asFile ? sprintf('self::do($containerRef->get(), %s)', $lazyLoad) : sprintf('self::%s($containerRef->get(), %s)', $methodName, $lazyLoad);
+                $factoryCode = $asFile ? sprintf('self::do($container, %s)', $lazyLoad) : sprintf('self::%s($container, %s)', $methodName, $lazyLoad);
                 $code .= $this->getProxyDumper()->getProxyFactoryCode($definition, $id, $factoryCode);
             }
 
@@ -945,9 +942,8 @@ protected static function {$methodName}(\$container$lazyInitialization)
             if (!$isProxyCandidate && !$definition->isShared()) {
                 $c = implode("\n", array_map(fn ($line) => $line ? '    '.$line : $line, explode("\n", $c)));
                 $lazyloadInitialization = $definition->isLazy() ? ', $lazyLoad = true' : '';
-                $useContainerRef = $this->addContainerRef ? ' use ($containerRef)' : '';
 
-                $c = sprintf("        %s = function (\$container%s)%s {\n%s        };\n\n        return %1\$s(\$container);\n", $factory, $lazyloadInitialization, $useContainerRef, $c);
+                $c = sprintf("        %s = function (\$container%s) {\n%s        };\n\n        return %1\$s(\$container);\n", $factory, $lazyloadInitialization, $c);
             }
 
             $code .= $c;
@@ -958,8 +954,6 @@ protected static function {$methodName}(\$container$lazyInitialization)
         $this->definitionVariables = $this->inlinedDefinitions = null;
         $this->referenceVariables = $this->serviceCalls = null;
 
-        $code = preg_replace('/%container_ref%/', $this->addContainerRef ? "\n        \$containerRef = \$container->ref;\n" : '', $code, 1);
-
         return [$file, $code];
     }
 
@@ -1196,12 +1190,7 @@ private function addNewInstance(Definition $definition, string $return = '', str
                 $callable[0] instanceof Reference
                 || ($callable[0] instanceof Definition && !$this->definitionVariables->contains($callable[0]))
             )) {
-                if (str_contains($initializer = $this->dumpValue($callable[0]), '$container')) {
-                    $this->addContainerRef = true;
-                    $initializer = sprintf('function () use ($containerRef) { $container = $containerRef->get(); return %s; }', $initializer);
-                } else {
-                    $initializer = 'fn () => '.$initializer;
-                }
+                $initializer = 'fn () => '.$this->dumpValue($callable[0]);
 
                 return $return.LazyClosure::getCode($initializer, $callable, $definition, $this->container, $id).$tail;
             }
@@ -1268,11 +1257,9 @@ class $class extends $baseClass
     private const DEPRECATED_PARAMETERS = [];
 
     protected \$parameters = [];
-    protected readonly \WeakReference \$ref;
 
     public function __construct()
     {
-        \$this->ref = \WeakReference::create(\$this);
 
 EOF;
         $code = str_replace("    private const DEPRECATED_PARAMETERS = [];\n\n", $this->addDeprecatedParameters(), $code);
@@ -1853,12 +1840,6 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
                         $attribute = sprintf('#[\Closure(%s)] ', $attribute);
                     }
 
-                    if (str_contains($code, '$container')) {
-                        $this->addContainerRef = true;
-
-                        return sprintf("%sfunction () use (\$containerRef)%s {\n            \$container = \$containerRef->get();\n\n            return %s;\n        }", $attribute, $returnedType, $code);
-                    }
-
                     return sprintf('%sfn ()%s => %s', $attribute, $returnedType, $code);
                 }
 
@@ -1867,15 +1848,8 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
                         return 'new RewindableGenerator(fn () => new \EmptyIterator(), 0)';
                     }
 
-                    $this->addContainerRef = true;
-
                     $code = [];
-                    $code[] = 'new RewindableGenerator(function () use ($containerRef) {';
-                    $code[] = '            $container = $containerRef->get();';
-                    $code[] = '';
-
-                    $countCode = [];
-                    $countCode[] = 'function () use ($containerRef) {';
+                    $code[] = 'new RewindableGenerator(function () use ($container) {';
 
                     $operands = [0];
                     foreach ($values as $k => $v) {
@@ -1888,12 +1862,7 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
                         }
                     }
 
-                    $countCode[] = '            $container = $containerRef->get();';
-                    $countCode[] = '';
-                    $countCode[] = sprintf('            return %s;', implode(' + ', $operands));
-                    $countCode[] = '        }';
-
-                    $code[] = sprintf('        }, %s)', \count($operands) > 1 ? implode("\n", $countCode) : $operands[0]);
+                    $code[] = sprintf('        }, %s)', \count($operands) > 1 ? 'fn () => '.implode(' + ', $operands) : $operands[0]);
 
                     return implode("\n", $code);
                 }
@@ -1925,7 +1894,7 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
                     }
                     $this->addGetService = true;
 
-                    return sprintf('new \%s($container->getService, [%s%s], [%s%s])', ServiceLocator::class, $serviceMap, $serviceMap ? "\n        " : '', $serviceTypes, $serviceTypes ? "\n        " : '');
+                    return sprintf('new \%s($container->getService ??= $container->getService(...), [%s%s], [%s%s])', ServiceLocator::class, $serviceMap, $serviceMap ? "\n        " : '', $serviceTypes, $serviceTypes ? "\n        " : '');
                 }
             } finally {
                 [$this->definitionVariables, $this->referenceVariables] = $scope;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/autowire_closure.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/autowire_closure.php
index d5c461e64f80d..cd0c1e8be7b9f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/autowire_closure.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/autowire_closure.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_Autowire_Closure extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -48,13 +46,7 @@ public function isCompiled(): bool
      */
     protected static function getBarService($container)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['bar'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\LazyClosureConsumer(#[\Closure(name: 'foo', class: 'Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo')] function () use ($containerRef) {
-            $container = $containerRef->get();
-
-            return ($container->services['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo());
-        }, ($container->services['baz'] ?? self::getBazService($container)), ($container->services['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo())->cloneFoo(...), ($container->services['my_callable'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\MyCallable())->__invoke(...));
+        return $container->services['bar'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\LazyClosureConsumer(#[\Closure(name: 'foo', class: 'Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo')] fn () => ($container->services['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo()), ($container->services['baz'] ?? self::getBazService($container)), ($container->services['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo())->cloneFoo(...), ($container->services['my_callable'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\MyCallable())->__invoke(...));
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/callable_adapter_consumer.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/callable_adapter_consumer.php
index 0a32e23ae9c32..ccd8d2e0bf63b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/callable_adapter_consumer.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/callable_adapter_consumer.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_Callable_Adapter_Consumer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure.php
index 1444190c5b645..287eb9e3e94e9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'closure' => 'getClosureService',
@@ -64,12 +62,6 @@ protected static function getClosureService($container)
      */
     protected static function getClosureOfServiceClosureService($container)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['closure_of_service_closure'] = #[\Closure(name: 'bar2', class: 'stdClass')] function () use ($containerRef) {
-            $container = $containerRef->get();
-
-            return ($container->privates['bar2'] ??= new \stdClass());
-        };
+        return $container->services['closure_of_service_closure'] = #[\Closure(name: 'bar2', class: 'stdClass')] fn () => ($container->privates['bar2'] ??= new \stdClass());
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure_proxy.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure_proxy.php
index 94ca615c4ddd4..2bef92604d3a9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure_proxy.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure_proxy.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_Closure_Proxy extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'closure_proxy' => 'getClosureProxyService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php
index 3745b291db52f..8bdda6b602b9b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php
@@ -17,11 +17,9 @@
 class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithoutArgumentsContainer
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         parent::__construct();
         $this->parameterBag = null;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php
index 482316c0ff1a0..85b8bc6dae27d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php
@@ -17,11 +17,9 @@
 class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithMandatoryArgumentsContainer
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
 
         $this->aliases = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php
index adb80f267dd0b..6aeea149719b9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php
@@ -17,11 +17,9 @@
 class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithOptionalArgumentsContainer
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         parent::__construct();
         $this->parameterBag = null;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_without_constructor.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_without_constructor.php
index ff3750b0847cb..ee47766101427 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_without_constructor.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_without_constructor.php
@@ -17,11 +17,9 @@
 class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\NoConstructorContainer
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
 
         $this->aliases = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute.php
index a82d5bc1e9b67..8134075865d25 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_Lazy_Autowire_Attribute extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -79,10 +77,8 @@ protected static function getFooService($container)
      */
     protected static function getFoo2Service($container, $lazyLoad = true)
     {
-        $containerRef = $container->ref;
-
         if (true === $lazyLoad) {
-            return $container->privates['.lazy.Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo'] = $container->createProxy('FooProxy4048957', static fn () => \FooProxy4048957::createLazyProxy(static fn () => self::getFoo2Service($containerRef->get(), false)));
+            return $container->privates['.lazy.Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo'] = $container->createProxy('FooProxy4048957', static fn () => \FooProxy4048957::createLazyProxy(static fn () => self::getFoo2Service($container, false)));
         }
 
         return ($container->services['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo());
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute_with_intersection.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute_with_intersection.php
index 4bf955ac2447a..8dc0eb50e62fb 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute_with_intersection.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute_with_intersection.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'foo' => 'getFooService',
@@ -73,10 +71,8 @@ protected static function getFooService($container)
      */
     protected static function get_Lazy_Foo_GDmfketService($container, $lazyLoad = true)
     {
-        $containerRef = $container->ref;
-
         if (true === $lazyLoad) {
-            return $container->privates['.lazy.foo.gDmfket'] = $container->createProxy('objectProxy8ac8e9a', static fn () => \objectProxy8ac8e9a::createLazyProxy(static fn () => self::get_Lazy_Foo_GDmfketService($containerRef->get(), false)));
+            return $container->privates['.lazy.foo.gDmfket'] = $container->createProxy('objectProxy8ac8e9a', static fn () => \objectProxy8ac8e9a::createLazyProxy(static fn () => self::get_Lazy_Foo_GDmfketService($container, false)));
         }
 
         return ($container->services['foo'] ?? self::getFooService($container));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_closure.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_closure.php
index e7783b6f90a1a..3623366544fa0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_closure.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_closure.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_Lazy_Closure extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'closure' => 'getClosureService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
index 98ea8c666ba36..da000bf8e41e3 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
@@ -17,11 +17,9 @@
 class Container extends \Symfony\Component\DependencyInjection\Dump\AbstractContainer
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
 
         $this->aliases = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
index a1398a57c976d..4cec1eb29b06e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
 
         $this->aliases = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
index a98229eb58979..95bf7aa4df39f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
index cd63684ca9f3a..25d0b3257f0d9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
@@ -27,15 +27,9 @@ class getClosureService extends ProjectServiceContainer
      */
     public static function do($container, $lazyLoad = true)
     {
-        $containerRef = $container->ref;
-
         $container->services['closure'] = $instance = new \stdClass();
 
-        $instance->closures = [#[\Closure(name: 'foo', class: 'FooClass')] function () use ($containerRef): ?\stdClass {
-            $container = $containerRef->get();
-
-            return ($container->services['foo'] ?? null);
-        }];
+        $instance->closures = [#[\Closure(name: 'foo', class: 'FooClass')] fn (): ?\stdClass => ($container->services['foo'] ?? null)];
 
         return $instance;
     }
@@ -61,11 +55,9 @@ class ProjectServiceContainer extends Container
 {
     protected $targetDir;
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct(private array $buildParameters = [], protected string $containerDir = __DIR__)
     {
-        $this->ref = \WeakReference::create($this);
         $this->targetDir = \dirname($containerDir);
         $this->services = $this->privates = [];
         $this->methodMap = [
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
index d2a31115d1187..be77a31954e4b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
index de0550de9b79c..9657c007ab03b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
index 328a9180ac5ab..03cb9b5ba5ee5 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
index b2bfd9e0865af..693c1c5a1619f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'foo' => 'getFooService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
index ad424a8e467a6..c434b19d9d2fe 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_EnvParameters extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
index eed5f3f6270dd..7d5f9e78999a0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'Bar\\Foo' => 'getFooService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
index 1625966d2d528..65aded752be4e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
index 9528de3651608..c3fddf9e67175 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -361,11 +361,7 @@ class getLazyContextService extends ProjectServiceContainer
      */
     public static function do($container, $lazyLoad = true)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () use ($container) {
             yield 'k1' => ($container->services['foo.baz'] ?? $container->load('getFoo_BazService'));
             yield 'k2' => $container;
         }, 2), new RewindableGenerator(fn () => new \EmptyIterator(), 0));
@@ -383,11 +379,7 @@ class getLazyContextIgnoreInvalidRefService extends ProjectServiceContainer
      */
     public static function do($container, $lazyLoad = true)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () use ($container) {
             yield 0 => ($container->services['foo.baz'] ?? $container->load('getFoo_BazService'));
         }, 1), new RewindableGenerator(fn () => new \EmptyIterator(), 0));
     }
@@ -515,11 +507,7 @@ class getTaggedIteratorService extends ProjectServiceContainer
      */
     public static function do($container, $lazyLoad = true)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () use ($container) {
             yield 0 => ($container->services['foo'] ?? $container->load('getFooService'));
             yield 1 => ($container->privates['tagged_iterator_foo'] ??= new \Bar());
         }, 2));
@@ -561,11 +549,9 @@ class ProjectServiceContainer extends Container
 {
     protected $targetDir;
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct(private array $buildParameters = [], protected string $containerDir = __DIR__)
     {
-        $this->ref = \WeakReference::create($this);
         $this->targetDir = \dirname($containerDir);
         $this->parameters = $this->getDefaultParameters();
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
index 765cc4a54b587..8161543a7d715 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -330,11 +328,7 @@ protected static function getFooWithInlineService($container)
      */
     protected static function getLazyContextService($container)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () use ($container) {
             yield 'k1' => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
             yield 'k2' => $container;
         }, 2), new RewindableGenerator(fn () => new \EmptyIterator(), 0));
@@ -347,11 +341,7 @@ protected static function getLazyContextService($container)
      */
     protected static function getLazyContextIgnoreInvalidRefService($container)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () use ($container) {
             yield 0 => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
         }, 1), new RewindableGenerator(fn () => new \EmptyIterator(), 0));
     }
@@ -428,11 +418,7 @@ protected static function getServiceFromStaticMethodService($container)
      */
     protected static function getTaggedIteratorService($container)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () use ($container) {
             yield 0 => ($container->services['foo'] ?? self::getFooService($container));
             yield 1 => ($container->privates['tagged_iterator_foo'] ??= new \Bar());
         }, 2));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
index c83530a598fe4..4fcb352ade2cc 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
@@ -38,11 +38,9 @@ class ProjectServiceContainer extends Container
 {
     protected $targetDir;
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct(private array $buildParameters = [], protected string $containerDir = __DIR__)
     {
-        $this->ref = \WeakReference::create($this);
         $this->targetDir = \dirname($containerDir);
         $this->parameters = $this->getDefaultParameters();
 
@@ -351,13 +349,9 @@ class ProjectServiceContainer extends Container
      */
     protected static function getLazyContextService($container)
     {
-        $containerRef = $container->ref;
-
         include_once $container->targetDir.''.'/Fixtures/includes/classes.php';
 
-        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () use ($container) {
             yield 'k1' => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
             yield 'k2' => $container;
         }, 2), new RewindableGenerator(fn () => new \EmptyIterator(), 0));
@@ -370,13 +364,9 @@ class ProjectServiceContainer extends Container
      */
     protected static function getLazyContextIgnoreInvalidRefService($container)
     {
-        $containerRef = $container->ref;
-
         include_once $container->targetDir.''.'/Fixtures/includes/classes.php';
 
-        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () use ($container) {
             yield 0 => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
         }, 1), new RewindableGenerator(fn () => new \EmptyIterator(), 0));
     }
@@ -469,11 +459,7 @@ class ProjectServiceContainer extends Container
      */
     protected static function getTaggedIteratorService($container)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () use ($container) {
             yield 0 => ($container->services['foo'] ?? self::getFooService($container));
             yield 1 => ($container->privates['tagged_iterator_foo'] ??= new \Bar());
         }, 2));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories_with_tagged_iterrator.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories_with_tagged_iterrator.txt
index cd0358301c712..61ea67f6b9521 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories_with_tagged_iterrator.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories_with_tagged_iterrator.txt
@@ -29,11 +29,9 @@ class ProjectServiceContainer extends Container
 {
     protected $targetDir;
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct(private array $buildParameters = [], protected string $containerDir = __DIR__)
     {
-        $this->ref = \WeakReference::create($this);
         $this->targetDir = \dirname($containerDir);
         $this->services = $this->privates = [];
         $this->methodMap = [
@@ -65,14 +63,10 @@ class ProjectServiceContainer extends Container
      */
     protected static function getFooService($container)
     {
-        $containerRef = $container->ref;
-
-        $container->factories['foo'] = function ($container) use ($containerRef) {
+        $container->factories['foo'] = function ($container) {
             $instance = new \Symfony\Component\DependencyInjection\Tests\Dumper\FooClass();
 
-            $instance->setOtherInstances(new RewindableGenerator(function () use ($containerRef) {
-                $container = $containerRef->get();
-
+            $instance->setOtherInstances(new RewindableGenerator(function () use ($container) {
                 yield 0 => ($container->privates['Bar'] ??= new \Bar());
                 yield 1 => ($container->privates['stdClass'] ??= new \stdClass());
             }, 2));
@@ -123,8 +117,8 @@ if (!\class_exists(ProjectServiceContainer::class, false)) {
 
 return new \Container%s\ProjectServiceContainer([
     'container.build_hash' => '%s',
-    'container.build_id' => '3f6e2bc2',
-    'container.build_time' => 1563381341,
+    'container.build_id' => '%s',
+    'container.build_time' => %d,
 ], __DIR__.\DIRECTORY_SEPARATOR.'Container%s');
 
 )
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
index 59aa77a6e150e..cc147d95abe10 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
@@ -33,11 +33,9 @@ class ProjectServiceContainer extends Container
 {
     protected $targetDir;
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct(private array $buildParameters = [], protected string $containerDir = __DIR__)
     {
-        $this->ref = \WeakReference::create($this);
         $this->targetDir = \dirname($containerDir);
         $this->parameters = $this->getDefaultParameters();
 
@@ -75,10 +73,8 @@ class ProjectServiceContainer extends Container
      */
     protected static function getLazyFooService($container, $lazyLoad = true)
     {
-        $containerRef = $container->ref;
-
         if (true === $lazyLoad) {
-            return $container->services['lazy_foo'] = $container->createProxy('FooClassGhostEe53b95', static fn () => \FooClassGhostEe53b95::createLazyGhost(static fn ($proxy) => self::getLazyFooService($containerRef->get(), $proxy)));
+            return $container->services['lazy_foo'] = $container->createProxy('FooClassGhostEe53b95', static fn () => \FooClassGhostEe53b95::createLazyGhost(static fn ($proxy) => self::getLazyFooService($container, $proxy)));
         }
 
         include_once $container->targetDir.''.'/Fixtures/includes/foo_lazy.php';
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_adawson.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_adawson.php
index 052eef5504a08..ae05d67a54999 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_adawson.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_adawson.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'App\\Bus' => 'getBusService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
index c1b00ed757b48..0a9c519c8e69c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar2' => 'getBar2Service',
@@ -198,12 +196,8 @@ protected static function getConnection2Service($container)
      */
     protected static function getDoctrine_EntityManagerService($container)
     {
-        $containerRef = $container->ref;
-
         $a = new \stdClass();
-        $a->resolver = new \stdClass(new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        $a->resolver = new \stdClass(new RewindableGenerator(function () use ($container) {
             yield 0 => ($container->privates['doctrine.listener'] ?? self::getDoctrine_ListenerService($container));
         }, 1));
         $a->flag = 'ok';
@@ -526,11 +520,7 @@ protected static function getLevel5Service($container)
      */
     protected static function getMailer_TransportService($container)
     {
-        $containerRef = $container->ref;
-
-        return $container->privates['mailer.transport'] = (new \FactoryCircular(new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        return $container->privates['mailer.transport'] = (new \FactoryCircular(new RewindableGenerator(function () use ($container) {
             yield 0 => ($container->privates['mailer.transport_factory.amazon'] ?? self::getMailer_TransportFactory_AmazonService($container));
             yield 1 => self::getMailerInline_TransportFactory_AmazonService($container);
         }, 2)))->create();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
index f17a8aaa1bbeb..2250e860264dc 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -273,11 +271,7 @@ protected static function getDispatcher2Service($container, $lazyLoad = true)
      */
     protected static function getDoctrine_EntityListenerResolverService($container)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['doctrine.entity_listener_resolver'] = new \stdClass(new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        return $container->services['doctrine.entity_listener_resolver'] = new \stdClass(new RewindableGenerator(function () use ($container) {
             yield 0 => ($container->services['doctrine.listener'] ?? self::getDoctrine_ListenerService($container));
         }, 1));
     }
@@ -526,11 +520,7 @@ protected static function getMailer_TransportService($container)
      */
     protected static function getMailer_TransportFactoryService($container)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['mailer.transport_factory'] = new \FactoryCircular(new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        return $container->services['mailer.transport_factory'] = new \FactoryCircular(new RewindableGenerator(function () use ($container) {
             yield 0 => ($container->services['mailer.transport_factory.amazon'] ?? self::getMailer_TransportFactory_AmazonService($container));
             yield 1 => ($container->services['mailer_inline.transport_factory.amazon'] ?? self::getMailerInline_TransportFactory_AmazonService($container));
         }, 2));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
index 41e1be5a93b20..97979327b7e9b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
index 8f64e9292ca0e..021599934834c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_Base64Parameters extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_closure_argument_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_closure_argument_compiled.php
index a9dcc3ceb10c3..acd87be99655e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_closure_argument_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_closure_argument_compiled.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'foo' => 'getFooService',
@@ -57,13 +55,7 @@ protected static function getFooService($container)
      */
     protected static function getServiceClosureService($container)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['service_closure'] = new \Bar(#[\Closure(name: 'foo', class: 'Foo')] function () use ($containerRef) {
-            $container = $containerRef->get();
-
-            return ($container->services['foo'] ??= new \Foo());
-        });
+        return $container->services['service_closure'] = new \Bar(#[\Closure(name: 'foo', class: 'Foo')] fn () => ($container->services['foo'] ??= new \Foo()));
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_csv_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_csv_env.php
index dc12622f95c41..2a48fdb329cc4 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_csv_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_csv_env.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_CsvParameters extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_current_factory_inlining.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_current_factory_inlining.php
index 4c641bc877871..98d431ce4a5b1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_current_factory_inlining.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_current_factory_inlining.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Service_CurrentFactoryInlining extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'inlined_current' => 'getInlinedCurrentService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_dedup_lazy.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_dedup_lazy.php
index 6c2481a68dc20..006820f527fd8 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_dedup_lazy.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_dedup_lazy.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -53,10 +51,8 @@ protected function createProxy($class, \Closure $factory)
      */
     protected static function getBarService($container, $lazyLoad = true)
     {
-        $containerRef = $container->ref;
-
         if (true === $lazyLoad) {
-            return $container->services['bar'] = $container->createProxy('stdClassGhost2fc7938', static fn () => \stdClassGhost2fc7938::createLazyGhost(static fn ($proxy) => self::getBarService($containerRef->get(), $proxy)));
+            return $container->services['bar'] = $container->createProxy('stdClassGhost2fc7938', static fn () => \stdClassGhost2fc7938::createLazyGhost(static fn ($proxy) => self::getBarService($container, $proxy)));
         }
 
         return $lazyLoad;
@@ -69,10 +65,8 @@ protected static function getBarService($container, $lazyLoad = true)
      */
     protected static function getBazService($container, $lazyLoad = true)
     {
-        $containerRef = $container->ref;
-
         if (true === $lazyLoad) {
-            return $container->services['baz'] = $container->createProxy('stdClassProxy2fc7938', static fn () => \stdClassProxy2fc7938::createLazyProxy(static fn () => self::getBazService($containerRef->get(), false)));
+            return $container->services['baz'] = $container->createProxy('stdClassProxy2fc7938', static fn () => \stdClassProxy2fc7938::createLazyProxy(static fn () => self::getBazService($container, false)));
         }
 
         return \foo_bar();
@@ -85,10 +79,8 @@ protected static function getBazService($container, $lazyLoad = true)
      */
     protected static function getBuzService($container, $lazyLoad = true)
     {
-        $containerRef = $container->ref;
-
         if (true === $lazyLoad) {
-            return $container->services['buz'] = $container->createProxy('stdClassProxy2fc7938', static fn () => \stdClassProxy2fc7938::createLazyProxy(static fn () => self::getBuzService($containerRef->get(), false)));
+            return $container->services['buz'] = $container->createProxy('stdClassProxy2fc7938', static fn () => \stdClassProxy2fc7938::createLazyProxy(static fn () => self::getBuzService($container, false)));
         }
 
         return \foo_bar();
@@ -101,10 +93,8 @@ protected static function getBuzService($container, $lazyLoad = true)
      */
     protected static function getFooService($container, $lazyLoad = true)
     {
-        $containerRef = $container->ref;
-
         if (true === $lazyLoad) {
-            return $container->services['foo'] = $container->createProxy('stdClassGhost2fc7938', static fn () => \stdClassGhost2fc7938::createLazyGhost(static fn ($proxy) => self::getFooService($containerRef->get(), $proxy)));
+            return $container->services['foo'] = $container->createProxy('stdClassGhost2fc7938', static fn () => \stdClassGhost2fc7938::createLazyGhost(static fn ($proxy) => self::getFooService($container, $proxy)));
         }
 
         return $lazyLoad;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deep_graph.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deep_graph.php
index 4b6c1e3936440..9c22c5f9e7ae1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deep_graph.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deep_graph.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_Deep_Graph extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_default_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_default_env.php
index 39e0c7f7570b1..292f0d6fed825 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_default_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_default_env.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_DefaultParameters extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters.php
index 2ed3522f6f578..90a79cba63a2a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters.php
@@ -19,11 +19,9 @@ class ProjectServiceContainer extends Container
     ];
 
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt
index 5081cf415d0cc..98476a4c1a171 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt
@@ -47,11 +47,9 @@ class ProjectServiceContainer extends Container
 
     protected $targetDir;
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct(private array $buildParameters = [], protected string $containerDir = __DIR__)
     {
-        $this->ref = \WeakReference::create($this);
         $this->targetDir = \dirname($containerDir);
         $this->parameters = $this->getDefaultParameters();
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php
index 3673a1cdfe1fe..589d2e81f04b2 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
index b6595bb34a7b7..7433eed182639 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Errored_Definition extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -330,11 +328,7 @@ protected static function getFooWithInlineService($container)
      */
     protected static function getLazyContextService($container)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () use ($container) {
             yield 'k1' => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
             yield 'k2' => $container;
         }, 2), new RewindableGenerator(fn () => new \EmptyIterator(), 0));
@@ -347,11 +341,7 @@ protected static function getLazyContextService($container)
      */
     protected static function getLazyContextIgnoreInvalidRefService($container)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () use ($container) {
             yield 0 => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
         }, 1), new RewindableGenerator(fn () => new \EmptyIterator(), 0));
     }
@@ -428,11 +418,7 @@ protected static function getServiceFromStaticMethodService($container)
      */
     protected static function getTaggedIteratorService($container)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () use ($container) {
             yield 0 => ($container->services['foo'] ?? self::getFooService($container));
             yield 1 => ($container->privates['tagged_iterator_foo'] ??= new \Bar());
         }, 2));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
index f184f64dca43a..cac95d6d6c1a8 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\ParentNotExists' => 'getParentNotExistsService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_self_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_self_ref.php
index 4ccee1b0c2bc4..265dbe3741730 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_self_ref.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_self_ref.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_Inline_Self_Ref extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'App\\Foo' => 'getFooService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_json_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_json_env.php
index 35aa89cd07e72..2fd5aa4c3a958 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_json_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_json_env.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_JsonParameters extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
index 793dd0e84b173..2510e647d24c3 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar_service' => 'getBarServiceService',
@@ -72,17 +70,7 @@ protected static function getBarServiceService($container)
      */
     protected static function getFooServiceService($container)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['foo_service'] = new \Symfony\Component\DependencyInjection\ServiceLocator(['bar' => #[\Closure(name: 'bar_service', class: 'stdClass')] function () use ($containerRef) {
-            $container = $containerRef->get();
-
-            return ($container->services['bar_service'] ?? self::getBarServiceService($container));
-        }, 'baz' => #[\Closure(name: 'baz_service', class: 'stdClass')] function () use ($containerRef): \stdClass {
-            $container = $containerRef->get();
-
-            return ($container->privates['baz_service'] ??= new \stdClass());
-        }, 'nil' => fn () => NULL]);
+        return $container->services['foo_service'] = new \Symfony\Component\DependencyInjection\ServiceLocator(['bar' => #[\Closure(name: 'bar_service', class: 'stdClass')] fn () => ($container->services['bar_service'] ?? self::getBarServiceService($container)), 'baz' => #[\Closure(name: 'baz_service', class: 'stdClass')] fn (): \stdClass => ($container->privates['baz_service'] ??= new \stdClass()), 'nil' => fn () => NULL]);
     }
 
     /**
@@ -122,13 +110,7 @@ protected static function getTranslator_Loader3Service($container)
      */
     protected static function getTranslator1Service($container)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['translator_1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_1' => #[\Closure(name: 'translator.loader_1', class: 'stdClass')] function () use ($containerRef) {
-            $container = $containerRef->get();
-
-            return ($container->services['translator.loader_1'] ??= new \stdClass());
-        }]));
+        return $container->services['translator_1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_1' => #[\Closure(name: 'translator.loader_1', class: 'stdClass')] fn () => ($container->services['translator.loader_1'] ??= new \stdClass())]));
     }
 
     /**
@@ -138,13 +120,7 @@ protected static function getTranslator1Service($container)
      */
     protected static function getTranslator2Service($container)
     {
-        $containerRef = $container->ref;
-
-        $container->services['translator_2'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_2' => #[\Closure(name: 'translator.loader_2', class: 'stdClass')] function () use ($containerRef) {
-            $container = $containerRef->get();
-
-            return ($container->services['translator.loader_2'] ??= new \stdClass());
-        }]));
+        $container->services['translator_2'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_2' => #[\Closure(name: 'translator.loader_2', class: 'stdClass')] fn () => ($container->services['translator.loader_2'] ??= new \stdClass())]));
 
         $instance->addResource('db', ($container->services['translator.loader_2'] ??= new \stdClass()), 'nl');
 
@@ -158,13 +134,7 @@ protected static function getTranslator2Service($container)
      */
     protected static function getTranslator3Service($container)
     {
-        $containerRef = $container->ref;
-
-        $container->services['translator_3'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_3' => #[\Closure(name: 'translator.loader_3', class: 'stdClass')] function () use ($containerRef) {
-            $container = $containerRef->get();
-
-            return ($container->services['translator.loader_3'] ??= new \stdClass());
-        }]));
+        $container->services['translator_3'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_3' => #[\Closure(name: 'translator.loader_3', class: 'stdClass')] fn () => ($container->services['translator.loader_3'] ??= new \stdClass())]));
 
         $a = ($container->services['translator.loader_3'] ??= new \stdClass());
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_new_in_initializer.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_new_in_initializer.php
index 238fabbae8c6f..7a2ebe901adb1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_new_in_initializer.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_new_in_initializer.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'foo' => 'getFooService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_duplicates.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_duplicates.php
index 30f5075304d2f..d3685cf9d9e00 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_duplicates.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_duplicates.php
@@ -15,13 +15,10 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
     protected \Closure $getService;
 
     public function __construct()
     {
-        $containerRef = $this->ref = \WeakReference::create($this);
-        $this->getService = static function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -66,7 +63,7 @@ protected static function getBarService($container)
      */
     protected static function getBazService($container)
     {
-        return $container->services['baz'] = new \stdClass(new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($container->getService, [
+        return $container->services['baz'] = new \stdClass(new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($container->getService ??= $container->getService(...), [
             'foo' => [false, 'foo', 'getFooService', false],
         ], [
             'foo' => '?',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy.php
index d00f210156e34..f584bef6b97cc 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -67,8 +65,6 @@ protected static function getBarService($container)
      */
     protected static function getFooService($container, $lazyLoad = true)
     {
-        $containerRef = $container->ref;
-
         $container->factories['service_container']['foo'] ??= self::getFooService(...);
 
         // lazy factory for stdClass
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
index 8cd2a9e190e70..ec0f4d6709c07 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
@@ -19,12 +19,10 @@ class getNonSharedFooService extends ProjectServiceContainer
      */
     public static function do($container, $lazyLoad = true)
     {
-        $containerRef = $container->ref;
-
         $container->factories['non_shared_foo'] ??= self::do(...);
 
         if (true === $lazyLoad) {
-            return $container->createProxy('FooLazyClassGhost0fc418d', static fn () => \FooLazyClassGhost0fc418d::createLazyGhost(static fn ($proxy) => self::do($containerRef->get(), $proxy)));
+            return $container->createProxy('FooLazyClassGhost0fc418d', static fn () => \FooLazyClassGhost0fc418d::createLazyGhost(static fn ($proxy) => self::do($container, $proxy)));
         }
 
         static $include = true;
@@ -79,11 +77,9 @@ class ProjectServiceContainer extends Container
 {
     protected $targetDir;
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct(private array $buildParameters = [], protected string $containerDir = __DIR__)
     {
-        $this->ref = \WeakReference::create($this);
         $this->targetDir = \dirname($containerDir);
         $this->services = $this->privates = [];
         $this->fileMap = [
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_ghost.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_ghost.php
index 1a32c1974f7af..0082641c56ed0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_ghost.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_ghost.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -67,12 +65,10 @@ protected static function getBarService($container)
      */
     protected static function getFooService($container, $lazyLoad = true)
     {
-        $containerRef = $container->ref;
-
         $container->factories['service_container']['foo'] ??= self::getFooService(...);
 
         if (true === $lazyLoad) {
-            return $container->createProxy('stdClassGhost2fc7938', static fn () => \stdClassGhost2fc7938::createLazyGhost(static fn ($proxy) => self::getFooService($containerRef->get(), $proxy)));
+            return $container->createProxy('stdClassGhost2fc7938', static fn () => \stdClassGhost2fc7938::createLazyGhost(static fn ($proxy) => self::getFooService($container, $proxy)));
         }
 
         return $lazyLoad;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
index 5d627cb89f0db..41eb55dd51e65 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar_service' => 'getBarServiceService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
index 6badcf4d0a48a..e2102b420c18a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'public_foo' => 'getPublicFooService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_query_string_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_query_string_env.php
index d3dc84d68c7c4..1a04af65f30e0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_query_string_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_query_string_env.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_QueryStringParameters extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
index 60700526ead94..556e91d783c31 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
@@ -15,13 +15,10 @@
 class Symfony_DI_PhpDumper_Test_Rot13Parameters extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
     protected \Closure $getService;
 
     public function __construct()
     {
-        $containerRef = $this->ref = \WeakReference::create($this);
-        $this->getService = static function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -67,7 +64,7 @@ protected static function getRot13EnvVarProcessorService($container)
      */
     protected static function getContainer_EnvVarProcessorsLocatorService($container)
     {
-        return $container->services['container.env_var_processors_locator'] = new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($container->getService, [
+        return $container->services['container.env_var_processors_locator'] = new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($container->getService ??= $container->getService(...), [
             'rot13' => ['services', 'Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor', 'getRot13EnvVarProcessorService', false],
         ], [
             'rot13' => '?',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php
index f999184479893..83e8d3a3a75b3 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php
@@ -15,13 +15,10 @@
 class Symfony_DI_PhpDumper_Service_Locator_Argument extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
     protected \Closure $getService;
 
     public function __construct()
     {
-        $containerRef = $this->ref = \WeakReference::create($this);
-        $this->getService = static function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
         $this->services = $this->privates = [];
         $this->syntheticIds = [
             'foo5' => true,
@@ -63,7 +60,7 @@ protected static function getBarService($container)
     {
         $container->services['bar'] = $instance = new \stdClass();
 
-        $instance->locator = new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($container->getService, [
+        $instance->locator = new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($container->getService ??= $container->getService(...), [
             'foo1' => ['services', 'foo1', 'getFoo1Service', false],
             'foo2' => ['privates', 'foo2', 'getFoo2Service', false],
             'foo3' => [false, 'foo3', 'getFoo3Service', false],
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
index 77ed9e02882a4..c90f03c14b68d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
@@ -15,13 +15,10 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
     protected \Closure $getService;
 
     public function __construct()
     {
-        $containerRef = $this->ref = \WeakReference::create($this);
-        $this->getService = static function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
         $this->services = $this->privates = [];
         $this->methodMap = [
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber' => 'getTestServiceSubscriberService',
@@ -71,7 +68,7 @@ protected static function getTestServiceSubscriberService($container)
      */
     protected static function getFooServiceService($container)
     {
-        return $container->services['foo_service'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber((new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($container->getService, [
+        return $container->services['foo_service'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber((new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($container->getService ??= $container->getService(...), [
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => ['privates', 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition', 'getCustomDefinitionService', false],
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber' => ['services', 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber', 'getTestServiceSubscriberService', false],
             'bar' => ['services', 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber', 'getTestServiceSubscriberService', false],
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_tsantos.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_tsantos.php
index 00dab8c875eee..77d78a6558fa6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_tsantos.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_tsantos.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'tsantos_serializer' => 'getTsantosSerializerService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
index b42db843a12c9..a24db964def5f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_Uninitialized_Reference extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -55,25 +53,13 @@ public function getRemovedIds(): array
      */
     protected static function getBarService($container)
     {
-        $containerRef = $container->ref;
-
         $container->services['bar'] = $instance = new \stdClass();
 
         $instance->foo1 = ($container->services['foo1'] ?? null);
         $instance->foo2 = null;
         $instance->foo3 = ($container->privates['foo3'] ?? null);
-        $instance->closures = [#[\Closure(name: 'foo1', class: 'stdClass')] function () use ($containerRef) {
-            $container = $containerRef->get();
-
-            return ($container->services['foo1'] ?? null);
-        }, #[\Closure(name: 'foo2')] fn () => null, #[\Closure(name: 'foo3', class: 'stdClass')] function () use ($containerRef) {
-            $container = $containerRef->get();
-
-            return ($container->privates['foo3'] ?? null);
-        }];
-        $instance->iter = new RewindableGenerator(function () use ($containerRef) {
-            $container = $containerRef->get();
-
+        $instance->closures = [#[\Closure(name: 'foo1', class: 'stdClass')] fn () => ($container->services['foo1'] ?? null), #[\Closure(name: 'foo2')] fn () => null, #[\Closure(name: 'foo3', class: 'stdClass')] fn () => ($container->privates['foo3'] ?? null)];
+        $instance->iter = new RewindableGenerator(function () use ($container) {
             if (isset($container->services['foo1'])) {
                 yield 'foo1' => ($container->services['foo1'] ?? null);
             }
@@ -83,11 +69,7 @@ protected static function getBarService($container)
             if (isset($container->privates['foo3'])) {
                 yield 'foo3' => ($container->privates['foo3'] ?? null);
             }
-        }, function () use ($containerRef) {
-            $container = $containerRef->get();
-
-            return 0 + (int) (isset($container->services['foo1'])) + (int) (false) + (int) (isset($container->privates['foo3']));
-        });
+        }, fn () => 0 + (int) (isset($container->services['foo1'])) + (int) (false) + (int) (isset($container->privates['foo3'])));
 
         return $instance;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php
index 3473edb993327..2849c8b53f04f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_Unsupported_Characters extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_url_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_url_env.php
index 154080cdbf257..7f0fb1d9d4af6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_url_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_url_env.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Test_UrlParameters extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither.php
index a4f9e848197bd..bb8aa67c8f3ef 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Service_Wither extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'wither' => 'getWitherService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_annotation.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_annotation.php
index a958df8ebdc0d..cad200e4d68df 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_annotation.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_annotation.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Service_Wither_Annotation extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'wither' => 'getWitherService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_lazy.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_lazy.php
index e5804f2e14805..f52f226597625 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_lazy.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_lazy.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Service_Wither_Lazy extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'wither' => 'getWitherService',
@@ -57,10 +55,8 @@ protected function createProxy($class, \Closure $factory)
      */
     protected static function getWitherService($container, $lazyLoad = true)
     {
-        $containerRef = $container->ref;
-
         if (true === $lazyLoad) {
-            return $container->services['wither'] = $container->createProxy('WitherProxy580fe0f', static fn () => \WitherProxy580fe0f::createLazyProxy(static fn () => self::getWitherService($containerRef->get(), false)));
+            return $container->services['wither'] = $container->createProxy('WitherProxy580fe0f', static fn () => \WitherProxy580fe0f::createLazyProxy(static fn () => self::getWitherService($container, false)));
         }
 
         $instance = new \Symfony\Component\DependencyInjection\Tests\Compiler\Wither();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_staticreturntype.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_staticreturntype.php
index 61de4e02dcadf..50c7664730e7b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_staticreturntype.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_staticreturntype.php
@@ -15,11 +15,9 @@
 class Symfony_DI_PhpDumper_Service_WitherStaticReturnType extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'wither' => 'getWitherService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/static_constructor.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/static_constructor.php
index a262304550f89..497136eba6a87 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/static_constructor.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/static_constructor.php
@@ -15,11 +15,9 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
-    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
-        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'static_constructor' => 'getStaticConstructorService',
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
index 1401929459a35..b7dcee08a977b 100644
--- a/src/Symfony/Component/Form/composer.json
+++ b/src/Symfony/Component/Form/composer.json
@@ -44,7 +44,6 @@
         "symfony/uid": "^5.4|^6.0"
     },
     "conflict": {
-        "phpunit/phpunit": "<5.4.3",
         "symfony/console": "<5.4",
         "symfony/dependency-injection": "<5.4",
         "symfony/doctrine-bridge": "<5.4.21|>=6,<6.2.7",
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
index dc7aae68cc62e..d52b02b773abe 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
@@ -74,20 +74,23 @@ public function dump(Data $data): ?string
 
         ['name' => $name, 'file' => $file, 'line' => $line, 'file_excerpt' => $fileExcerpt] = $this->sourceContextProvider->getContext();
 
-        if ($this->dumper instanceof Connection) {
-            if (!$this->dumper->write($data)) {
-                $this->isCollected = false;
-            }
-        } elseif ($this->dumper) {
-            $this->doDump($this->dumper, $data, $name, $file, $line);
-        } else {
+        if (!$this->dumper || $this->dumper instanceof Connection && !$this->dumper->write($data)) {
             $this->isCollected = false;
         }
 
+        $context = $data->getContext();
+        $label = $context['label'] ?? '';
+        unset($context['label']);
+        $data = $data->withContext($context);
+
+        if ($this->dumper && !$this->dumper instanceof Connection) {
+            $this->doDump($this->dumper, $data, $name, $file, $line, $label);
+        }
+
         if (!$this->dataCount) {
             $this->data = [];
         }
-        $this->data[] = compact('data', 'name', 'file', 'line', 'fileExcerpt');
+        $this->data[] = compact('data', 'name', 'file', 'line', 'fileExcerpt', 'label');
         ++$this->dataCount;
 
         $this->stopwatch?->stop('dump');
@@ -125,7 +128,7 @@ public function collect(Request $request, Response $response, \Throwable $except
             }
 
             foreach ($this->data as $dump) {
-                $this->doDump($dumper, $dump['data'], $dump['name'], $dump['file'], $dump['line']);
+                $this->doDump($dumper, $dump['data'], $dump['name'], $dump['file'], $dump['line'], $dump['label'] ?? '');
             }
         }
     }
@@ -242,7 +245,7 @@ public function __destruct()
 
             foreach ($this->data as $i => $dump) {
                 $this->data[$i] = null;
-                $this->doDump($dumper, $dump['data'], $dump['name'], $dump['file'], $dump['line']);
+                $this->doDump($dumper, $dump['data'], $dump['name'], $dump['file'], $dump['line'], $dump['label'] ?? '');
             }
 
             $this->data = [];
@@ -250,10 +253,12 @@ public function __destruct()
         }
     }
 
-    private function doDump(DataDumperInterface $dumper, Data $data, string $name, string $file, int $line): void
+    private function doDump(DataDumperInterface $dumper, Data $data, string $name, string $file, int $line, string $label): void
     {
         if ($dumper instanceof CliDumper) {
-            $contextDumper = function ($name, $file, $line, $fmt) {
+            $contextDumper = function ($name, $file, $line, $fmt, $label) {
+                $this->line = '' !== $label ? $this->style('meta', $label).' in ' : '';
+
                 if ($this instanceof HtmlDumper) {
                     if ($file) {
                         $s = $this->style('meta', '%s');
@@ -267,17 +272,17 @@ private function doDump(DataDumperInterface $dumper, Data $data, string $name, s
                     } else {
                         $name = $this->style('meta', $name);
                     }
-                    $this->line = $name.' on line '.$this->style('meta', $line).':';
+                    $this->line .= $name.' on line '.$this->style('meta', $line).':';
                 } else {
-                    $this->line = $this->style('meta', $name).' on line '.$this->style('meta', $line).':';
+                    $this->line .= $this->style('meta', $name).' on line '.$this->style('meta', $line).':';
                 }
                 $this->dumpLine(0);
             };
             $contextDumper = $contextDumper->bindTo($dumper, $dumper);
-            $contextDumper($name, $file, $line, $this->fileLinkFormat);
+            $contextDumper($name, $file, $line, $this->fileLinkFormat, $label);
         } else {
             $cloner = new VarCloner();
-            $dumper->dump($cloner->cloneVar($name.' on line '.$line.':'));
+            $dumper->dump($cloner->cloneVar(('' !== $label ? $label.' in ' : '').$name.' on line '.$line.':'));
         }
         $dumper->dump($data);
     }
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 0af222d32d8ac..0bd152bc8208a 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -76,12 +76,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     private static array $freshCache = [];
 
-    public const VERSION = '6.3.0-RC1';
+    public const VERSION = '6.3.0-RC2';
     public const VERSION_ID = 60300;
     public const MAJOR_VERSION = 6;
     public const MINOR_VERSION = 3;
     public const RELEASE_VERSION = 0;
-    public const EXTRA_VERSION = 'RC1';
+    public const EXTRA_VERSION = 'RC2';
 
     public const END_OF_MAINTENANCE = '01/2024';
     public const END_OF_LIFE = '01/2024';
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php
index 106420c8e3a1f..eaee994a9e3bf 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php
@@ -28,6 +28,7 @@ class DumpDataCollectorTest extends TestCase
     public function testDump()
     {
         $data = new Data([[123]]);
+        $data = $data->withContext(['label' => 'foo']);
 
         $collector = new DumpDataCollector(null, new FileLinkFormatter([]));
 
@@ -49,11 +50,12 @@ public function testDump()
                 'file' => __FILE__,
                 'line' => $line,
                 'fileExcerpt' => false,
+                'label' => 'foo',
             ],
         ];
         $this->assertEquals($xDump, $dump);
 
-        $this->assertStringMatchesFormat('%a;a:%d:{i:0;a:5:{s:4:"data";%c:39:"Symfony\Component\VarDumper\Cloner\Data":%a', serialize($collector));
+        $this->assertStringMatchesFormat('%a;a:%d:{i:0;a:6:{s:4:"data";%c:39:"Symfony\Component\VarDumper\Cloner\Data":%a', serialize($collector));
         $this->assertSame(0, $collector->getDumpsCount());
 
         $serialized = serialize($collector);
@@ -77,7 +79,7 @@ public function testDumpWithServerConnection()
         ob_start();
         $collector->collect(new Request(), new Response());
         $this->assertEmpty(ob_get_clean());
-        $this->assertStringMatchesFormat('%a;a:%d:{i:0;a:5:{s:4:"data";%c:39:"Symfony\Component\VarDumper\Cloner\Data":%a', serialize($collector));
+        $this->assertStringMatchesFormat('%a;a:%d:{i:0;a:6:{s:4:"data";%c:39:"Symfony\Component\VarDumper\Cloner\Data":%a', serialize($collector));
     }
 
     public function testCollectDefault()
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index 49be38bed0628..bf8be24d05ab4 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -67,6 +67,7 @@
         "symfony/translation-contracts": "<2.5",
         "symfony/twig-bridge": "<5.4",
         "symfony/validator": "<5.4",
+        "symfony/var-dumper": "<6.3",
         "twig/twig": "<2.13"
     },
     "autoload": {
diff --git a/src/Symfony/Component/Messenger/Event/SendMessageToTransportsEvent.php b/src/Symfony/Component/Messenger/Event/SendMessageToTransportsEvent.php
index 76ef196ba0e5c..b32e03b7b49c9 100644
--- a/src/Symfony/Component/Messenger/Event/SendMessageToTransportsEvent.php
+++ b/src/Symfony/Component/Messenger/Event/SendMessageToTransportsEvent.php
@@ -19,7 +19,7 @@
  *
  * The event is *only* dispatched if the message will actually
  * be sent to at least one transport. If the message is sent
- * to multiple transports, the message is dispatched only one time.
+ * to multiple transports, the message is dispatched only once.
  * This message is only dispatched the first time a message
  * is sent to a transport, not also if it is retried.
  *
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
index 6d87bca7c763d..27a9acb70ccb7 100644
--- a/src/Symfony/Component/Validator/composer.json
+++ b/src/Symfony/Component/Validator/composer.json
@@ -45,7 +45,6 @@
     "conflict": {
         "doctrine/annotations": "<1.13",
         "doctrine/lexer": "<1.1",
-        "phpunit/phpunit": "<5.4.3",
         "symfony/dependency-injection": "<5.4",
         "symfony/expression-language": "<5.4",
         "symfony/http-kernel": "<5.4",
diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php
index 3bf0a09cb5594..928f72d7a850e 100644
--- a/src/Symfony/Component/VarDumper/Cloner/Data.php
+++ b/src/Symfony/Component/VarDumper/Cloner/Data.php
@@ -271,7 +271,11 @@ public function dump(DumperInterface $dumper)
         $cursor = new Cursor();
         $cursor->hashType = -1;
         $cursor->attr = $this->context[SourceContextProvider::class] ?? [];
-        $dumper->dumpScalar($cursor, 'label', $this->context['label'] ?? '');
+        $label = $this->context['label'] ?? '';
+
+        if ($cursor->attr || '' !== $label) {
+            $dumper->dumpScalar($cursor, 'label', $label);
+        }
         $cursor->hashType = 0;
         $this->dumpItem($dumper, $cursor, $refs, $this->data[$this->position][$this->key]);
     }
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
index d9ce7ae4ed8fc..c155d4c79a7cb 100644
--- a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -139,8 +139,14 @@ public function dumpScalar(Cursor $cursor, string $type, string|int|float|bool|n
         $attr = $cursor->attr;
 
         switch ($type) {
-            case 'label': $style = 'label'; break;
-            case 'default': $style = 'default'; break;
+            case 'default':
+                $style = 'default';
+                break;
+
+            case 'label':
+                $this->styles += ['label' => $this->styles['default']];
+                $style = 'label';
+                break;
 
             case 'integer':
                 $style = 'num';
@@ -467,7 +473,7 @@ protected function style(string $style, string $value, array $attr = []): string
 
         $map = static::$controlCharsMap;
         $startCchr = $this->colors ? "\033[m\033[{$this->styles['default']}m" : '';
-        $endCchr = $this->colors ? "\033[m\033[{$this->styles['label' === $style ? 'default' : $style]}m" : '';
+        $endCchr = $this->colors ? "\033[m\033[{$this->styles[$style]}m" : '';
         $value = preg_replace_callback(static::$controlCharsRx, function ($c) use ($map, $startCchr, $endCchr) {
             $s = $startCchr;
             $c = $c[$i = 0];
@@ -490,7 +496,7 @@ protected function style(string $style, string $value, array $attr = []): string
             if ($cchrCount && "\033" === $value[0]) {
                 $value = substr($value, \strlen($startCchr));
             } else {
-                $value = "\033[{$this->styles['label' === $style ? 'default' : $style]}m".$value;
+                $value = "\033[{$this->styles[$style]}m".$value;
             }
             if ($cchrCount && str_ends_with($value, $endCchr)) {
                 $value = substr($value, 0, -\strlen($endCchr));
diff --git a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
index 34ef644ad0837..345a89cf726e0 100644
--- a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
@@ -903,7 +903,7 @@ protected function style(string $style, string $value, array $attr = []): string
         }
 
         $map = static::$controlCharsMap;
-        $v = '<span class=sf-dump-'.('label' === $style ? 'default' : $style).'>'.preg_replace_callback(static::$controlCharsRx, function ($c) use ($map) {
+        $v = "<span class=sf-dump-{$style}>".preg_replace_callback(static::$controlCharsRx, function ($c) use ($map) {
             $s = $b = '<span class="sf-dump-default';
             $c = $c[$i = 0];
             if ($ns = "\r" === $c[$i] || "\n" === $c[$i]) {
@@ -944,6 +944,9 @@ protected function style(string $style, string $value, array $attr = []): string
         if (isset($attr['lang'])) {
             $v = sprintf('<code class="%s">%s</code>', esc($attr['lang']), $v);
         }
+        if ('label' === $style) {
+            $v .= ' ';
+        }
 
         return $v;
     }
diff --git a/src/Symfony/Component/VarDumper/Resources/functions/dump.php b/src/Symfony/Component/VarDumper/Resources/functions/dump.php
index d933bb7b10f62..a0e5addff1094 100644
--- a/src/Symfony/Component/VarDumper/Resources/functions/dump.php
+++ b/src/Symfony/Component/VarDumper/Resources/functions/dump.php
@@ -49,7 +49,7 @@ function dd(mixed ...$vars): never
             header('HTTP/1.1 500 Internal Server Error');
         }
 
-        if (isset($vars[0]) && 1 === count($vars)) {
+        if (array_key_exists(0, $vars) && 1 === count($vars)) {
             VarDumper::dump($vars[0]);
         } else {
             foreach ($vars as $k => $v) {
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_multiple_args.phpt b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_multiple_args.phpt
new file mode 100644
index 0000000000000..fe6fc5b638833
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_multiple_args.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Test dd() with multiple args shows line number
+--FILE--
+<?php
+putenv('NO_COLOR=1');
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+dd(null, 1, 'foo');
+
+--EXPECT--
+1 null
+2 1
+3 "foo"
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_null.phpt b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_null.phpt
new file mode 100644
index 0000000000000..30741e11ae3e8
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_null.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Test dd() with null doesn't show line number
+--FILE--
+<?php
+putenv('NO_COLOR=1');
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+dd(null);
+
+--EXPECT--
+null
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_single_arg.phpt b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_single_arg.phpt
new file mode 100644
index 0000000000000..e451a4dcced6a
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_single_arg.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Test dd() with one arg doesn't show line number
+--FILE--
+<?php
+putenv('NO_COLOR=1');
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+dd('foo');
+
+--EXPECT--
+"foo"
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_multiple_args.phpt b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_multiple_args.phpt
new file mode 100644
index 0000000000000..ea65e705852ce
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_multiple_args.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Test dump() with multiple args shows line number
+--FILE--
+<?php
+putenv('NO_COLOR=1');
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+dump(null, 1, 'foo');
+
+--EXPECT--
+1 null
+2 1
+3 "foo"
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_null.phpt b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_null.phpt
new file mode 100644
index 0000000000000..3bb6de25dc4b6
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_null.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Test dump() with null doesn't show line number
+--FILE--
+<?php
+putenv('NO_COLOR=1');
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+dump(null);
+
+--EXPECT--
+null
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_single_arg.phpt b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_single_arg.phpt
new file mode 100644
index 0000000000000..0a03293c7767c
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_single_arg.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Test dump() with one arg doesn't show line number
+--FILE--
+<?php
+putenv('NO_COLOR=1');
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+dump('foo');
+
+--EXPECT--
+"foo"
diff --git a/src/Symfony/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json
index 0c81f0da2ad4d..e9967f0e52479 100644
--- a/src/Symfony/Component/VarDumper/composer.json
+++ b/src/Symfony/Component/VarDumper/composer.json
@@ -27,7 +27,6 @@
         "twig/twig": "^2.13|^3.0.4"
     },
     "conflict": {
-        "phpunit/phpunit": "<5.4.3",
         "symfony/console": "<5.4"
     },
     "autoload": {
diff --git a/src/Symfony/Component/VarDumper/phpunit.xml.dist b/src/Symfony/Component/VarDumper/phpunit.xml.dist
index 61727f16f6eeb..a629967b7baa2 100644
--- a/src/Symfony/Component/VarDumper/phpunit.xml.dist
+++ b/src/Symfony/Component/VarDumper/phpunit.xml.dist
@@ -17,6 +17,7 @@
     <testsuites>
         <testsuite name="Symfony VarDumper Component Test Suite">
             <directory>./Tests/</directory>
+            <directory suffix=".phpt">./Tests/Dumper/functions/</directory>
         </testsuite>
     </testsuites>