summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Acl/Dbal/AclProvider.php2
-rw-r--r--Acl/Dbal/MutableAclProvider.php4
-rw-r--r--Acl/Domain/PermissionGrantingStrategy.php4
-rw-r--r--Acl/Model/AclInterface.php8
-rw-r--r--Acl/Model/AuditableEntryInterface.php4
-rw-r--r--Acl/Model/EntryInterface.php6
-rw-r--r--Acl/Model/MutableAclInterface.php2
-rw-r--r--Acl/Model/ObjectIdentityInterface.php2
-rw-r--r--Acl/Model/PermissionGrantingStrategyInterface.php4
-rw-r--r--Acl/Permission/MaskBuilder.php2
-rw-r--r--Acl/Permission/PermissionMapInterface.php2
-rw-r--r--Acl/Voter/AclVoter.php2
-rw-r--r--Core/Authentication/AuthenticationTrustResolverInterface.php6
-rw-r--r--Core/Authentication/Provider/AuthenticationProviderInterface.php2
-rw-r--r--Core/Authentication/Token/AbstractToken.php2
-rw-r--r--Core/Authentication/Token/TokenInterface.php4
-rw-r--r--Core/Authorization/AccessDecisionManagerInterface.php4
-rw-r--r--Core/Authorization/Voter/VoterInterface.php6
-rw-r--r--Core/Encoder/BasePasswordEncoder.php4
-rw-r--r--Core/Encoder/PasswordEncoderInterface.php2
-rw-r--r--Core/SecurityContextInterface.php2
-rw-r--r--Core/User/AdvancedUserInterface.php8
-rw-r--r--Core/User/EquatableInterface.php2
-rw-r--r--Core/User/UserProviderInterface.php2
-rw-r--r--Core/Util/StringUtils.php2
-rw-r--r--Http/Firewall/AbstractAuthenticationListener.php2
-rw-r--r--Http/Firewall/LogoutListener.php2
-rw-r--r--Http/HttpUtils.php2
-rw-r--r--Http/RememberMe/AbstractRememberMeServices.php2
-rw-r--r--Http/RememberMe/TokenBasedRememberMeServices.php2
30 files changed, 49 insertions, 49 deletions
diff --git a/Acl/Dbal/AclProvider.php b/Acl/Dbal/AclProvider.php
index d1b6198..9b0774b 100644
--- a/Acl/Dbal/AclProvider.php
+++ b/Acl/Dbal/AclProvider.php
@@ -374,7 +374,7 @@ QUERY;
* Returns the primary key of the passed object identity.
*
* @param ObjectIdentityInterface $oid
- * @return integer
+ * @return int
*/
final protected function retrieveObjectIdentityPrimaryKey(ObjectIdentityInterface $oid)
{
diff --git a/Acl/Dbal/MutableAclProvider.php b/Acl/Dbal/MutableAclProvider.php
index 482f443..ae86060 100644
--- a/Acl/Dbal/MutableAclProvider.php
+++ b/Acl/Dbal/MutableAclProvider.php
@@ -673,7 +673,7 @@ QUERY;
* If the type does not yet exist in the database, it will be created.
*
* @param string $classType
- * @return integer
+ * @return int
*/
private function createOrRetrieveClassId($classType)
{
@@ -693,7 +693,7 @@ QUERY;
* created.
*
* @param SecurityIdentityInterface $sid
- * @return integer
+ * @return int
*/
private function createOrRetrieveSecurityIdentityId(SecurityIdentityInterface $sid)
{
diff --git a/Acl/Domain/PermissionGrantingStrategy.php b/Acl/Domain/PermissionGrantingStrategy.php
index d031b34..0ca0785 100644
--- a/Acl/Domain/PermissionGrantingStrategy.php
+++ b/Acl/Domain/PermissionGrantingStrategy.php
@@ -130,7 +130,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
* @param SecurityIdentityInterface[] $sids An array of SecurityIdentityInterface implementations
* @param bool $administrativeMode True turns off audit logging
*
- * @return Boolean true, or false; either granting, or denying access respectively.
+ * @return bool true, or false; either granting, or denying access respectively.
*
* @throws NoAceFoundException
*/
@@ -191,7 +191,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
* @param int $requiredMask
* @param EntryInterface $ace
*
- * @return Boolean
+ * @return bool
*
* @throws \RuntimeException if the ACE strategy is not supported
*/
diff --git a/Acl/Model/AclInterface.php b/Acl/Model/AclInterface.php
index 800eaa8..85a4e83 100644
--- a/Acl/Model/AclInterface.php
+++ b/Acl/Model/AclInterface.php
@@ -72,7 +72,7 @@ interface AclInterface extends \Serializable
/**
* Whether this ACL is inheriting ACEs from a parent ACL.
*
- * @return Boolean
+ * @return bool
*/
public function isEntriesInheriting();
@@ -83,7 +83,7 @@ interface AclInterface extends \Serializable
* @param array $masks
* @param array $securityIdentities
* @param bool $administrativeMode
- * @return Boolean
+ * @return bool
*/
public function isFieldGranted($field, array $masks, array $securityIdentities, $administrativeMode = false);
@@ -94,7 +94,7 @@ interface AclInterface extends \Serializable
* @param array $masks
* @param array $securityIdentities
* @param bool $administrativeMode
- * @return Boolean
+ * @return bool
*/
public function isGranted(array $masks, array $securityIdentities, $administrativeMode = false);
@@ -102,7 +102,7 @@ interface AclInterface extends \Serializable
* Whether the ACL has loaded ACEs for all of the passed security identities
*
* @param mixed $securityIdentities an implementation of SecurityIdentityInterface, or an array thereof
- * @return Boolean
+ * @return bool
*/
public function isSidLoaded($securityIdentities);
}
diff --git a/Acl/Model/AuditableEntryInterface.php b/Acl/Model/AuditableEntryInterface.php
index e957965..509acda 100644
--- a/Acl/Model/AuditableEntryInterface.php
+++ b/Acl/Model/AuditableEntryInterface.php
@@ -21,14 +21,14 @@ interface AuditableEntryInterface extends EntryInterface
/**
* Whether auditing for successful grants is turned on
*
- * @return Boolean
+ * @return bool
*/
public function isAuditFailure();
/**
* Whether auditing for successful denies is turned on
*
- * @return Boolean
+ * @return bool
*/
public function isAuditSuccess();
}
diff --git a/Acl/Model/EntryInterface.php b/Acl/Model/EntryInterface.php
index 98b754c..b33f1f0 100644
--- a/Acl/Model/EntryInterface.php
+++ b/Acl/Model/EntryInterface.php
@@ -31,14 +31,14 @@ interface EntryInterface extends \Serializable
/**
* The primary key of this ACE
*
- * @return integer
+ * @return int
*/
public function getId();
/**
* The permission mask of this ACE
*
- * @return integer
+ * @return int
*/
public function getMask();
@@ -59,7 +59,7 @@ interface EntryInterface extends \Serializable
/**
* Returns whether this ACE is granting, or denying
*
- * @return Boolean
+ * @return bool
*/
public function isGranting();
}
diff --git a/Acl/Model/MutableAclInterface.php b/Acl/Model/MutableAclInterface.php
index d76c598..8993aa5 100644
--- a/Acl/Model/MutableAclInterface.php
+++ b/Acl/Model/MutableAclInterface.php
@@ -54,7 +54,7 @@ interface MutableAclInterface extends AclInterface
/**
* Returns the primary key of this ACL
*
- * @return integer
+ * @return int
*/
public function getId();
diff --git a/Acl/Model/ObjectIdentityInterface.php b/Acl/Model/ObjectIdentityInterface.php
index 8ad0eba..2ee365f 100644
--- a/Acl/Model/ObjectIdentityInterface.php
+++ b/Acl/Model/ObjectIdentityInterface.php
@@ -28,7 +28,7 @@ interface ObjectIdentityInterface
* Example for Object Equality: $object1->getId() === $object2->getId()
*
* @param ObjectIdentityInterface $identity
- * @return Boolean
+ * @return bool
*/
public function equals(ObjectIdentityInterface $identity);
diff --git a/Acl/Model/PermissionGrantingStrategyInterface.php b/Acl/Model/PermissionGrantingStrategyInterface.php
index def5fd1..25f1687 100644
--- a/Acl/Model/PermissionGrantingStrategyInterface.php
+++ b/Acl/Model/PermissionGrantingStrategyInterface.php
@@ -25,7 +25,7 @@ interface PermissionGrantingStrategyInterface
* @param array $masks
* @param array $sids
* @param bool $administrativeMode
- * @return Boolean
+ * @return bool
*/
public function isGranted(AclInterface $acl, array $masks, array $sids, $administrativeMode = false);
@@ -38,7 +38,7 @@ interface PermissionGrantingStrategyInterface
* @param array $sids
* @param bool $administrativeMode
*
- * @return Boolean
+ * @return bool
*/
public function isFieldGranted(AclInterface $acl, $field, array $masks, array $sids, $administrativeMode = false);
}
diff --git a/Acl/Permission/MaskBuilder.php b/Acl/Permission/MaskBuilder.php
index c0d21ac..4d475fb 100644
--- a/Acl/Permission/MaskBuilder.php
+++ b/Acl/Permission/MaskBuilder.php
@@ -110,7 +110,7 @@ class MaskBuilder
/**
* Returns the mask of this permission
*
- * @return integer
+ * @return int
*/
public function get()
{
diff --git a/Acl/Permission/PermissionMapInterface.php b/Acl/Permission/PermissionMapInterface.php
index 44c15cc..20ca181 100644
--- a/Acl/Permission/PermissionMapInterface.php
+++ b/Acl/Permission/PermissionMapInterface.php
@@ -34,7 +34,7 @@ interface PermissionMapInterface
* Whether this map contains the given permission
*
* @param string $permission
- * @return Boolean
+ * @return bool
*/
public function contains($permission);
}
diff --git a/Acl/Voter/AclVoter.php b/Acl/Voter/AclVoter.php
index 5e9aee6..d401ef3 100644
--- a/Acl/Voter/AclVoter.php
+++ b/Acl/Voter/AclVoter.php
@@ -134,7 +134,7 @@ class AclVoter implements VoterInterface
*
* @param string $class The class name
*
- * @return Boolean
+ * @return bool
*/
public function supportsClass($class)
{
diff --git a/Core/Authentication/AuthenticationTrustResolverInterface.php b/Core/Authentication/AuthenticationTrustResolverInterface.php
index ac07db0..03b48e9 100644
--- a/Core/Authentication/AuthenticationTrustResolverInterface.php
+++ b/Core/Authentication/AuthenticationTrustResolverInterface.php
@@ -28,7 +28,7 @@ interface AuthenticationTrustResolverInterface
*
* @param TokenInterface $token
*
- * @return Boolean
+ * @return bool
*/
public function isAnonymous(TokenInterface $token = null);
@@ -38,7 +38,7 @@ interface AuthenticationTrustResolverInterface
*
* @param TokenInterface $token
*
- * @return Boolean
+ * @return bool
*/
public function isRememberMe(TokenInterface $token = null);
@@ -47,7 +47,7 @@ interface AuthenticationTrustResolverInterface
*
* @param TokenInterface $token
*
- * @return Boolean
+ * @return bool
*/
public function isFullFledged(TokenInterface $token = null);
}
diff --git a/Core/Authentication/Provider/AuthenticationProviderInterface.php b/Core/Authentication/Provider/AuthenticationProviderInterface.php
index f63a924..23724db 100644
--- a/Core/Authentication/Provider/AuthenticationProviderInterface.php
+++ b/Core/Authentication/Provider/AuthenticationProviderInterface.php
@@ -29,7 +29,7 @@ interface AuthenticationProviderInterface extends AuthenticationManagerInterface
*
* @param TokenInterface $token A TokenInterface instance
*
- * @return Boolean true if the implementation supports the Token, false otherwise
+ * @return bool true if the implementation supports the Token, false otherwise
*/
public function supports(TokenInterface $token);
}
diff --git a/Core/Authentication/Token/AbstractToken.php b/Core/Authentication/Token/AbstractToken.php
index c22522c..993960b 100644
--- a/Core/Authentication/Token/AbstractToken.php
+++ b/Core/Authentication/Token/AbstractToken.php
@@ -192,7 +192,7 @@ abstract class AbstractToken implements TokenInterface
*
* @param string $name The attribute name
*
- * @return Boolean true if the attribute exists, false otherwise
+ * @return bool true if the attribute exists, false otherwise
*/
public function hasAttribute($name)
{
diff --git a/Core/Authentication/Token/TokenInterface.php b/Core/Authentication/Token/TokenInterface.php
index a909469..8f7d03f 100644
--- a/Core/Authentication/Token/TokenInterface.php
+++ b/Core/Authentication/Token/TokenInterface.php
@@ -69,7 +69,7 @@ interface TokenInterface extends \Serializable
/**
* Returns whether the user is authenticated or not.
*
- * @return Boolean true if the token has been authenticated, false otherwise
+ * @return bool true if the token has been authenticated, false otherwise
*/
public function isAuthenticated();
@@ -104,7 +104,7 @@ interface TokenInterface extends \Serializable
*
* @param string $name The attribute name
*
- * @return Boolean true if the attribute exists, false otherwise
+ * @return bool true if the attribute exists, false otherwise
*/
public function hasAttribute($name);
diff --git a/Core/Authorization/AccessDecisionManagerInterface.php b/Core/Authorization/AccessDecisionManagerInterface.php
index 742ea74..ec82800 100644
--- a/Core/Authorization/AccessDecisionManagerInterface.php
+++ b/Core/Authorization/AccessDecisionManagerInterface.php
@@ -27,7 +27,7 @@ interface AccessDecisionManagerInterface
* @param array $attributes An array of attributes associated with the method being invoked
* @param object $object The object to secure
*
- * @return Boolean true if the access is granted, false otherwise
+ * @return bool true if the access is granted, false otherwise
*/
public function decide(TokenInterface $token, array $attributes, $object = null);
@@ -36,7 +36,7 @@ interface AccessDecisionManagerInterface
*
* @param string $attribute An attribute
*
- * @return Boolean true if this decision manager supports the attribute, false otherwise
+ * @return bool true if this decision manager supports the attribute, false otherwise
*/
public function supportsAttribute($attribute);
diff --git a/Core/Authorization/Voter/VoterInterface.php b/Core/Authorization/Voter/VoterInterface.php
index 0840c1c..abc18b4 100644
--- a/Core/Authorization/Voter/VoterInterface.php
+++ b/Core/Authorization/Voter/VoterInterface.php
@@ -29,7 +29,7 @@ interface VoterInterface
*
* @param string $attribute An attribute
*
- * @return Boolean true if this Voter supports the attribute, false otherwise
+ * @return bool true if this Voter supports the attribute, false otherwise
*/
public function supportsAttribute($attribute);
@@ -38,7 +38,7 @@ interface VoterInterface
*
* @param string $class A class name
*
- * @return Boolean true if this Voter can process the class
+ * @return bool true if this Voter can process the class
*/
public function supportsClass($class);
@@ -52,7 +52,7 @@ interface VoterInterface
* @param object $object The object to secure
* @param array $attributes An array of attributes associated with the method being invoked
*
- * @return integer either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED
+ * @return int either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED
*/
public function vote(TokenInterface $token, $object, array $attributes);
}
diff --git a/Core/Encoder/BasePasswordEncoder.php b/Core/Encoder/BasePasswordEncoder.php
index b83eb30..b27c2b0 100644
--- a/Core/Encoder/BasePasswordEncoder.php
+++ b/Core/Encoder/BasePasswordEncoder.php
@@ -79,7 +79,7 @@ abstract class BasePasswordEncoder implements PasswordEncoderInterface
* @param string $password1 The first password
* @param string $password2 The second password
*
- * @return Boolean true if the two passwords are the same, false otherwise
+ * @return bool true if the two passwords are the same, false otherwise
*/
protected function comparePasswords($password1, $password2)
{
@@ -89,7 +89,7 @@ abstract class BasePasswordEncoder implements PasswordEncoderInterface
/**
* Checks if the password is too long.
*
- * @return Boolean true if the password is too long, false otherwise
+ * @return bool true if the password is too long, false otherwise
*/
protected function isPasswordTooLong($password)
{
diff --git a/Core/Encoder/PasswordEncoderInterface.php b/Core/Encoder/PasswordEncoderInterface.php
index 78b4e42..23acaf3 100644
--- a/Core/Encoder/PasswordEncoderInterface.php
+++ b/Core/Encoder/PasswordEncoderInterface.php
@@ -35,7 +35,7 @@ interface PasswordEncoderInterface
* @param string $raw A raw password
* @param string $salt The salt
*
- * @return Boolean true if the password is valid, false otherwise
+ * @return bool true if the password is valid, false otherwise
*/
public function isPasswordValid($encoded, $raw, $salt);
}
diff --git a/Core/SecurityContextInterface.php b/Core/SecurityContextInterface.php
index 434f9a5..ca816a8 100644
--- a/Core/SecurityContextInterface.php
+++ b/Core/SecurityContextInterface.php
@@ -44,7 +44,7 @@ interface SecurityContextInterface
* @param mixed $attributes
* @param mixed $object
*
- * @return Boolean
+ * @return bool
*/
public function isGranted($attributes, $object = null);
}
diff --git a/Core/User/AdvancedUserInterface.php b/Core/User/AdvancedUserInterface.php
index 5b3a51a..19775c0 100644
--- a/Core/User/AdvancedUserInterface.php
+++ b/Core/User/AdvancedUserInterface.php
@@ -43,7 +43,7 @@ interface AdvancedUserInterface extends UserInterface
* Internally, if this method returns false, the authentication system
* will throw an AccountExpiredException and prevent login.
*
- * @return Boolean true if the user's account is non expired, false otherwise
+ * @return bool true if the user's account is non expired, false otherwise
*
* @see AccountExpiredException
*/
@@ -55,7 +55,7 @@ interface AdvancedUserInterface extends UserInterface
* Internally, if this method returns false, the authentication system
* will throw a LockedException and prevent login.
*
- * @return Boolean true if the user is not locked, false otherwise
+ * @return bool true if the user is not locked, false otherwise
*
* @see LockedException
*/
@@ -67,7 +67,7 @@ interface AdvancedUserInterface extends UserInterface
* Internally, if this method returns false, the authentication system
* will throw a CredentialsExpiredException and prevent login.
*
- * @return Boolean true if the user's credentials are non expired, false otherwise
+ * @return bool true if the user's credentials are non expired, false otherwise
*
* @see CredentialsExpiredException
*/
@@ -79,7 +79,7 @@ interface AdvancedUserInterface extends UserInterface
* Internally, if this method returns false, the authentication system
* will throw a DisabledException and prevent login.
*
- * @return Boolean true if the user is enabled, false otherwise
+ * @return bool true if the user is enabled, false otherwise
*
* @see DisabledException
*/
diff --git a/Core/User/EquatableInterface.php b/Core/User/EquatableInterface.php
index 645b77c..c6082ce 100644
--- a/Core/User/EquatableInterface.php
+++ b/Core/User/EquatableInterface.php
@@ -31,7 +31,7 @@ interface EquatableInterface
*
* @param UserInterface $user
*
- * @return Boolean
+ * @return bool
*/
public function isEqualTo(UserInterface $user);
}
diff --git a/Core/User/UserProviderInterface.php b/Core/User/UserProviderInterface.php
index 6669c43..6b7895c 100644
--- a/Core/User/UserProviderInterface.php
+++ b/Core/User/UserProviderInterface.php
@@ -70,7 +70,7 @@ interface UserProviderInterface
*
* @param string $class
*
- * @return Boolean
+ * @return bool
*/
public function supportsClass($class);
}
diff --git a/Core/Util/StringUtils.php b/Core/Util/StringUtils.php
index 2e8925d..d47bd4b 100644
--- a/Core/Util/StringUtils.php
+++ b/Core/Util/StringUtils.php
@@ -31,7 +31,7 @@ class StringUtils
* @param string $knownString The string of known length to compare against
* @param string $userInput The string that the user can control
*
- * @return Boolean true if the two strings are the same, false otherwise
+ * @return bool true if the two strings are the same, false otherwise
*/
public static function equals($knownString, $userInput)
{
diff --git a/Http/Firewall/AbstractAuthenticationListener.php b/Http/Firewall/AbstractAuthenticationListener.php
index 7fa991c..80bfcd0 100644
--- a/Http/Firewall/AbstractAuthenticationListener.php
+++ b/Http/Firewall/AbstractAuthenticationListener.php
@@ -171,7 +171,7 @@ abstract class AbstractAuthenticationListener implements ListenerInterface
*
* @param Request $request
*
- * @return Boolean
+ * @return bool
*/
protected function requiresAuthentication(Request $request)
{
diff --git a/Http/Firewall/LogoutListener.php b/Http/Firewall/LogoutListener.php
index 7dc9503..722f4a1 100644
--- a/Http/Firewall/LogoutListener.php
+++ b/Http/Firewall/LogoutListener.php
@@ -121,7 +121,7 @@ class LogoutListener implements ListenerInterface
*
* @param Request $request
*
- * @return Boolean
+ * @return bool
*/
protected function requiresLogout(Request $request)
{
diff --git a/Http/HttpUtils.php b/Http/HttpUtils.php
index a7b0226..50d4f26 100644
--- a/Http/HttpUtils.php
+++ b/Http/HttpUtils.php
@@ -96,7 +96,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))
*
- * @return Boolean true if the path is the same as the one from the Request, false otherwise
+ * @return bool true if the path is the same as the one from the Request, false otherwise
*/
public function checkRequestPath(Request $request, $path)
{
diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php
index 740d3d6..1e60db0 100644
--- a/Http/RememberMe/AbstractRememberMeServices.php
+++ b/Http/RememberMe/AbstractRememberMeServices.php
@@ -295,7 +295,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
*
* @param Request $request
*
- * @return Boolean
+ * @return bool
*/
protected function isRememberMeRequested(Request $request)
{
diff --git a/Http/RememberMe/TokenBasedRememberMeServices.php b/Http/RememberMe/TokenBasedRememberMeServices.php
index 75a2a0d..db1b508 100644
--- a/Http/RememberMe/TokenBasedRememberMeServices.php
+++ b/Http/RememberMe/TokenBasedRememberMeServices.php
@@ -73,7 +73,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices
* @param string $hash1 The first hash
* @param string $hash2 The second hash
*
- * @return Boolean true if the two hashes are the same, false otherwise
+ * @return bool true if the two hashes are the same, false otherwise
*/
private function compareHashes($hash1, $hash2)
{