Skip to content

Commit 6f20d32

Browse files
Merge branch '8.0' into 8.1
* 8.0: (24 commits) [Validator] Drop PHP < 8.4 compat in PropertyMetadata [Form] Preserve collection children added by PRE_SET_DATA listeners [Messenger] Keep deduplication lock when handler throws [Mailer][Postmark] Handle alternate error payload shapes for Payload Too Large CS fix [Serializer] Catch TypeError when setting an attribute to collect denormalization errors [Config] Allow env placeholders in NumericNode min/max checks [Mime] Preserve inline part filename instead of overwriting it with the Content-ID [FrameworkBundle] Apply tagged MIME type guessers in File::getMimeType() [Notifier] [Ntfy] Fix Basic auth header by keeping base64 padding [MonologBridge] Guard against re-entrant calls in AbstractTokenProcessor [RateLimiter] Keep token bucket alive while reservation debt is unpaid [Lock] Avoid aborting outer PostgreSQL transaction on lock contention [HttpClient] Don't share CURL_LOCK_DATA_CONNECT to honor max_host_connections [Validator] fix mapping properties using property hooks [DoctrineBridge] Fail with a clear exception when symfony/form is missing [DoctrineBridge] Prevent install with incompatible symfony/property-info versions [AssetMapper] Allow spaces in version constraints [Dotenv] Strip NUL byte placeholder from values passed to `putenv()` [Cache] Normalize default_lifetime for pools wrapped by ChainAdapter ... # Conflicts: # src/Symfony/Component/Cache/Tests/DependencyInjection/CachePoolPassTest.php # src/Symfony/Component/HttpClient/Internal/CurlClientState.php # src/Symfony/Component/ObjectMapper/Tests/ObjectMapperTest.php # src/Symfony/Component/Security/Http/Tests/EventListener/IsCsrfTokenValidAttributeListenerTest.php # src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
2 parents f5abbf8 + 483e408 commit 6f20d32

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

Tests/Command/DebugFirewallCommandTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function testFirewallMainOutputMatchesFixture()
7777
switchUser: null
7878
);
7979

80-
$context = new FirewallContext([], config: $config);
80+
$context = new FirewallContext([], null, null, $config);
8181

8282
$contexts = new Container();
8383
$contexts->set('security.firewall.map.context.main', $context);
@@ -108,7 +108,7 @@ public function testFirewallWithEventsOutputMatchesFixture()
108108
accessDeniedUrl: '/access-denied',
109109
);
110110

111-
$context = new FirewallContext([], config: $config);
111+
$context = new FirewallContext([], null, null, $config);
112112

113113
$contexts = new Container();
114114
$contexts->set('security.firewall.map.context.main', $context);
@@ -156,7 +156,7 @@ public function testFirewallWithSwitchUserDisplaysSection()
156156
switchUser: $switchUserConfig,
157157
);
158158

159-
$context = new FirewallContext([], config: $config);
159+
$context = new FirewallContext([], null, null, $config);
160160

161161
$contexts = new Container();
162162
$contexts->set('security.firewall.map.context.main', $context);

Tests/Security/FirewallMapTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function testGetListeners(Request $request, bool $expectedState)
8787
public static function providesStatefulStatelessRequests(): \Generator
8888
{
8989
yield [new Request(), false];
90-
yield [new Request(attributes: ['_stateless' => false]), false];
91-
yield [new Request(attributes: ['_stateless' => true]), true];
90+
yield [new Request([], [], ['_stateless' => false]), false];
91+
yield [new Request([], [], ['_stateless' => true]), true];
9292
}
9393
}

Tests/SecurityTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public function testLogin()
205205

206206
$security = new Security($container, ['main' => $firewallAuthenticatorLocator]);
207207

208-
$security->login($user, badges: [$badge], attributes: ['foo' => 'bar']);
208+
$security->login($user, null, null, [$badge], ['foo' => 'bar']);
209209
}
210210

211211
public function testLoginReturnsAuthenticatorResponse()
@@ -468,7 +468,7 @@ public function testLogoutWithValidCsrf()
468468
;
469469

470470
$firewallMap = $this->createMock(FirewallMap::class);
471-
$firewallConfig = new FirewallConfig(name: 'my_firewall', userChecker: 'user_checker', logout: ['csrf_parameter' => '_csrf_token', 'csrf_token_id' => 'logout']);
471+
$firewallConfig = new FirewallConfig('my_firewall', 'user_checker', null, true, false, null, null, null, null, null, [], null, ['csrf_parameter' => '_csrf_token', 'csrf_token_id' => 'logout']);
472472
$firewallMap->expects($this->once())->method('getFirewallConfig')->willReturn($firewallConfig);
473473

474474
$eventDispatcherLocator = new Container();

0 commit comments

Comments
 (0)