Add support for PHP 8.1 (#18)

Author: Slamdunk

.github/workflows/integrate.yaml

@@ -63,6 +63,7 @@ jobs:
       matrix:
         php-version:
           - "8.0"
+          - "8.1"
 
     steps:
       - name: "Checkout"
@@ -87,13 +88,8 @@ jobs:
           restore-keys: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
 
       - name: "Install dependencies"
-        if: ${{ matrix.php-version != '8.0' }}
         run: "composer update --no-interaction --no-progress"
 
-      - name: "Install dependencies PHP 8.0"
-        if: ${{ matrix.php-version == '8.0' }}
-        run: "composer update --no-interaction --no-progress --ignore-platform-reqs"
-
       - name: "Run tests"
         timeout-minutes: 3
         run: "vendor/bin/phpunit --no-coverage --no-logging"

composer.json

@@ -16,19 +16,14 @@
     },
     "require-dev": {
         "malukenho/mcbumpface": "^1.1.5",
-        "mikey179/vfsstream": "^1.6.9",
-        "phpoffice/phpspreadsheet": "^1.18.0",
-        "phpstan/phpstan": "^0.12.94",
-        "phpstan/phpstan-phpunit": "^0.12.21",
-        "phpunit/phpunit": "^9.5.8",
-        "slam/php-cs-fixer-extensions": "^3.0.1",
+        "mikey179/vfsstream": "^1.6.10",
+        "phpoffice/phpspreadsheet": "^1.20.0",
+        "phpstan/phpstan": "^1.2.0",
+        "phpstan/phpstan-phpunit": "^1.0.0",
+        "phpunit/phpunit": "^9.5.10",
+        "slam/php-cs-fixer-extensions": "^3.1.0",
         "slam/php-debug-r": "^1.7.0",
-        "slam/phpstan-extensions": "^5.1.0"
-    },
-    "extra": {
-        "mc-bumpface": {
-            "stripVersionPrefixes": true
-        }
+        "slam/phpstan-extensions": "^6.0.0"
     },
     "autoload": {
         "psr-4": {
@@ -39,5 +34,10 @@
         "psr-4": {
             "Slam\\Excel\\Tests\\": "tests/"
         }
+    },
+    "extra": {
+        "mc-bumpface": {
+            "stripVersionPrefixes": true
+        }
     }
 }

lib/Helper/Table.php

@@ -189,10 +189,7 @@ public function setCount(int $count): void
         $this->count = $count;
     }
 
-    /**
-     * @return null|int
-     */
-    public function count()
+    public function count(): int
     {
         if (null === $this->count) {
             throw new Exception\RuntimeException('Workbook must set count on table');

lib/Pear/OLE.php

@@ -94,12 +94,12 @@ public static function LocalDate2Excel_OLE($date = null)
         $res = '';
 
         for ($i = 0; $i < 4; ++$i) {
-            $hex = $low_part % 0x100;
+            $hex = \floor($low_part) % 0x100;
             $res .= \pack('c', $hex);
             $low_part /= 0x100;
         }
         for ($i = 0; $i < 4; ++$i) {
-            $hex = $high_part % 0x100;
+            $hex = \floor($high_part) % 0x100;
             $res .= \pack('c', $hex);
             $high_part /= 0x100;
         }

lib/Pear/Writer/Workbook.php

@@ -253,8 +253,8 @@ public function setCountry($code)
      *
      * @param string $name the optional name of the worksheet
      *
-     * @return mixed reference to a worksheet object on success, Excel_PEAR_Error
-     *               on failure
+     * @return Worksheet reference to a worksheet object on success, Excel_PEAR_Error
+     *                   on failure
      */
     public function addWorksheet($name = '')
     {

phpstan-baseline.neon

@@ -5,3 +5,13 @@ parameters:
 			count: 1
 			path: tests/Helper/ColumnCollectionTest.php
 
+		-
+			message: "#^Property Slam\\\\Excel\\\\Tests\\\\Helper\\\\MainTest\\:\\:\\$vfs is never read, only written\\.$#"
+			count: 1
+			path: tests/Helper/MainTest.php
+
+		-
+			message: "#^Property Slam\\\\Excel\\\\Tests\\\\Helper\\\\TableWorkbookTest\\:\\:\\$vfs is never read, only written\\.$#"
+			count: 1
+			path: tests/Helper/TableWorkbookTest.php
+

phpstan.neon

@@ -4,10 +4,11 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
-    level: max
+    level: 8
     checkMissingIterableValueType: false
     paths:
         - lib/
         - tests/
-    excludes_analyse:
+    excludePaths:
+        analyseAndScan:
         - %currentWorkingDirectory%/lib/Pear/*