Skip to content

Commit 3e046fd

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '7.3' into 7.4
* 7.3: [JsonPath] Use composer packages for JsonPath compliance test suite Fix negative delays with AMQP messenger transport [TwigBundle] Align TemplateIterator handling of @! original bundle templates with TwigExtension [AssetMapper] Batch concurrent requests to prevent flooding jsdelivr [HttpFoundation][Cache] Fix VARBINARY columns on sqlsrv [Cache] Fix calling the callback wrapper for ChainAdapter [Routing] Fix simple parameter mappings in routes [Process] Fix dealing with broken stdin pipes
2 parents ff94804 + 7256823 commit 3e046fd

File tree

23 files changed

+324
-13226
lines changed

23 files changed

+324
-13226
lines changed

‎composer.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@
142142
"egulias/email-validator": "^2.1.10|^3.1|^4",
143143
"guzzlehttp/promises": "^1.4|^2.0",
144144
"jolicode/jolinotif": "^2.7.2|^3.0",
145+
"jsonpath-standard/jsonpath-compliance-test-suite": "*",
145146
"league/html-to-markdown": "^5.0",
146147
"league/uri": "^6.5|^7.0",
147148
"masterminds/html5": "^2.7.2",
@@ -233,6 +234,18 @@
233234
{
234235
"type": "path",
235236
"url": "src/Symfony/Component/Runtime"
237+
},
238+
{
239+
"type": "package",
240+
"package": {
241+
"name": "jsonpath-standard/jsonpath-compliance-test-suite",
242+
"version": "2025.11.23",
243+
"source": {
244+
"type": "git",
245+
"url": "https://github.com/jsonpath-standard/jsonpath-compliance-test-suite.git",
246+
"reference": "b9d7153e58711ad38bb8e35ece69c13f4b2f7d63"
247+
}
248+
}
236249
}
237250
],
238251
"minimum-stability": "dev"

‎src/Symfony/Bundle/TwigBundle/TemplateIterator.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ public function getIterator(): \Traversable
6060
if (null !== $this->defaultPath) {
6161
$templates[] = $this->findTemplatesInDirectory($this->defaultPath.'/bundles/'.$bundle->getName(), $name);
6262
}
63+
64+
/*
65+
* The bundle's own templates are also registered with the "!" prefix namespace - this matches
66+
* @see \Symfony\Bundle\TwigBundle\DependencyInjection\TwigExtension::load()
67+
*/
68+
$templates[] = $this->findTemplatesInDirectory($bundleTemplatesDir, '!'.$name);
6369
}
6470

6571
foreach ($this->paths as $dir => $namespace) {

‎src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public function testGetIterator()
2525
sort($sorted);
2626
$this->assertEquals(
2727
[
28+
'@!Bar/index.html.twig',
2829
'@Bar/index.html.twig',
2930
'@Bar/layout.html.twig',
3031
'@Foo/index.html.twig',
@@ -43,6 +44,7 @@ public function testGetIteratorWithFileNameFilter()
4344
sort($sorted);
4445
$this->assertEquals(
4546
[
47+
'@!Bar/index.html.twig',
4648
'@Bar/index.html.twig',
4749
'@Bar/layout.html.twig',
4850
'@Foo/index.html.twig',

‎src/Symfony/Component/AssetMapper/ImportMap/BatchHttpClient.php‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\AssetMapper\ImportMap;
13+
14+
use Symfony\Component\HttpClient\DecoratorTrait;
15+
use Symfony\Contracts\HttpClient\HttpClientInterface;
16+
use Symfony\Contracts\HttpClient\ResponseInterface;
17+
18+
/**
19+
* @internal
20+
*/
21+
class BatchHttpClient implements HttpClientInterface
22+
{
23+
use DecoratorTrait;
24+
25+
private const BATCH_SIZE = 250;
26+
27+
private \WeakMap $pendingRequests;
28+
29+
public function request(string $method, string $url, array $options = []): ResponseInterface
30+
{
31+
$this->pendingRequests ??= new \WeakMap();
32+
$pendingRequests = [];
33+
34+
foreach ($this->pendingRequests as $response => $_) {
35+
if ($response->getInfo('http_code')) {
36+
$this->pendingRequests->offsetUnset($response);
37+
} else {
38+
$pendingRequests[] = $response;
39+
}
40+
}
41+
42+
if (\count($pendingRequests) >= self::BATCH_SIZE) {
43+
foreach ($this->client->stream($pendingRequests) as $response => $chunk) {
44+
if (!$chunk->isTimeout() && $chunk->isFirst()) {
45+
$response->getStatusCode(); // ignore 3/4/5xx
46+
$this->pendingRequests->offsetUnset($response);
47+
break;
48+
}
49+
}
50+
}
51+
52+
$response = $this->client->request($method, $url, $options);
53+
$this->pendingRequests[$response] = true;
54+
55+
return $response;
56+
}
57+
}

‎src/Symfony/Component/AssetMapper/ImportMap/ImportMapUpdateChecker.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function __construct(
2424
private readonly ImportMapConfigReader $importMapConfigReader,
2525
?HttpClientInterface $httpClient = null,
2626
) {
27-
$this->httpClient = $httpClient ?? HttpClient::create();
27+
$this->httpClient = new BatchHttpClient($httpClient ?? HttpClient::create());
2828
}
2929

3030
/**

‎src/Symfony/Component/AssetMapper/ImportMap/ImportMapVersionChecker.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ class ImportMapVersionChecker
2121
{
2222
private const PACKAGE_METADATA_PATTERN = 'https://registry.npmjs.org/%package%/%version%';
2323

24-
private HttpClientInterface $httpClient;
24+
private readonly HttpClientInterface $httpClient;
2525

2626
public function __construct(
2727
private ImportMapConfigReader $importMapConfigReader,
2828
private RemotePackageDownloader $packageDownloader,
2929
?HttpClientInterface $httpClient = null,
3030
) {
31-
$this->httpClient = $httpClient ?? HttpClient::create();
31+
$this->httpClient = new BatchHttpClient($httpClient ?? HttpClient::create());
3232
}
3333

3434
/**

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Component\AssetMapper\Compiler\CssAssetUrlCompiler;
1515
use Symfony\Component\AssetMapper\Exception\RuntimeException;
16+
use Symfony\Component\AssetMapper\ImportMap\BatchHttpClient;
1617
use Symfony\Component\AssetMapper\ImportMap\ImportMapEntry;
1718
use Symfony\Component\AssetMapper\ImportMap\ImportMapType;
1819
use Symfony\Component\AssetMapper\ImportMap\PackageRequireOptions;
@@ -33,12 +34,12 @@ final class JsDelivrEsmResolver implements PackageResolverInterface
3334

3435
private const ES_MODULE_SHIMS = 'es-module-shims';
3536

36-
private HttpClientInterface $httpClient;
37+
private readonly HttpClientInterface $httpClient;
3738

3839
public function __construct(
3940
?HttpClientInterface $httpClient = null,
4041
) {
41-
$this->httpClient = $httpClient ?? HttpClient::create();
42+
$this->httpClient = new BatchHttpClient($httpClient ?? HttpClient::create());
4243
}
4344

4445
public function resolvePackages(array $packagesToRequire): array

‎src/Symfony/Component/Cache/Adapter/ChainAdapter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function get(string $key, callable $callback, ?float $beta = null, ?array
108108
$callback = $wrap;
109109
$beta = \INF === $beta ? \INF : 0;
110110
}
111-
if ($adapter instanceof CacheInterface) {
111+
if ($adapter instanceof CacheInterface && $i !== $this->adapterCount) {
112112
$value = $adapter->get($key, $callback, $beta, $metadata);
113113
} else {
114114
$value = $this->doGet($adapter, $key, $callback, $beta, $metadata);

‎src/Symfony/Component/Cache/Adapter/PdoAdapter.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,17 @@ protected function doSave(array $values, int $lifetime): array|bool
324324
$insertStmt->bindValue(':time', $now, \PDO::PARAM_INT);
325325
}
326326

327+
if ('sqlsrv' === $driver) {
328+
$dataStream = fopen('php://memory', 'r+');
329+
}
327330
foreach ($values as $id => $data) {
331+
if ('sqlsrv' === $driver) {
332+
rewind($dataStream);
333+
fwrite($dataStream, $data);
334+
ftruncate($dataStream, \strlen($data));
335+
rewind($dataStream);
336+
$data = $dataStream;
337+
}
328338
try {
329339
$stmt->execute();
330340
} catch (\PDOException $e) {

‎src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,4 +266,28 @@ private function getNonPruneableMock(): AdapterInterface
266266
{
267267
return $this->createMock(AdapterInterface::class);
268268
}
269+
270+
public function testSetCallbackWrapperPropagation()
271+
{
272+
$adapter1 = new ArrayAdapter();
273+
$adapter2 = new FilesystemAdapter();
274+
275+
$chain = new ChainAdapter([$adapter1, $adapter2]);
276+
277+
$callbackWrapperCalled = false;
278+
$customWrapper = static function (callable $callback, CacheItem $item, bool &$save) use (&$callbackWrapperCalled) {
279+
$callbackWrapperCalled = true;
280+
281+
return $callback($item, $save);
282+
};
283+
284+
$chain->setCallbackWrapper($customWrapper);
285+
286+
$chain->delete('test-callback-wrapper');
287+
288+
$result = $chain->get('test-callback-wrapper', static fn () => 'computed-value');
289+
290+
$this->assertTrue($callbackWrapperCalled);
291+
$this->assertSame('computed-value', $result);
292+
}
269293
}

0 commit comments

Comments
 (0)