Skip to content

Commit 4feeb98

Browse files
xabbuhxabbuh
committed
Merge branch '7.2' into 7.3
* 7.2: fix Twig 3.17 compatibility Bump Symfony version to 7.2.1 Update VERSION for 7.2.0 Update CHANGELOG for 7.2.0
2 parents 4ed9d03 + 67c835e commit 4feeb98

File tree

2 files changed

+92
-39
lines changed

2 files changed

+92
-39
lines changed

‎CHANGELOG-7.2.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,49 @@ in 7.2 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v7.2.0...v7.2.1
99

10+
* 7.2.0 (2024-11-29)
11+
12+
* bug #59023 [HttpClient] Fix streaming and redirecting with NoPrivateNetworkHttpClient (nicolas-grekas)
13+
* bug #59014 [Form] Allow integer for the `calendar` option of `DateType` (alexandre-daubois)
14+
* bug #59013 [HttpClient] Fix checking for private IPs before connecting (nicolas-grekas)
15+
* bug #58562 [HttpClient] Close gracefull when the server closes the connection abruptly (discordier)
16+
* bug #59007 [Dotenv] read runtime config from composer.json in debug dotenv command (xabbuh)
17+
* bug #58963 [PropertyInfo] Fix write visibility for Asymmetric Visibility and Virtual Properties (xabbuh, pan93412)
18+
* bug #58983 [Translation] [Bridge][Lokalise] Fix empty keys array in PUT, DELETE requests causing Lokalise API error (DominicLuidold)
19+
* bug #58956 [DoctrineBridge] Fix `Connection::createSchemaManager()` for Doctrine DBAL v2 (neodevcode)
20+
* bug #58959 [PropertyInfo] consider write property visibility to decide whether a property is writable (xabbuh)
21+
* bug #58964 [TwigBridge] do not add child nodes to EmptyNode instances (xabbuh)
22+
* bug #58950 [FrameworkBundle] Revert " Deprecate making `cache.app` adapter taggable" (keulinho)
23+
* bug #58952 [Cache] silence warnings issued by Redis Sentinel on connection issues (xabbuh)
24+
* bug #58953 [HttpClient] Fix computing stats for PUSH with Amp (nicolas-grekas)
25+
* bug #58943 [FrameworkBundle] Revert " Don't auto-register form/csrf when the corresponding components are not installed" (nicolas-grekas)
26+
* bug #58937 [FrameworkBundle] Don't auto-register form/csrf when the corresponding components are not installed (nicolas-grekas)
27+
* bug #58859 [AssetMapper] ignore missing directory in `isVendor()` (alexislefebvre)
28+
* bug #58917 [OptionsResolver] Allow Union/Intersection Types in Resolved Closures (zanbaldwin)
29+
* bug #58822 [DependencyInjection] Fix checking for interfaces in ContainerBuilder::getReflectionClass() (donquixote)
30+
* bug #58865 Dynamically fix compatibility with doctrine/data-fixtures v2 (greg0ire)
31+
* bug #58921 [HttpKernel] Ensure `HttpCache::getTraceKey()` does not throw exception (lyrixx)
32+
* bug #58908 [DoctrineBridge] don't call `EntityManager::initializeObject()` with scalar values (xabbuh)
33+
* bug #58938 [Cache] make RelayProxyTrait compatible with relay extension 0.9.0 (xabbuh)
34+
* bug #58924 [HttpClient] Fix empty hosts in option "resolve" (nicolas-grekas)
35+
* bug #58915 [HttpClient] Fix option "resolve" with IPv6 addresses (nicolas-grekas)
36+
* bug #58919 [WebProfilerBundle] Twig deprecations (mazodude)
37+
* bug #58914 [HttpClient] Fix option "bindto" with IPv6 addresses (nicolas-grekas)
38+
* bug #58888 [Mailer][Notifier] Sweego is backing their bridges, thanks to them! (nicolas-grekas)
39+
* bug #58885 [PropertyInfo][Serializer][TypeInfo][Validator] TypeInfo 7.1 compatibility (mtarld)
40+
* bug #58870 [Serializer][Validator] prevent failures around not existing TypeInfo classes (xabbuh)
41+
* bug #58872 [PropertyInfo][Serializer][Validator] TypeInfo 7.2 compatibility (mtarld)
42+
* bug #58875 [HttpClient] Removed body size limit (Carl Julian Sauter)
43+
* bug #58866 [Validator] fix compatibility with PHP < 8.2.4 (xabbuh)
44+
* bug #58862 [Notifier] Fix GoIpTransport (nicolas-grekas)
45+
* bug #58860 [HttpClient] Fix catching some invalid Location headers (nicolas-grekas)
46+
* bug #58834 [FrameworkBundle] ensure `validator.translation_domain` parameter is always set (xabbuh)
47+
* bug #58836 Work around `parse_url()` bug (bis) (nicolas-grekas)
48+
* bug #58818 [Messenger] silence PHP warnings issued by `Redis::connect()` (xabbuh)
49+
* bug #58828 [PhpUnitBridge] fix dumping tests to skip with data providers (xabbuh)
50+
* bug #58842 [Routing] Fix: lost priority when defining hosts in configuration (BeBlood)
51+
* bug #58850 [HttpClient] fix PHP 7.2 compatibility (xabbuh)
52+
1053
* 7.2.0-RC1 (2024-11-13)
1154

1255
* feature #58852 [TypeInfo] Remove ``@experimental`` tag (mtarld)

‎src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php

Lines changed: 49 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
use Twig\Node\Expression\ConditionalExpression;
2222
use Twig\Node\Expression\ConstantExpression;
2323
use Twig\Node\Expression\NameExpression;
24+
use Twig\Node\Expression\Ternary\ConditionalTernary;
2425
use Twig\Node\Expression\Variable\ContextVariable;
2526
use Twig\Node\Node;
2627
use Twig\Node\Nodes;
@@ -275,32 +276,32 @@ public function testCompileLabelWithLabelAndAttributes()
275276

276277
public function testCompileLabelWithLabelThatEvaluatesToNull()
277278
{
279+
if (class_exists(ConditionalTernary::class)) {
280+
$conditional = new ConditionalTernary(
281+
// if
282+
new ConstantExpression(true, 0),
283+
// then
284+
new ConstantExpression(null, 0),
285+
// else
286+
new ConstantExpression(null, 0),
287+
0
288+
);
289+
} else {
290+
$conditional = new ConditionalExpression(
291+
// if
292+
new ConstantExpression(true, 0),
293+
// then
294+
new ConstantExpression(null, 0),
295+
// else
296+
new ConstantExpression(null, 0),
297+
0
298+
);
299+
}
300+
278301
if (class_exists(Nodes::class)) {
279-
$arguments = new Nodes([
280-
new ContextVariable('form', 0),
281-
new ConditionalExpression(
282-
// if
283-
new ConstantExpression(true, 0),
284-
// then
285-
new ConstantExpression(null, 0),
286-
// else
287-
new ConstantExpression(null, 0),
288-
0
289-
),
290-
]);
302+
$arguments = new Nodes([new ContextVariable('form', 0), $conditional]);
291303
} else {
292-
$arguments = new Node([
293-
new NameExpression('form', 0),
294-
new ConditionalExpression(
295-
// if
296-
new ConstantExpression(true, 0),
297-
// then
298-
new ConstantExpression(null, 0),
299-
// else
300-
new ConstantExpression(null, 0),
301-
0
302-
),
303-
]);
304+
$arguments = new Node([new NameExpression('form', 0), $conditional]);
304305
}
305306

306307
$node = new SearchAndRenderBlockNode(new TwigFunction('form_label'), $arguments, 0);
@@ -322,18 +323,32 @@ public function testCompileLabelWithLabelThatEvaluatesToNull()
322323

323324
public function testCompileLabelWithLabelThatEvaluatesToNullAndAttributes()
324325
{
326+
if (class_exists(ConditionalTernary::class)) {
327+
$conditional = new ConditionalTernary(
328+
// if
329+
new ConstantExpression(true, 0),
330+
// then
331+
new ConstantExpression(null, 0),
332+
// else
333+
new ConstantExpression(null, 0),
334+
0
335+
);
336+
} else {
337+
$conditional = new ConditionalExpression(
338+
// if
339+
new ConstantExpression(true, 0),
340+
// then
341+
new ConstantExpression(null, 0),
342+
// else
343+
new ConstantExpression(null, 0),
344+
0
345+
);
346+
}
347+
325348
if (class_exists(Nodes::class)) {
326349
$arguments = new Nodes([
327350
new ContextVariable('form', 0),
328-
new ConditionalExpression(
329-
// if
330-
new ConstantExpression(true, 0),
331-
// then
332-
new ConstantExpression(null, 0),
333-
// else
334-
new ConstantExpression(null, 0),
335-
0
336-
),
351+
$conditional,
337352
new ArrayExpression([
338353
new ConstantExpression('foo', 0),
339354
new ConstantExpression('bar', 0),
@@ -344,12 +359,7 @@ public function testCompileLabelWithLabelThatEvaluatesToNullAndAttributes()
344359
} else {
345360
$arguments = new Node([
346361
new NameExpression('form', 0),
347-
new ConditionalExpression(
348-
new ConstantExpression(true, 0),
349-
new ConstantExpression(null, 0),
350-
new ConstantExpression(null, 0),
351-
0
352-
),
362+
$conditional,
353363
new ArrayExpression([
354364
new ConstantExpression('foo', 0),
355365
new ConstantExpression('bar', 0),

0 commit comments

Comments
 (0)