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

22 files changed, 173 insertions, 173 deletions

diff --git a/Acl/Dbal/AclProvider.php b/Acl/Dbal/AclProvider.php
index 5d45655..6097702 100644
--- a/Acl/Dbal/AclProvider.php
+++ b/Acl/Dbal/AclProvider.php
@@ -62,7 +62,7 @@ class AclProvider implements AclProviderInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function findChildren(ObjectIdentityInterface $parentOid, $directChildrenOnly = false)
     {
@@ -77,7 +77,7 @@ class AclProvider implements AclProviderInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function findAcl(ObjectIdentityInterface $oid, array $sids = array())
     {
@@ -85,7 +85,7 @@ class AclProvider implements AclProviderInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function findAcls(array $oids, array $sids = array())
     {
@@ -316,7 +316,7 @@ SELECTCLAUSE;
      * object identities.
      *
      * @param ObjectIdentityInterface $oid
-     * @param Boolean                 $directChildrenOnly
+     * @param bool                    $directChildrenOnly
      * @return string
      */
     protected function getFindChildrenSql(ObjectIdentityInterface $oid, $directChildrenOnly)
@@ -552,7 +552,7 @@ QUERY;
                     $oidCache[$oidLookupKey] = new ObjectIdentity($objectIdentifier, $classType);
                 }
 
-                $acl = new Acl((integer) $aclId, $oidCache[$oidLookupKey], $permissionGrantingStrategy, $emptyArray, !!$entriesInheriting);
+                $acl = new Acl((int) $aclId, $oidCache[$oidLookupKey], $permissionGrantingStrategy, $emptyArray, !!$entriesInheriting);
 
                 // keep a local, and global reference to this ACL
                 $loadedAcls[$classType][$objectIdentifier] = $acl;
@@ -594,9 +594,9 @@ QUERY;
                     }
 
                     if (null === $fieldName) {
-                        $loadedAces[$aceId] = new Entry((integer) $aceId, $acl, $sids[$key], $grantingStrategy, (integer) $mask, !!$granting, !!$auditFailure, !!$auditSuccess);
+                        $loadedAces[$aceId] = new Entry((int) $aceId, $acl, $sids[$key], $grantingStrategy, (int) $mask, !!$granting, !!$auditFailure, !!$auditSuccess);
                     } else {
-                        $loadedAces[$aceId] = new FieldEntry((integer) $aceId, $acl, $fieldName, $sids[$key], $grantingStrategy, (integer) $mask, !!$granting, !!$auditFailure, !!$auditSuccess);
+                        $loadedAces[$aceId] = new FieldEntry((int) $aceId, $acl, $fieldName, $sids[$key], $grantingStrategy, (int) $mask, !!$granting, !!$auditFailure, !!$auditSuccess);
                     }
                 }
                 $ace = $loadedAces[$aceId];
diff --git a/Acl/Dbal/MutableAclProvider.php b/Acl/Dbal/MutableAclProvider.php
index 29d3cfd..482f443 100644
--- a/Acl/Dbal/MutableAclProvider.php
+++ b/Acl/Dbal/MutableAclProvider.php
@@ -36,7 +36,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
     private $propertyChanges;
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function __construct(Connection $connection, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $options, AclCacheInterface $cache = null)
     {
@@ -46,7 +46,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function createAcl(ObjectIdentityInterface $oid)
     {
@@ -73,7 +73,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function deleteAcl(ObjectIdentityInterface $oid)
     {
@@ -109,7 +109,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function findAcls(array $oids, array $sids = array())
     {
@@ -216,7 +216,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function updateAcl(MutableAclInterface $acl)
     {
@@ -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 dd3e8d4..5be5831 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)
     {
@@ -75,7 +75,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function deleteClassAce($index)
     {
@@ -83,7 +83,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function deleteClassFieldAce($index, $field)
     {
@@ -91,7 +91,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function deleteObjectAce($index)
     {
@@ -99,7 +99,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function deleteObjectFieldAce($index, $field)
     {
@@ -107,7 +107,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getClassAces()
     {
@@ -115,7 +115,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getClassFieldAces($field)
     {
@@ -123,7 +123,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getObjectAces()
     {
@@ -131,7 +131,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getObjectFieldAces($field)
     {
@@ -139,7 +139,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getId()
     {
@@ -147,7 +147,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getObjectIdentity()
     {
@@ -155,7 +155,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getParentAcl()
     {
@@ -163,7 +163,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function insertClassAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null)
     {
@@ -171,7 +171,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function insertClassFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null)
     {
@@ -179,7 +179,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function insertObjectAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null)
     {
@@ -187,7 +187,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function insertObjectFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null)
     {
@@ -195,7 +195,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isEntriesInheriting()
     {
@@ -203,7 +203,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isFieldGranted($field, array $masks, array $securityIdentities, $administrativeMode = false)
     {
@@ -211,7 +211,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isGranted(array $masks, array $securityIdentities, $administrativeMode = false)
     {
@@ -219,7 +219,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isSidLoaded($sids)
     {
@@ -291,7 +291,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function setEntriesInheriting($boolean)
     {
@@ -302,7 +302,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function setParentAcl(AclInterface $acl = null)
     {
@@ -317,7 +317,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function updateClassAce($index, $mask, $strategy = null)
     {
@@ -325,7 +325,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function updateClassFieldAce($index, $field, $mask, $strategy = null)
     {
@@ -333,7 +333,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function updateObjectAce($index, $mask, $strategy = null)
     {
@@ -341,7 +341,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function updateObjectFieldAce($index, $field, $mask, $strategy = null)
     {
@@ -349,7 +349,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function updateClassAuditing($index, $auditSuccess, $auditFailure)
     {
@@ -357,7 +357,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function updateClassFieldAuditing($index, $field, $auditSuccess, $auditFailure)
     {
@@ -369,7 +369,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function updateObjectAuditing($index, $auditSuccess, $auditFailure)
     {
@@ -377,7 +377,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function updateObjectFieldAuditing($index, $field, $auditSuccess, $auditFailure)
     {
@@ -392,7 +392,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)
@@ -416,7 +416,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
      */
@@ -441,10 +441,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
@@ -489,11 +489,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
@@ -546,8 +546,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
      */
@@ -573,9 +573,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)
@@ -599,9 +599,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/DoctrineAclCache.php b/Acl/Domain/DoctrineAclCache.php
index bfc5452..b680fb1 100644
--- a/Acl/Domain/DoctrineAclCache.php
+++ b/Acl/Domain/DoctrineAclCache.php
@@ -51,7 +51,7 @@ class DoctrineAclCache implements AclCacheInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function clearCache()
     {
@@ -59,7 +59,7 @@ class DoctrineAclCache implements AclCacheInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function evictFromCacheById($aclId)
     {
@@ -77,7 +77,7 @@ class DoctrineAclCache implements AclCacheInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function evictFromCacheByIdentity(ObjectIdentityInterface $oid)
     {
@@ -90,7 +90,7 @@ class DoctrineAclCache implements AclCacheInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getFromCacheById($aclId)
     {
@@ -110,7 +110,7 @@ class DoctrineAclCache implements AclCacheInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getFromCacheByIdentity(ObjectIdentityInterface $oid)
     {
@@ -123,7 +123,7 @@ class DoctrineAclCache implements AclCacheInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function putInCache(AclInterface $acl)
     {
diff --git a/Acl/Domain/Entry.php b/Acl/Domain/Entry.php
index 42449c4..b5eb28b 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)
     {
@@ -56,7 +56,7 @@ class Entry implements AuditableEntryInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getAcl()
     {
@@ -64,7 +64,7 @@ class Entry implements AuditableEntryInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getMask()
     {
@@ -72,7 +72,7 @@ class Entry implements AuditableEntryInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getId()
     {
@@ -80,7 +80,7 @@ class Entry implements AuditableEntryInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getSecurityIdentity()
     {
@@ -88,7 +88,7 @@ class Entry implements AuditableEntryInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getStrategy()
     {
@@ -96,7 +96,7 @@ class Entry implements AuditableEntryInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isAuditFailure()
     {
@@ -104,7 +104,7 @@ class Entry implements AuditableEntryInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isAuditSuccess()
     {
@@ -112,7 +112,7 @@ class Entry implements AuditableEntryInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isGranting()
     {
@@ -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..2edc33d 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)
     {
@@ -45,7 +45,7 @@ class FieldEntry extends Entry implements FieldEntryInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getField()
     {
@@ -53,7 +53,7 @@ class FieldEntry extends Entry implements FieldEntryInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function serialize()
     {
@@ -64,7 +64,7 @@ class FieldEntry extends Entry implements FieldEntryInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function unserialize($serialized)
     {
diff --git a/Acl/Domain/ObjectIdentity.php b/Acl/Domain/ObjectIdentity.php
index d7d5f84..cf10330 100644
--- a/Acl/Domain/ObjectIdentity.php
+++ b/Acl/Domain/ObjectIdentity.php
@@ -74,7 +74,7 @@ final class ObjectIdentity implements ObjectIdentityInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getIdentifier()
     {
@@ -82,7 +82,7 @@ final class ObjectIdentity implements ObjectIdentityInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getType()
     {
@@ -90,7 +90,7 @@ final class ObjectIdentity implements ObjectIdentityInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function equals(ObjectIdentityInterface $identity)
     {
diff --git a/Acl/Domain/ObjectIdentityRetrievalStrategy.php b/Acl/Domain/ObjectIdentityRetrievalStrategy.php
index acd3b2c..7dc552c 100644
--- a/Acl/Domain/ObjectIdentityRetrievalStrategy.php
+++ b/Acl/Domain/ObjectIdentityRetrievalStrategy.php
@@ -22,7 +22,7 @@ use Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterfac
 class ObjectIdentityRetrievalStrategy implements ObjectIdentityRetrievalStrategyInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getObjectIdentity($domainObject)
     {
diff --git a/Acl/Domain/PermissionGrantingStrategy.php b/Acl/Domain/PermissionGrantingStrategy.php
index d505843..d031b34 100644
--- a/Acl/Domain/PermissionGrantingStrategy.php
+++ b/Acl/Domain/PermissionGrantingStrategy.php
@@ -42,7 +42,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isGranted(AclInterface $acl, array $masks, array $sids, $administrativeMode = false)
     {
@@ -74,7 +74,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isFieldGranted(AclInterface $acl, $field, array $masks, array $sids, $administrativeMode = false)
     {
@@ -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/Domain/RoleSecurityIdentity.php b/Acl/Domain/RoleSecurityIdentity.php
index 0d3d0d2..64f864d 100644
--- a/Acl/Domain/RoleSecurityIdentity.php
+++ b/Acl/Domain/RoleSecurityIdentity.php
@@ -48,7 +48,7 @@ final class RoleSecurityIdentity implements SecurityIdentityInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function equals(SecurityIdentityInterface $sid)
     {
diff --git a/Acl/Domain/SecurityIdentityRetrievalStrategy.php b/Acl/Domain/SecurityIdentityRetrievalStrategy.php
index dbc0530..b95fddc 100644
--- a/Acl/Domain/SecurityIdentityRetrievalStrategy.php
+++ b/Acl/Domain/SecurityIdentityRetrievalStrategy.php
@@ -42,7 +42,7 @@ class SecurityIdentityRetrievalStrategy implements SecurityIdentityRetrievalStra
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getSecurityIdentities(TokenInterface $token)
     {
diff --git a/Acl/Domain/UserSecurityIdentity.php b/Acl/Domain/UserSecurityIdentity.php
index 3166a1a..9418c81 100644
--- a/Acl/Domain/UserSecurityIdentity.php
+++ b/Acl/Domain/UserSecurityIdentity.php
@@ -96,7 +96,7 @@ final class UserSecurityIdentity implements SecurityIdentityInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function equals(SecurityIdentityInterface $sid)
     {
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/BasicPermissionMap.php b/Acl/Permission/BasicPermissionMap.php
index 97157f1..30d801f 100644
--- a/Acl/Permission/BasicPermissionMap.php
+++ b/Acl/Permission/BasicPermissionMap.php
@@ -87,7 +87,7 @@ class BasicPermissionMap implements PermissionMapInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getMasks($permission, $object)
     {
@@ -99,7 +99,7 @@ class BasicPermissionMap implements PermissionMapInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function contains($permission)
     {
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