Skip to content

Commit 26fc2bd

Browse files
Merge branch '6.0' into 6.1
* 6.0: (23 commits) Fix composer on appveyor fix bootstrap_3_layout ChoiceType's expanded label_html [Messenger][Security/Core] Remove legacy class aliases [PropertyAccess] Fix typo in PropertyAccessor::readProperty() DocBlock [PropertyInfo] PhpStanExtractor namespace missmatch issue [VarExporter] Fix exporting objects with readonly properties [ExpressionLanguage] Fix matches when the regexp is not valid [Messenger] Add mysql indexes back and work around deadlocks using soft-delete Add BC layer to handle old objects already present in cache [RateLimiter] Always store SlidingWindows with an expiration set [Validator] Fix File constraint invalid max size exception message [Console] Fix exit status on uncaught exception with negative code [Validator] fix #43345 @Assert\DivisibleBy [HttpClient] fix 303 after PUT and sending chunked requests [HttpClient] always send Content-Type when a body is passed [HttpClient] always send Content-Length when a body is passed [HttpClient] fix sending Content-Length/Type for POST Fix merge [HttpClient] fix sending PUT requests with curl Fix locales format in CrowdinProvider ...
2 parents 43a29f7 + 6bac15f commit 26fc2bd

File tree

3 files changed

+0
-16
lines changed

3 files changed

+0
-16
lines changed

Authorization/TraceableAccessDecisionManager.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,3 @@ public function getDecisionLog(): array
108108
return $this->decisionLog;
109109
}
110110
}
111-
112-
if (!class_exists(DebugAccessDecisionManager::class, false)) {
113-
class_alias(TraceableAccessDecisionManager::class, DebugAccessDecisionManager::class);
114-
}

Exception/UserNotFoundException.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,3 @@ public function __unserialize(array $data): void
7171
parent::__unserialize($parentData);
7272
}
7373
}
74-
75-
if (!class_exists(UsernameNotFoundException::class, false)) {
76-
class_alias(UserNotFoundException::class, UsernameNotFoundException::class);
77-
}

Tests/Authorization/TraceableAccessDecisionManagerTest.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1616
use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
1717
use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
18-
use Symfony\Component\Security\Core\Authorization\DebugAccessDecisionManager;
1918
use Symfony\Component\Security\Core\Authorization\TraceableAccessDecisionManager;
2019
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
2120

@@ -171,13 +170,6 @@ public function provideObjectsAndLogs(): \Generator
171170
];
172171
}
173172

174-
public function testDebugAccessDecisionManagerAliasExistsForBC()
175-
{
176-
$adm = new TraceableAccessDecisionManager(new AccessDecisionManager());
177-
178-
$this->assertInstanceOf(DebugAccessDecisionManager::class, $adm, 'For BC, TraceableAccessDecisionManager must be an instance of DebugAccessDecisionManager');
179-
}
180-
181173
/**
182174
* Tests decision log returned when a voter call decide method of AccessDecisionManager.
183175
*/

0 commit comments

Comments
 (0)