Null Passed to AutoFilter SetRange

phpstan-baseline.neon

@@ -6065,16 +6065,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
 
-		-
-			message: "#^Parameter \\#1 \\$range of class PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter constructor expects string, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$range of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\:\\:setRange\\(\\) expects string, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
 		-
 			message: "#^Parameter \\#1 \\$range of static method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Coordinate\\:\\:rangeDimension\\(\\) expects string, string\\|false given\\.$#"
 			count: 1

src/PhpSpreadsheet/Worksheet/AutoFilter.php

@@ -50,10 +50,8 @@ public function setEvaluated(bool $value): void
 
     /**
      * Create a new AutoFilter.
-     *
-     * @param string $range Cell range (i.e. A1:E10)
      */
-    public function __construct($range = '', ?Worksheet $worksheet = null)
+    public function __construct(string $range = '', ?Worksheet $worksheet = null)
     {
         $this->range = $range;
         $this->workSheet = $worksheet;
@@ -93,13 +91,9 @@ public function getRange()
     }
 
     /**
-     * Set AutoFilter Range.
-     *
-     * @param string $range Cell range (i.e. A1:E10)
-     *
-     * @return $this
+     * Set AutoFilter Cell Range.
      */
-    public function setRange($range)
+    public function setRange(string $range): self
     {
         $this->evaluated = false;
         // extract coordinate

src/PhpSpreadsheet/Worksheet/Worksheet.php

@@ -371,7 +371,7 @@ public function __construct(?Spreadsheet $parent = null, $title = 'Worksheet')
         $this->defaultRowDimension = new RowDimension(null);
         // Default column dimension
         $this->defaultColumnDimension = new ColumnDimension(null);
-        $this->autoFilter = new AutoFilter(null, $this);
+        $this->autoFilter = new AutoFilter('', $this);
     }
 
     /**
@@ -1914,12 +1914,10 @@ public function setAutoFilterByColumnAndRow($columnIndex1, $row1, $columnIndex2,
 
     /**
      * Remove autofilter.
-     *
-     * @return $this
      */
-    public function removeAutoFilter()
+    public function removeAutoFilter(): self
     {
-        $this->autoFilter->setRange(null);
+        $this->autoFilter->setRange('');
 
         return $this;
     }

tests/PhpSpreadsheetTests/Worksheet/AutoFilter/DeleteAutoFilterTest.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Worksheet\AutoFilter;
+
+class DeleteAutoFilterTest extends SetupTeardown
+{
+    public function testDelete(): void
+    {
+        // Issue 2281 - deprecation in PHP81 when deleting filter
+        $sheet = $this->getSheet();
+        $autoFilter = $sheet->getAutoFilter();
+        $autoFilter->setRange('H2:O256');
+        $sheet->removeAutoFilter();
+        self::assertSame('', $sheet->getAutoFilter()->getRange());
+    }
+}