made phpdoc types consistent with those defined in Hack

29 files changed, 124 insertions, 124 deletions

diff --git a/Acl/Dbal/AclProvider.php b/Acl/Dbal/AclProvider.php
index 69d4d95..57c5329 100644
--- a/Acl/Dbal/AclProvider.php
+++ b/Acl/Dbal/AclProvider.php
@@ -318,7 +318,7 @@ SELECTCLAUSE;
      * object identities.
      *
      * @param ObjectIdentityInterface $oid
-     * @param Boolean                 $directChildrenOnly
+     * @param bool                    $directChildrenOnly
      * @return string
      */
     protected function getFindChildrenSql(ObjectIdentityInterface $oid, $directChildrenOnly)
diff --git a/Acl/Dbal/MutableAclProvider.php b/Acl/Dbal/MutableAclProvider.php
index 29d3cfd..7b0f4bc 100644
--- a/Acl/Dbal/MutableAclProvider.php
+++ b/Acl/Dbal/MutableAclProvider.php
@@ -354,7 +354,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
     /**
      * Constructs the SQL for deleting access control entries.
      *
-     * @param integer $oidPK
+     * @param int     $oidPK
      * @return string
      */
     protected function getDeleteAccessControlEntriesSql($oidPK)
@@ -369,7 +369,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
     /**
      * Constructs the SQL for deleting a specific ACE.
      *
-     * @param integer $acePK
+     * @param int     $acePK
      * @return string
      */
     protected function getDeleteAccessControlEntrySql($acePK)
@@ -384,7 +384,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
     /**
      * Constructs the SQL for deleting an object identity.
      *
-     * @param integer $pk
+     * @param int     $pk
      * @return string
      */
     protected function getDeleteObjectIdentitySql($pk)
@@ -399,7 +399,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
     /**
      * Constructs the SQL for deleting relation entries.
      *
-     * @param integer $pk
+     * @param int     $pk
      * @return string
      */
     protected function getDeleteObjectIdentityRelationsSql($pk)
@@ -414,16 +414,16 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
     /**
      * Constructs the SQL for inserting an ACE.
      *
-     * @param integer      $classId
-     * @param integer|null $objectIdentityId
+     * @param int          $classId
+     * @param int    |null $objectIdentityId
      * @param string|null  $field
-     * @param integer      $aceOrder
-     * @param integer      $securityIdentityId
+     * @param int          $aceOrder
+     * @param int          $securityIdentityId
      * @param string       $strategy
-     * @param integer      $mask
-     * @param Boolean      $granting
-     * @param Boolean      $auditSuccess
-     * @param Boolean      $auditFailure
+     * @param int          $mask
+     * @param bool         $granting
+     * @param bool         $auditSuccess
+     * @param bool         $auditFailure
      * @return string
      */
     protected function getInsertAccessControlEntrySql($classId, $objectIdentityId, $field, $aceOrder, $securityIdentityId, $strategy, $mask, $granting, $auditSuccess, $auditFailure)
@@ -478,8 +478,8 @@ QUERY;
     /**
      * Constructs the SQL for inserting a relation entry.
      *
-     * @param integer $objectIdentityId
-     * @param integer $ancestorId
+     * @param int     $objectIdentityId
+     * @param int     $ancestorId
      * @return string
      */
     protected function getInsertObjectIdentityRelationSql($objectIdentityId, $ancestorId)
@@ -496,8 +496,8 @@ QUERY;
      * Constructs the SQL for inserting an object identity.
      *
      * @param string  $identifier
-     * @param integer $classId
-     * @param Boolean $entriesInheriting
+     * @param int     $classId
+     * @param bool    $entriesInheriting
      * @return string
      */
     protected function getInsertObjectIdentitySql($identifier, $classId, $entriesInheriting)
@@ -546,10 +546,10 @@ QUERY;
     /**
      * Constructs the SQL for selecting an ACE.
      *
-     * @param integer $classId
-     * @param integer $oid
+     * @param int     $classId
+     * @param int     $oid
      * @param string  $field
-     * @param integer $order
+     * @param int     $order
      * @return string
      */
     protected function getSelectAccessControlEntryIdSql($classId, $oid, $field, $order)
@@ -614,7 +614,7 @@ QUERY;
     /**
      * Constructs the SQL for updating an object identity.
      *
-     * @param integer $pk
+     * @param int     $pk
      * @param array   $changes
      * @throws \InvalidArgumentException
      * @return string
@@ -636,7 +636,7 @@ QUERY;
     /**
      * Constructs the SQL for updating an ACE.
      *
-     * @param integer $pk
+     * @param int     $pk
      * @param array   $sets
      * @throws \InvalidArgumentException
      * @return string
@@ -709,7 +709,7 @@ QUERY;
     /**
      * Deletes all ACEs for the given object identity primary key.
      *
-     * @param integer $oidPK
+     * @param int     $oidPK
      */
     private function deleteAccessControlEntries($oidPK)
     {
@@ -719,7 +719,7 @@ QUERY;
     /**
      * Deletes the object identity from the database.
      *
-     * @param integer $pk
+     * @param int     $pk
      */
     private function deleteObjectIdentity($pk)
     {
@@ -729,7 +729,7 @@ QUERY;
     /**
      * Deletes all entries from the relations table from the database.
      *
-     * @param integer $pk
+     * @param int     $pk
      */
     private function deleteObjectIdentityRelations($pk)
     {
diff --git a/Acl/Domain/Acl.php b/Acl/Domain/Acl.php
index 4665c0e..41b2cd6 100644
--- a/Acl/Domain/Acl.php
+++ b/Acl/Domain/Acl.php
@@ -49,11 +49,11 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     /**
      * Constructor
      *
-     * @param integer                             $id
+     * @param int                                 $id
      * @param ObjectIdentityInterface             $objectIdentity
      * @param PermissionGrantingStrategyInterface $permissionGrantingStrategy
      * @param array                               $loadedSids
-     * @param Boolean                             $entriesInheriting
+     * @param bool                                $entriesInheriting
      */
     public function __construct($id, ObjectIdentityInterface $objectIdentity, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $loadedSids = array(), $entriesInheriting)
     {
@@ -398,7 +398,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
      * Deletes an ACE
      *
      * @param string  $property
-     * @param integer $index
+     * @param int     $index
      * @throws \OutOfBoundsException
      */
     private function deleteAce($property, $index)
@@ -422,7 +422,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
      * Deletes a field-based ACE
      *
      * @param string  $property
-     * @param integer $index
+     * @param int     $index
      * @param string  $field
      * @throws \OutOfBoundsException
      */
@@ -447,10 +447,10 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
      * Inserts an ACE
      *
      * @param string                    $property
-     * @param integer                   $index
-     * @param integer                   $mask
+     * @param int                       $index
+     * @param int                       $mask
      * @param SecurityIdentityInterface $sid
-     * @param Boolean                   $granting
+     * @param bool                      $granting
      * @param string                    $strategy
      * @throws \OutOfBoundsException
      * @throws \InvalidArgumentException
@@ -495,11 +495,11 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
      * Inserts a field-based ACE
      *
      * @param string                    $property
-     * @param integer                   $index
+     * @param int                       $index
      * @param string                    $field
-     * @param integer                   $mask
+     * @param int                       $mask
      * @param SecurityIdentityInterface $sid
-     * @param Boolean                   $granting
+     * @param bool                      $granting
      * @param string                    $strategy
      * @throws \InvalidArgumentException
      * @throws \OutOfBoundsException
@@ -552,8 +552,8 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
      * Updates an ACE
      *
      * @param string  $property
-     * @param integer $index
-     * @param integer $mask
+     * @param int     $index
+     * @param int     $mask
      * @param string  $strategy
      * @throws \OutOfBoundsException
      */
@@ -579,9 +579,9 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
      * Updates auditing for an ACE
      *
      * @param array   &$aces
-     * @param integer $index
-     * @param Boolean $auditSuccess
-     * @param Boolean $auditFailure
+     * @param int     $index
+     * @param bool    $auditSuccess
+     * @param bool    $auditFailure
      * @throws \OutOfBoundsException
      */
     private function updateAuditing(array &$aces, $index, $auditSuccess, $auditFailure)
@@ -605,9 +605,9 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
      * Updates a field-based ACE
      *
      * @param string  $property
-     * @param integer $index
+     * @param int     $index
      * @param string  $field
-     * @param integer $mask
+     * @param int     $mask
      * @param string  $strategy
      * @throws \InvalidArgumentException
      * @throws \OutOfBoundsException
diff --git a/Acl/Domain/AuditLogger.php b/Acl/Domain/AuditLogger.php
index 8174873..feb2c42 100644
--- a/Acl/Domain/AuditLogger.php
+++ b/Acl/Domain/AuditLogger.php
@@ -25,7 +25,7 @@ abstract class AuditLogger implements AuditLoggerInterface
     /**
      * Performs some checks if logging was requested
      *
-     * @param Boolean        $granted
+     * @param bool           $granted
      * @param EntryInterface $ace
      */
     public function logIfNeeded($granted, EntryInterface $ace)
@@ -44,7 +44,7 @@ abstract class AuditLogger implements AuditLoggerInterface
     /**
      * This method is only called when logging is needed
      *
-     * @param Boolean        $granted
+     * @param bool           $granted
      * @param EntryInterface $ace
      */
     abstract protected function doLog($granted, EntryInterface $ace);
diff --git a/Acl/Domain/Entry.php b/Acl/Domain/Entry.php
index 42449c4..f49c95b 100644
--- a/Acl/Domain/Entry.php
+++ b/Acl/Domain/Entry.php
@@ -34,14 +34,14 @@ class Entry implements AuditableEntryInterface
     /**
      * Constructor
      *
-     * @param integer                   $id
+     * @param int                       $id
      * @param AclInterface              $acl
      * @param SecurityIdentityInterface $sid
      * @param string                    $strategy
-     * @param integer                   $mask
-     * @param Boolean                   $granting
-     * @param Boolean                   $auditFailure
-     * @param Boolean                   $auditSuccess
+     * @param int                       $mask
+     * @param bool                      $granting
+     * @param bool                      $auditFailure
+     * @param bool                      $auditSuccess
      */
     public function __construct($id, AclInterface $acl, SecurityIdentityInterface $sid, $strategy, $mask, $granting, $auditFailure, $auditSuccess)
     {
@@ -125,7 +125,7 @@ class Entry implements AuditableEntryInterface
      * Do never call this method directly. Use the respective methods on the
      * AclInterface instead.
      *
-     * @param Boolean $boolean
+     * @param bool    $boolean
      */
     public function setAuditFailure($boolean)
     {
@@ -138,7 +138,7 @@ class Entry implements AuditableEntryInterface
      * Do never call this method directly. Use the respective methods on the
      * AclInterface instead.
      *
-     * @param Boolean $boolean
+     * @param bool    $boolean
      */
     public function setAuditSuccess($boolean)
     {
@@ -151,7 +151,7 @@ class Entry implements AuditableEntryInterface
      * Do never call this method directly. Use the respective methods on the
      * AclInterface instead.
      *
-     * @param integer $mask
+     * @param int     $mask
      */
     public function setMask($mask)
     {
diff --git a/Acl/Domain/FieldEntry.php b/Acl/Domain/FieldEntry.php
index f057367..e4554f9 100644
--- a/Acl/Domain/FieldEntry.php
+++ b/Acl/Domain/FieldEntry.php
@@ -27,15 +27,15 @@ class FieldEntry extends Entry implements FieldEntryInterface
     /**
      * Constructor
      *
-     * @param integer                   $id
+     * @param int                       $id
      * @param AclInterface              $acl
      * @param string                    $field
      * @param SecurityIdentityInterface $sid
      * @param string                    $strategy
-     * @param integer                   $mask
-     * @param Boolean                   $granting
-     * @param Boolean                   $auditFailure
-     * @param Boolean                   $auditSuccess
+     * @param int                       $mask
+     * @param bool                      $granting
+     * @param bool                      $auditFailure
+     * @param bool                      $auditSuccess
      */
     public function __construct($id, AclInterface $acl, $field, SecurityIdentityInterface $sid, $strategy, $mask, $granting, $auditFailure, $auditSuccess)
     {
diff --git a/Acl/Domain/PermissionGrantingStrategy.php b/Acl/Domain/PermissionGrantingStrategy.php
index d505843..0ebb8bc 100644
--- a/Acl/Domain/PermissionGrantingStrategy.php
+++ b/Acl/Domain/PermissionGrantingStrategy.php
@@ -128,7 +128,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
      * @param EntryInterface[]            $aces               An array of ACE to check against
      * @param array                       $masks              An array of permission masks
      * @param SecurityIdentityInterface[] $sids               An array of SecurityIdentityInterface implementations
-     * @param Boolean                     $administrativeMode True turns off audit logging
+     * @param bool                        $administrativeMode True turns off audit logging
      *
      * @return Boolean true, or false; either granting, or denying access respectively.
      *
@@ -188,7 +188,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
      * Strategy EQUAL:
      * The ACE will be considered applicable when the bitmasks are equal.
      *
-     * @param integer        $requiredMask
+     * @param int            $requiredMask
      * @param EntryInterface $ace
      *
      * @return Boolean
diff --git a/Acl/Model/AclCacheInterface.php b/Acl/Model/AclCacheInterface.php
index ea9604e..4673e01 100644
--- a/Acl/Model/AclCacheInterface.php
+++ b/Acl/Model/AclCacheInterface.php
@@ -37,7 +37,7 @@ interface AclCacheInterface
     /**
      * Retrieves an ACL for the given object identity primary key from the cache
      *
-     * @param integer $primaryKey
+     * @param int     $primaryKey
      * @return AclInterface
      */
     public function getFromCacheById($primaryKey);
diff --git a/Acl/Model/AclInterface.php b/Acl/Model/AclInterface.php
index 02bbd00..800eaa8 100644
--- a/Acl/Model/AclInterface.php
+++ b/Acl/Model/AclInterface.php
@@ -82,7 +82,7 @@ interface AclInterface extends \Serializable
      * @param string  $field
      * @param array   $masks
      * @param array   $securityIdentities
-     * @param Boolean $administrativeMode
+     * @param bool    $administrativeMode
      * @return Boolean
      */
     public function isFieldGranted($field, array $masks, array $securityIdentities, $administrativeMode = false);
@@ -93,7 +93,7 @@ interface AclInterface extends \Serializable
      * @throws NoAceFoundException when no ACE was applicable for this request
      * @param array   $masks
      * @param array   $securityIdentities
-     * @param Boolean $administrativeMode
+     * @param bool    $administrativeMode
      * @return Boolean
      */
     public function isGranted(array $masks, array $securityIdentities, $administrativeMode = false);
diff --git a/Acl/Model/AclProviderInterface.php b/Acl/Model/AclProviderInterface.php
index 615cf14..dd8fb19 100644
--- a/Acl/Model/AclProviderInterface.php
+++ b/Acl/Model/AclProviderInterface.php
@@ -24,7 +24,7 @@ interface AclProviderInterface
      * Retrieves all child object identities from the database
      *
      * @param ObjectIdentityInterface $parentOid
-     * @param Boolean                 $directChildrenOnly
+     * @param bool                    $directChildrenOnly
      *
      * @return array returns an array of child 'ObjectIdentity's
      */
diff --git a/Acl/Model/AuditLoggerInterface.php b/Acl/Model/AuditLoggerInterface.php
index 09bcbb8..11fe7f5 100644
--- a/Acl/Model/AuditLoggerInterface.php
+++ b/Acl/Model/AuditLoggerInterface.php
@@ -22,7 +22,7 @@ interface AuditLoggerInterface
      * This method is called whenever access is granted, or denied, and
      * administrative mode is turned off.
      *
-     * @param Boolean        $granted
+     * @param bool           $granted
      * @param EntryInterface $ace
      */
     public function logIfNeeded($granted, EntryInterface $ace);
diff --git a/Acl/Model/AuditableAclInterface.php b/Acl/Model/AuditableAclInterface.php
index 14b4c04..f5ed9dd 100644
--- a/Acl/Model/AuditableAclInterface.php
+++ b/Acl/Model/AuditableAclInterface.php
@@ -21,38 +21,38 @@ interface AuditableAclInterface extends MutableAclInterface
     /**
      * Updates auditing for class-based ACE
      *
-     * @param integer $index
-     * @param Boolean $auditSuccess
-     * @param Boolean $auditFailure
+     * @param int     $index
+     * @param bool    $auditSuccess
+     * @param bool    $auditFailure
      */
     public function updateClassAuditing($index, $auditSuccess, $auditFailure);
 
     /**
      * Updates auditing for class-field-based ACE
      *
-     * @param integer $index
+     * @param int     $index
      * @param string  $field
-     * @param Boolean $auditSuccess
-     * @param Boolean $auditFailure
+     * @param bool    $auditSuccess
+     * @param bool    $auditFailure
      */
     public function updateClassFieldAuditing($index, $field, $auditSuccess, $auditFailure);
 
     /**
      * Updates auditing for object-based ACE
      *
-     * @param integer $index
-     * @param Boolean $auditSuccess
-     * @param Boolean $auditFailure
+     * @param int     $index
+     * @param bool    $auditSuccess
+     * @param bool    $auditFailure
      */
     public function updateObjectAuditing($index, $auditSuccess, $auditFailure);
 
     /**
      * Updates auditing for object-field-based ACE
      *
-     * @param integer $index
+     * @param int     $index
      * @param string  $field
-     * @param Boolean $auditSuccess
-     * @param Boolean $auditFailure
+     * @param bool    $auditSuccess
+     * @param bool    $auditFailure
      */
     public function updateObjectFieldAuditing($index, $field, $auditSuccess, $auditFailure);
 }
diff --git a/Acl/Model/MutableAclInterface.php b/Acl/Model/MutableAclInterface.php
index 365a779..d76c598 100644
--- a/Acl/Model/MutableAclInterface.php
+++ b/Acl/Model/MutableAclInterface.php
@@ -24,14 +24,14 @@ interface MutableAclInterface extends AclInterface
     /**
      * Deletes a class-based ACE
      *
-     * @param integer $index
+     * @param int     $index
      */
     public function deleteClassAce($index);
 
     /**
      * Deletes a class-field-based ACE
      *
-     * @param integer $index
+     * @param int     $index
      * @param string  $field
      */
     public function deleteClassFieldAce($index, $field);
@@ -39,14 +39,14 @@ interface MutableAclInterface extends AclInterface
     /**
      * Deletes an object-based ACE
      *
-     * @param integer $index
+     * @param int     $index
      */
     public function deleteObjectAce($index);
 
     /**
      * Deletes an object-field-based ACE
      *
-     * @param integer $index
+     * @param int     $index
      * @param string  $field
      */
     public function deleteObjectFieldAce($index, $field);
@@ -62,9 +62,9 @@ interface MutableAclInterface extends AclInterface
      * Inserts a class-based ACE
      *
      * @param SecurityIdentityInterface $sid
-     * @param integer                   $mask
-     * @param integer                   $index
-     * @param Boolean                   $granting
+     * @param int                       $mask
+     * @param int                       $index
+     * @param bool                      $granting
      * @param string                    $strategy
      */
     public function insertClassAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
@@ -74,9 +74,9 @@ interface MutableAclInterface extends AclInterface
      *
      * @param string                    $field
      * @param SecurityIdentityInterface $sid
-     * @param integer                   $mask
-     * @param integer                   $index
-     * @param Boolean                   $granting
+     * @param int                       $mask
+     * @param int                       $index
+     * @param bool                      $granting
      * @param string                    $strategy
      */
     public function insertClassFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
@@ -85,9 +85,9 @@ interface MutableAclInterface extends AclInterface
      * Inserts an object-based ACE
      *
      * @param SecurityIdentityInterface $sid
-     * @param integer                   $mask
-     * @param integer                   $index
-     * @param Boolean                   $granting
+     * @param int                       $mask
+     * @param int                       $index
+     * @param bool                      $granting
      * @param string                    $strategy
      */
     public function insertObjectAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
@@ -97,9 +97,9 @@ interface MutableAclInterface extends AclInterface
      *
      * @param string                    $field
      * @param SecurityIdentityInterface $sid
-     * @param integer                   $mask
-     * @param integer                   $index
-     * @param Boolean                   $granting
+     * @param int                       $mask
+     * @param int                       $index
+     * @param bool                      $granting
      * @param string                    $strategy
      */
     public function insertObjectFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
@@ -107,7 +107,7 @@ interface MutableAclInterface extends AclInterface
     /**
      * Sets whether entries are inherited
      *
-     * @param Boolean $boolean
+     * @param bool    $boolean
      */
     public function setEntriesInheriting($boolean);
 
@@ -121,8 +121,8 @@ interface MutableAclInterface extends AclInterface
     /**
      * Updates a class-based ACE
      *
-     * @param integer $index
-     * @param integer $mask
+     * @param int     $index
+     * @param int     $mask
      * @param string  $strategy if null the strategy should not be changed
      */
     public function updateClassAce($index, $mask, $strategy = null);
@@ -130,9 +130,9 @@ interface MutableAclInterface extends AclInterface
     /**
      * Updates a class-field-based ACE
      *
-     * @param integer $index
+     * @param int     $index
      * @param string  $field
-     * @param integer $mask
+     * @param int     $mask
      * @param string  $strategy if null the strategy should not be changed
      */
     public function updateClassFieldAce($index, $field, $mask, $strategy = null);
@@ -140,8 +140,8 @@ interface MutableAclInterface extends AclInterface
     /**
      * Updates an object-based ACE
      *
-     * @param integer $index
-     * @param integer $mask
+     * @param int     $index
+     * @param int     $mask
      * @param string  $strategy if null the strategy should not be changed
      */
     public function updateObjectAce($index, $mask, $strategy = null);
@@ -149,9 +149,9 @@ interface MutableAclInterface extends AclInterface
     /**
      * Updates an object-field-based ACE
      *
-     * @param integer $index
+     * @param int     $index
      * @param string  $field
-     * @param integer $mask
+     * @param int     $mask
      * @param string  $strategy if null the strategy should not be changed
      */
     public function updateObjectFieldAce($index, $field, $mask, $strategy = null);
diff --git a/Acl/Model/PermissionGrantingStrategyInterface.php b/Acl/Model/PermissionGrantingStrategyInterface.php
index 7f8f81b..def5fd1 100644
--- a/Acl/Model/PermissionGrantingStrategyInterface.php
+++ b/Acl/Model/PermissionGrantingStrategyInterface.php
@@ -24,7 +24,7 @@ interface PermissionGrantingStrategyInterface
      * @param AclInterface $acl
      * @param array        $masks
      * @param array        $sids
-     * @param Boolean      $administrativeMode
+     * @param bool         $administrativeMode
      * @return Boolean
      */
     public function isGranted(AclInterface $acl, array $masks, array $sids, $administrativeMode = false);
@@ -36,7 +36,7 @@ interface PermissionGrantingStrategyInterface
      * @param string       $field
      * @param array        $masks
      * @param array        $sids
-     * @param Boolean      $administrativeMode
+     * @param bool         $administrativeMode
      *
      * @return Boolean
      */
diff --git a/Acl/Permission/MaskBuilder.php b/Acl/Permission/MaskBuilder.php
index 017e7c0..c0d21ac 100644
--- a/Acl/Permission/MaskBuilder.php
+++ b/Acl/Permission/MaskBuilder.php
@@ -72,7 +72,7 @@ class MaskBuilder
     /**
      * Constructor
      *
-     * @param integer $mask optional; defaults to 0
+     * @param int     $mask optional; defaults to 0
      *
      * @throws \InvalidArgumentException
      */
@@ -178,7 +178,7 @@ class MaskBuilder
     /**
      * Returns the code for the passed mask
      *
-     * @param integer $mask
+     * @param int     $mask
      * @throws \InvalidArgumentException
      * @throws \RuntimeException
      * @return string
diff --git a/Core/Authentication/AuthenticationProviderManager.php b/Core/Authentication/AuthenticationProviderManager.php
index de1973d..f713e8f 100644
--- a/Core/Authentication/AuthenticationProviderManager.php
+++ b/Core/Authentication/AuthenticationProviderManager.php
@@ -38,7 +38,7 @@ class AuthenticationProviderManager implements AuthenticationManagerInterface
      * Constructor.
      *
      * @param AuthenticationProviderInterface[] $providers        An array of AuthenticationProviderInterface instances
-     * @param Boolean                           $eraseCredentials Whether to erase credentials after authentication or not
+     * @param bool                              $eraseCredentials Whether to erase credentials after authentication or not
      *
      * @throws \InvalidArgumentException
      */
diff --git a/Core/Authentication/Provider/DaoAuthenticationProvider.php b/Core/Authentication/Provider/DaoAuthenticationProvider.php
index a9a2205..4913be8 100644
--- a/Core/Authentication/Provider/DaoAuthenticationProvider.php
+++ b/Core/Authentication/Provider/DaoAuthenticationProvider.php
@@ -38,7 +38,7 @@ class DaoAuthenticationProvider extends UserAuthenticationProvider
      * @param UserCheckerInterface    $userChecker                An UserCheckerInterface instance
      * @param string                  $providerKey                The provider key
      * @param EncoderFactoryInterface $encoderFactory             An EncoderFactoryInterface instance
-     * @param Boolean                 $hideUserNotFoundExceptions Whether to hide user not found exception or not
+     * @param bool                    $hideUserNotFoundExceptions Whether to hide user not found exception or not
      */
     public function __construct(UserProviderInterface $userProvider, UserCheckerInterface $userChecker, $providerKey, EncoderFactoryInterface $encoderFactory, $hideUserNotFoundExceptions = true)
     {
diff --git a/Core/Authentication/Provider/UserAuthenticationProvider.php b/Core/Authentication/Provider/UserAuthenticationProvider.php
index 18c3e70..14fbdda 100644
--- a/Core/Authentication/Provider/UserAuthenticationProvider.php
+++ b/Core/Authentication/Provider/UserAuthenticationProvider.php
@@ -37,7 +37,7 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter
      *
      * @param UserCheckerInterface $userChecker                An UserCheckerInterface interface
      * @param string               $providerKey                A provider key
-     * @param Boolean              $hideUserNotFoundExceptions Whether to hide user not found exception or not
+     * @param bool                 $hideUserNotFoundExceptions Whether to hide user not found exception or not
      *
      * @throws \InvalidArgumentException
      */
diff --git a/Core/Authentication/Token/TokenInterface.php b/Core/Authentication/Token/TokenInterface.php
index 11f69da..a909469 100644
--- a/Core/Authentication/Token/TokenInterface.php
+++ b/Core/Authentication/Token/TokenInterface.php
@@ -76,7 +76,7 @@ interface TokenInterface extends \Serializable
     /**
      * Sets the authenticated flag.
      *
-     * @param Boolean $isAuthenticated The authenticated flag
+     * @param bool    $isAuthenticated The authenticated flag
      */
     public function setAuthenticated($isAuthenticated);
 
diff --git a/Core/Authorization/AccessDecisionManager.php b/Core/Authorization/AccessDecisionManager.php
index 2b2a158..6e5effb 100644
--- a/Core/Authorization/AccessDecisionManager.php
+++ b/Core/Authorization/AccessDecisionManager.php
@@ -32,8 +32,8 @@ class AccessDecisionManager implements AccessDecisionManagerInterface
      *
      * @param VoterInterface[] $voters                             An array of VoterInterface instances
      * @param string           $strategy                           The vote strategy
-     * @param Boolean          $allowIfAllAbstainDecisions         Whether to grant access if all voters abstained or not
-     * @param Boolean          $allowIfEqualGrantedDeniedDecisions Whether to grant access if result are equals
+     * @param bool             $allowIfAllAbstainDecisions         Whether to grant access if all voters abstained or not
+     * @param bool             $allowIfEqualGrantedDeniedDecisions Whether to grant access if result are equals
      *
      * @throws \InvalidArgumentException
      */
diff --git a/Core/Encoder/BCryptPasswordEncoder.php b/Core/Encoder/BCryptPasswordEncoder.php
index 5a0f122..1dcf3a6 100644
--- a/Core/Encoder/BCryptPasswordEncoder.php
+++ b/Core/Encoder/BCryptPasswordEncoder.php
@@ -27,7 +27,7 @@ class BCryptPasswordEncoder extends BasePasswordEncoder
     /**
      * Constructor.
      *
-     * @param integer $cost The algorithmic cost that should be used
+     * @param int     $cost The algorithmic cost that should be used
      *
      * @throws \RuntimeException When no BCrypt encoder is available
      * @throws \InvalidArgumentException if cost is out of range
diff --git a/Core/Encoder/MessageDigestPasswordEncoder.php b/Core/Encoder/MessageDigestPasswordEncoder.php
index a7e5546..9aa240a 100644
--- a/Core/Encoder/MessageDigestPasswordEncoder.php
+++ b/Core/Encoder/MessageDigestPasswordEncoder.php
@@ -28,8 +28,8 @@ class MessageDigestPasswordEncoder extends BasePasswordEncoder
      * Constructor.
      *
      * @param string  $algorithm          The digest algorithm to use
-     * @param Boolean $encodeHashAsBase64 Whether to base64 encode the password hash
-     * @param integer $iterations         The number of iterations to use to stretch the password hash
+     * @param bool    $encodeHashAsBase64 Whether to base64 encode the password hash
+     * @param int     $iterations         The number of iterations to use to stretch the password hash
      */
     public function __construct($algorithm = 'sha512', $encodeHashAsBase64 = true, $iterations = 5000)
     {
diff --git a/Core/Encoder/Pbkdf2PasswordEncoder.php b/Core/Encoder/Pbkdf2PasswordEncoder.php
index 8a5a958..55b5261 100644
--- a/Core/Encoder/Pbkdf2PasswordEncoder.php
+++ b/Core/Encoder/Pbkdf2PasswordEncoder.php
@@ -37,9 +37,9 @@ class Pbkdf2PasswordEncoder extends BasePasswordEncoder
      * Constructor.
      *
      * @param string  $algorithm          The digest algorithm to use
-     * @param Boolean $encodeHashAsBase64 Whether to base64 encode the password hash
-     * @param integer $iterations         The number of iterations to use to stretch the password hash
-     * @param integer $length             Length of derived key to create
+     * @param bool    $encodeHashAsBase64 Whether to base64 encode the password hash
+     * @param int     $iterations         The number of iterations to use to stretch the password hash
+     * @param int     $length             Length of derived key to create
      */
     public function __construct($algorithm = 'sha512', $encodeHashAsBase64 = true, $iterations = 1000, $length = 40)
     {
diff --git a/Core/Encoder/PlaintextPasswordEncoder.php b/Core/Encoder/PlaintextPasswordEncoder.php
index 22f3da4..bdb058a 100644
--- a/Core/Encoder/PlaintextPasswordEncoder.php
+++ b/Core/Encoder/PlaintextPasswordEncoder.php
@@ -25,7 +25,7 @@ class PlaintextPasswordEncoder extends BasePasswordEncoder
     /**
      * Constructor.
      *
-     * @param Boolean $ignorePasswordCase Compare password case-insensitive
+     * @param bool    $ignorePasswordCase Compare password case-insensitive
      */
     public function __construct($ignorePasswordCase = false)
     {
diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php
index c55cecf..0326f1d 100644
--- a/Core/SecurityContext.php
+++ b/Core/SecurityContext.php
@@ -36,7 +36,7 @@ class SecurityContext implements SecurityContextInterface
      *
      * @param AuthenticationManagerInterface      $authenticationManager An AuthenticationManager instance
      * @param AccessDecisionManagerInterface|null $accessDecisionManager An AccessDecisionManager instance
-     * @param Boolean                             $alwaysAuthenticate
+     * @param bool                                $alwaysAuthenticate
      */
     public function __construct(AuthenticationManagerInterface $authenticationManager, AccessDecisionManagerInterface $accessDecisionManager, $alwaysAuthenticate = false)
     {
diff --git a/Core/Util/SecureRandomInterface.php b/Core/Util/SecureRandomInterface.php
index 2c35a72..2cf7779 100644
--- a/Core/Util/SecureRandomInterface.php
+++ b/Core/Util/SecureRandomInterface.php
@@ -21,7 +21,7 @@ interface SecureRandomInterface
     /**
      * Generates the specified number of secure random bytes.
      *
-     * @param integer $nbBytes
+     * @param int     $nbBytes
      *
      * @return string
      */
diff --git a/Http/EntryPoint/FormAuthenticationEntryPoint.php b/Http/EntryPoint/FormAuthenticationEntryPoint.php
index 06df099..c734db0 100644
--- a/Http/EntryPoint/FormAuthenticationEntryPoint.php
+++ b/Http/EntryPoint/FormAuthenticationEntryPoint.php
@@ -34,7 +34,7 @@ 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)
     {
diff --git a/Http/HttpUtils.php b/Http/HttpUtils.php
index 0c8b21b..a7b0226 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/RememberMe/TokenBasedRememberMeServices.php b/Http/RememberMe/TokenBasedRememberMeServices.php
index df0ea1b..64d41be 100644
--- a/Http/RememberMe/TokenBasedRememberMeServices.php
+++ b/Http/RememberMe/TokenBasedRememberMeServices.php
@@ -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