Merge branch '6.4' into 7.0

* 6.4:
  [AssetMapper] Fix URL pattern when importing es-module-shims
  Allow psr/container 1.1 again
  [Notifier] Mention `postAt()` in the Slack bridge README

Author: xabbuh

src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php

@@ -30,6 +30,8 @@ final class JsDelivrEsmResolver implements PackageResolverInterface
 
     public const IMPORT_REGEX = '#(?:import\s*(?:\w+,)?(?:(?:\{[^}]*\}|\w+|\*\s*as\s+\w+)\s*\bfrom\s*)?|export\s*(?:\{[^}]*\}|\*)\s*from\s*)("/npm/((?:@[^/]+/)?[^@]+?)(?:@([^/]+))?((?:/[^/]+)*?)/\+esm")#';
 
+    private const ES_MODULE_SHIMS = 'es-module-shims';
+
     private HttpClientInterface $httpClient;
 
     public function __construct(
@@ -78,7 +80,7 @@ public function resolvePackages(array $packagesToRequire): array
                 throw new RuntimeException(sprintf('Unable to find the latest version for package "%s" - try specifying the version manually.', $packageName));
             }
 
-            $pattern = str_ends_with($filePath, '.css') ? self::URL_PATTERN_DIST_CSS : self::URL_PATTERN_DIST;
+            $pattern = $this->resolveUrlPattern($packageName, $filePath);
             $requiredPackages[$i][1] = $this->httpClient->request('GET', sprintf($pattern, $packageName, $version, $filePath));
             $requiredPackages[$i][4] = $version;
 
@@ -169,7 +171,11 @@ public function downloadPackages(array $importMapEntries, callable $progressCall
                 throw new \InvalidArgumentException(sprintf('The entry "%s" is not a remote package.', $entry->importName));
             }
 
-            $pattern = ImportMapType::CSS === $entry->type ? self::URL_PATTERN_DIST_CSS : self::URL_PATTERN_DIST;
+            $pattern = $this->resolveUrlPattern(
+                $entry->getPackageName(),
+                $entry->getPackagePathString(),
+                $entry->type,
+            );
             $url = sprintf($pattern, $entry->getPackageName(), $entry->version, $entry->getPackagePathString());
 
             $responses[$package] = [$this->httpClient->request('GET', $url), $entry];
@@ -326,4 +332,19 @@ private function makeImportsBare(string $content, array &$dependencies, array &$
 
         return preg_replace('{/\*# sourceMappingURL=[^ ]*+ \*/}', '', $content);
     }
+
+    /**
+     * Determine the URL pattern to be used by the HTTP Client.
+     */
+    private function resolveUrlPattern(string $packageName, string $path, ImportMapType $type = null): string
+    {
+        // The URL for the es-module-shims polyfill package uses the CSS pattern to
+        // prevent a syntax error in the browser console, so check the package name
+        // as part of the condition.
+        if (self::ES_MODULE_SHIMS === $packageName || str_ends_with($path, '.css') || ImportMapType::CSS === $type) {
+            return self::URL_PATTERN_DIST_CSS;
+        }
+
+        return self::URL_PATTERN_DIST;
+    }
 }

src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php

@@ -439,17 +439,17 @@ public static function provideDownloadPackagesTests()
             ],
             [
                 [
-                    'url' => '/[email protected]/+esm',
+                    'url' => '/[email protected]',
                     'body' => <<<'EOF'
-const je="\n//# sourceURL=",Ue="\n//# sourceMappingURL=",Me=/^(text|application)\/(x-)?javascript(;|$)/,_e=/^(application)\/wasm(;|$)/,Ie=/^(text|application)\/json(;|$)/,Re=/^(text|application)\/css(;|$)/,Te=/url\(\s*(?:(["'])((?:\\.|[^\n\\"'])+)\1|((?:\\.|[^\s,"'()\\])+))\s*\)/g;export{t as default};
+const je="\n//# sourceURL=",Ue="\n//# sourceMappingURL=",Me=/^(text|application)\/(x-)?javascript(;|$)/,_e=/^(application)\/wasm(;|$)/,Ie=/^(text|application)\/json(;|$)/,Re=/^(text|application)\/css(;|$)/,Te=/url\(\s*(?:(["'])((?:\\.|[^\n\\"'])+)\1|((?:\\.|[^\s,"'()\\])+))\s*\)/g;
 //# sourceMappingURL=/sm/ef3916de598f421a779ba0e69af94655b2043095cde2410cc01893452d893338.map
 EOF
                 ],
             ],
             [
                 'es-module-shims' => [
                     'content' => <<<'EOF'
-const je="\n//# sourceURL=",Ue="\n//# sourceMappingURL=",Me=/^(text|application)\/(x-)?javascript(;|$)/,_e=/^(application)\/wasm(;|$)/,Ie=/^(text|application)\/json(;|$)/,Re=/^(text|application)\/css(;|$)/,Te=/url\(\s*(?:(["'])((?:\\.|[^\n\\"'])+)\1|((?:\\.|[^\s,"'()\\])+))\s*\)/g;export{t as default};
+const je="\n//# sourceURL=",Ue="\n//# sourceMappingURL=",Me=/^(text|application)\/(x-)?javascript(;|$)/,_e=/^(application)\/wasm(;|$)/,Ie=/^(text|application)\/json(;|$)/,Re=/^(text|application)\/css(;|$)/,Te=/url\(\s*(?:(["'])((?:\\.|[^\n\\"'])+)\1|((?:\\.|[^\s,"'()\\])+))\s*\)/g;
 EOF,
                     'dependencies' => [],
                     'extraFiles' => [],

src/Symfony/Component/Notifier/Bridge/Slack/README.md

@@ -29,7 +29,7 @@ SLACK_DSN=slack://xoxb-......@default?channel=fabien
 Adding Interactions to a Message
 --------------------------------
 
-With a Slack message, you can use the `SlackOptions` class to add some 
+With a Slack message, you can use the `SlackOptions` class to add some
 interactive options called [Block elements](https://api.slack.com/reference/block-kit/block-elements).
 
 ```php
@@ -177,7 +177,7 @@ $chatter->send($chatMessage);
 Sending a Message as a Reply
 ----------------------------
 
-To send your slack message as a reply in a thread use the `threadTs()` method.
+To send your Slack message as a reply in a thread use the `threadTs()` method.
 
 ```php
 use Symfony\Component\Notifier\Bridge\Slack\Block\SlackSectionBlock;
@@ -226,6 +226,23 @@ $options = new UpdateMessageSlackOptions($channelId, $messageId);
 $chatter->send(new ChatMessage('Updated message', $options));
 ```
 
+Scheduling a Slack Message
+--------------------------
+
+To schedule a message to be sent at a later time, use the `postAt()` method:
+
+```php
+use Symfony\Component\Notifier\Bridge\Slack\SlackOptions;
+use Symfony\Component\Notifier\Message\ChatMessage;
+
+$options = (new SlackOptions())->postAt(new \DateTime('+1 day'));
+
+$chatMessage = new ChatMessage('Symfony Feature');
+$chatMessage->options($options);
+
+$chatter->send($chatMessage);
+```
+
 Resources
 ---------
 

src/Symfony/Contracts/Service/composer.json

@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "psr/container": "^2.0"
+        "psr/container": "^1.1|^2.0"
     },
     "conflict": {
         "ext-psr": "<1.1|>=2"