Fix incorrect check error while converting IP + Fix psalm (#59)

Co-authored-by: Alexander Makarov <[email protected]>

Author: vjik

.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']

CHANGELOG.md

@@ -2,11 +2,11 @@
 
 ## 1.0.2 under development
 
-- no changes in this release.
+- Bug #59: Fix error while converting IP address to bits representation in PHP 8.0+ (@vjik)
 
 ## 1.0.1 January 27, 2022
 
-- Bug #40: Fix return type for callback of `set_error_handler()` function (devanych)
+- Bug #40: Fix return type for callback of `set_error_handler()` function (@devanych)
 
 ## 1.0.0 March 04, 2021
 

composer.json

@@ -37,7 +37,7 @@
         "rector/rector": "^1.2",
         "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": {

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"

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 case `explode()` always returns an array with 2 elements.
+             */
             [, $hostnameOrEmail] = explode('@', $hostnameOrEmail, 2);
         }
         return self::existsMx($hostnameOrEmail) || self::existsA($hostnameOrEmail);

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 either {@see IPV4} or {@see IPV6} constant.
      */
     public static function getIpVersion(string $ip, bool $validate = true): int
     {
@@ -173,7 +173,7 @@ public static function ip2bin(string $ip): string
         $result = '';
         for ($i = 0, $iMax = strlen($ipBinary); $i < $iMax; $i += 4) {
             $data = substr($ipBinary, $i, 4);
-            if (!is_string($data)) {
+            if (empty($data)) {
                 throw new RuntimeException('An error occurred while converting IP address to bits representation.');
             }
             /** @psalm-suppress MixedArgument */