Skip to content

Commit 6c100c9

Browse files
xabbuhxabbuh
committed
Merge branch '7.1' into 7.2
* 7.1: Compare paths after realpath() has been applied to both fix AssetMapper usage without assets enabled Bump Symfony version to 7.1.3 Update VERSION for 7.1.2 Update CHANGELOG for 7.1.2 Bump Symfony version to 7.0.10 Update VERSION for 7.0.9 Update CHANGELOG for 7.0.9 Bump Symfony version to 6.4.10 Update VERSION for 6.4.9 Update CHANGELOG for 6.4.9
2 parents 685d131 + f5dbe04 commit 6c100c9

File tree

9 files changed

+128
-1
lines changed

9 files changed

+128
-1
lines changed

‎CHANGELOG-7.0.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,42 @@ in 7.0 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.0.0...v7.0.1
99

10+
* 7.0.9 (2024-06-28)
11+
12+
* bug #57345 [DependencyInjection] Fix regression in ordering service locators by priority (longwave)
13+
* bug #57553 [HttpKernel] Enable optional cache-warmers when cache-dir != build-dir (nicolas-grekas)
14+
* bug #57497 [String] Fixed u()->snake(), b()->snake() and s()->snake() methods (arczinosek)
15+
* bug #57574 [Filesystem] Fix Filesystem::remove() on Windows (nicolas-grekas)
16+
* bug #57572 [DoctrineBridge] Fix compat with DI >= 6.4 (nicolas-grekas)
17+
* bug #57538 [String] Add `alias` case to `EnglishInflector` (alexandre-daubois)
18+
* bug #57533 [FrameworkBundle] Throw runtime exception when trying to use asset-mapper while http-client is disabled (nicolas-grekas)
19+
* bug #57520 [SecurityBundle] Remove unused memory users’ `name` attribute from the XSD (MatTheCat)
20+
* feature #57557 Ibexa is sponsoring Symfony 5.4, thanks to them! \o/ (nicolas-grekas)
21+
* bug #57569 [HttpClient][Mailer] Revert "Let curl handle transfer encoding", use HTTP/1.1 for Mailgun (nicolas-grekas)
22+
* bug #57499 [Mailer] Add additional headers in Scaleway bridge (MrMicky-FR)
23+
* bug #57460 [VarExporter] fix contravariance problem with __unserialize() in lazy proxy (nikophil)
24+
* bug #57397 [VarDumper] Fix FFI caster test (alexandre-daubois)
25+
* bug #57453 [HttpClient] Fix parsing SSE (fancyweb)
26+
* bug #57467 [SecurityBundle] Add `provider` XML attribute to the authenticators it’s missing from (MatTheCat)
27+
* bug #57384 [Notifier] Fix thread key in GoogleChat bridge (romain-jacquart)
28+
* bug #57372 [HttpKernel][Security] Fix accessing session for stateless request (VincentLanglet)
29+
* bug #57112 [Messenger] Handle `AMQPConnectionException` when publishing a message (jwage)
30+
* bug #57341 [Serializer] properly handle invalid data for false/true types (xabbuh)
31+
* bug #57187 [Serializer] Fix `ObjectNormalizer` with property path (HypeMC)
32+
* bug #57355 [ErrorHandler] Fix rendered exception code highlighting on PHP 8.3 (tscni)
33+
* bug #57310 [DependencyInjection] Fix ternary in `AutowireCallable` attribute (alamirault)
34+
* bug #57273 [FrameworkBundle] Fix setting default context for certain normalizers (HypeMC)
35+
* bug #57395 [Notifier]  send the recipient phone number as an array (xabbuh)
36+
* bug #52699 [Serializer] [PropertyAccessor] Ignore non-collection interface generics (mtarld)
37+
* bug #54634 [String] Fix #54611 pluralization of -on ending words + singularization of -a ending foreign words (Geordie, DesLynx)
38+
* bug #57213 [Validator] [UniqueValidator] Use correct variable as parameter in (custom) error message (seho-nl, Sebastien Hoek)
39+
* bug #54920 [Messenger] Comply with Amazon SQS requirements for message body (VincentLanglet)
40+
* bug #57321 [AssetMapper] fix npm version constraint conversion (Jean-Beru)
41+
* bug #57110 [PhpUnitBridge] Fix error handler triggered outside of tests (HypeMC)
42+
* bug #57297 [FrameworkBundle] not registered definitions must not be modified (xabbuh)
43+
* bug #57234 [String] Fix Inflector for 'hardware' (podhy)
44+
* bug #57224 [Mime] Use streams instead of loading raw message generator into memory (bytestream)
45+
1046
* 7.0.8 (2024-06-02)
1147

1248
* bug #57284 [Mime] Fix TextPart using an unknown File (fabpot)

‎CHANGELOG-7.1.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,50 @@ in 7.1 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.1.0...v7.1.1
99

10+
* 7.1.2 (2024-06-28)
11+
12+
* bug #57345 [DependencyInjection] Fix regression in ordering service locators by priority (longwave)
13+
* bug #57553 [HttpKernel] Enable optional cache-warmers when cache-dir != build-dir (nicolas-grekas)
14+
* bug #57497 [String] Fixed u()->snake(), b()->snake() and s()->snake() methods (arczinosek)
15+
* bug #57574 [Filesystem] Fix Filesystem::remove() on Windows (nicolas-grekas)
16+
* bug #57572 [DoctrineBridge] Fix compat with DI >= 6.4 (nicolas-grekas)
17+
* bug #57541 [Serializer] [ObjectNormalizer] Use bool filter when FILTER_BOOL is set (Maximilian Zumbansen)
18+
* bug #57538 [String] Add `alias` case to `EnglishInflector` (alexandre-daubois)
19+
* bug #57533 [FrameworkBundle] Throw runtime exception when trying to use asset-mapper while http-client is disabled (nicolas-grekas)
20+
* bug #57520 [SecurityBundle] Remove unused memory users’ `name` attribute from the XSD (MatTheCat)
21+
* bug #57554 [FrameworkBundle] Fix warming up routes (nicolas-grekas)
22+
* feature #57557 Ibexa is sponsoring Symfony 5.4, thanks to them! \o/ (nicolas-grekas)
23+
* bug #57433 [Serializer] forward exceptions caught in the `AbstractObjectNormalizer` (HypeMC, xabbuh)
24+
* bug #57569 [HttpClient][Mailer] Revert "Let curl handle transfer encoding", use HTTP/1.1 for Mailgun (nicolas-grekas)
25+
* bug #57564 [HttpClient] Fix initializing InformationalChunk (nicolas-grekas)
26+
* bug #57289 [DependencyInjection] Fix phpdoc for $calls in class Autoconfigure (ThomasTr)
27+
* bug #57499 [Mailer] Add additional headers in Scaleway bridge (MrMicky-FR)
28+
* bug #57488 [Security] check token in payload instead just request (eltharin)
29+
* bug #57460 [VarExporter] fix contravariance problem with __unserialize() in lazy proxy (nikophil)
30+
* bug #57397 [VarDumper] Fix FFI caster test (alexandre-daubois)
31+
* bug #57453 [HttpClient] Fix parsing SSE (fancyweb)
32+
* bug #57467 [SecurityBundle] Add `provider` XML attribute to the authenticators it’s missing from (MatTheCat)
33+
* bug #57447 [Notifier] [Lox24] Fix request body format to JSON string (alebedev80)
34+
* bug #57434 [FrameworkBundle] inject the missing logger service (xabbuh)
35+
* bug #57384 [Notifier] Fix thread key in GoogleChat bridge (romain-jacquart)
36+
* bug #57372 [HttpKernel][Security] Fix accessing session for stateless request (VincentLanglet)
37+
* bug #57112 [Messenger] Handle `AMQPConnectionException` when publishing a message (jwage)
38+
* bug #57341 [Serializer] properly handle invalid data for false/true types (xabbuh)
39+
* bug #57187 [Serializer] Fix `ObjectNormalizer` with property path (HypeMC)
40+
* bug #57355 [ErrorHandler] Fix rendered exception code highlighting on PHP 8.3 (tscni)
41+
* bug #57310 [DependencyInjection] Fix ternary in `AutowireCallable` attribute (alamirault)
42+
* bug #57405 [DoctrineBridge] fix handling of special "value" constraint option (xabbuh)
43+
* bug #57273 [FrameworkBundle] Fix setting default context for certain normalizers (HypeMC)
44+
* bug #57395 [Notifier]  send the recipient phone number as an array (xabbuh)
45+
* bug #57378 [Security] Change to `BadCredentialsException` when empty username / password (llupa)
46+
* bug #52699 [Serializer] [PropertyAccessor] Ignore non-collection interface generics (mtarld)
47+
* bug #54634 [String] Fix #54611 pluralization of -on ending words + singularization of -a ending foreign words (Geordie, DesLynx)
48+
* bug #57213 [Validator] [UniqueValidator] Use correct variable as parameter in (custom) error message (seho-nl, Sebastien Hoek)
49+
* bug #54920 [Messenger] Comply with Amazon SQS requirements for message body (VincentLanglet)
50+
* bug #57348 [Notifier][Brevo] change type from chatter to texter (xabbuh)
51+
* bug #57321 [AssetMapper] fix npm version constraint conversion (Jean-Beru)
52+
* bug #57320 [Serializer] avoid calling undefined built-in is_*() functions (xabbuh)
53+
1054
* 7.1.1 (2024-06-04)
1155

1256
* bug #57110 [PhpUnitBridge] Fix error handler triggered outside of tests (HypeMC)

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,6 +1300,10 @@ private function registerAssetMapperConfiguration(array $config, ContainerBuilde
13001300
{
13011301
$loader->load('asset_mapper.php');
13021302

1303+
if (!$assetEnabled) {
1304+
$container->removeDefinition('asset_mapper.asset_package');
1305+
}
1306+
13031307
if (!$httpClientEnabled) {
13041308
$container->register('asset_mapper.http_client', HttpClientInterface::class)
13051309
->addTag('container.error')

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/asset_mapper_without_assets.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', [
4+
'annotations' => false,
5+
'asset_mapper' => null,
6+
'assets' => false,
7+
'handle_all_throwables' => true,
8+
'http_method_override' => false,
9+
'php_errors' => ['log' => true],
10+
]);

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/asset_mapper_without_assets.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" ?>
2+
<container xmlns="http://symfony.com/schema/dic/services"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:framework="http://symfony.com/schema/dic/symfony"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
6+
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
7+
8+
<framework:config http-method-override="false" handle-all-throwables="true">
9+
<framework:annotations enabled="false" />
10+
<framework:asset-mapper enabled="true" />
11+
<framework:assets enabled="false" />
12+
<framework:php-errors log="true" />
13+
</framework:config>
14+
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/asset_mapper_without_assets.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
framework:
2+
annotations: false
3+
asset_mapper: ~
4+
assets: false
5+
handle_all_throwables: true
6+
http_method_override: false
7+
php_errors:
8+
log: true

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2376,6 +2376,16 @@ public function testWebhookWithoutSerializer()
23762376
);
23772377
}
23782378

2379+
public function testAssetMapperWithoutAssets()
2380+
{
2381+
$container = $this->createContainerFromFile('asset_mapper_without_assets');
2382+
2383+
$this->assertTrue($container->has('asset_mapper'));
2384+
$this->assertFalse($container->has('asset_mapper.asset_package'));
2385+
$this->assertFalse($container->has('assets.packages'));
2386+
$this->assertFalse($container->has('assets._default_package'));
2387+
}
2388+
23792389
protected function createContainer(array $data = [])
23802390
{
23812391
return new ContainerBuilder(new EnvPlaceholderParameterBag(array_merge([

‎src/Symfony/Component/HttpKernel/Kernel.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,7 @@ protected function initializeContainer(): void
528528
touch($oldContainerDir.'.legacy');
529529
}
530530

531+
$buildDir = $this->container->getParameter('kernel.build_dir');
531532
$cacheDir = $this->container->getParameter('kernel.cache_dir');
532533
$preload = $this instanceof WarmableInterface ? (array) $this->warmUp($cacheDir, $buildDir) : [];
533534

‎src/Symfony/Component/HttpKernel/Tests/KernelTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ public function testWarmup()
452452
$kernel->boot();
453453

454454
$this->assertTrue($kernel->warmedUp);
455-
$this->assertSame($kernel->getBuildDir(), $kernel->warmedUpBuildDir);
455+
$this->assertSame(realpath($kernel->getBuildDir()), $kernel->warmedUpBuildDir);
456456
}
457457

458458
public function testServicesResetter()

0 commit comments

Comments
 (0)