Php 7.4 (#5)

* PHPUnit ok

* Support PHP 7.4

* Tests: update to PHPOffice\PhpSpreadsheet

* Updated PHPStan rules to reflect new library

Author: Slamdunk

.gitignore

@@ -1,3 +1,5 @@
+.idea/
 vendor/
 .php_cs.cache
+.phpunit.result.cache
 composer.lock

.travis.yml

@@ -5,10 +5,9 @@ sudo: false
 matrix:
   fast_finish: true
   include:
-    - php: 7.1
-      env: CS_CHECK=1 STATIC_ANALYSIS=1
-    - php: 7.2
     - php: 7.3
+      env: CS_CHECK=1 STATIC_ANALYSIS=1
+    - php: 7.4
       env: CODE_COVERAGE=1
 
 cache:

composer.json

@@ -10,19 +10,19 @@
         }
     ],
     "require": {
-        "php": "^7.1"
+        "php": "^7.3"
     },
     "require-dev": {
         "mikey179/vfsstream": "^1.6",
-        "phpoffice/phpexcel": "^1.8",
-        "phpstan/phpstan": "^0.11",
-        "phpstan/phpstan-phpunit": "^0.11",
-        "phpunit/phpunit": "^7.5",
+        "phpoffice/phpspreadsheet": "^1.10",
+        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan-phpunit": "^0.12",
+        "phpunit/phpunit": "^8.5",
         "roave/security-advisories": "dev-master",
-        "slam/php-cs-fixer-extensions": "^1.18",
+        "slam/php-cs-fixer-extensions": "^1.19",
         "slam/php-debug-r": "^1.6",
-        "slam/phpstan-extensions": "^3.6",
-        "thecodingmachine/phpstan-strict-rules": "^0.11"
+        "slam/phpstan-extensions": "^4.0",
+        "thecodingmachine/phpstan-strict-rules": "^0.12"
     },
     "autoload": {
         "psr-4": {

lib/Helper/CellStyleInterface.php

@@ -8,6 +8,11 @@
 
 interface CellStyleInterface
 {
+    /**
+     * @param mixed $value
+     *
+     * @return mixed
+     */
     public function decorateValue($value);
 
     public function styleCell(Format $format): void;

lib/Helper/Column.php

@@ -6,12 +6,24 @@
 
 final class Column implements ColumnInterface
 {
+    /**
+     * @var string
+     */
     private $key;
 
+    /**
+     * @var string
+     */
     private $heading;
 
+    /**
+     * @var int
+     */
     private $width;
 
+    /**
+     * @var CellStyleInterface
+     */
     private $cellStyle;
 
     public function __construct(string $key, string $heading, int $width, CellStyleInterface $cellStyle)

lib/Helper/ColumnCollection.php

@@ -8,6 +8,9 @@
 
 final class ColumnCollection implements ColumnCollectionInterface
 {
+    /**
+     * @var array<string, ColumnInterface>
+     */
     private $columns = [];
 
     public function __construct(array $columns)
@@ -17,26 +20,43 @@ public function __construct(array $columns)
         }
     }
 
-    private function addColumn(ColumnInterface $column)
+    private function addColumn(ColumnInterface $column): void
     {
         $this->columns[$column->getKey()] = $column;
     }
 
+    /**
+     * @param string $offset
+     * @param mixed  $value
+     */
     public function offsetSet($offset, $value)
     {
         throw new Exception\RuntimeException('Collection not editable');
     }
 
+    /**
+     * @param string $offset
+     *
+     * @return bool
+     */
     public function offsetExists($offset)
     {
         return isset($this->columns[$offset]);
     }
 
+    /**
+     * @param string $offset
+     */
     public function offsetUnset($offset)
     {
         throw new Exception\RuntimeException('Collection not editable');
     }
 
+    /**
+     * @param string $offset
+     *
+     * @return null|mixed
+     */
     public function offsetGet($offset)
     {
         return $this->columns[$offset] ?? null;

lib/Helper/Table.php

@@ -16,28 +16,84 @@ final class Table implements Countable
      */
     private $activeSheet;
 
+    /**
+     * @var null|int
+     */
     private $dataRowStart;
 
+    /**
+     * @var int
+     */
     private $rowStart;
+
+    /**
+     * @var int
+     */
     private $rowEnd;
+
+    /**
+     * @var int
+     */
     private $rowCurrent;
 
+    /**
+     * @var int
+     */
     private $columnStart;
+
+    /**
+     * @var int
+     */
     private $columnEnd;
+
+    /**
+     * @var int
+     */
     private $columnCurrent;
 
+    /**
+     * @var string
+     */
     private $heading;
 
+    /**
+     * @var Iterator
+     */
     private $data;
 
+    /**
+     * @var null|ColumnCollectionInterface
+     */
     private $columnCollection;
 
+    /**
+     * @var bool
+     */
     private $freezePanes = true;
-    private $fontSize    = 8;
+
+    /**
+     * @var int
+     */
+    private $fontSize = 8;
+
+    /**
+     * @var null|int
+     */
     private $rowHeight;
+
+    /**
+     * @var bool
+     */
     private $textWrap = false;
+
+    /**
+     * @var null|array
+     */
     private $writtenColumnTitles;
 
+    /**
+     * @var null|int
+     */
     private $count;
 
     public function __construct(Worksheet $activeSheet, int $row, int $column, string $heading, Iterator $data)
@@ -200,6 +256,9 @@ public function setCount(int $count): void
         $this->count = $count;
     }
 
+    /**
+     * @return null|int
+     */
     public function count()
     {
         if (null === $this->count) {

lib/Helper/TableWorkbook.php

@@ -51,7 +51,7 @@ public function setEmptyTableMessage(string $emptyTableMessage): void
         $this->emptyTableMessage = $emptyTableMessage;
     }
 
-    public static function getColumnStringFromIndex(int $index)
+    public static function getColumnStringFromIndex(int $index): string
     {
         if ($index < 0) {
             throw new Excel\Exception\InvalidArgumentException('Column index must be equal or greater than zero');
@@ -173,7 +173,7 @@ private function writeColumnsHeading(Table $table, array $row): void
         $table->flagDataRowStart();
     }
 
-    private function writeRow(Table $table, array $row, string $type = null): void
+    private function writeRow(Table $table, array $row, ?string $type = null): void
     {
         $table->resetColumn();
         $sheet = $table->getActiveSheet();
@@ -212,6 +212,9 @@ private function writeRow(Table $table, array $row, string $type = null): void
         $table->incrementRow();
     }
 
+    /**
+     * @param mixed $value
+     */
     private function sanitize($value): string
     {
         static $sanitizeMap = [
@@ -225,14 +228,14 @@ private function sanitize($value): string
         $value = \str_replace(
             \array_keys($sanitizeMap),
             \array_values($sanitizeMap),
-            $value
+            (string) $value
         );
         $value = \mb_convert_encoding($value, 'Windows-1252');
 
         return $value;
     }
 
-    private function generateFormats(Table $table, array $titles, ColumnCollectionInterface $columnCollection = null): void
+    private function generateFormats(Table $table, array $titles, ?ColumnCollectionInterface $columnCollection = null): void
     {
         $this->formats = [];
         foreach ($titles as $key) {

phpstan.neon

@@ -1,23 +1,21 @@
 includes:
-    - vendor/phpstan/phpstan/conf/config.levelmax.neon
+    - phar://phpstan.phar/conf/config.levelmax.neon
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/slam/phpstan-extensions/conf/slam-rules.neon
     - vendor/slam/phpstan-extensions/conf/thecodingmachine-rules.neon
 
 parameters:
+    checkGenericClassInNonGenericObjectType: false
+    checkMissingIterableValueType: false
     paths:
         - lib/
         - tests/
     excludes_analyse:
         - %currentWorkingDirectory%/lib/Pear/*
     ignoreErrors:
         -
-            message: '#Call to static method PHPUnit\\Framework\\Assert::assertSame\(\) with \d+ and float will always evaluate to false#'
-            path: %currentWorkingDirectory%/tests/Helper/TableWorkbookTest.php
+            message: '#Method Slam\\Excel\\Helper\\ColumnCollection::offset.+ has no return typehint specified#'
+            path: %currentWorkingDirectory%/lib/Helper/ColumnCollection.php
         -
-            message: '#Cannot call method \w+\(\) on PHPExcel_Cell\|null#'
+            message: '#Cannot call method \w+\(\) on PhpOffice\\PhpSpreadsheet\\Cell\\Cell\|null#'
             path: %currentWorkingDirectory%/tests/Helper/TableWorkbookTest.php
-        -
-            message: '#Call to static method PHPUnit\\Framework\\Assert::assertSame\(\) with .+ and null will always evaluate to false#'
-            path: %currentWorkingDirectory%/tests/Helper/TableTest.php
-

tests/Helper/ColumnCollectionTest.php

@@ -10,10 +10,17 @@
 
 final class ColumnCollectionTest extends TestCase
 {
+    /**
+     * @var Helper\Column
+     */
     private $column;
+
+    /**
+     * @var Helper\ColumnCollection
+     */
     private $collection;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->column = new Helper\Column('foo', 'Foo', 10, new Helper\CellStyle\Text());
 
@@ -22,20 +29,20 @@ protected function setUp()
         ]);
     }
 
-    public function testBaseFunctionalities()
+    public function testBaseFunctionalities(): void
     {
-        static::assertArrayHasKey('foo', $this->collection);
-        static::assertSame($this->column, $this->collection['foo']);
+        self::assertArrayHasKey('foo', $this->collection);
+        self::assertSame($this->column, $this->collection['foo']);
     }
 
-    public function testNotEditableOnSet()
+    public function testNotEditableOnSet(): void
     {
         $this->expectException(Exception\RuntimeException::class);
 
         $this->collection['foo'] = 1;
     }
 
-    public function testNotEditableOnUnset()
+    public function testNotEditableOnUnset(): void
     {
         $this->expectException(Exception\RuntimeException::class);