Fix psalm

yiisoft · Aug 2, 2024 · 6242c91 · 6242c91
1 parent f5c94ca
commit 6242c91
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -10,6 +10,8 @@ on:
       - 'phpunit.xml.dist'
 
   push:
+    branches:
+      - master
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -28,4 +30,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['7.4', '8.0', '8.1']
+        ['7.4', '8.0', '8.1', '8.2', '8.3']
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
         "phpunit/phpunit": "^9.5",
         "roave/infection-static-analysis-plugin": "^1.16",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.18"
+        "vimeo/psalm": "^4.30|^5.25"
     },
     "autoload": {
         "psr-4": {

diff --git a/psalm.xml b/psalm.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="1"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

diff --git a/src/DnsHelper.php b/src/DnsHelper.php
@@ -70,6 +70,9 @@ public static function existsA(string $hostname): bool
     public static function acceptsEmails(string $hostnameOrEmail): bool
     {
         if (strpos($hostnameOrEmail, '@') !== false) {
+            /**
+             * @psalm-suppress PossiblyUndefinedArrayOffset In this cse `explode()` always returns array with 2 elements.
+             */
             [, $hostnameOrEmail] = explode('@', $hostnameOrEmail, 2);
         }
         return self::existsMx($hostnameOrEmail) || self::existsA($hostnameOrEmail);

diff --git a/src/IpHelper.php b/src/IpHelper.php
@@ -52,7 +52,7 @@ final class IpHelper
      * @param string $ip The valid IPv4 or IPv6 address.
      * @param bool $validate Enable perform IP address validation. False is best practice if the data comes from a trusted source.
      *
-     * @return int {@see IPV4} or {@see IPV6}.
+     * @return int Value of {@see IPV4} or {@see IPV6} constants.
      */
     public static function getIpVersion(string $ip, bool $validate = true): int
     {