Fix deprecations introduced in admin-bundle

Pager::setCountColumn call has been removed since that property is not used.
sonata-project · Jan 4, 2021 · eaf0a0d · eaf0a0d
1 parent a59f450
commit eaf0a0d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
         "doctrine/mongodb-odm": "^2.1",
         "doctrine/mongodb-odm-bundle": "^4.0",
         "doctrine/persistence": "^1.3.4 || ^2.0",
-        "sonata-project/admin-bundle": "^3.83",
+        "sonata-project/admin-bundle": "^3.84",
         "sonata-project/form-extensions": "^0.1 || ^1.4",
         "symfony/config": "^4.4",
         "symfony/dependency-injection": "^4.4",

diff --git a/src/Builder/DatagridBuilder.php b/src/Builder/DatagridBuilder.php
@@ -167,7 +167,6 @@ public function addFilter(DatagridInterface $datagrid, $type, FieldDescriptionIn
     public function getBaseDatagrid(AdminInterface $admin, array $values = [])
     {
         $pager = new Pager();
-        $pager->setCountColumn($admin->getModelManager()->getIdentifierFieldNames($admin->getClass()));
 
         $defaultOptions = [];
         if ($this->csrfTokenEnabled) {

diff --git a/src/Filter/Filter.php b/src/Filter/Filter.php
@@ -29,6 +29,7 @@ abstract class Filter extends BaseFilter
      */
     public function apply($query, $filterData)
     {
+        // NEXT_MAJOR: Remove next line.
         $this->value = $filterData;
 
         $field = $this->getParentAssociationMappings() ? $this->getName() : $this->getFieldName();

diff --git a/tests/Admin/FieldDescriptionTest.php b/tests/Admin/FieldDescriptionTest.php
@@ -128,10 +128,13 @@ public function testSetNameSetFieldNameToo(): void
         $this->assertSame($field->getFieldName(), 'New field description name');
     }
 
+    /**
+     * NEXT_MAJOR: Remove this test.
+     */
     public function testSetNameDoesNotSetFieldNameWhenSetBefore(): void
     {
         $field = new FieldDescription('name');
-        $field->setFieldName('field name');
+        $field->setFieldName('field name', 'sonata_deprecation_mute');
         $field->setName('New field description name');
 
         $this->assertSame($field->getFieldName(), 'field name');

diff --git a/tests/Filter/FilterTest.php b/tests/Filter/FilterTest.php
@@ -69,6 +69,11 @@ public function testFieldDescription(): void
         $this->assertSame(['class' => 'FooBar'], $filter->getFieldOptions());
     }
 
+    /**
+     * NEXT_MAJOR: Remove this test.
+     *
+     * @group legacy
+     */
     public function testValues(): void
     {
         $filter = new FilterTest_Filter();