minor #109 Bump CI workflows and fix CS (derrabus)

This PR was merged into the 3.x-dev branch.

Discussion
----------

Bump CI workflows and fix CS

* Bumped PHP CS Fixer to 3.11.0 and ran it
* Added a PHPUnit job for PHP 8.2

Commits
-------

a2f4126 Bump CI workflows and fix CS

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: ['7.2.5', '7.3', '7.4', '8.0', '8.1']
+                php: ['7.2.5', '7.3', '7.4', '8.0', '8.1', '8.2']
                 include:
                     - php: '7.4'
                       deps: lowest
@@ -56,6 +56,6 @@ jobs:
             - name: Checkout code
               uses: actions/checkout@v2
             - name: PHP-CS-Fixer
-              uses: docker://oskarstark/php-cs-fixer-ga:3.5.0
+              uses: docker://oskarstark/php-cs-fixer-ga:3.11.0
               with:
                   args: --diff --dry-run

.github/workflows/psalm.yml

@@ -10,7 +10,7 @@ defaults:
 jobs:
   psalm:
     name: Psalm
-    runs-on: Ubuntu-20.04
+    runs-on: Ubuntu-22.04
 
     steps:
       - name: Setup PHP

Dbal/AclProvider.php

@@ -504,21 +504,21 @@ private function hydrateObjectIdentities(Result $stmt, array $oidLookup, array $
         // but it is faster
         foreach ($stmt->fetchAllNumeric() as $data) {
             [$aclId,
-                 $objectIdentifier,
-                 $parentObjectIdentityId,
-                 $entriesInheriting,
-                 $classType,
-                 $aceId,
-                 $objectIdentityId,
-                 $fieldName,
-                 $aceOrder,
-                 $mask,
-                 $granting,
-                 $grantingStrategy,
-                 $auditSuccess,
-                 $auditFailure,
-                 $username,
-                 $securityIdentifier] = array_values($data);
+                $objectIdentifier,
+                $parentObjectIdentityId,
+                $entriesInheriting,
+                $classType,
+                $aceId,
+                $objectIdentityId,
+                $fieldName,
+                $aceOrder,
+                $mask,
+                $granting,
+                $grantingStrategy,
+                $auditSuccess,
+                $auditFailure,
+                $username,
+                $securityIdentifier] = array_values($data);
 
             // FIX: remove duplicate slashes
             $classType = str_replace('\\\\', '\\', $classType);

Dbal/MutableAclProvider.php

@@ -553,9 +553,9 @@ protected function getInsertObjectIdentitySql($identifier, $classId, $entriesInh
     /**
      * Constructs the SQL for inserting a security identity.
      *
-     * @throws \InvalidArgumentException
-     *
      * @return string
+     *
+     * @throws \InvalidArgumentException
      */
     protected function getInsertSecurityIdentitySql(SecurityIdentityInterface $sid)
     {
@@ -623,9 +623,9 @@ protected function getSelectClassIdSql($classType)
     /**
      * Constructs the SQL for selecting the primary key of a security identity.
      *
-     * @throws \InvalidArgumentException
-     *
      * @return string
+     *
+     * @throws \InvalidArgumentException
      */
     protected function getSelectSecurityIdentityIdSql(SecurityIdentityInterface $sid)
     {
@@ -650,9 +650,9 @@ protected function getSelectSecurityIdentityIdSql(SecurityIdentityInterface $sid
     /**
      * Constructs the SQL to delete a security identity.
      *
-     * @throws \InvalidArgumentException
-     *
      * @return string
+     *
+     * @throws \InvalidArgumentException
      */
     protected function getDeleteSecurityIdentityIdSql(SecurityIdentityInterface $sid)
     {
@@ -667,9 +667,9 @@ protected function getDeleteSecurityIdentityIdSql(SecurityIdentityInterface $sid
      *
      * @param int $pk
      *
-     * @throws \InvalidArgumentException
-     *
      * @return string
+     *
+     * @throws \InvalidArgumentException
      */
     protected function getUpdateObjectIdentitySql($pk, array $changes)
     {
@@ -715,9 +715,9 @@ protected function getUpdateUserSecurityIdentitySql(UserSecurityIdentity $usid,
      *
      * @param int $pk
      *
-     * @throws \InvalidArgumentException
-     *
      * @return string
+     *
+     * @throws \InvalidArgumentException
      */
     protected function getUpdateAccessControlEntrySql($pk, array $sets)
     {

Domain/Acl.php

@@ -264,21 +264,22 @@ public function __serialize(): array
     public function __unserialize(array $data): void
     {
         [$this->parentAcl,
-             $this->objectIdentity,
-             $this->classAces,
-             $this->classFieldAces,
-             $this->objectAces,
-             $this->objectFieldAces,
-             $this->id,
-             $this->loadedSids,
-             $this->entriesInheriting
+            $this->objectIdentity,
+            $this->classAces,
+            $this->classFieldAces,
+            $this->objectAces,
+            $this->objectFieldAces,
+            $this->id,
+            $this->loadedSids,
+            $this->entriesInheriting
         ] = $data;
 
         $this->listeners = [];
     }
 
     /**
      * @internal
+     *
      * @final
      *
      * @return string
@@ -290,6 +291,7 @@ public function serialize()
 
     /**
      * @internal
+     *
      * @final
      *
      * @param string $serialized

Domain/Entry.php

@@ -175,17 +175,18 @@ public function __serialize(): array
     public function __unserialize(array $data): void
     {
         [$this->mask,
-             $this->id,
-             $this->securityIdentity,
-             $this->strategy,
-             $this->auditFailure,
-             $this->auditSuccess,
-             $this->granting
+            $this->id,
+            $this->securityIdentity,
+            $this->strategy,
+            $this->auditFailure,
+            $this->auditSuccess,
+            $this->granting
         ] = $data;
     }
 
     /**
      * @internal
+     *
      * @final
      *
      * @return string
@@ -197,6 +198,7 @@ public function serialize()
 
     /**
      * @internal
+     *
      * @final
      *
      * @param string $serialized

Domain/ObjectIdentity.php

@@ -52,9 +52,9 @@ public function __construct($identifier, $type)
      *
      * @param object $domainObject
      *
-     * @throws InvalidDomainObjectException
-     *
      * @return ObjectIdentity
+     *
+     * @throws InvalidDomainObjectException
      */
     public static function fromDomainObject($domainObject)
     {

Model/AclInterface.php

@@ -87,9 +87,9 @@ public function isFieldGranted(string $field, array $masks, array $securityIdent
     /**
      * Determines whether access is granted.
      *
-     * @throws NoAceFoundException when no ACE was applicable for this request
-     *
      * @return bool
+     *
+     * @throws NoAceFoundException when no ACE was applicable for this request
      */
     public function isGranted(array $masks, array $securityIdentities, bool $administrativeMode = false);
 

Model/MutableAclProviderInterface.php

@@ -37,10 +37,10 @@ public function findAcls(array $oids, array $sids = []);
     /**
      * Creates a new ACL for the given object identity.
      *
+     * @return MutableAclInterface
+     *
      * @throws AclAlreadyExistsException when there already is an ACL for the given
      *                                   object identity
-     *
-     * @return MutableAclInterface
      */
     public function createAcl(ObjectIdentityInterface $oid);
 

Permission/MaskBuilder.php

@@ -96,10 +96,10 @@ public function getPattern()
      *
      * @param int $mask
      *
+     * @return string
+     *
      * @throws \InvalidArgumentException
      * @throws \RuntimeException
-     *
-     * @return string
      */
     public static function getCode($mask)
     {

Tests/Domain/SecurityIdentityRetrievalStrategyTest.php

@@ -71,6 +71,7 @@ public function testGetSecurityIdentities($user, array $roles, string $authentic
 
     /**
      * @group legacy
+     *
      * @dataProvider getDeprecatedSecurityIdentityRetrievalTests
      */
     public function testDeprecatedGetSecurityIdentities($user, array $roles, string $authenticationStatus, array $sids)