Merge branch 'master' into 2.x

# Conflicts:
#	.travis.yml
#	Tests/RandomGenerator/NoRandomGeneratorTest.php
#	composer.json
#	phpunit.xml.dist

Author: hackzilla

.gitignore

@@ -1,3 +1,6 @@
 vendor/
 composer.lock
 /.php_cs.cache
+.phpunit
+.phpunit.result.cache
+/phpunit.xml

.travis.yml

@@ -1,7 +1,12 @@
 language: php
 
 php:
+<<<<<<< HEAD
+=======
+  - 7.3
+>>>>>>> master
   - 7.4
+  - 8.0
   - nightly
 
 env:
@@ -11,9 +16,17 @@ env:
 matrix:
   fast_finish: true
   include:
+<<<<<<< HEAD
     - php: 7.4
       env: CS_FIXER=run
     - php: 7.4
+=======
+    - php: 8.0
+      env: CS_FIXER=run
+    - php: 7.3
+      env: CS_FIXER=run
+    - php: 7.3
+>>>>>>> master
       env: COMPOSER_FLAGS="--prefer-lowest"
   allow_failures:
     - php: nightly

README.md

@@ -15,8 +15,9 @@ Simple library for generating random passwords.
 Requirements
 ------------
 
-* PHP >= 5.3.2
-(No longer testing <= PHP 5.6, and next version will drop support)
+* PHP >= 7.1
+
+We only support PHP 7.3+ 
 
 Installation
 ------------
@@ -104,7 +105,6 @@ The segment separator will be remove from the possible characters.
 Human Password Generator Usage
 -------------------------------
 
-
 ```php
 use Hackzilla\PasswordGenerator\Generator\HumanPasswordGenerator;
 
@@ -157,14 +157,15 @@ $generator
 When setting the minimum and maximum values, be careful of unachievable settings.
 
 For example the following will end up in an infinite loop.
-
+```php
 $generator
   ->setLength(4)
   ->setOptionValue(RequirementPasswordGenerator::OPTION_UPPER_CASE, true)
   ->setOptionValue(RequirementPasswordGenerator::OPTION_LOWER_CASE, false)
   ->setMinimumCount(RequirementPasswordGenerator::OPTION_UPPER_CASE, 5)
   ->setMaximumCount(RequirementPasswordGenerator::OPTION_LOWER_CASE, 1)
 ;
+```
 
 For the moment you can call ```$generator->validLimits()``` to test whether the counts will cause problems.
 If the method returns true, then you can proceed. If false, then generatePassword() will likely cause an infinite loop.
@@ -177,27 +178,7 @@ Example Implementations
 * Password Generator Bundle [https://github.com/hackzilla/password-generator-bundle]
 
 
-Caution
+Random Note
 -------
 
-This library uses [mt_rand](http://www.php.net/manual/en/function.mt-rand.php) which is does not generate cryptographically secure values.
-Basically an attacker could predict the random passwords this library produces given the right conditions.
-
-If you have a source of randomness you can inject it into the PasswordGenerator, using RandomGeneratorInterface.
-
-PHP 7 has [random_int](http://www.php.net/random_int) function which they say is good to use for cryptographic random integers.
-
-```php
-use Hackzilla\PasswordGenerator\Generator\HumanPasswordGenerator;
-use Hackzilla\PasswordGenerator\RandomGenerator\Php7RandomGenerator;
-
-$generator = new HumanPasswordGenerator();
-
-$generator
-  ->setRandomGenerator(new Php7RandomGenerator())
-  ->setWordList('/usr/share/dict/words')
-  ->setWordCount(3)
-  ->setWordSeparator('-');
-
-$password = $generator->generatePasswords(10);
-```
+Since version 1.5.0, the library depends on the presence of [random_int](http://www.php.net/random_int) which is found in PHP 7.0+

Tests/RandomGenerator/NoRandomGeneratorTest.php

@@ -10,7 +10,7 @@ class NoRandomGeneratorTest extends \PHPUnit\Framework\TestCase
 {
     private $_object;
 
-    public function setup() : void
+    public function setup(): void
     {
         $this->_object = new NoRandomGenerator();
     }

composer.json

@@ -7,7 +7,7 @@
         {
             "name": "Daniel Platt",
             "email": "[email protected]",
-            "homepage": "http://www.hackzilla.org"
+            "homepage": "https://www.hackzilla.org"
         }
     ],
     "require": {

phpunit.xml.dist

@@ -1,33 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="Tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
 
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         bootstrap="Tests/bootstrap.php"
-        >
+    <exclude>
+      <directory>./Resources</directory>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
 
-    <testsuites>
-        <testsuite name="Password Generator test suite">
-            <directory suffix="Test.php">./Tests</directory>
-        </testsuite>
-    </testsuites>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+    </report>
+  </coverage>
 
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
+  <testsuites>
+    <testsuite name="Password Generator test suite">
+      <directory suffix="Test.php">./Tests</directory>
+    </testsuite>
+  </testsuites>
+
+  <logging/>
 </phpunit>