summaryrefslogtreecommitdiffstats
path: root/Core/Exception
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-04-16 10:08:40 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2014-04-16 10:08:40 +0200
commit4746383920bc2bb152808092c7a68fb117e12273 (patch)
tree7d933d839d3c09834db65daec098f5c77a04a40f /Core/Exception
parentf70d3420f4f5bdb9b98ce3c880c7fcd8ccc46918 (diff)
parentbe954bbe63838d3d08885b96547e6081a0773757 (diff)
downloadsymfony-security-4746383920bc2bb152808092c7a68fb117e12273.zip
symfony-security-4746383920bc2bb152808092c7a68fb117e12273.tar.gz
symfony-security-4746383920bc2bb152808092c7a68fb117e12273.tar.bz2
Merge branch '2.4'
* 2.4: made types consistent with those defined in Hack made {@inheritdoc} annotations consistent across the board made {@inheritdoc} annotations consistent across the board fixed types in phpdocs [Debug] Fixed ClassNotFoundFatalErrorHandler on windows. made phpdoc types consistent with those defined in Hack Add support Thai translations [Validator] Add missing czech 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/Component/Console/Helper/TableHelper.php src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php src/Symfony/Component/Form/FormError.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/Process/ProcessPipes.php src/Symfony/Component/PropertyAccess/PropertyAccessor.php src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php src/Symfony/Component/Translation/Dumper/FileDumper.php src/Symfony/Component/Validator/ConstraintViolation.php src/Symfony/Component/Validator/Constraints/EmailValidator.php src/Symfony/Component/Validator/ExecutionContextInterface.php src/Symfony/Component/Validator/Mapping/BlackholeMetadataFactory.php
Diffstat (limited to 'Core/Exception')
-rw-r--r--Core/Exception/AccountExpiredException.php2
-rw-r--r--Core/Exception/AccountStatusException.php4
-rw-r--r--Core/Exception/AuthenticationCredentialsNotFoundException.php2
-rw-r--r--Core/Exception/AuthenticationServiceException.php2
-rw-r--r--Core/Exception/BadCredentialsException.php2
-rw-r--r--Core/Exception/CookieTheftException.php2
-rw-r--r--Core/Exception/CredentialsExpiredException.php2
-rw-r--r--Core/Exception/DisabledException.php2
-rw-r--r--Core/Exception/InsufficientAuthenticationException.php2
-rw-r--r--Core/Exception/InvalidCsrfTokenException.php2
-rw-r--r--Core/Exception/LockedException.php2
-rw-r--r--Core/Exception/NonceExpiredException.php2
-rw-r--r--Core/Exception/ProviderNotFoundException.php2
-rw-r--r--Core/Exception/SessionUnavailableException.php2
-rw-r--r--Core/Exception/TokenNotFoundException.php2
-rw-r--r--Core/Exception/UsernameNotFoundException.php6
16 files changed, 19 insertions, 19 deletions
diff --git a/Core/Exception/AccountExpiredException.php b/Core/Exception/AccountExpiredException.php
index a5618ce..4a71263 100644
--- a/Core/Exception/AccountExpiredException.php
+++ b/Core/Exception/AccountExpiredException.php
@@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception;
class AccountExpiredException extends AccountStatusException
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getMessageKey()
{
diff --git a/Core/Exception/AccountStatusException.php b/Core/Exception/AccountStatusException.php
index 7819e4d..9b29f63 100644
--- a/Core/Exception/AccountStatusException.php
+++ b/Core/Exception/AccountStatusException.php
@@ -45,7 +45,7 @@ abstract class AccountStatusException extends AuthenticationException
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function serialize()
{
@@ -56,7 +56,7 @@ abstract class AccountStatusException extends AuthenticationException
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function unserialize($str)
{
diff --git a/Core/Exception/AuthenticationCredentialsNotFoundException.php b/Core/Exception/AuthenticationCredentialsNotFoundException.php
index 633b2be..8595bed 100644
--- a/Core/Exception/AuthenticationCredentialsNotFoundException.php
+++ b/Core/Exception/AuthenticationCredentialsNotFoundException.php
@@ -21,7 +21,7 @@ namespace Symfony\Component\Security\Core\Exception;
class AuthenticationCredentialsNotFoundException extends AuthenticationException
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getMessageKey()
{
diff --git a/Core/Exception/AuthenticationServiceException.php b/Core/Exception/AuthenticationServiceException.php
index 758a4f0..66f051d 100644
--- a/Core/Exception/AuthenticationServiceException.php
+++ b/Core/Exception/AuthenticationServiceException.php
@@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception;
class AuthenticationServiceException extends AuthenticationException
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getMessageKey()
{
diff --git a/Core/Exception/BadCredentialsException.php b/Core/Exception/BadCredentialsException.php
index 5deecca..be061c7 100644
--- a/Core/Exception/BadCredentialsException.php
+++ b/Core/Exception/BadCredentialsException.php
@@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception;
class BadCredentialsException extends AuthenticationException
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getMessageKey()
{
diff --git a/Core/Exception/CookieTheftException.php b/Core/Exception/CookieTheftException.php
index 8d9e154..af97168 100644
--- a/Core/Exception/CookieTheftException.php
+++ b/Core/Exception/CookieTheftException.php
@@ -21,7 +21,7 @@ namespace Symfony\Component\Security\Core\Exception;
class CookieTheftException extends AuthenticationException
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getMessageKey()
{
diff --git a/Core/Exception/CredentialsExpiredException.php b/Core/Exception/CredentialsExpiredException.php
index b9bf2d1..bcc1267 100644
--- a/Core/Exception/CredentialsExpiredException.php
+++ b/Core/Exception/CredentialsExpiredException.php
@@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception;
class CredentialsExpiredException extends AccountStatusException
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getMessageKey()
{
diff --git a/Core/Exception/DisabledException.php b/Core/Exception/DisabledException.php
index 5571ab1..e9b784f 100644
--- a/Core/Exception/DisabledException.php
+++ b/Core/Exception/DisabledException.php
@@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception;
class DisabledException extends AccountStatusException
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getMessageKey()
{
diff --git a/Core/Exception/InsufficientAuthenticationException.php b/Core/Exception/InsufficientAuthenticationException.php
index 74fc2b9..e33ef6a 100644
--- a/Core/Exception/InsufficientAuthenticationException.php
+++ b/Core/Exception/InsufficientAuthenticationException.php
@@ -22,7 +22,7 @@ namespace Symfony\Component\Security\Core\Exception;
class InsufficientAuthenticationException extends AuthenticationException
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getMessageKey()
{
diff --git a/Core/Exception/InvalidCsrfTokenException.php b/Core/Exception/InvalidCsrfTokenException.php
index ce0e1f4..84be855 100644
--- a/Core/Exception/InvalidCsrfTokenException.php
+++ b/Core/Exception/InvalidCsrfTokenException.php
@@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception;
class InvalidCsrfTokenException extends AuthenticationException
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getMessageKey()
{
diff --git a/Core/Exception/LockedException.php b/Core/Exception/LockedException.php
index 6532f70..fffae74 100644
--- a/Core/Exception/LockedException.php
+++ b/Core/Exception/LockedException.php
@@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception;
class LockedException extends AccountStatusException
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getMessageKey()
{
diff --git a/Core/Exception/NonceExpiredException.php b/Core/Exception/NonceExpiredException.php
index 2f6681f..998e987 100644
--- a/Core/Exception/NonceExpiredException.php
+++ b/Core/Exception/NonceExpiredException.php
@@ -21,7 +21,7 @@ namespace Symfony\Component\Security\Core\Exception;
class NonceExpiredException extends AuthenticationException
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getMessageKey()
{
diff --git a/Core/Exception/ProviderNotFoundException.php b/Core/Exception/ProviderNotFoundException.php
index ea2b1fd..af2e1b5 100644
--- a/Core/Exception/ProviderNotFoundException.php
+++ b/Core/Exception/ProviderNotFoundException.php
@@ -21,7 +21,7 @@ namespace Symfony\Component\Security\Core\Exception;
class ProviderNotFoundException extends AuthenticationException
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getMessageKey()
{
diff --git a/Core/Exception/SessionUnavailableException.php b/Core/Exception/SessionUnavailableException.php
index 4b47b18..90b858a 100644
--- a/Core/Exception/SessionUnavailableException.php
+++ b/Core/Exception/SessionUnavailableException.php
@@ -26,7 +26,7 @@ namespace Symfony\Component\Security\Core\Exception;
class SessionUnavailableException extends AuthenticationException
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getMessageKey()
{
diff --git a/Core/Exception/TokenNotFoundException.php b/Core/Exception/TokenNotFoundException.php
index fb85abf..b050302 100644
--- a/Core/Exception/TokenNotFoundException.php
+++ b/Core/Exception/TokenNotFoundException.php
@@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception;
class TokenNotFoundException extends AuthenticationException
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getMessageKey()
{
diff --git a/Core/Exception/UsernameNotFoundException.php b/Core/Exception/UsernameNotFoundException.php
index f656bac..11607d3 100644
--- a/Core/Exception/UsernameNotFoundException.php
+++ b/Core/Exception/UsernameNotFoundException.php
@@ -22,7 +22,7 @@ class UsernameNotFoundException extends AuthenticationException
private $username;
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getMessageKey()
{
@@ -50,7 +50,7 @@ class UsernameNotFoundException extends AuthenticationException
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function serialize()
{
@@ -61,7 +61,7 @@ class UsernameNotFoundException extends AuthenticationException
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function unserialize($str)
{