| {{ message.locale }} |
{% if is_fallback %}
{{ message.fallbackLocale|default('-') }} |
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
index b706620496b7..45d8ce3e2a75 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
@@ -1463,6 +1463,7 @@ tr.status-warning td {
}
.tab-navigation .tab-control {
background: transparent;
+ color: inherit;
border: 0;
box-shadow: none;
transition: box-shadow .05s ease-in, background-color .05s ease-in;
@@ -1552,42 +1553,6 @@ tr.status-warning td {
display: block;
}
-{# Filters
- ========================================================================= #}
-[data-filters] { position: relative; }
-[data-filtered] { cursor: pointer; }
-[data-filtered]:after { content: '\00a0\25BE'; }
-[data-filtered]:hover .filter-list li { display: inline-flex; }
-[class*="filter-hidden-"] { display: none; }
-.filter-list { position: absolute; border: var(--border); box-shadow: var(--shadow); margin: 0; padding: 0; display: flex; flex-direction: column; }
-.filter-list :after { content: ''; }
-.filter-list li {
- background: var(--tab-disabled-background);
- border-bottom: var(--border);
- color: var(--tab-disabled-color);
- display: none;
- list-style: none;
- margin: 0;
- padding: 5px 10px;
- text-align: left;
- font-weight: normal;
-}
-.filter-list li.active {
- background: var(--tab-background);
- color: var(--tab-color);
-}
-.filter-list li.last-active {
- background: var(--tab-active-background);
- color: var(--tab-active-color);
-}
-
-.filter-list-level li { cursor: s-resize; }
-.filter-list-level li.active { cursor: n-resize; }
-.filter-list-level li.last-active { cursor: default; }
-.filter-list-level li.last-active:before { content: '\2714\00a0'; }
-.filter-list-choice li:before { content: '\2714\00a0'; color: transparent; }
-.filter-list-choice li.active:before { color: unset; }
-
{# Badges
========================================================================= #}
.badge {
diff --git a/src/Symfony/Component/AssetMapper/AssetMapper.php b/src/Symfony/Component/AssetMapper/AssetMapper.php
index f05348d2df68..a500f008a5c2 100644
--- a/src/Symfony/Component/AssetMapper/AssetMapper.php
+++ b/src/Symfony/Component/AssetMapper/AssetMapper.php
@@ -138,6 +138,7 @@ public function getAsset(string $logicalPath): ?MappedAsset
$asset->setSourcePath($filePath);
$asset->setMimeType($this->getMimeType($logicalPath));
+ $asset->setPublicPathWithoutDigest($this->getPublicPathWithoutDigest($logicalPath));
$publicPath = $this->getPublicPath($logicalPath);
$asset->setPublicPath($publicPath);
[$digest, $isPredigested] = $this->getDigest($asset);
@@ -202,6 +203,11 @@ public function getPublicPath(string $logicalPath): ?string
}, $logicalPath);
}
+ private function getPublicPathWithoutDigest(string $logicalPath): string
+ {
+ return $this->publicPrefix.$logicalPath;
+ }
+
public static function isPathPredigested(string $path): bool
{
return 1 === preg_match(self::PREDIGESTED_REGEX, $path);
@@ -239,11 +245,7 @@ private function getMimeType(string $logicalPath): ?string
$extension = pathinfo($logicalPath, \PATHINFO_EXTENSION);
- if (!isset($this->extensionsMap[$extension])) {
- throw new \LogicException(sprintf('The file extension "%s" from "%s" does not correspond to any known types in the asset mapper. To support this extension, configure framework.asset_mapper.extensions.', $extension, $logicalPath));
- }
-
- return $this->extensionsMap[$extension];
+ return $this->extensionsMap[$extension] ?? null;
}
private function calculateContent(MappedAsset $asset): string
@@ -265,7 +267,7 @@ private function loadManifest(): array
if (null === $this->manifestData) {
$path = $this->getPublicAssetsFilesystemPath().'/'.self::MANIFEST_FILE_NAME;
- if (!file_exists($path)) {
+ if (!is_file($path)) {
$this->manifestData = [];
} else {
$this->manifestData = json_decode(file_get_contents($path), true);
diff --git a/src/Symfony/Component/AssetMapper/AssetMapperRepository.php b/src/Symfony/Component/AssetMapper/AssetMapperRepository.php
index 87c165ccf23e..70ef44b00006 100644
--- a/src/Symfony/Component/AssetMapper/AssetMapperRepository.php
+++ b/src/Symfony/Component/AssetMapper/AssetMapperRepository.php
@@ -54,8 +54,8 @@ public function find(string $logicalPath): ?string
}
$file = rtrim($path, '/').'/'.$localLogicalPath;
- if (file_exists($file)) {
- return $file;
+ if (is_file($file)) {
+ return realpath($file);
}
}
@@ -64,17 +64,24 @@ public function find(string $logicalPath): ?string
public function findLogicalPath(string $filesystemPath): ?string
{
+ if (!is_file($filesystemPath)) {
+ return null;
+ }
+
+ $filesystemPath = realpath($filesystemPath);
+
foreach ($this->getDirectories() as $path => $namespace) {
if (!str_starts_with($filesystemPath, $path)) {
continue;
}
$logicalPath = substr($filesystemPath, \strlen($path));
+
if ('' !== $namespace) {
- $logicalPath = $namespace.'/'.$logicalPath;
+ $logicalPath = $namespace.'/'.ltrim($logicalPath, '/\\');
}
- return ltrim($logicalPath, '/');
+ return $this->normalizeLogicalPath($logicalPath);
}
return null;
@@ -100,6 +107,7 @@ public function all(): array
/** @var RecursiveDirectoryIterator $innerIterator */
$innerIterator = $iterator->getInnerIterator();
$logicalPath = ($namespace ? rtrim($namespace, '/').'/' : '').$innerIterator->getSubPathName();
+ $logicalPath = $this->normalizeLogicalPath($logicalPath);
$paths[$logicalPath] = $file->getPathname();
}
}
@@ -107,6 +115,14 @@ public function all(): array
return $paths;
}
+ /**
+ * @internal
+ */
+ public function allDirectories(): array
+ {
+ return $this->getDirectories();
+ }
+
private function getDirectories(): array
{
$filesystem = new Filesystem();
@@ -120,13 +136,13 @@ private function getDirectories(): array
if (!file_exists($path)) {
throw new \InvalidArgumentException(sprintf('The asset mapper directory "%s" does not exist.', $path));
}
- $this->absolutePaths[$path] = $namespace;
+ $this->absolutePaths[realpath($path)] = $namespace;
continue;
}
if (file_exists($this->projectRootDir.'/'.$path)) {
- $this->absolutePaths[$this->projectRootDir.'/'.$path] = $namespace;
+ $this->absolutePaths[realpath($this->projectRootDir.'/'.$path)] = $namespace;
continue;
}
@@ -136,4 +152,12 @@ private function getDirectories(): array
return $this->absolutePaths;
}
+
+ /**
+ * Normalize slashes to / for logical paths.
+ */
+ private function normalizeLogicalPath(string $logicalPath): string
+ {
+ return ltrim(str_replace('\\', '/', $logicalPath), '/\\');
+ }
}
diff --git a/src/Symfony/Component/AssetMapper/Command/AssetMapperCompileCommand.php b/src/Symfony/Component/AssetMapper/Command/AssetMapperCompileCommand.php
index 6c08da1c7d68..d0cb9f64631a 100644
--- a/src/Symfony/Component/AssetMapper/Command/AssetMapperCompileCommand.php
+++ b/src/Symfony/Component/AssetMapper/Command/AssetMapperCompileCommand.php
@@ -31,7 +31,7 @@
*
* @author Ryan Weaver
*/
-#[AsCommand(name: 'assetmap:compile', description: 'Compiles all mapped assets and writes them to the final public output directory.')]
+#[AsCommand(name: 'asset-map:compile', description: 'Compiles all mapped assets and writes them to the final public output directory.')]
final class AssetMapperCompileCommand extends Command
{
public function __construct(
@@ -66,13 +66,54 @@ protected function execute(InputInterface $input, OutputInterface $output): int
throw new InvalidArgumentException(sprintf('The public directory "%s" does not exist.', $publicDir));
}
+ $outputDir = $publicDir.$this->assetMapper->getPublicPrefix();
if ($input->getOption('clean')) {
- $outputDir = $publicDir.$this->assetMapper->getPublicPrefix();
$io->comment(sprintf('Cleaning %s', $outputDir));
$this->filesystem->remove($outputDir);
$this->filesystem->mkdir($outputDir);
}
+ $manifestPath = $publicDir.$this->assetMapper->getPublicPrefix().AssetMapper::MANIFEST_FILE_NAME;
+ if (is_file($manifestPath)) {
+ $this->filesystem->remove($manifestPath);
+ }
+ $manifest = $this->createManifestAndWriteFiles($io, $publicDir);
+ $this->filesystem->dumpFile($manifestPath, json_encode($manifest, \JSON_PRETTY_PRINT));
+ $io->comment(sprintf('Manifest written to %s', $manifestPath));
+
+ $importMapPath = $outputDir.ImportMapManager::IMPORT_MAP_FILE_NAME;
+ if (is_file($importMapPath)) {
+ $this->filesystem->remove($importMapPath);
+ }
+ $this->filesystem->dumpFile($importMapPath, $this->importMapManager->getImportMapJson());
+
+ $importMapPreloadPath = $outputDir.ImportMapManager::IMPORT_MAP_PRELOAD_FILE_NAME;
+ if (is_file($importMapPreloadPath)) {
+ $this->filesystem->remove($importMapPreloadPath);
+ }
+ $this->filesystem->dumpFile(
+ $importMapPreloadPath,
+ json_encode($this->importMapManager->getModulesToPreload(), \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES)
+ );
+ $io->comment(sprintf('Import map written to %s and %s for quick importmap dumping onto the page.', $this->shortenPath($importMapPath), $this->shortenPath($importMapPreloadPath)));
+
+ if ($this->isDebug) {
+ $io->warning(sprintf(
+ 'You are compiling assets in development. Symfony will not serve any changed assets until you delete the "%s" directory.',
+ $this->shortenPath($outputDir)
+ ));
+ }
+
+ return 0;
+ }
+
+ private function shortenPath(string $path): string
+ {
+ return str_replace($this->projectDir.'/', '', $path);
+ }
+
+ private function createManifestAndWriteFiles(SymfonyStyle $io, string $publicDir): array
+ {
$allAssets = $this->assetMapper->allAssets();
$io->comment(sprintf('Compiling %d assets to %s%s', \count($allAssets), $publicDir, $this->assetMapper->getPublicPrefix()));
@@ -88,23 +129,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$this->filesystem->dumpFile($targetPath, $asset->getContent());
$manifest[$asset->logicalPath] = $asset->getPublicPath();
}
+ ksort($manifest);
- $manifestPath = $publicDir.$this->assetMapper->getPublicPrefix().AssetMapper::MANIFEST_FILE_NAME;
- $this->filesystem->dumpFile($manifestPath, json_encode($manifest, \JSON_PRETTY_PRINT));
- $io->comment(sprintf('Manifest written to %s', $manifestPath));
-
- $importMapPath = $publicDir.$this->assetMapper->getPublicPrefix().ImportMapManager::IMPORT_MAP_FILE_NAME;
- $this->filesystem->dumpFile($importMapPath, $this->importMapManager->getImportMapJson());
- $io->comment(sprintf('Import map written to %s', $importMapPath));
-
- if ($this->isDebug) {
- $io->warning(sprintf(
- 'You are compiling assets in development. Symfony will not serve any changed assets until you delete %s and %s.',
- $manifestPath,
- $importMapPath
- ));
- }
-
- return self::SUCCESS;
+ return $manifest;
}
}
diff --git a/src/Symfony/Component/AssetMapper/Command/DebugAssetMapperCommand.php b/src/Symfony/Component/AssetMapper/Command/DebugAssetMapperCommand.php
new file mode 100644
index 000000000000..54b2e7e98038
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Command/DebugAssetMapperCommand.php
@@ -0,0 +1,114 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Command;
+
+use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\AssetMapperRepository;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+/**
+ * Outputs all the assets in the asset mapper.
+ *
+ * @experimental
+ *
+ * @author Ryan Weaver
+ */
+#[AsCommand(name: 'debug:asset-map', description: 'Outputs all mapped assets.')]
+final class DebugAssetMapperCommand extends Command
+{
+ private bool $didShortenPaths = false;
+
+ public function __construct(
+ private readonly AssetMapperInterface $assetMapper,
+ private readonly AssetMapperRepository $assetMapperRepository,
+ private readonly string $projectDir,
+ ) {
+ parent::__construct();
+ }
+
+ protected function configure(): void
+ {
+ $this
+ ->addOption('full', null, null, 'Whether to show the full paths')
+ ->setHelp(<<<'EOT'
+The %command.name% command outputs all of the assets in
+asset mapper for debugging purposes.
+EOT
+ );
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output): int
+ {
+ $io = new SymfonyStyle($input, $output);
+
+ $allAssets = $this->assetMapper->allAssets();
+
+ $pathRows = [];
+ foreach ($this->assetMapperRepository->allDirectories() as $path => $namespace) {
+ $path = $this->relativizePath($path);
+ if (!$input->getOption('full')) {
+ $path = $this->shortenPath($path);
+ }
+
+ $pathRows[] = [$path, $namespace];
+ }
+ $io->section('Asset Mapper Paths');
+ $io->table(['Path', 'Namespace prefix'], $pathRows);
+
+ $rows = [];
+ foreach ($allAssets as $asset) {
+ $logicalPath = $asset->logicalPath;
+ $sourcePath = $this->relativizePath($asset->getSourcePath());
+
+ if (!$input->getOption('full')) {
+ $logicalPath = $this->shortenPath($logicalPath);
+ $sourcePath = $this->shortenPath($sourcePath);
+ }
+
+ $rows[] = [
+ $logicalPath,
+ $sourcePath,
+ ];
+ }
+ $io->section('Mapped Assets');
+ $io->table(['Logical Path', 'Filesystem Path'], $rows);
+
+ if ($this->didShortenPaths) {
+ $io->note('To see the full paths, re-run with the --full option.');
+ }
+
+ return 0;
+ }
+
+ private function relativizePath(string $path): string
+ {
+ return str_replace($this->projectDir.'/', '', $path);
+ }
+
+ private function shortenPath($path): string
+ {
+ $limit = 50;
+
+ if (\strlen($path) <= $limit) {
+ return $path;
+ }
+
+ $this->didShortenPaths = true;
+ $limit = floor(($limit - 3) / 2);
+
+ return substr($path, 0, $limit).'...'.substr($path, -$limit);
+ }
+}
diff --git a/src/Symfony/Component/AssetMapper/Command/ImportMapRequireCommand.php b/src/Symfony/Component/AssetMapper/Command/ImportMapRequireCommand.php
index 529a90bca7f5..88efaccdab50 100644
--- a/src/Symfony/Component/AssetMapper/Command/ImportMapRequireCommand.php
+++ b/src/Symfony/Component/AssetMapper/Command/ImportMapRequireCommand.php
@@ -13,6 +13,7 @@
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\ImportMap\ImportMapEntry;
use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
use Symfony\Component\AssetMapper\ImportMap\PackageRequireOptions;
use Symfony\Component\Console\Attribute\AsCommand;
@@ -95,7 +96,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$message .= '.';
} else {
- $message = sprintf('%d new packages (%s) added to the importmap.php!', \count($newPackages), implode(', ', array_keys($newPackages)));
+ $names = array_map(fn (ImportMapEntry $package) => $package->importName, $newPackages);
+ $message = sprintf('%d new packages (%s) added to the importmap.php!', \count($newPackages), implode(', ', $names));
}
$messages = [$message];
diff --git a/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerInterface.php b/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerInterface.php
index 247161dffa32..52dfe0e88046 100644
--- a/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerInterface.php
+++ b/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerInterface.php
@@ -11,7 +11,6 @@
namespace Symfony\Component\AssetMapper\Compiler;
-use Symfony\Component\AssetMapper\AssetMapper;
use Symfony\Component\AssetMapper\AssetMapperInterface;
use Symfony\Component\AssetMapper\MappedAsset;
diff --git a/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php b/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php
index f252bb7bb9ab..ddb82c77d59c 100644
--- a/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php
+++ b/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php
@@ -11,7 +11,6 @@
namespace Symfony\Component\AssetMapper\Compiler;
-use Symfony\Component\AssetMapper\AssetMapper;
use Symfony\Component\AssetMapper\AssetMapperInterface;
use Symfony\Component\AssetMapper\MappedAsset;
@@ -64,6 +63,6 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
public function supports(MappedAsset $asset): bool
{
- return 'application/javascript' === $asset->getMimeType() || 'text/javascript' === $asset->getMimeType();
+ return 'application/javascript' === $asset->getMimeType() || 'text/javascript' === $asset->getMimeType();
}
}
diff --git a/src/Symfony/Component/AssetMapper/Compiler/SourceMappingUrlsCompiler.php b/src/Symfony/Component/AssetMapper/Compiler/SourceMappingUrlsCompiler.php
index 31dab5a79c7e..643cf233045b 100644
--- a/src/Symfony/Component/AssetMapper/Compiler/SourceMappingUrlsCompiler.php
+++ b/src/Symfony/Component/AssetMapper/Compiler/SourceMappingUrlsCompiler.php
@@ -11,7 +11,6 @@
namespace Symfony\Component\AssetMapper\Compiler;
-use Symfony\Component\AssetMapper\AssetMapper;
use Symfony\Component\AssetMapper\AssetMapperInterface;
use Symfony\Component\AssetMapper\MappedAsset;
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php
index 1dbbf34d28d9..d71496f4a228 100644
--- a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php
+++ b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php
@@ -22,6 +22,7 @@
*
* @author Kévin Dunglas
* @author Ryan Weaver
+ *
* @final
*/
class ImportMapManager
@@ -48,6 +49,7 @@ class ImportMapManager
*/
private const PACKAGE_PATTERN = '/^(?:https?:\/\/[\w\.-]+\/)?(?:(?\w+):)?(?(?:@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*)(?:@(?[\w\._-]+))?(?:(?\/.*))?$/';
public const IMPORT_MAP_FILE_NAME = 'importmap.json';
+ public const IMPORT_MAP_PRELOAD_FILE_NAME = 'importmap.preload.json';
private array $importMapEntries;
private array $modulesToPreload;
@@ -81,6 +83,7 @@ public function getImportMapJson(): string
* Adds or updates packages.
*
* @param PackageRequireOptions[] $packages
+ *
* @return ImportMapEntry[]
*/
public function require(array $packages): array
@@ -111,8 +114,8 @@ public function update(): array
*/
public static function parsePackageName(string $packageName): ?array
{
- // https://regex101.com/r/58bl9L/1
- $regex = '/(?:(?P[^:\n]+):)?(?P[^@\n]+)(?:@(?P[^\s\n]+))?/';
+ // https://regex101.com/r/d99BEc/1
+ $regex = '/(?:(?P[^:\n]+):)?((?P@?[^@\n]+))(?:@(?P[^\s\n]+))?/';
return preg_match($regex, $packageName, $matches) ? $matches : null;
}
@@ -123,9 +126,11 @@ private function buildImportMapJson(): void
return;
}
- $dumpedPath = $this->assetMapper->getPublicAssetsFilesystemPath().'/'.self::IMPORT_MAP_FILE_NAME;
- if (file_exists($dumpedPath)) {
- $this->json = file_get_contents($dumpedPath);
+ $dumpedImportMapPath = $this->assetMapper->getPublicAssetsFilesystemPath().'/'.self::IMPORT_MAP_FILE_NAME;
+ $dumpedModulePreloadPath = $this->assetMapper->getPublicAssetsFilesystemPath().'/'.self::IMPORT_MAP_PRELOAD_FILE_NAME;
+ if (is_file($dumpedImportMapPath) && is_file($dumpedModulePreloadPath)) {
+ $this->json = file_get_contents($dumpedImportMapPath);
+ $this->modulesToPreload = json_decode(file_get_contents($dumpedModulePreloadPath), true, 512, \JSON_THROW_ON_ERROR);
return;
}
@@ -143,7 +148,8 @@ private function buildImportMapJson(): void
/**
* @param PackageRequireOptions[] $packagesToRequire
- * @param string[] $packagesToRemove
+ * @param string[] $packagesToRemove
+ *
* @return ImportMapEntry[]
*/
private function updateImportMapConfig(bool $update, array $packagesToRequire, array $packagesToRemove): array
@@ -202,7 +208,7 @@ private function updateImportMapConfig(bool $update, array $packagesToRequire, a
*
* Returns an array of the entries that were added.
*
- * @param PackageRequireOptions[] $packagesToRequire
+ * @param PackageRequireOptions[] $packagesToRequire
* @param array $importMapEntries
*/
private function requirePackages(array $packagesToRequire, array &$importMapEntries): array
@@ -216,7 +222,7 @@ private function requirePackages(array $packagesToRequire, array &$importMapEntr
foreach ($packagesToRequire as $requireOptions) {
$constraint = $requireOptions->packageName;
if (null !== $requireOptions->versionConstraint) {
- $constraint .= '@' . $requireOptions->versionConstraint;
+ $constraint .= '@'.$requireOptions->versionConstraint;
}
if (null !== $requireOptions->registryName) {
$constraint = sprintf('%s:%s', $requireOptions->registryName, $constraint);
@@ -243,7 +249,7 @@ private function requirePackages(array $packagesToRequire, array &$importMapEntr
$data = $response->toArray(false);
if (isset($data['error'])) {
- throw new \RuntimeException(sprintf('Error requiring JavaScript package: "%s"', $data['error']));
+ throw new \RuntimeException('Error requiring JavaScript package: '.$data['error']);
}
// Throws the original HttpClient exception
@@ -251,7 +257,7 @@ private function requirePackages(array $packagesToRequire, array &$importMapEntr
}
// 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;
+ $defaultPreload = 1 === \count($packagesToRequire) ? $packagesToRequire[0]->preload : false;
$addedEntries = [];
foreach ($response->toArray()['map']['imports'] as $packageName => $url) {
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapRenderer.php b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapRenderer.php
index 08c75f52771b..7a5dc4300100 100644
--- a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapRenderer.php
+++ b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapRenderer.php
@@ -16,6 +16,7 @@
*
* @author Kévin Dunglas
* @author Ryan Weaver
+ *
* @final
*/
class ImportMapRenderer
@@ -28,7 +29,7 @@ public function __construct(
) {
}
- public function render(?string $entryPoint = null): string
+ public function render(string $entryPoint = null): string
{
$attributeString = '';
@@ -69,7 +70,7 @@ public function render(?string $entryPoint = null): string
}
if (null !== $entryPoint) {
- $output .= "\n";
+ $output .= "\n";
}
return $output;
diff --git a/src/Symfony/Component/AssetMapper/MappedAsset.php b/src/Symfony/Component/AssetMapper/MappedAsset.php
index 7d09bd3acb6f..e3f31938d6fa 100644
--- a/src/Symfony/Component/AssetMapper/MappedAsset.php
+++ b/src/Symfony/Component/AssetMapper/MappedAsset.php
@@ -20,16 +20,17 @@
*/
final class MappedAsset
{
- public string $publicPath;
+ private string $publicPath;
+ private string $publicPathWithoutDigest;
/**
- * @var string The filesystem path to the source file.
+ * @var string the filesystem path to the source file
*/
private string $sourcePath;
private string $content;
private string $digest;
private bool $isPredigested;
private ?string $mimeType;
- /** @var AssetDependency[] */
+ /** @var AssetDependency[] */
private array $dependencies = [];
public function __construct(public readonly string $logicalPath)
@@ -88,6 +89,15 @@ public function setPublicPath(string $publicPath): void
$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.');
+ }
+
+ $this->publicPathWithoutDigest = $publicPathWithoutDigest;
+ }
+
public function setSourcePath(string $sourcePath): void
{
if (isset($this->sourcePath)) {
@@ -125,23 +135,13 @@ public function setContent(string $content): void
$this->content = $content;
}
- public function addDependency(MappedAsset $asset, bool $isLazy = false): void
+ public function addDependency(self $asset, bool $isLazy = false): void
{
$this->dependencies[] = new AssetDependency($asset, $isLazy);
}
public function getPublicPathWithoutDigest(): string
{
- if ($this->isPredigested()) {
- return $this->getPublicPath();
- }
-
- // remove last part of publicPath and replace with last part of logicalPath
- $publicPathParts = explode('/', $this->getPublicPath());
- $logicalPathParts = explode('/', $this->logicalPath);
- array_pop($publicPathParts);
- $publicPathParts[] = array_pop($logicalPathParts);
-
- return implode('/', $publicPathParts);
+ return $this->publicPathWithoutDigest;
}
}
diff --git a/src/Symfony/Component/AssetMapper/Tests/AssetMapperRepositoryTest.php b/src/Symfony/Component/AssetMapper/Tests/AssetMapperRepositoryTest.php
index f2110f1e2a2a..e92b419fddad 100644
--- a/src/Symfony/Component/AssetMapper/Tests/AssetMapperRepositoryTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/AssetMapperRepositoryTest.php
@@ -23,9 +23,9 @@ public function testFindWithAbsolutePaths()
__DIR__.'/fixtures/dir2' => '',
], __DIR__);
- $this->assertSame(__DIR__.'/fixtures/dir1/file1.css', $repository->find('file1.css'));
- $this->assertSame(__DIR__.'/fixtures/dir2/file4.js', $repository->find('file4.js'));
- $this->assertSame(__DIR__.'/fixtures/dir2/subdir/file5.js', $repository->find('subdir/file5.js'));
+ $this->assertSame(realpath(__DIR__.'/fixtures/dir1/file1.css'), $repository->find('file1.css'));
+ $this->assertSame(realpath(__DIR__.'/fixtures/dir2/file4.js'), $repository->find('file4.js'));
+ $this->assertSame(realpath(__DIR__.'/fixtures/dir2/subdir/file5.js'), $repository->find('subdir/file5.js'));
$this->assertNull($repository->find('file5.css'));
}
@@ -36,12 +36,22 @@ public function testFindWithRelativePaths()
'dir2' => '',
], __DIR__.'/fixtures');
- $this->assertSame(__DIR__.'/fixtures/dir1/file1.css', $repository->find('file1.css'));
- $this->assertSame(__DIR__.'/fixtures/dir2/file4.js', $repository->find('file4.js'));
- $this->assertSame(__DIR__.'/fixtures/dir2/subdir/file5.js', $repository->find('subdir/file5.js'));
+ $this->assertSame(realpath(__DIR__.'/fixtures/dir1/file1.css'), $repository->find('file1.css'));
+ $this->assertSame(realpath(__DIR__.'/fixtures/dir2/file4.js'), $repository->find('file4.js'));
+ $this->assertSame(realpath(__DIR__.'/fixtures/dir2/subdir/file5.js'), $repository->find('subdir/file5.js'));
$this->assertNull($repository->find('file5.css'));
}
+ public function testFindWithMovingPaths()
+ {
+ $repository = new AssetMapperRepository([
+ __DIR__.'/../Tests/fixtures/dir2' => '',
+ ], __DIR__);
+
+ $this->assertSame(realpath(__DIR__.'/fixtures/dir2/file4.js'), $repository->find('file4.js'));
+ $this->assertSame(realpath(__DIR__.'/fixtures/dir2/file4.js'), $repository->find('subdir/../file4.js'));
+ }
+
public function testFindWithNamespaces()
{
$repository = new AssetMapperRepository([
@@ -49,9 +59,9 @@ public function testFindWithNamespaces()
'dir2' => 'dir2_namespace',
], __DIR__.'/fixtures');
- $this->assertSame(__DIR__.'/fixtures/dir1/file1.css', $repository->find('dir1_namespace/file1.css'));
- $this->assertSame(__DIR__.'/fixtures/dir2/file4.js', $repository->find('dir2_namespace/file4.js'));
- $this->assertSame(__DIR__.'/fixtures/dir2/subdir/file5.js', $repository->find('dir2_namespace/subdir/file5.js'));
+ $this->assertSame(realpath(__DIR__.'/fixtures/dir1/file1.css'), $repository->find('dir1_namespace/file1.css'));
+ $this->assertSame(realpath(__DIR__.'/fixtures/dir2/file4.js'), $repository->find('dir2_namespace/file4.js'));
+ $this->assertSame(realpath(__DIR__.'/fixtures/dir2/subdir/file5.js'), $repository->find('dir2_namespace/subdir/file5.js'));
// non-namespaced path does not work
$this->assertNull($repository->find('file4.js'));
}
@@ -59,10 +69,12 @@ public function testFindWithNamespaces()
public function testFindLogicalPath()
{
$repository = new AssetMapperRepository([
- 'dir1' => '',
+ 'dir1' => 'some_namespace',
'dir2' => '',
], __DIR__.'/fixtures');
$this->assertSame('subdir/file5.js', $repository->findLogicalPath(__DIR__.'/fixtures/dir2/subdir/file5.js'));
+ $this->assertSame('some_namespace/file2.js', $repository->findLogicalPath(__DIR__.'/fixtures/dir1/file2.js'));
+ $this->assertSame('some_namespace/file2.js', $repository->findLogicalPath(__DIR__.'/../Tests/fixtures/dir1/file2.js'));
}
public function testAll()
@@ -83,8 +95,8 @@ public function testAll()
'already-abcdefVWXYZ0123456789.digested.css' => __DIR__.'/fixtures/dir2/already-abcdefVWXYZ0123456789.digested.css',
'file3.css' => __DIR__.'/fixtures/dir2/file3.css',
'file4.js' => __DIR__.'/fixtures/dir2/file4.js',
- 'subdir'.DIRECTORY_SEPARATOR.'file5.js' => __DIR__.'/fixtures/dir2/subdir/file5.js',
- 'subdir'.DIRECTORY_SEPARATOR.'file6.js' => __DIR__.'/fixtures/dir2/subdir/file6.js',
+ 'subdir/file5.js' => __DIR__.'/fixtures/dir2/subdir/file5.js',
+ 'subdir/file6.js' => __DIR__.'/fixtures/dir2/subdir/file6.js',
'test.gif.foo' => __DIR__.'/fixtures/dir3/test.gif.foo',
]);
$this->assertEquals($expectedAllAssets, array_map('realpath', $actualAllAssets));
@@ -109,16 +121,10 @@ public function testAllWithNamespaces()
'dir3_namespace/test.gif.foo' => __DIR__.'/fixtures/dir3/test.gif.foo',
];
- $normalizedExpectedAllAssets = [];
- foreach ($expectedAllAssets as $key => $val) {
- $normalizedExpectedAllAssets[str_replace('/', DIRECTORY_SEPARATOR, $key)] = realpath($val);
- }
+ $normalizedExpectedAllAssets = array_map('realpath', $expectedAllAssets);
$actualAssets = $repository->all();
- $normalizedActualAssets = [];
- foreach ($actualAssets as $key => $val) {
- $normalizedActualAssets[str_replace('/', DIRECTORY_SEPARATOR, $key)] = realpath($val);
- }
+ $normalizedActualAssets = array_map('realpath', $actualAssets);
$this->assertEquals($normalizedExpectedAllAssets, $normalizedActualAssets);
}
diff --git a/src/Symfony/Component/AssetMapper/Tests/AssetMapperTest.php b/src/Symfony/Component/AssetMapper/Tests/AssetMapperTest.php
index 79cf7267135f..272c07e20c1e 100644
--- a/src/Symfony/Component/AssetMapper/Tests/AssetMapperTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/AssetMapperTest.php
@@ -65,6 +65,7 @@ public function testGetAsset()
$asset = $assetMapper->getAsset('file2.js');
$this->assertSame('file2.js', $asset->logicalPath);
$this->assertMatchesRegularExpression('/^\/final-assets\/file2-[a-zA-Z0-9]{7,128}\.js$/', $asset->getPublicPath());
+ $this->assertSame('/final-assets/file2.js', $asset->getPublicPathWithoutDigest());
}
public function testGetAssetRespectsPreDigestedPaths()
@@ -73,6 +74,8 @@ public function testGetAssetRespectsPreDigestedPaths()
$asset = $assetMapper->getAsset('already-abcdefVWXYZ0123456789.digested.css');
$this->assertSame('already-abcdefVWXYZ0123456789.digested.css', $asset->logicalPath);
$this->assertSame('/final-assets/already-abcdefVWXYZ0123456789.digested.css', $asset->getPublicPath());
+ // for pre-digested files, the digest *is* part of the public path
+ $this->assertSame('/final-assets/already-abcdefVWXYZ0123456789.digested.css', $asset->getPublicPathWithoutDigest());
}
public function testGetAssetUsesManifestIfAvailable()
diff --git a/src/Symfony/Component/AssetMapper/Tests/Command/AssetsMapperCompileCommandTest.php b/src/Symfony/Component/AssetMapper/Tests/Command/AssetsMapperCompileCommandTest.php
index 3bbaac82d723..6475a9110276 100644
--- a/src/Symfony/Component/AssetMapper/Tests/Command/AssetsMapperCompileCommandTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/Command/AssetsMapperCompileCommandTest.php
@@ -13,7 +13,6 @@
use PHPUnit\Framework\TestCase;
use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Bundle\FrameworkBundle\Tests\Command\AssetsMapperCompileCommand\Fixture\TestAppKernel;
use Symfony\Component\AssetMapper\Tests\fixtures\AssetMapperTestAppKernel;
use Symfony\Component\Console\Tester\CommandTester;
use Symfony\Component\Filesystem\Filesystem;
@@ -41,14 +40,20 @@ public function testAssetsAreCompiled()
{
$application = new Application($this->kernel);
- $command = $application->find('assetmap:compile');
+ $targetBuildDir = $this->kernel->getProjectDir().'/public/assets';
+ // put old "built" versions to make sure the system skips using these
+ $this->filesystem->mkdir($targetBuildDir);
+ file_put_contents($targetBuildDir.'/manifest.json', '{}');
+ file_put_contents($targetBuildDir.'/importmap.json', '{"imports": {}}');
+ file_put_contents($targetBuildDir.'/importmap.preload.json', '{}');
+
+ $command = $application->find('asset-map:compile');
$tester = new CommandTester($command);
$res = $tester->execute([]);
$this->assertSame(0, $res);
// match Compiling \d+ assets
$this->assertMatchesRegularExpression('/Compiling \d+ assets/', $tester->getDisplay());
- $targetBuildDir = $this->kernel->getProjectDir().'/public/assets';
$this->assertFileExists($targetBuildDir.'/subdir/file5-f4fdc37375c7f5f2629c5659a0579967.js');
$this->assertSame(<<in($targetBuildDir)->files();
- $this->assertCount(9, $finder);
+ $this->assertCount(10, $finder);
$this->assertFileExists($targetBuildDir.'/manifest.json');
+
+ $this->assertSame([
+ 'already-abcdefVWXYZ0123456789.digested.css',
+ 'file1.css',
+ 'file2.js',
+ 'file3.css',
+ 'file4.js',
+ 'subdir/file5.js',
+ 'subdir/file6.js',
+ ], array_keys(json_decode(file_get_contents($targetBuildDir.'/manifest.json'), true)));
+
$this->assertFileExists($targetBuildDir.'/importmap.json');
+ $actualImportMap = json_decode(file_get_contents($targetBuildDir.'/importmap.json'), true);
+ $this->assertSame([
+ '@hotwired/stimulus',
+ 'lodash',
+ 'file6',
+ '/assets/subdir/file5.js', // imported by file6
+ '/assets/file4.js', // imported by file5
+ ], array_keys($actualImportMap['imports']));
+
+ $this->assertFileExists($targetBuildDir.'/importmap.preload.json');
+ $actualPreload = json_decode(file_get_contents($targetBuildDir.'/importmap.preload.json'), true);
+ $this->assertCount(4, $actualPreload);
+ $this->assertStringStartsWith('https://unpkg.com/@hotwired/stimulus', $actualPreload[0]);
+ $this->assertStringStartsWith('/assets/subdir/file6-', $actualPreload[1]);
+ $this->assertStringStartsWith('/assets/subdir/file5-', $actualPreload[2]);
+ $this->assertStringStartsWith('/assets/file4-', $actualPreload[3]);
}
}
diff --git a/src/Symfony/Component/AssetMapper/Tests/Command/DebugAssetsMapperCommandTest.php b/src/Symfony/Component/AssetMapper/Tests/Command/DebugAssetsMapperCommandTest.php
new file mode 100644
index 000000000000..8f375876078f
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/Command/DebugAssetsMapperCommandTest.php
@@ -0,0 +1,34 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\AssetMapper\Tests\fixtures\AssetMapperTestAppKernel;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class DebugAssetsMapperCommandTest extends TestCase
+{
+ public function testCommandDumpsInformation()
+ {
+ $application = new Application(new AssetMapperTestAppKernel('test', true));
+
+ $command = $application->find('debug:asset-map');
+ $tester = new CommandTester($command);
+ $res = $tester->execute([]);
+ $this->assertSame(0, $res);
+
+ $this->assertStringContainsString('dir1', $tester->getDisplay());
+ $this->assertStringContainsString('subdir/file6.js', $tester->getDisplay());
+ $this->assertStringContainsString('dir2'.\DIRECTORY_SEPARATOR.'subdir'.\DIRECTORY_SEPARATOR.'file6.js', $tester->getDisplay());
+ }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php b/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php
index da34a4ef5a8e..d1d2fffdb876 100644
--- a/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php
@@ -40,7 +40,7 @@ public static function provideCompileTests(): iterable
yield 'dynamic_simple_double_quotes' => [
'sourceLogicalName' => 'app.js',
'input' => 'import("./other.js");',
- 'expectedDependencies' => ['other.js' => true]
+ 'expectedDependencies' => ['other.js' => true],
];
yield 'dynamic_simple_multiline' => [
@@ -50,19 +50,19 @@ public static function provideCompileTests(): iterable
import("./other.js");
EOF
,
- 'expectedDependencies' => ['other.js' => true]
+ 'expectedDependencies' => ['other.js' => true],
];
yield 'dynamic_simple_single_quotes' => [
'sourceLogicalName' => 'app.js',
'input' => 'import(\'./other.js\');',
- 'expectedDependencies' => ['other.js' => true]
+ 'expectedDependencies' => ['other.js' => true],
];
yield 'dynamic_simple_tick_quotes' => [
'sourceLogicalName' => 'app.js',
'input' => 'import(`./other.js`);',
- 'expectedDependencies' => ['other.js' => true]
+ 'expectedDependencies' => ['other.js' => true],
];
yield 'dynamic_resolves_multiple' => [
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php
index 4c75084c8681..e47a5f233123 100644
--- a/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php
@@ -27,25 +27,24 @@ class ImportMapManagerTest extends TestCase
private MockHttpClient $httpClient;
private Filesystem $filesystem;
-
protected function setUp(): void
{
$this->filesystem = new Filesystem();
- if (!file_exists(__DIR__ . '/../fixtures/importmaps_for_writing')) {
- $this->filesystem->mkdir(__DIR__ . '/../fixtures/importmaps_for_writing');
+ if (!file_exists(__DIR__.'/../fixtures/importmaps_for_writing')) {
+ $this->filesystem->mkdir(__DIR__.'/../fixtures/importmaps_for_writing');
}
}
protected function tearDown(): void
{
- $this->filesystem->remove(__DIR__ . '/../fixtures/importmaps_for_writing');
+ $this->filesystem->remove(__DIR__.'/../fixtures/importmaps_for_writing');
}
public function testGetModulesToPreload()
{
$manager = $this->createImportMapManager(
['assets' => '', 'assets2' => 'namespaced_assets2'],
- __DIR__ . '/../fixtures/importmaps/'
+ __DIR__.'/../fixtures/importmaps/'
);
$this->assertEquals([
'https://unpkg.com/@hotwired/stimulus@3.2.1/dist/stimulus.js',
@@ -60,7 +59,7 @@ public function testGetImportMapJson()
{
$manager = $this->createImportMapManager(
['assets' => '', 'assets2' => 'namespaced_assets2'],
- __DIR__ . '/../fixtures/importmaps/'
+ __DIR__.'/../fixtures/importmaps/'
);
$this->assertEquals(['imports' => [
'@hotwired/stimulus' => 'https://unpkg.com/@hotwired/stimulus@3.2.1/dist/stimulus.js',
@@ -77,7 +76,7 @@ public function testGetImportMapJsonUsesDumpedFile()
{
$manager = $this->createImportMapManager(
['assets' => ''],
- __DIR__ . '/../fixtures/',
+ __DIR__.'/../fixtures/',
'/final-assets',
'test_public'
);
@@ -85,6 +84,9 @@ public function testGetImportMapJsonUsesDumpedFile()
'@hotwired/stimulus' => 'https://unpkg.com/@hotwired/stimulus@3.2.1/dist/stimulus.js',
'app' => '/assets/app-ea9ebe6156adc038aba53164e2be0867.js',
]], json_decode($manager->getImportMapJson(), true));
+ $this->assertEquals([
+ '/assets/app-ea9ebe6156adc038aba53164e2be0867.js',
+ ], $manager->getModulesToPreload());
}
/**
@@ -92,7 +94,7 @@ public function testGetImportMapJsonUsesDumpedFile()
*/
public function testRequire(array $packages, array $expectedInstallRequest, array $responseMap, array $expectedImportMap, array $expectedDownloadedFiles)
{
- $rootDir = __DIR__ . '/../fixtures/importmaps_for_writing';
+ $rootDir = __DIR__.'/../fixtures/importmaps_for_writing';
$manager = $this->createImportMapManager(['assets' => ''], $rootDir);
$expectedRequestBody = [
@@ -120,11 +122,11 @@ public function testRequire(array $packages, array $expectedInstallRequest, arra
$this->httpClient->setResponseFactory($responses);
$manager->require($packages);
- $actualImportMap = require($rootDir.'/importmap.php');
+ $actualImportMap = require $rootDir.'/importmap.php';
$this->assertEquals($expectedImportMap, $actualImportMap);
foreach ($expectedDownloadedFiles as $file) {
- $this->assertFileExists($rootDir.'/' . $file);
- $actualContents = file_get_contents($rootDir.'/' . $file);
+ $this->assertFileExists($rootDir.'/'.$file);
+ $actualContents = file_get_contents($rootDir.'/'.$file);
$this->assertSame(sprintf('contents of %s', $file), $actualContents);
}
}
@@ -140,7 +142,7 @@ public static function getRequirePackageTests(): iterable
'expectedImportMap' => [
'lodash' => [
'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
- ]
+ ],
],
'expectedDownloadedFiles' => [],
];
@@ -163,7 +165,7 @@ public static function getRequirePackageTests(): iterable
'expectedDownloadedFiles' => [],
];
- yield 'single_package_that_returns_as_two' => [
+ yield 'single_package_that_returns_as_two' => [
'packages' => [new PackageRequireOptions('lodash')],
'expectedInstallRequest' => ['lodash'],
'responseMap' => [
@@ -258,7 +260,7 @@ public static function getRequirePackageTests(): iterable
public function testRemove()
{
- $rootDir = __DIR__ . '/../fixtures/importmaps_for_writing';
+ $rootDir = __DIR__.'/../fixtures/importmaps_for_writing';
$manager = $this->createImportMapManager(['assets' => ''], $rootDir);
$map = [
@@ -289,7 +291,7 @@ public function testRemove()
touch($rootDir.'/assets/other.js');
$manager->remove(['cowsay', 'app']);
- $actualImportMap = require($rootDir.'/importmap.php');
+ $actualImportMap = require $rootDir.'/importmap.php';
$expectedImportMap = $map;
unset($expectedImportMap['cowsay'], $expectedImportMap['app']);
$this->assertEquals($expectedImportMap, $actualImportMap);
@@ -301,7 +303,7 @@ public function testRemove()
public function testUpdate()
{
- $rootDir = __DIR__ . '/../fixtures/importmaps_for_writing';
+ $rootDir = __DIR__.'/../fixtures/importmaps_for_writing';
$manager = $this->createImportMapManager(['assets' => ''], $rootDir);
$map = [
@@ -342,11 +344,11 @@ public function testUpdate()
]));
};
// 1 file will be downloaded
- $responses[] = new MockResponse(sprintf('contents of cowsay.js'));
+ $responses[] = new MockResponse('contents of cowsay.js');
$this->httpClient->setResponseFactory($responses);
$manager->update();
- $actualImportMap = require($rootDir.'/importmap.php');
+ $actualImportMap = require $rootDir.'/importmap.php';
$expectedImportMap = [
'lodash' => [
'url' => 'https://ga.jspm.io/npm:lodash@1.2.9/lodash.js',
@@ -379,10 +381,10 @@ public function testParsePackageName(string $packageName, array $expectedReturn)
$parsed = ImportMapManager::parsePackageName($packageName);
// remove integer keys - they're noise
- if (is_array($parsed)) {
+ if (\is_array($parsed)) {
$parsed = array_filter($parsed, function ($key) {
- return !is_int($key);
- }, ARRAY_FILTER_USE_KEY);
+ return !\is_int($key);
+ }, \ARRAY_FILTER_USE_KEY);
}
$this->assertEquals($expectedReturn, $parsed);
}
@@ -422,6 +424,40 @@ public static function getPackageNameTests(): iterable
'version' => '^1.2.3',
],
];
+
+ yield 'namespaced_package_simple' => [
+ '@hotwired/stimulus',
+ [
+ 'package' => '@hotwired/stimulus',
+ 'registry' => '',
+ ],
+ ];
+
+ yield 'namespaced_package_with_version_constraint' => [
+ '@hotwired/stimulus@^1.2.3',
+ [
+ 'package' => '@hotwired/stimulus',
+ 'registry' => '',
+ 'version' => '^1.2.3',
+ ],
+ ];
+
+ yield 'namespaced_package_with_registry' => [
+ 'npm:@hotwired/stimulus',
+ [
+ 'package' => '@hotwired/stimulus',
+ 'registry' => 'npm',
+ ],
+ ];
+
+ yield 'namespaced_package_with_registry_and_version' => [
+ 'npm:@hotwired/stimulus@^1.2.3',
+ [
+ 'package' => '@hotwired/stimulus',
+ 'registry' => 'npm',
+ 'version' => '^1.2.3',
+ ],
+ ];
}
private function createImportMapManager(array $dirs, string $rootDir, string $publicPrefix = '/assets/', string $publicDirName = 'public'): ImportMapManager
@@ -431,8 +467,8 @@ private function createImportMapManager(array $dirs, string $rootDir, string $pu
return new ImportMapManager(
$mapper,
- $rootDir . '/importmap.php',
- $rootDir . '/assets/vendor',
+ $rootDir.'/importmap.php',
+ $rootDir.'/assets/vendor',
ImportMapManager::PROVIDER_JSPM,
$this->httpClient
);
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapRendererTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapRendererTest.php
index 7742e9e7841a..2df0be10449a 100644
--- a/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapRendererTest.php
+++ b/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapRendererTest.php
@@ -25,8 +25,9 @@ public function testBasicRenderNoEntry()
- EOF
- , $html);
+ EOF,
+ $html
+ );
$this->assertStringContainsString('