Merge branch '3.x' into 4.x

sonata-project · Dec 5, 2021 · 4588c58 · 4588c58
2 parents b35e5bf + 849814f
commit 4588c58
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -89,6 +89,7 @@ jobs:
               run: composer require ${{ matrix.variant }} --no-update
 
             - name: Allow unstable dependencies
+              if: matrix.symfony-require == '6.0.*'
               run: composer config minimum-stability dev
 
             - name: Install Composer dependencies (${{ matrix.dependencies }})

diff --git a/composer.json b/composer.json
@@ -1,7 +1,8 @@
 {
     "name": "sonata-project/doctrine-mongodb-admin-bundle",
-    "type": "symfony-bundle",
     "description": "Symfony Sonata / Integrate Doctrine MongoDB ODM into the SonataAdminBundle",
+    "license": "MIT",
+    "type": "symfony-bundle",
     "keywords": [
         "Admin Generator",
         "admin",
@@ -11,8 +12,6 @@
         "Mongo",
         "MongoDB"
     ],
-    "homepage": "https://docs.sonata-project.org/projects/SonataDoctrineMongoDBAdminBundle",
-    "license": "MIT",
     "authors": [
         {
             "name": "Kévin Dunglas",
@@ -24,6 +23,7 @@
             "homepage": "https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/contributors"
         }
     ],
+    "homepage": "https://docs.sonata-project.org/projects/SonataDoctrineMongoDBAdminBundle",
     "require": {
         "php": "^7.3 || ^8.0",
         "ext-mongodb": "*",
@@ -41,9 +41,6 @@
         "symfony/property-access": "^4.4 || ^5.3 || ^6.0",
         "twig/twig": "^2.6 || ^3.0"
     },
-    "conflict": {
-        "sonata-project/block-bundle": "<4.2"
-    },
     "require-dev": {
         "doctrine/annotations": "^1.10",
         "doctrine/data-fixtures": "^1.4",
@@ -64,13 +61,8 @@
         "symfony/phpunit-bridge": "^5.3 || ^6.0",
         "vimeo/psalm": "^4.1.1"
     },
-    "config": {
-        "sort-packages": true
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "4.x-dev"
-        }
+    "conflict": {
+        "sonata-project/block-bundle": "<4.2"
     },
     "autoload": {
         "psr-4": {
@@ -81,5 +73,13 @@
         "psr-4": {
             "Sonata\\DoctrineMongoDBAdminBundle\\Tests\\": "tests/"
         }
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "4.x-dev"
+        }
     }
 }
diff --git a/tests/Datagrid/ProxyQueryTest.php b/tests/Datagrid/ProxyQueryTest.php
@@ -153,7 +153,7 @@ public function testExecuteAllowsSortingWithEmbedded(): void
     }
 
     /**
-     * @param array{array{name: string}} $results
+     * @param array<array{name: string}> $results
      *
      * @return string[]
      */