Merge 4.x into 5.x

sonata-project · Jan 10, 2024 · 5aef356 · 5aef356
2 parents fe91081 + a210094
commit 5aef356
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -79,7 +79,7 @@
         "psalm/plugin-phpunit": "^0.18",
         "psalm/plugin-symfony": "^5.0",
         "psr/event-dispatcher": "^1.0",
-        "rector/rector": "^0.18",
+        "rector/rector": "^0.19",
         "symfony/browser-kit": "^5.4 || ^6.2 || ^7.0",
         "symfony/css-selector": "^5.4 || ^6.2 || ^7.0",
         "symfony/filesystem": "^5.4 || ^6.2 || ^7.0",

diff --git a/src/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php b/src/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php
@@ -310,7 +310,7 @@ static function (array $a, array $b): int {
         } else {
             $groups = $groupDefaults;
 
-            uasort($groups, static fn (array $a, array $b): int => ($b['priority'] ?? 0) <=> ($a['priority'] ?? 0));
+            uasort($groups, static fn (array $a, array $b): int => $b['priority'] <=> $a['priority']);
         }
 
         if ($sortAdminsByPriority) {

diff --git a/src/Maker/AdminMaker.php b/src/Maker/AdminMaker.php
@@ -39,46 +39,46 @@ final class AdminMaker extends AbstractMaker
     /**
      * @phpstan-var class-string
      *
+     * @see AdminMaker::configure
+     *
      * @psalm-suppress PropertyNotSetInConstructor
      * @phpstan-ignore-next-line
-     *
-     * @see AdminMaker::configure
      */
     private string $modelClass;
 
     /**
+     * @see AdminMaker::configure
+     *
      * @psalm-suppress PropertyNotSetInConstructor
      * @phpstan-ignore-next-line
-     *
-     * @see AdminMaker::configure
      */
     private string $modelClassBasename;
 
     /**
+     * @see AdminMaker::configure
+     *
      * @psalm-suppress PropertyNotSetInConstructor
      * @phpstan-ignore-next-line
-     *
-     * @see AdminMaker::configure
      */
     private string $adminClassBasename;
 
     private ?string $controllerClassBasename = null;
 
     /**
+     * @see AdminMaker::configure
+     *
      * @psalm-suppress PropertyNotSetInConstructor
      * @phpstan-ignore-next-line
-     *
-     * @see AdminMaker::configure
      */
     private string $managerType;
 
     /**
      * @var ModelManagerInterface<object>
      *
+     * @see AdminMaker::configure
+     *
      * @psalm-suppress PropertyNotSetInConstructor
      * @phpstan-ignore-next-line
-     *
-     * @see AdminMaker::configure
      */
     private ModelManagerInterface $modelManager;
 

diff --git a/src/Security/Handler/AclSecurityHandler.php b/src/Security/Handler/AclSecurityHandler.php
@@ -188,9 +188,9 @@ public function findObjectAcls(\Traversable $oids, array $sids = []): \SplObject
             $acls = $this->aclProvider->findAcls(iterator_to_array($oids), $sids);
         } catch (NotAllAclsFoundException $e) {
             /**
-             * @phpstan-ignore-next-line https://github.com/phpstan/phpstan/discussions/8996
-             *
              * @var \SplObjectStorage<ObjectIdentityInterface, MutableAclInterface> $acls
+             *
+             * @phpstan-ignore-next-line https://github.com/phpstan/phpstan/discussions/8996
              */
             $acls = $e->getPartialResult();
         } catch (AclNotFoundException) { // if only one oid, this error is thrown