Skip to content

Commit e963127

Browse files
Merge branch '4.0' into 4.1
* 4.0: Alpha-ordering for "use" statements
2 parents 8ace9c9 + 7fc08fa commit e963127

File tree

55 files changed

+156
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+156
-156
lines changed

AccessMap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Component\Security\Http;
1313

14-
use Symfony\Component\HttpFoundation\RequestMatcherInterface;
1514
use Symfony\Component\HttpFoundation\Request;
15+
use Symfony\Component\HttpFoundation\RequestMatcherInterface;
1616

1717
/**
1818
* AccessMap allows configuration of different access control rules for

Authentication/AuthenticationFailureHandlerInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
namespace Symfony\Component\Security\Http\Authentication;
1313

14-
use Symfony\Component\Security\Core\Exception\AuthenticationException;
1514
use Symfony\Component\HttpFoundation\Request;
1615
use Symfony\Component\HttpFoundation\Response;
16+
use Symfony\Component\Security\Core\Exception\AuthenticationException;
1717

1818
/**
1919
* Interface for custom authentication failure handlers.

Authentication/AuthenticationSuccessHandlerInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
namespace Symfony\Component\Security\Http\Authentication;
1313

14-
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1514
use Symfony\Component\HttpFoundation\Request;
1615
use Symfony\Component\HttpFoundation\Response;
16+
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1717

1818
/**
1919
* Interface for a custom authentication success handler.

Authentication/CustomAuthenticationSuccessHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Component\Security\Http\Authentication;
1313

14-
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1514
use Symfony\Component\HttpFoundation\Request;
15+
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1616

1717
/**
1818
* @author Fabien Potencier <fabien@symfony.com>

Authentication/DefaultAuthenticationFailureHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
namespace Symfony\Component\Security\Http\Authentication;
1313

14+
use Psr\Log\LoggerInterface;
1415
use Symfony\Component\HttpFoundation\Request;
1516
use Symfony\Component\HttpKernel\HttpKernelInterface;
16-
use Psr\Log\LoggerInterface;
1717
use Symfony\Component\Security\Core\Exception\AuthenticationException;
1818
use Symfony\Component\Security\Core\Security;
1919
use Symfony\Component\Security\Http\HttpUtils;

Authentication/DefaultAuthenticationSuccessHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
namespace Symfony\Component\Security\Http\Authentication;
1313

14-
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1514
use Symfony\Component\HttpFoundation\Request;
16-
use Symfony\Component\Security\Http\Util\TargetPathTrait;
15+
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1716
use Symfony\Component\Security\Http\HttpUtils;
1817
use Symfony\Component\Security\Http\ParameterBagUtils;
18+
use Symfony\Component\Security\Http\Util\TargetPathTrait;
1919

2020
/**
2121
* Class with the default authentication success handling logic.

Authentication/SimpleAuthenticationHandler.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
namespace Symfony\Component\Security\Http\Authentication;
1313

14+
use Psr\Log\LoggerInterface;
1415
use Symfony\Component\HttpFoundation\Request;
1516
use Symfony\Component\HttpFoundation\Response;
16-
use Psr\Log\LoggerInterface;
17-
use Symfony\Component\Security\Core\Exception\AuthenticationException;
18-
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1917
use Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface;
18+
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
19+
use Symfony\Component\Security\Core\Exception\AuthenticationException;
2020

2121
/**
2222
* Class to proxy authentication success/failure handlers.

EntryPoint/AuthenticationEntryPointInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
namespace Symfony\Component\Security\Http\EntryPoint;
1313

14-
use Symfony\Component\Security\Core\Exception\AuthenticationException;
1514
use Symfony\Component\HttpFoundation\Request;
1615
use Symfony\Component\HttpFoundation\Response;
16+
use Symfony\Component\Security\Core\Exception\AuthenticationException;
1717

1818
/**
1919
* Implement this interface for any classes that will be called to "start"

EntryPoint/BasicAuthenticationEntryPoint.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
namespace Symfony\Component\Security\Http\EntryPoint;
1313

14-
use Symfony\Component\Security\Core\Exception\AuthenticationException;
15-
use Symfony\Component\HttpFoundation\Response;
1614
use Symfony\Component\HttpFoundation\Request;
15+
use Symfony\Component\HttpFoundation\Response;
16+
use Symfony\Component\Security\Core\Exception\AuthenticationException;
1717

1818
/**
1919
* BasicAuthenticationEntryPoint starts an HTTP Basic authentication.

EntryPoint/FormAuthenticationEntryPoint.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
namespace Symfony\Component\Security\Http\EntryPoint;
1313

1414
use Symfony\Component\HttpFoundation\Request;
15+
use Symfony\Component\HttpKernel\HttpKernelInterface;
1516
use Symfony\Component\Security\Core\Exception\AuthenticationException;
1617
use Symfony\Component\Security\Http\HttpUtils;
17-
use Symfony\Component\HttpKernel\HttpKernelInterface;
1818

1919
/**
2020
* FormAuthenticationEntryPoint starts an authentication via a login form.

0 commit comments

Comments
 (0)