Merge pull request #4349 from oleibman/updstan

Upgrade Phpstan
2026-09-15 12:36:32 +00:00 · 2025-02-08 05:02:56 +00:00
parent 2d4b9f3582 4bbbbac700
commit 9d1ad14a48
4 changed files with 49 additions and 52 deletions
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "264ef911bd6d773a3a9085bc86b0ea48",
+    "content-hash": "d4317d9994deb0d3755600f3c5a7a277",
    "packages": [
        {
            "name": "composer/pcre",
@@ -699,21 +699,21 @@
            "source": {
                "type": "git",
                "url": "https://github.com/PHPCSStandards/composer-installer.git",
-                "reference": "075144b1addb55ccfd2f18f5f1d4fccd278d3890"
+                "reference": "a97da0ee61b752ff3318785d50bea8a67ee515e6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/075144b1addb55ccfd2f18f5f1d4fccd278d3890",
-                "reference": "075144b1addb55ccfd2f18f5f1d4fccd278d3890",
+                "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/a97da0ee61b752ff3318785d50bea8a67ee515e6",
+                "reference": "a97da0ee61b752ff3318785d50bea8a67ee515e6",
                "shasum": ""
            },
            "require": {
-                "composer-plugin-api": "^1.0 || ^2.0",
+                "composer-plugin-api": "^2.2",
                "php": ">=5.4",
                "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0"
            },
            "require-dev": {
-                "composer/composer": "*",
+                "composer/composer": "^2.2",
                "ext-json": "*",
                "ext-zip": "*",
                "php-parallel-lint/php-parallel-lint": "^1.3.1",
@@ -784,7 +784,7 @@
                    "type": "open_collective"
                }
            ],
-            "time": "2024-05-07T13:54:23+00:00"
+            "time": "2025-01-19T21:20:38+00:00"
        },
        {
            "name": "dompdf/dompdf",
@@ -1509,16 +1509,16 @@
        },
        {
            "name": "nikic/php-parser",
-            "version": "v5.3.1",
+            "version": "v5.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+                "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
-                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+                "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
                "shasum": ""
            },
            "require": {
@@ -1561,9 +1561,9 @@
            ],
            "support": {
                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
            },
-            "time": "2024-10-08T18:51:32+00:00"
+            "time": "2024-12-30T11:07:19+00:00"
        },
        {
            "name": "paragonie/random_compat",
@@ -1797,16 +1797,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "1.12.9",
+            "version": "1.12.17",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "ceb937fb39a92deabc02d20709cf14b2c452502c"
+                "reference": "7027b3b0270bf392de0cfba12825979768d728bf"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ceb937fb39a92deabc02d20709cf14b2c452502c",
-                "reference": "ceb937fb39a92deabc02d20709cf14b2c452502c",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7027b3b0270bf392de0cfba12825979768d728bf",
+                "reference": "7027b3b0270bf392de0cfba12825979768d728bf",
                "shasum": ""
            },
            "require": {
@@ -1851,25 +1851,25 @@
                    "type": "github"
                }
            ],
-            "time": "2024-11-10T17:10:04+00:00"
+            "time": "2025-02-07T15:01:57+00:00"
        },
        {
            "name": "phpstan/phpstan-phpunit",
-            "version": "1.4.0",
+            "version": "1.4.2",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan-phpunit.git",
-                "reference": "f3ea021866f4263f07ca3636bf22c64be9610c11"
+                "reference": "72a6721c9b64b3e4c9db55abbc38f790b318267e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/f3ea021866f4263f07ca3636bf22c64be9610c11",
-                "reference": "f3ea021866f4263f07ca3636bf22c64be9610c11",
+                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/72a6721c9b64b3e4c9db55abbc38f790b318267e",
+                "reference": "72a6721c9b64b3e4c9db55abbc38f790b318267e",
                "shasum": ""
            },
            "require": {
                "php": "^7.2 || ^8.0",
-                "phpstan/phpstan": "^1.11"
+                "phpstan/phpstan": "^1.12"
            },
            "conflict": {
                "phpunit/phpunit": "<7.0"
@@ -1901,9 +1901,9 @@
            "description": "PHPUnit extensions and rules for PHPStan",
            "support": {
                "issues": "https://github.com/phpstan/phpstan-phpunit/issues",
-                "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.4.0"
+                "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.4.2"
            },
-            "time": "2024-04-20T06:39:00+00:00"
+            "time": "2024-12-17T17:20:49+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
@@ -2228,16 +2228,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "10.5.38",
+            "version": "10.5.45",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132"
+                "reference": "bd68a781d8e30348bc297449f5234b3458267ae8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a86773b9e887a67bc53efa9da9ad6e3f2498c132",
-                "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bd68a781d8e30348bc297449f5234b3458267ae8",
+                "reference": "bd68a781d8e30348bc297449f5234b3458267ae8",
                "shasum": ""
            },
            "require": {
@@ -2247,7 +2247,7 @@
                "ext-mbstring": "*",
                "ext-xml": "*",
                "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.12.0",
+                "myclabs/deep-copy": "^1.12.1",
                "phar-io/manifest": "^2.0.4",
                "phar-io/version": "^3.2.1",
                "php": ">=8.1",
@@ -2309,7 +2309,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.38"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.45"
            },
            "funding": [
                {
@@ -2325,7 +2325,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-10-28T13:06:21+00:00"
+            "time": "2025-02-06T16:08:12+00:00"
        },
        {
            "name": "psr/container",
@@ -3989,31 +3989,31 @@
        },
        {
            "name": "setasign/fpdi",
-            "version": "v2.6.1",
+            "version": "v2.6.3",
            "source": {
                "type": "git",
                "url": "https://github.com/Setasign/FPDI.git",
-                "reference": "09a816004fcee9ed3405bd164147e3fdbb79a56f"
+                "reference": "67c31f5e50c93c20579ca9e23035d8c540b51941"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/09a816004fcee9ed3405bd164147e3fdbb79a56f",
-                "reference": "09a816004fcee9ed3405bd164147e3fdbb79a56f",
+                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/67c31f5e50c93c20579ca9e23035d8c540b51941",
+                "reference": "67c31f5e50c93c20579ca9e23035d8c540b51941",
                "shasum": ""
            },
            "require": {
                "ext-zlib": "*",
-                "php": "^5.6 || ^7.0 || ^8.0"
+                "php": "^7.1 || ^8.0"
            },
            "conflict": {
                "setasign/tfpdf": "<1.31"
            },
            "require-dev": {
-                "phpunit/phpunit": "~5.7",
+                "phpunit/phpunit": "^7",
                "setasign/fpdf": "~1.8.6",
                "setasign/tfpdf": "~1.33",
                "squizlabs/php_codesniffer": "^3.5",
-                "tecnickcom/tcpdf": "~6.2"
+                "tecnickcom/tcpdf": "^6.2"
            },
            "suggest": {
                "setasign/fpdf": "FPDI will extend this class but as it is also possible to use TCPDF or tFPDF as an alternative. There's no fixed dependency configured."
@@ -4049,7 +4049,7 @@
            ],
            "support": {
                "issues": "https://github.com/Setasign/FPDI/issues",
-                "source": "https://github.com/Setasign/FPDI/tree/v2.6.1"
+                "source": "https://github.com/Setasign/FPDI/tree/v2.6.3"
            },
            "funding": [
                {
@@ -4057,7 +4057,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-09-02T10:17:15+00:00"
+            "time": "2025-02-05T13:22:35+00:00"
        },
        {
            "name": "squizlabs/php_codesniffer",
@@ -5574,5 +5574,5 @@
    "platform-overrides": {
        "php": "8.1.99"
    },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }
@@ -348,7 +348,7 @@ class LocaleGenerator

                    continue;
                }
-                if ($cell->getValue() != '') {
+                if ($cell->getValue() !== '') {
                    if (is_bool($cell->getValue())) {
                        $this->log($cell->getRow() . ' -> ' . ($cell->getValue() ? 'TRUE' : 'FALSE'));
                        $this->functionNameMap[($cell->getValue() ? 'TRUE' : 'FALSE')] = $cell->getRow();
@@ -317,7 +317,7 @@ class AutoFilter implements Stringable
    {
        $dataSetValues = $dataSet['filterValues'];
        $blanks = $dataSet['blanks'];
-        if (($cellValue == '') || ($cellValue === null)) {
+        if (($cellValue === '') || ($cellValue === null)) {
            return $blanks;
        }

@@ -333,7 +333,7 @@ class AutoFilter implements Stringable
    {
        $dateSet = $dataSet['filterValues'];
        $blanks = $dataSet['blanks'];
-        if (($cellValue == '') || ($cellValue === null)) {
+        if (($cellValue === '') || ($cellValue === null)) {
            return $blanks;
        }
        $timeZone = new DateTimeZone('UTC');
@@ -379,7 +379,7 @@ class AutoFilter implements Stringable

        if (!$customRuleForBlanks) {
            //    Blank cells are always ignored, so return a FALSE
-            if (($cellValue == '') || ($cellValue === null)) {
+            if (($cellValue === '') || ($cellValue === null)) {
                return false;
            }
        }
@@ -424,7 +424,7 @@ class AutoFilter implements Stringable
                }
            } elseif ($ruleValue == '') {
                $retVal = match ($ruleOperator) {
-                    Rule::AUTOFILTER_COLUMN_RULE_EQUAL => ($cellValue == '') || ($cellValue === null),
+                    Rule::AUTOFILTER_COLUMN_RULE_EQUAL => ($cellValue === '') || ($cellValue === null),
                    Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL => ($cellValue != '') && ($cellValue !== null),
                    default => true,
                };
@@ -486,7 +486,7 @@ class AutoFilter implements Stringable
    protected static function filterTestInPeriodDateSet(mixed $cellValue, array $monthSet): bool
    {
        //    Blank cells are always ignored, so return a FALSE
-        if (($cellValue == '') || ($cellValue === null)) {
+        if (($cellValue === '') || ($cellValue === null)) {
            return false;
        }

@@ -2395,11 +2395,8 @@ class Worksheet extends BIFFwriter
                $data .= str_repeat("\x00", 4 - 3 * $width % 4);
            }
        }
-        // Phpstan says this always throws an exception before getting here.
-        // I don't see why, but I think this is code is never exercised
-        // in unit tests, so I can't say for sure it's wrong.

-        return [$width, $height, strlen($data), $data]; //* @phpstan-ignore-line
+        return [$width, $height, strlen($data), $data];
    }

    /**