Skip to content

Commit eddcd6b

Browse files
Merge branch '3.4' into 4.4
* 3.4: Enable "native_constant_invocation" CS rule Make AbstractPhpFileCacheWarmer public
2 parents 473da00 + 0e09c78 commit eddcd6b

7 files changed

+8
-8
lines changed

Authentication/SimpleAuthenticationHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1919
use Symfony\Component\Security\Core\Exception\AuthenticationException;
2020

21-
@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.2, use Guard instead.', SimpleAuthenticationHandler::class), E_USER_DEPRECATED);
21+
@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.2, use Guard instead.', SimpleAuthenticationHandler::class), \E_USER_DEPRECATED);
2222

2323
/**
2424
* Class to proxy authentication success/failure handlers.

Firewall.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function onKernelRequest(GetResponseEvent $event)
5959
$listeners = $this->map->getListeners($event->getRequest());
6060

6161
if (3 !== \count($listeners)) {
62-
@trigger_error(sprintf('Not returning an array of 3 elements from %s::getListeners() is deprecated since Symfony 4.2, the 3rd element must be an instance of %s or null.', FirewallMapInterface::class, LogoutListener::class), E_USER_DEPRECATED);
62+
@trigger_error(sprintf('Not returning an array of 3 elements from %s::getListeners() is deprecated since Symfony 4.2, the 3rd element must be an instance of %s or null.', FirewallMapInterface::class, LogoutListener::class), \E_USER_DEPRECATED);
6363
$listeners[2] = null;
6464
}
6565

@@ -139,7 +139,7 @@ protected function handleRequest(GetResponseEvent $event, $listeners)
139139
if (\is_callable($listener)) {
140140
$listener($event);
141141
} else {
142-
@trigger_error(sprintf('Calling the "%s::handle()" method from the firewall is deprecated since Symfony 4.3, extend "%s" instead.', \get_class($listener), AbstractListener::class), E_USER_DEPRECATED);
142+
@trigger_error(sprintf('Calling the "%s::handle()" method from the firewall is deprecated since Symfony 4.3, extend "%s" instead.', \get_class($listener), AbstractListener::class), \E_USER_DEPRECATED);
143143
$listener->handle($event);
144144
}
145145

Firewall/ContextListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function __construct(TokenStorageInterface $tokenStorage, iterable $userP
8989
*/
9090
public function setLogoutOnUserChange($logoutOnUserChange)
9191
{
92-
@trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1.', __METHOD__), E_USER_DEPRECATED);
92+
@trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1.', __METHOD__), \E_USER_DEPRECATED);
9393
}
9494

9595
/**

Firewall/LegacyListenerTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ trait LegacyListenerTrait
3030
*/
3131
public function handle(GetResponseEvent $event)
3232
{
33-
@trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.3, use __invoke() instead.', __METHOD__), E_USER_DEPRECATED);
33+
@trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.3, use __invoke() instead.', __METHOD__), \E_USER_DEPRECATED);
3434

3535
if (!$event instanceof RequestEvent) {
3636
$event = new class($event) extends RequestEvent {

Firewall/SimpleFormAuthenticationListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
use Symfony\Component\Security\Http\ParameterBagUtils;
3030
use Symfony\Component\Security\Http\Session\SessionAuthenticationStrategyInterface;
3131

32-
@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.2, use Guard instead.', SimpleFormAuthenticationListener::class), E_USER_DEPRECATED);
32+
@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.2, use Guard instead.', SimpleFormAuthenticationListener::class), \E_USER_DEPRECATED);
3333

3434
/**
3535
* @author Jordi Boggiano <[email protected]>

Firewall/SimplePreAuthenticationListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
use Symfony\Component\Security\Http\SecurityEvents;
3333
use Symfony\Component\Security\Http\Session\SessionAuthenticationStrategyInterface;
3434

35-
@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.2, use Guard instead.', SimplePreAuthenticationListener::class), E_USER_DEPRECATED);
35+
@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.2, use Guard instead.', SimplePreAuthenticationListener::class), \E_USER_DEPRECATED);
3636

3737
/**
3838
* SimplePreAuthenticationListener implements simple proxying to an authenticator.

HttpUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public function generateUri($request, $path)
168168
// fortunately, they all are, so we have to remove entire query string
169169
$position = strpos($url, '?');
170170
if (false !== $position) {
171-
$fragment = parse_url($url, PHP_URL_FRAGMENT);
171+
$fragment = parse_url($url, \PHP_URL_FRAGMENT);
172172
$url = substr($url, 0, $position);
173173
// fragment must be preserved
174174
if ($fragment) {

0 commit comments

Comments
 (0)