patch

AnourValar · Dec 20, 2024 · 0fc44c1 · 0fc44c1
1 parent 09b0c9e
commit 0fc44c1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ composer require anourvalar/office
 ### Phpspreadsheet is required to work with Excel (xlsx).
 
 ```bash
-composer require phpoffice/phpspreadsheet "^1.29"
+composer require phpoffice/phpspreadsheet "^3.6"
 ```
 
 ### Zipstream-php is required to work with Word (docx).

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "^2.0",
         "friendsofphp/php-cs-fixer": "^3.26",
         "squizlabs/php_codesniffer": "^3.7",
         "vimeo/psalm": "^5.17"

diff --git a/phpstan.neon b/phpstan.neon
@@ -4,7 +4,7 @@ parameters:
         - src
         - tests
 
-    # The level 9 is the highest level
+    # The level 10 is the highest level
     level: 5
 
     ignoreErrors:
@@ -32,16 +32,23 @@ parameters:
         - '#Match expression does not handle remaining value: mixed#'
         - '#Access to an undefined property AnourValar\\Office\\Drivers\\MixInterface\:\:\$spreadsheet#'
         - '#Call to an undefined method AnourValar\\Office\\Drivers\\MixInterface\:\:sheet\(\)#'
+        - '#Call to an undefined method#'
+        - '#Offset numeric\-string on list\<string> in isset\(\) does not exist\.#'
+        - '#Format\:\:Docx is always true#'
+        - '#string\, \(float\|int\) given#'
+        - '#SaveInterface given\.#'
 
     excludePaths:
 
     checkFunctionNameCase: true
     checkInternalClassCaseSensitivity: true
-    checkAlwaysTrueInstanceof: true
     reportMaybesInMethodSignatures: true
     reportStaticMethodSignatures: true
     checkUninitializedProperties: true
     checkDynamicProperties: true
     reportAlwaysTrueInLastCondition: true
     reportWrongPhpDocTypeInVarTag: true
     checkMissingCallableSignature: true
+    reportPossiblyNonexistentGeneralArrayOffset: true
+    reportPossiblyNonexistentConstantArrayOffset: true
+    reportAnyTypeWideningInVarTag: true
diff --git a/src/Generated.php b/src/Generated.php
@@ -12,7 +12,7 @@ class Generated
     /**
      * Handle template's saving
      *
-     * @var \Closure(\AnourValar\Office\Drivers\SaveInterface $driver, \AnourValar\Office\Format $format)
+     * @var \Closure(\AnourValar\Office\Drivers\SaveInterface $driver, \AnourValar\Office\Format $format): void
      */
     protected ?\Closure $hookSave = null;
 

diff --git a/src/GridService.php b/src/GridService.php
@@ -23,28 +23,28 @@ class GridService
     /**
      * Actions with template before data inserted
      *
-     * @var \Closure(GridInterface $driver, array &$headers, iterable &$data, string $leftTopCorner)
+     * @var \Closure(GridInterface $driver, array &$headers, iterable &$data, string $leftTopCorner): void
      */
     protected ?\Closure $hookBefore = null;
 
     /**
      * Header handler
      *
-     * @var \Closure(GridInterface $driver, mixed $header, string|int $key, string $column)
+     * @var \Closure(GridInterface $driver, mixed $header, string|int $key, string $column): string
      */
     protected ?\Closure $hookHeader = null;
 
     /**
      * Row data handler
      *
-     * @var \Closure(GridInterface $driver, mixed $row, string|int $key)
+     * @var \Closure(GridInterface $driver, mixed $row, string|int $key): array
      */
     protected ?\Closure $hookRow = null;
 
     /**
      * Actions with template after data inserted
      *
-     * @var \Closure(GridInterface $driver, ?string $headersRange, ?string $dataRange, ?string $totalRange, array $columns)
+     * @var \Closure(GridInterface $driver, ?string $headersRange, ?string $dataRange, ?string $totalRange, array $columns): void
      */
     protected ?\Closure $hookAfter = null;
 

diff --git a/src/SheetsService.php b/src/SheetsService.php
@@ -26,21 +26,21 @@ class SheetsService
     /**
      * Actions with template before data inserted
      *
-     * @var \Closure(SheetsInterface $driver, array &$data)
+     * @var \Closure(SheetsInterface $driver, array &$data): void
      */
     protected ?\Closure $hookBefore = null;
 
     /**
      * Cell's value handler (on set)
      *
-     * @var \Closure(SheetsInterface $driver, string $column, int $row, mixed $value, int $sheetIndex)
+     * @var \Closure(SheetsInterface $driver, string $column, int $row, mixed $value, int $sheetIndex): mixed
      */
     protected ?\Closure $hookValue = null;
 
     /**
      * Actions with template after data inserted
      *
-     * @var \Closure(SheetsInterface $driver)
+     * @var \Closure(SheetsInterface $driver): void
      */
     protected ?\Closure $hookAfter = null;