Merging Pull Request "Update for PHP 7.2 compatibility" from jsmitty12 for testing purpose

Author: alexissavin

.gitignore

@@ -1,4 +1,11 @@
+### Composer template
 composer.lock
+composer.phar
 /vendor
+
 nbproject
-.idea
+
+### JetBrains template
+.idea/
+
+*.phar

.travis.yml

@@ -1,18 +1,15 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7
-  - hhvm
-  - hhvm-nightly
+  - 7.0
+  - 7.1
+  - 7.2
+  - nightly
 
 matrix:
   fast_finish: true
   allow_failures:
-    - php: hhvm-nightly
+    - php: nightly
 
 # faster builds on new travis containers
 sudo: false
@@ -22,6 +19,7 @@ install:
   - composer install --prefer-dist
 
 script:
+  - php testsuite.php --ci
   - vendor/bin/phpunit --verbose --coverage-clover=coverage.clover
 
 after_script:

CHANGELOG.md

@@ -2,6 +2,10 @@
 ---
 * Disable support for non ICANN domains (Used new.net doesn't exist anymore)
 
+v4.2.5
+------
+* New whois servers
+
 2011/07/09
 ----------
 * html & cosmetic changes in examples
@@ -1147,7 +1151,7 @@ David Saez <[email protected]>
 
 2000/12/12
 ----------
-* v2.3
+* v2.3
 * PHP4 BUG IS FIXED!!!! Very special thanks to all who submitted fixes, used one provided by Stephen Leavitt <[email protected]> as it was the easiest and backwards compatible to PHP3
 * added Enom handler, also by Stephen Leavitt <[email protected]>
 * changed .ca whois to whois.cira.ca, using same handler for now.
@@ -1160,7 +1164,7 @@ David Saez <[email protected]>
 
 2000/08/07
 ----------
-* v2.2-3
+* v2.2-3
 * gtld.whois, "TUCOWS.COM INC." now, "TUCOWS.COM, INC." an unannounced change by the NSI registry once again breaks scripts all over the world...(thanks to Fred Andrews <[email protected]> for the report and fix on this)
 * servers.whois, added .ke Kenyan whois server, thanks to "Peter Anampiu" <[email protected]> for digging that up.:x
 

composer.json

@@ -23,13 +23,12 @@
             "email": "[email protected]"
         }
     ],
-    "minimum-stability": "dev",
     "require": {
-        "php": ">=5.3.0",
-        "mso/idna-convert": "*"
+        "php": ">=7.0",
+        "mso/idna-convert": "^1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.4.1"
+        "phpunit/phpunit": "^6.0"
     },
     "suggest": {
         "lib-openssl": "*"

phpunit.xml.dist

@@ -1,19 +1,26 @@
+
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="./tests/bootstrap.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    stopOnFailure="false">
+<!--
+    You should copy this file into phpunit.xml and customize it to your needs.
+    You'll need to update the paths in here if you use a directory other than
+    one in which this file resides.
+-->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.5/phpunit.xsd"
+         bootstrap="./tests/bootstrap.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         stopOnFailure="false">
     <testsuites>
         <testsuite name="phpWhois Test suite">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
     <filter>
-        <blacklist>
-            <directory>./vendor</directory>
-            <directory>./tests</directory>
-        </blacklist>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
+        </whitelist>
     </filter>
-</phpunit>
+</phpunit>

src/Utils.php

@@ -21,9 +21,7 @@
  * @copyright Maintained by David Saez
  * @copyright Copyright (c) 2014 Dmitry Lukashin
  */
-
 namespace phpWhois;
-
 /**
  * Additional utils
  */
@@ -39,7 +37,6 @@ public function showObject(&$obj)
         $r = $this->debugObject($obj);
         return "<pre>$r</pre>\n";
     }
-
     /**
      * Return object or array as formatted string
      * @param $obj
@@ -62,30 +59,23 @@ public function debugObject($obj, $indent = 0)
             return $return;
         }
     }
-
     public function nsRrDefined($query)
     {
         return checkdnsrr($query, 'NS');
     }
-
     /**
      * Get nice HTML output
      */
     public function showHTML($result, $link_myself = true, $params = 'query=$0&amp;output=nice')
     {
-
         // adds links for HTML output
-
         $email_regex = "/([-_\w\.]+)(@)([-_\w\.]+)\b/i";
         $html_regex = "/(?:^|\b)((((http|https|ftp):\/\/)|(www\.))([\w\.]+)([,:%#&\/?~=\w+\.-]+))(?:\b|$)/is";
         $ip_regex = "/\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/i";
-
         $out = '';
         $lempty = true;
-
         foreach ($result['rawdata'] as $line) {
             $line = trim($line);
-
             if ($line == '') {
                 if ($lempty) {
                     continue;
@@ -95,14 +85,11 @@ public function showHTML($result, $link_myself = true, $params = 'query=$0&amp;o
             } else {
                 $lempty = false;
             }
-
             $out .= $line . "\n";
         }
-
         if ($lempty) {
             $out = trim($out);
         }
-
         $out = strip_tags($out);
         $out = preg_replace($email_regex, '<a href="mailto:$0">$0</a>', $out);
         $out = preg_replace_callback(
@@ -115,47 +102,37 @@ function ($matches) {
                     $web = $matches[0];
                     $url = $web;
                 }
-
                 return '<a href="' . $url . '" target="_blank">' . $web . '</a>';
             },
             $out
         );
-
         if ($link_myself) {
             if ($params[0] == '/') {
                 $link = $params;
             } else {
                 $link = $_SERVER['PHP_SELF'] . '?' . $params;
             }
-
             $out = preg_replace($ip_regex, '<a href="' . $link . '">$0</a>', $out);
-
             if (isset($result['regrinfo']['domain']['nserver'])) {
                 $nserver = $result['regrinfo']['domain']['nserver'];
             } else {
                 $nserver = false;
             }
-
             if (isset($result['regrinfo']['network']['nserver'])) {
                 $nserver = $result['regrinfo']['network']['nserver'];
             }
-
             if (is_array($nserver)) {
-                reset($nserver);
-                while (list($host, $ip) = each($nserver)) {
+                foreach ($nserver as $host => $ip) {
                     $url = '<a href="' . str_replace('$0', $ip, $link) . "\">$host</a>";
                     $out = str_replace($host, $url, $out);
                     $out = str_replace(strtoupper($host), $url, $out);
                 }
             }
         }
-
         // Add bold field names
         $out = preg_replace("/(?m)^([-\s\.&;'\w\t\(\)\/]+:\s*)/", '<b>$1</b>', $out);
-
         // Add italics for disclaimer
         $out = preg_replace("/(?m)^(%.*)/", '<i>$0</i>', $out);
-
         return str_replace("\n", "<br/>\n", $out);
     }
 }