diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-16 10:02:57 +0200 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-16 10:02:57 +0200 |
commit | 3b378cf0eb09f4e34cfde24e29cda4f578fe6833 (patch) | |
tree | 3af3ef29ca707579cc8de674a8da0ff00e151701 /Http | |
parent | ef511d47c94ad92e37112b43efcbf7da8696a803 (diff) | |
parent | 74eaf535ddcd6cad834c68e7802cfcb08f400c1e (diff) | |
download | symfony-security-3b378cf0eb09f4e34cfde24e29cda4f578fe6833.zip symfony-security-3b378cf0eb09f4e34cfde24e29cda4f578fe6833.tar.gz symfony-security-3b378cf0eb09f4e34cfde24e29cda4f578fe6833.tar.bz2 |
Merge branch '2.3' into 2.4
* 2.3:
made {@inheritdoc} annotations consistent across the board
fixed types in phpdocs
made phpdoc types consistent with those defined in Hack
Add support Thai translations
made types consistent with those defined in Hack
removed extra/unsupported arguments
[HttpKernel] fixed an error message
[TwigBundle] removed undefined argument
[Translation] Make IcuDatFileLoader/IcuResFileLoader::load invalid resource compatible with HHVM.
Conflicts:
src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
src/Symfony/Component/Config/Definition/ReferenceDumper.php
src/Symfony/Component/Console/Helper/DescriptorHelper.php
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
src/Symfony/Component/HttpFoundation/Response.php
src/Symfony/Component/HttpFoundation/StreamedResponse.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
src/Symfony/Component/Stopwatch/StopwatchPeriod.php
src/Symfony/Component/Translation/TranslatorInterface.php
src/Symfony/Component/Validator/ConstraintValidatorFactory.php
Diffstat (limited to 'Http')
-rw-r--r-- | Http/AccessMap.php | 2 | ||||
-rw-r--r-- | Http/Authentication/DefaultAuthenticationFailureHandler.php | 2 | ||||
-rw-r--r-- | Http/Authentication/DefaultAuthenticationSuccessHandler.php | 2 | ||||
-rw-r--r-- | Http/EntryPoint/FormAuthenticationEntryPoint.php | 4 | ||||
-rw-r--r-- | Http/Firewall.php | 2 | ||||
-rw-r--r-- | Http/FirewallMap.php | 2 | ||||
-rw-r--r-- | Http/HttpUtils.php | 2 | ||||
-rw-r--r-- | Http/Logout/DefaultLogoutSuccessHandler.php | 2 | ||||
-rw-r--r-- | Http/RememberMe/PersistentTokenBasedRememberMeServices.php | 6 | ||||
-rw-r--r-- | Http/RememberMe/ResponseListener.php | 2 | ||||
-rw-r--r-- | Http/RememberMe/TokenBasedRememberMeServices.php | 8 | ||||
-rw-r--r-- | Http/Session/SessionAuthenticationStrategy.php | 2 |
12 files changed, 18 insertions, 18 deletions
diff --git a/Http/AccessMap.php b/Http/AccessMap.php index dc2e66a..116874a 100644 --- a/Http/AccessMap.php +++ b/Http/AccessMap.php @@ -37,7 +37,7 @@ class AccessMap implements AccessMapInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function getPatterns(Request $request) { diff --git a/Http/Authentication/DefaultAuthenticationFailureHandler.php b/Http/Authentication/DefaultAuthenticationFailureHandler.php index 70dcd1e..f106a4a 100644 --- a/Http/Authentication/DefaultAuthenticationFailureHandler.php +++ b/Http/Authentication/DefaultAuthenticationFailureHandler.php @@ -58,7 +58,7 @@ class DefaultAuthenticationFailureHandler implements AuthenticationFailureHandle } /** - * {@inheritDoc} + * {@inheritdoc} */ public function onAuthenticationFailure(Request $request, AuthenticationException $exception) { diff --git a/Http/Authentication/DefaultAuthenticationSuccessHandler.php b/Http/Authentication/DefaultAuthenticationSuccessHandler.php index 0c084b9..54d6fc1 100644 --- a/Http/Authentication/DefaultAuthenticationSuccessHandler.php +++ b/Http/Authentication/DefaultAuthenticationSuccessHandler.php @@ -48,7 +48,7 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle } /** - * {@inheritDoc} + * {@inheritdoc} */ public function onAuthenticationSuccess(Request $request, TokenInterface $token) { diff --git a/Http/EntryPoint/FormAuthenticationEntryPoint.php b/Http/EntryPoint/FormAuthenticationEntryPoint.php index b78f0a9..c734db0 100644 --- a/Http/EntryPoint/FormAuthenticationEntryPoint.php +++ b/Http/EntryPoint/FormAuthenticationEntryPoint.php @@ -34,14 +34,14 @@ class FormAuthenticationEntryPoint implements AuthenticationEntryPointInterface * @param HttpKernelInterface $kernel * @param HttpUtils $httpUtils An HttpUtils instance * @param string $loginPath The path to the login form - * @param Boolean $useForward Whether to forward or redirect to the login form + * @param bool $useForward Whether to forward or redirect to the login form */ public function __construct(HttpKernelInterface $kernel, HttpUtils $httpUtils, $loginPath, $useForward = false) { $this->httpKernel = $kernel; $this->httpUtils = $httpUtils; $this->loginPath = $loginPath; - $this->useForward = (Boolean) $useForward; + $this->useForward = (bool) $useForward; } /** diff --git a/Http/Firewall.php b/Http/Firewall.php index 392da0b..7bad47a 100644 --- a/Http/Firewall.php +++ b/Http/Firewall.php @@ -85,7 +85,7 @@ class Firewall implements EventSubscriberInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public static function getSubscribedEvents() { diff --git a/Http/FirewallMap.php b/Http/FirewallMap.php index 0554bed..1bb73bd 100644 --- a/Http/FirewallMap.php +++ b/Http/FirewallMap.php @@ -36,7 +36,7 @@ class FirewallMap implements FirewallMapInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function getListeners(Request $request) { diff --git a/Http/HttpUtils.php b/Http/HttpUtils.php index 422c8ce..e78935e 100644 --- a/Http/HttpUtils.php +++ b/Http/HttpUtils.php @@ -53,7 +53,7 @@ class HttpUtils * * @param Request $request A Request instance * @param string $path A path (an absolute path (/foo), an absolute URL (http://...), or a route name (foo)) - * @param integer $status The status code + * @param int $status The status code * * @return RedirectResponse A RedirectResponse instance */ diff --git a/Http/Logout/DefaultLogoutSuccessHandler.php b/Http/Logout/DefaultLogoutSuccessHandler.php index 70f15cf..48626b0 100644 --- a/Http/Logout/DefaultLogoutSuccessHandler.php +++ b/Http/Logout/DefaultLogoutSuccessHandler.php @@ -37,7 +37,7 @@ class DefaultLogoutSuccessHandler implements LogoutSuccessHandlerInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function onLogoutSuccess(Request $request) { diff --git a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php index 6500bfd..12478dc 100644 --- a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php +++ b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php @@ -62,7 +62,7 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices } /** - * {@inheritDoc} + * {@inheritdoc} */ protected function cancelCookie(Request $request) { @@ -79,7 +79,7 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices } /** - * {@inheritDoc} + * {@inheritdoc} */ protected function processAutoLoginCookie(array $cookieParts, Request $request) { @@ -117,7 +117,7 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices } /** - * {@inheritDoc} + * {@inheritdoc} */ protected function onLoginSuccess(Request $request, Response $response, TokenInterface $token) { diff --git a/Http/RememberMe/ResponseListener.php b/Http/RememberMe/ResponseListener.php index 6087587..2253c5d 100644 --- a/Http/RememberMe/ResponseListener.php +++ b/Http/RememberMe/ResponseListener.php @@ -36,7 +36,7 @@ class ResponseListener implements EventSubscriberInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public static function getSubscribedEvents() { diff --git a/Http/RememberMe/TokenBasedRememberMeServices.php b/Http/RememberMe/TokenBasedRememberMeServices.php index 571abbe..79b8a89 100644 --- a/Http/RememberMe/TokenBasedRememberMeServices.php +++ b/Http/RememberMe/TokenBasedRememberMeServices.php @@ -27,7 +27,7 @@ use Symfony\Component\Security\Core\User\UserInterface; class TokenBasedRememberMeServices extends AbstractRememberMeServices { /** - * {@inheritDoc} + * {@inheritdoc} */ protected function processAutoLoginCookie(array $cookieParts, Request $request) { @@ -90,7 +90,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices } /** - * {@inheritDoc} + * {@inheritdoc} */ protected function onLoginSuccess(Request $request, Response $response, TokenInterface $token) { @@ -116,7 +116,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices * * @param string $class * @param string $username The username - * @param integer $expires The Unix timestamp when the cookie expires + * @param int $expires The Unix timestamp when the cookie expires * @param string $password The encoded password * * @throws \RuntimeException if username contains invalid chars @@ -138,7 +138,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices * * @param string $class * @param string $username The username - * @param integer $expires The Unix timestamp when the cookie expires + * @param int $expires The Unix timestamp when the cookie expires * @param string $password The encoded password * * @throws \RuntimeException when the private key is empty diff --git a/Http/Session/SessionAuthenticationStrategy.php b/Http/Session/SessionAuthenticationStrategy.php index e9c9826..17160a1 100644 --- a/Http/Session/SessionAuthenticationStrategy.php +++ b/Http/Session/SessionAuthenticationStrategy.php @@ -38,7 +38,7 @@ class SessionAuthenticationStrategy implements SessionAuthenticationStrategyInte } /** - * {@inheritDoc} + * {@inheritdoc} */ public function onAuthentication(Request $request, TokenInterface $token) { |