Merge pull request #3793 from PHPOffice/powerkiki

Add all missing native types

Author: PowerKiKi

bin/check-phpdoc-types

@@ -11,7 +11,7 @@
 function checkPhpDocTypes(): void
 {
     $content = `git diff --cached` ?? `git diff` ?? `git show HEAD`;
-    preg_match_all('~^\+ +\* @(param|var) (mixed|string|int|float|bool|null|array|\?|\|)+ \$\w+$~m', $content, $parameters);
+    preg_match_all('~^\+ +\* @(param|var) (mixed|string|int|float|bool|null|array|\?|\|)+( \$\w+)?$~m', $content, $parameters);
     preg_match_all('~^\+ +\* @return (mixed|string|int|float|bool|null|array|void|\?|\|)+$~m', $content, $returns);
 
     $errors = [

composer.json

@@ -46,22 +46,22 @@
     "scripts": {
         "check": [
             "./bin/check-phpdoc-types",
-            "phpcs src/ tests/ --report=checkstyle",
-            "phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PHPCompatibility --runtime-set testVersion 8.0- -n",
+            "phpcs samples/ src/ tests/ --report=checkstyle",
+            "phpcs samples/ src/ tests/ --standard=PHPCompatibility --runtime-set testVersion 8.0- -n",
             "php-cs-fixer fix --ansi --dry-run --diff",
             "phpunit --color=always",
             "phpstan analyse --ansi --memory-limit=2048M"
         ],
         "style": [
-            "phpcs src/ tests/ --report=checkstyle",
+            "phpcs samples/ src/ tests/ --report=checkstyle",
             "php-cs-fixer fix --ansi --dry-run --diff"
         ],
         "fix": [
-            "phpcbf src/ tests/ --report=checkstyle",
+            "phpcbf samples/ src/ tests/ --report=checkstyle",
             "php-cs-fixer fix"
         ],
         "versions": [
-            "phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PHPCompatibility --runtime-set testVersion 8.0- -n"
+            "phpcs samples/ src/ tests/ --standard=PHPCompatibility --runtime-set testVersion 8.0- -n"
         ]
     },
     "require": {

infra/LocaleGenerator.php

@@ -28,38 +28,23 @@ class LocaleGenerator
     private const ENGLISH_REFERENCE_COLUMN = 'B';
     private const EOL = "\n"; // not PHP_EOL
 
-    /**
-     * @var string
-     */
-    protected $translationSpreadsheetName;
+    protected string $translationSpreadsheetName;
 
-    /**
-     * @var string
-     */
-    protected $translationBaseFolder;
+    protected string $translationBaseFolder;
 
     protected array $phpSpreadsheetFunctions;
 
-    /**
-     * @var Spreadsheet
-     */
-    protected $translationSpreadsheet;
+    protected Spreadsheet $translationSpreadsheet;
 
     protected bool $verbose;
 
-    /**
-     * @var Worksheet
-     */
-    protected $localeTranslations;
+    protected Worksheet $localeTranslations;
 
     protected array $localeLanguageMap = [];
 
     protected array $errorCodeMap = [];
 
-    /**
-     * @var Worksheet
-     */
-    private $functionNameTranslations;
+    private Worksheet $functionNameTranslations;
 
     protected array $functionNameLanguageMap = [];
 

phpstan-baseline.neon

@@ -6,9 +6,9 @@ includes:
 parameters:
     level: 8
     paths:
+        - samples/
         - src/
         - tests/
-        - samples/
         - infra/
         - bin/generate-document
         - bin/generate-locales

phpstan.neon.dist

@@ -18,7 +18,7 @@
 
 class MyReadFilter implements IReadFilter
 {
-    public function readCell($columnAddress, $row, $worksheetName = '')
+    public function readCell(string $columnAddress, int $row, string $worksheetName = ''): bool
     {
         // Read title row and rows 20 - 30
         if ($row == 1 || ($row >= 20 && $row <= 30)) {

samples/Basic/24_Readfilter.php

@@ -16,27 +16,20 @@
 $helper->write($spreadsheet, __FILE__, ['Xlsx', 'Xls', 'Html']);
 
 // Export to PDF (mpdf)
-function mpdfCjkWriter(Mpdf $writer): void
-{
-    /** @var callable */
-    $callback = 'mpdfCjk';
-    $writer->setEditHtmlCallback($callback);
-}
+$mpdfCjkWriter = function (Mpdf $writer): void {
+    $mpdfCjk = function (string $html): string {
+        $html = str_replace("'Calibri'", "'Calibri',Sun-ExtA", $html);
 
-function mpdfCjk(string $html): string
-{
-    $html = str_replace("'Calibri'", "'Calibri',Sun-ExtA", $html);
+        return str_replace("'Times New Roman'", "'Times New Roman',Sun-ExtA", $html);
+    };
 
-    return str_replace("'Times New Roman'", "'Times New Roman',Sun-ExtA", $html);
-}
+    $writer->setEditHtmlCallback($mpdfCjk);
+};
 
 $helper->log('Write to Mpdf');
 IOFactory::registerWriter('Pdf', Mpdf::class);
-/** @var callable */
-$callback = 'mpdfCjkWriter';
 $filename = __FILE__;
-//$filename = str_replace('.php', '.mdpf.php', __FILE__);
-$helper->write($spreadsheet, $filename, ['Pdf'], false, $callback);
+$helper->write($spreadsheet, $filename, ['Pdf'], false, $mpdfCjkWriter);
 
 // Remove first two rows with field headers before exporting to CSV
 $helper->log('Removing first two heading rows for CSV export');

samples/Basic/26_Utf8.php

@@ -40,7 +40,7 @@ function transpose(string $value): array
     $countryCount = count($countries);
 
     // Transpose $countries from a row to a column array
-    $countries = array_map('transpose', $countries);
+    $countries = array_map(fn (mixed $value): array => [$value], $countries);
     $spreadsheet->getActiveSheet()
         ->fromArray($countries, null, $column . '1');
     $spreadsheet->addNamedRange(

samples/Basic/39_Dropdown.php

@@ -157,7 +157,7 @@
     $xAxisTickValues, // plotCategory
     $dataSeriesValues, // plotValues
     null, // plotDirection
-    null, // smooth line
+    false, // smooth line
     DataSeries::STYLE_SMOOTHMARKER // plotStyle
 );
 
@@ -279,7 +279,7 @@
 // change xAxis tick marks to match Qtr boundaries
 
 $nQtrs = sprintf('%3.2f', (($dateMinMax['max'] - $dateMinMax['min']) / 30.5) / 4);
-$tickMarkInterval = ($nQtrs > 20) ? 6 : 3; // tick marks every ? months
+$tickMarkInterval = ($nQtrs > 20) ? '6' : '3'; // tick marks every ? months
 
 $xAxis->setAxisOptionsProperties(
     Properties::AXIS_LABELS_NEXT_TO, // axis_label pos

samples/Chart/33_Chart_create_line_dateaxis.php

@@ -74,7 +74,7 @@
     $xAxisTickValues, // plotCategory
     $dataSeriesValues, // plotValues
     null, // plotDirection
-    null, // smooth line
+    false, // smooth line
     DataSeries::STYLE_MARKER  // plotStyle
 );