Merge 4.x into 5.x

sonata-project · Nov 23, 2021 · 21fd6de · 21fd6de
2 parents 652d1f5 + 049eb93
commit 21fd6de
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -94,7 +94,7 @@
         "psalm/plugin-symfony": "^3.0",
         "sonata-project/admin-bundle": "^4.0",
         "sonata-project/block-bundle": "^4.0",
-        "sonata-project/classification-bundle": "^4.0@alpha",
+        "sonata-project/classification-bundle": "^4.0.0-RC1",
         "sonata-project/doctrine-orm-admin-bundle": "^4.0",
         "symfony/browser-kit": "^4.4 || ^5.3",
         "symfony/messenger": "^4.4 || ^5.3",

diff --git a/tests/App/Entity/Context.php b/tests/App/Entity/Context.php
@@ -28,9 +28,4 @@ class Context extends BaseContext
      * @ORM\Column(type="string")
      */
     protected ?string $id = null;
-
-    public function getId(): ?string
-    {
-        return $this->id;
-    }
 }