Update README.md

* Fix PHP7.1+ issue with MCryptRNGProvider

.travis.yml

@@ -1,18 +1,15 @@
 language: php
 
-dist: trusty
-matrix:
-  include:
-    - php: 5.3
-      dist: precise
-
 php:
   - 5.4
   - 5.5
   - 5.6
   - 7.0
   - 7.1
-  - hhvm
+  - 7.2
+
+before_script:
+  - composer install
 
 script:
-  - if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then phpunit --coverage-text tests ; fi
+  - vendor/bin/phpunit --coverage-text tests

README.md

@@ -10,7 +10,7 @@ PHP library for [two-factor (or multi-factor) authentication](http://en.wikipedi
 
 ## Requirements
 
-* Tested on PHP 5.3, 5.4, 5.5 and 5.6, 7.0, 7.1 and HHVM
+* Tested on PHP 5.4 up to 7.2
 * [cURL](http://php.net/manual/en/book.curl.php) when using the provided `GoogleQRCodeProvider` (default), `QRServerProvider` or `QRicketProvider` but you can also provide your own QR-code provider.
 * [random_bytes()](http://php.net/manual/en/function.random-bytes.php), [MCrypt](http://php.net/manual/en/book.mcrypt.php), [OpenSSL](http://php.net/manual/en/book.openssl.php) or [Hash](http://php.net/manual/en/book.hash.php) depending on which built-in RNG you use (TwoFactorAuth will try to 'autodetect' and use the best available); however: feel free to provide your own (CS)RNG.
 

TwoFactorAuth.phpproj

@@ -65,5 +65,6 @@
     <Content Include="logo.png" />
     <Content Include="multifactorauthforeveryone.png" />
     <Content Include="LICENSE" />
+    <Content Include="phpunit.xml" />
   </ItemGroup>
 </Project>

lib/Providers/Rng/HashRNGProvider.php

@@ -17,7 +17,7 @@ class HashRNGProvider implements IRNGProvider
         $hash = mt_rand();
         for ($i = 0; $i < $bytecount; $i++) {
             $hash = hash($this->algorithm, $hash.mt_rand(), true);
-            $result .= $hash[mt_rand(0, sizeof($hash))];
+            $result .= $hash[mt_rand(0, strlen($hash)-1)];
         }
         return $result;
     }

lib/Providers/Rng/MCryptRNGProvider.php

@@ -11,7 +11,7 @@ class MCryptRNGProvider implements IRNGProvider
     }
     
     public function getRandomBytes($bytecount) {
-        $result = mcrypt_create_iv($bytecount, $this->source);
+        $result = @mcrypt_create_iv($bytecount, $this->source);
         if ($result === false)
             throw new \RNGException('mcrypt_create_iv returned an invalid value');
         return $result;

phpunit.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false">
+  <testsuites>
+    <testsuite name="Unit">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
+  <filter>
+    <whitelist processUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">./lib</directory>
+    </whitelist>
+  </filter>
+</phpunit>

tests/TwoFactorAuthTest.php

@@ -125,7 +125,7 @@ class TwoFactorAuthTest extends PHPUnit_Framework_TestCase
         $tfa = new TwoFactorAuth('Test', 6, 30, 'sha1');
         $tfa->ensureCorrectTime(array(
             new RobThree\Auth\Providers\Time\NTPTimeProvider(),                         // Uses pool.ntp.org by default
-            new RobThree\Auth\Providers\Time\NTPTimeProvider('time.windows.com'),
+            //new RobThree\Auth\Providers\Time\NTPTimeProvider('time.google.com'),      // Somehow time.google.com and time.windows.com make travis timeout??
             new RobThree\Auth\Providers\Time\HttpTimeProvider(),                        // Uses google.com by default
             new RobThree\Auth\Providers\Time\HttpTimeProvider('https://github.com'),
             new RobThree\Auth\Providers\Time\HttpTimeProvider('https://yahoo.com'),
@@ -317,10 +317,12 @@ class TwoFactorAuthTest extends PHPUnit_Framework_TestCase
      * @requires function mcrypt_create_iv
      */
     public function testMCryptRNGProvidersReturnExpectedNumberOfBytes() {
-        $rng = new \RobThree\Auth\Providers\Rng\MCryptRNGProvider();
+        if (function_exists('mcrypt_create_iv')) {
-        foreach ($this->getRngTestLengths() as $l)
+            $rng = new \RobThree\Auth\Providers\Rng\MCryptRNGProvider();
-            $this->assertEquals($l, strlen($rng->getRandomBytes($l)));
+            foreach ($this->getRngTestLengths() as $l)
-        $this->assertEquals(true, $rng->isCryptographicallySecure());
+                $this->assertEquals($l, strlen($rng->getRandomBytes($l)));
+            $this->assertEquals(true, $rng->isCryptographicallySecure());
+        }
     }
 
     /**