Merge 3.x into master

sonata-project · Apr 21, 2020 · 5162177 · 5162177
2 parents f724f63 + 288b1dc
commit 5162177
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -35,6 +35,7 @@ $rules = [
     'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
     'ordered_class_elements' => true,
     'ordered_imports' => true,
+    'php_unit_set_up_tear_down_visibility' => true,
     'phpdoc_order' => true,
     '@PHP56Migration' => true,
     '@PHP56Migration:risky' => true,

diff --git a/tests/Datagrid/DatagridTest.php b/tests/Datagrid/DatagridTest.php
@@ -57,7 +57,7 @@ class DatagridTest extends TestCase
      */
     private $formTypes;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->query = $this->createMock(ProxyQueryInterface::class);
         $this->pager = $this->createMock(PagerInterface::class);