| @@ -1,9 +1,8 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | namespace TablePress\PhpOffice\PhpSpreadsheet\Reader; |
| 4 | 4 | |
| 5 | -use Closure; | |
| 6 | 5 | use TablePress\PhpOffice\PhpSpreadsheet\Cell\IValueBinder; |
| 7 | 6 | use TablePress\PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException; |
| 8 | 7 | use TablePress\PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException; |
| 9 | 8 | use TablePress\PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner; |
| @@ -9,9 +8,9 @@ | ||
| 9 | 8 | use TablePress\PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner; |
| 10 | 9 | use TablePress\PhpOffice\PhpSpreadsheet\Shared\File; |
| 11 | 10 | use TablePress\PhpOffice\PhpSpreadsheet\Spreadsheet; |
| 12 | 11 | |
| 13 | -abstract class BaseReader implements IReader | |
| 12 | +abstract class BaseReader implements IReader2 | |
| 14 | 13 | { |
| 15 | 14 | /** |
| 16 | 15 | * Read data only? |
| 17 | 16 | * Identifies whether the Reader should only read data values for cells, and ignore any formatting information; |
| @@ -80,10 +79,10 @@ | ||
| 80 | 79 | protected ?XmlScanner $securityScanner = null; |
| 81 | 80 | |
| 82 | 81 | protected ?IValueBinder $valueBinder = null; |
| 83 | 82 | |
| 84 | - /** @var null|Closure(string):bool function to return whether image path is okay */ | |
| 85 | - protected ?Closure $isWhitelisted = null; | |
| 83 | + /** @var null|callable(string):bool function to return whether image path is okay */ | |
| 84 | + protected $isWhitelisted; | |
| 86 | 85 | |
| 87 | 86 | public function __construct() |
| 88 | 87 | { |
| 89 | 88 | $this->readFilter = new DefaultReadFilter(); |
| @@ -233,12 +232,12 @@ | ||
| 233 | 232 | * used in conjunction with setAllowExternalImages; |
| 234 | 233 | * supplying a method which might return true |
| 235 | 234 | * can subject the caller to security exploits. |
| 236 | 235 | * |
| 237 | - * @param Closure(string):bool $isWhitelisted | |
| 236 | + * @param callable(string):bool $isWhitelisted | |
| 238 | 237 | * @return static |
| 239 | 238 | */ |
| 240 | - public function setIsWhitelisted(Closure $isWhitelisted) | |
| 239 | + public function setIsWhitelisted(callable $isWhitelisted) | |
| 241 | 240 | { |
| 242 | 241 | $this->isWhitelisted = $isWhitelisted; |
| 243 | 242 | |
| 244 | 243 | return $this; |