DevKit updates for 3.x branch (#1959)

* DevKit updates * Fix tests Co-authored-by: Vincent Langlet <[email protected]>
sonata-project · May 9, 2021 · f17b360 · f17b360
1 parent 242e74f
commit f17b360
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -91,7 +91,7 @@
         "matthiasnoback/symfony-config-test": "^4.2",
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
         "nelmio/api-doc-bundle": "^2.13.5",
-        "sonata-project/admin-bundle": "^3.41",
+        "sonata-project/admin-bundle": "^3.98.2",
         "sonata-project/block-bundle": "^3.17",
         "sonata-project/datagrid-bundle": "^3.0.1",
         "sonata-project/doctrine-orm-admin-bundle": "^3.14",

diff --git a/docs/.doctor-rst.yaml b/docs/.doctor-rst.yaml
@@ -9,6 +9,7 @@ rules:
     blank_line_after_filepath_in_code_block: ~
     composer_dev_option_at_the_end: ~
     ensure_exactly_one_space_between_link_definition_and_link: ~
+    ensure_link_definition_contains_valid_url: ~
     ensure_order_of_code_blocks_in_configuration_block: ~
     extend_abstract_admin: ~
     final_admin_class: ~

diff --git a/tests/Controller/GalleryAdminControllerTest.php b/tests/Controller/GalleryAdminControllerTest.php
@@ -103,8 +103,8 @@ private function configureCRUDController(): void
             ['_list_mode', null, 'list'],
             ['_sonata_admin', null, 'admin_code'],
         ]);
-        $this->container->set('sonata.admin.pool', $pool);
-        $this->container->set('sonata.admin.breadcrumbs_builder', $breadcrumbsBuilder);
+        $this->container->set('sonata.admin.pool.do-not-use', $pool);
+        $this->container->set('sonata.admin.breadcrumbs_builder.do-not-use', $breadcrumbsBuilder);
         $this->container->set('admin_code.template_registry', $templateRegistry);
         $this->admin->method('getTemplate')->willReturnMap([
             ['layout', 'layout.html.twig'],

diff --git a/tests/Controller/MediaAdminControllerTest.php b/tests/Controller/MediaAdminControllerTest.php
@@ -160,8 +160,8 @@ private function configureCRUDController(): void
         $pool->method('getAdminByAdminCode')->with('admin_code')->willReturn($this->admin);
         $this->request->query->set('_xml_http_request', false);
         $this->request->query->set('_sonata_admin', 'admin_code');
-        $this->container->set('sonata.admin.pool', $pool);
-        $this->container->set('sonata.admin.breadcrumbs_builder', $breadcrumbsBuilder);
+        $this->container->set('sonata.admin.pool.do-not-use', $pool);
+        $this->container->set('sonata.admin.breadcrumbs_builder.do-not-use', $breadcrumbsBuilder);
         $this->container->set('admin_code.template_registry', $templateRegistry);
         $this->admin->method('getTemplate')->willReturnMap([
             ['layout', 'layout.html.twig'],