New upstream version 3.3.2

.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 @@ QUERY;
         // 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

@@ -162,6 +162,8 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
      * @param mixed  $oldValue
      * @param mixed  $newValue
      *
+     * @return void
+     *
      * @throws \InvalidArgumentException
      */
     public function propertyChanged($sender, $propertyName, $oldValue, $newValue)
@@ -551,9 +553,9 @@ QUERY;
     /**
      * Constructs the SQL for inserting a security identity.
      *
-     * @throws \InvalidArgumentException
-     *
      * @return string
+     *
+     * @throws \InvalidArgumentException
      */
     protected function getInsertSecurityIdentitySql(SecurityIdentityInterface $sid)
     {
@@ -621,9 +623,9 @@ QUERY;
     /**
      * Constructs the SQL for selecting the primary key of a security identity.
      *
-     * @throws \InvalidArgumentException
-     *
      * @return string
+     *
+     * @throws \InvalidArgumentException
      */
     protected function getSelectSecurityIdentityIdSql(SecurityIdentityInterface $sid)
     {
@@ -648,9 +650,9 @@ QUERY;
     /**
      * Constructs the SQL to delete a security identity.
      *
-     * @throws \InvalidArgumentException
-     *
      * @return string
+     *
+     * @throws \InvalidArgumentException
      */
     protected function getDeleteSecurityIdentityIdSql(SecurityIdentityInterface $sid)
     {
@@ -665,9 +667,9 @@ QUERY;
      *
      * @param int $pk
      *
-     * @throws \InvalidArgumentException
-     *
      * @return string
+     *
+     * @throws \InvalidArgumentException
      */
     protected function getUpdateObjectIdentitySql($pk, array $changes)
     {
@@ -713,9 +715,9 @@ QUERY;
      *
      * @param int $pk
      *
-     * @throws \InvalidArgumentException
-     *
      * @return string
+     *
+     * @throws \InvalidArgumentException
      */
     protected function getUpdateAccessControlEntrySql($pk, array $sets)
     {

Domain/Acl.php

@@ -64,6 +64,8 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
 
     /**
      * Adds a property changed listener.
+     *
+     * @return void
      */
     public function addPropertyChangedListener(PropertyChangedListener $listener)
     {
@@ -262,14 +264,14 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     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 = [];
@@ -277,6 +279,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
 
     /**
      * @internal
+     *
      * @final
      *
      * @return string
@@ -288,6 +291,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
 
     /**
      * @internal
+     *
      * @final
      *
      * @param string $serialized

Domain/Entry.php

@@ -175,17 +175,18 @@ class Entry implements AuditableEntryInterface
     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 @@ class Entry implements AuditableEntryInterface
 
     /**
      * @internal
+     *
      * @final
      *
      * @param string $serialized

Domain/ObjectIdentity.php

@@ -52,9 +52,9 @@ final class ObjectIdentity implements ObjectIdentityInterface
      *
      * @param object $domainObject
      *
-     * @throws InvalidDomainObjectException
-     *
      * @return ObjectIdentity
+     *
+     * @throws InvalidDomainObjectException
      */
     public static function fromDomainObject($domainObject)
     {

Model/AclInterface.php

@@ -87,9 +87,9 @@ interface AclInterface extends \Serializable
     /**
      * 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 @@ interface MutableAclProviderInterface extends AclProviderInterface
     /**
      * 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 @@ class MaskBuilder extends AbstractMaskBuilder
      *
      * @param int $mask
      *
+     * @return string
+     *
      * @throws \InvalidArgumentException
      * @throws \RuntimeException
-     *
-     * @return string
      */
     public static function getCode($mask)
     {

Tests/Domain/SecurityIdentityRetrievalStrategyTest.php

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

composer.json

@@ -25,7 +25,7 @@
         "symfony/phpunit-bridge": "^5.2|^6.0",
         "doctrine/cache": "^1.11|^2.0",
         "doctrine/common": "^2.2|^3",
-        "doctrine/persistence": "^1.3.3|^2",
+        "doctrine/persistence": "^1.3.3|^2|^3",
         "doctrine/dbal": "^2.13.1|^3.1",
         "psr/log": "^1|^2|^3"
     },