Fix endless loop whe generating uppercase char w/o ambiguous (#15)

fix #13 Also modify testGenerateAmbiguous, ambiguous characters come from the uppercase set, thus it required to enable $capitalize in order to get some ambiguous ones.
roderik · Nov 30, 2017 · 7ecf653 · 7ecf653
1 parent 299a78f
commit 7ecf653
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/PWGen.php b/src/PWGen.php
@@ -291,8 +291,8 @@ private function pw_phonemes()
                 if ($this->pwgen_flags & self::PW_UPPERS) {
                     if (($first || $flags & self::CONSONANT) &&
                         (self::my_rand(0, 9) < 2) &&
-                        ($this->pwgen_flags & self::PW_AMBIGUOUS) &&
-                        strpos(self::$pw_ambiguous, strtoupper($this->password[$c])) === false) {
+                        (($this->pwgen_flags & self::PW_AMBIGUOUS) ||
+                        strpos(self::$pw_ambiguous, strtoupper($this->password[$c])) === false)) {
                         $this->password[$c] = strtoupper($this->password[$c]);
                         $feature_flags &= ~self::PW_UPPERS;
                     }

diff --git a/tests/PWGen/PWGenTest.php b/tests/PWGen/PWGenTest.php
@@ -113,7 +113,7 @@ public function testGenerateCapitalize()
 
     public function testGenerateAmbiguous()
     {
-        $pwgen = new PWGen(20, false, false, false, true);
+        $pwgen = new PWGen(20, false, false, true, true);
 
         $this->assertEquals(20, $pwgen->getLength());
         $this->assertTrue($pwgen->hasAmbiguous());