Updated tests

Author: indy2kro

test/FeedbackTest.php

@@ -23,16 +23,16 @@ public function testFeedbackForEmptyPassword(): void
     {
         $feedback = $this->feedback->getFeedback(0, []);
 
-        $this->assertSame('', $feedback['warning'], "default warning");
+        $this->assertSame('', $feedback['warning'], 'default warning');
         $this->assertContains(
             'Use a few words, avoid common phrases',
             $feedback['suggestions'],
-            "default suggestion #1"
+            'default suggestion #1'
         );
         $this->assertContains(
             'No need for symbols, digits, or uppercase letters',
             $feedback['suggestions'],
-            "default suggestion #1"
+            'default suggestion #1'
         );
     }
 
@@ -41,52 +41,52 @@ public function testHighScoringSequence(): void
         $match = new Bruteforce('a', 0, 1, 'a');
         $feedback = $this->feedback->getFeedback(3, [$match]);
 
-        $this->assertSame('', $feedback['warning'], "no warning for good score");
-        $this->assertEmpty($feedback['suggestions'], "no suggestions for good score");
+        $this->assertSame('', $feedback['warning'], 'no warning for good score');
+        $this->assertEmpty($feedback['suggestions'], 'no suggestions for good score');
     }
 
     public function testLongestMatchGetsFeedback(): void
     {
         $match1 = new SequenceMatch('abcd26-01-1991', 0, 4, 'abcd');
         $match2 = new DateMatch('abcd26-01-1991', 4, 14, '26-01-1991', [
-            'day'       => 26,
-            'month'     => 1,
-            'year'      => 1991,
+            'day' => 26,
+            'month' => 1,
+            'year' => 1991,
             'separator' => '-',
         ]);
         $feedback = $this->feedback->getFeedback(1, [$match1, $match2]);
 
         $this->assertSame(
             'Dates are often easy to guess',
             $feedback['warning'],
-            "warning provided for the longest match"
+            'warning provided for the longest match'
         );
         $this->assertContains(
             'Avoid dates and years that are associated with you',
             $feedback['suggestions'],
-            "suggestion provided for the longest match"
+            'suggestion provided for the longest match'
         );
         $this->assertNotContains(
             'Avoid sequences',
             $feedback['suggestions'],
-            "no suggestion provided for the shorter match"
+            'no suggestion provided for the shorter match'
         );
     }
 
     public function testDefaultSuggestion(): void
     {
         $match = new DateMatch('26-01-1991', 0, 10, '26-01-1991', [
-            'day'       => 26,
-            'month'     => 1,
-            'year'      => 1991,
+            'day' => 26,
+            'month' => 1,
+            'year' => 1991,
             'separator' => '-',
         ]);
         $feedback = $this->feedback->getFeedback(1, [$match]);
 
         $this->assertContains(
             'Add another word or two. Uncommon words are better.',
             $feedback['suggestions'],
-            "default suggestion provided"
+            'default suggestion provided'
         );
         $this->assertCount(2, $feedback['suggestions'], "default suggestion doesn\'t override existing suggestion");
     }
@@ -96,11 +96,11 @@ public function testBruteforceFeedback(): void
         $match = new Bruteforce('qkcriv', 0, 6, 'qkcriv');
         $feedback = $this->feedback->getFeedback(1, [$match]);
 
-        $this->assertSame('', $feedback['warning'], "bruteforce match has no warning");
+        $this->assertSame('', $feedback['warning'], 'bruteforce match has no warning');
         $this->assertSame(
             ['Add another word or two. Uncommon words are better.'],
             $feedback['suggestions'],
-            "bruteforce match only has the default suggestion"
+            'bruteforce match only has the default suggestion'
         );
     }
 }

test/MatcherTest.php

@@ -42,7 +42,7 @@ public function testMultiplePatterns(): void
             ['dictionary', [ 0,  6]],
             ['dictionary', [ 7, 15]],
             ['date',       [16, 23]],
-            ['repeat',     [24, 27]]
+            ['repeat',     [24, 27]],
         ];
 
         $matches = $matcher->getMatches($password);
@@ -53,7 +53,7 @@ public function testMultiplePatterns(): void
             }
         }
 
-        $this->assertEmpty($expectedMatches, "matches multiple patterns");
+        $this->assertEmpty($expectedMatches, 'matches multiple patterns');
     }
 
     /**
@@ -65,8 +65,8 @@ public function testUserDefinedWords(): void
         $matcher = new Matcher();
         $matches = $matcher->getMatches('_wQbgL491', ['PJnD', 'WQBG', 'ZhwZ']);
 
-        $this->assertInstanceOf(DictionaryMatch::class, $matches[0], "user input match is correct class");
-        $this->assertSame('wQbg', $matches[0]->token, "user input match has correct token");
+        $this->assertInstanceOf(DictionaryMatch::class, $matches[0], 'user input match is correct class');
+        $this->assertSame('wQbg', $matches[0]->token, 'user input match has correct token');
     }
 
     public function testAddMatcherWillThrowException(): void

test/Matchers/AbstractMatchTest.php

@@ -18,16 +18,17 @@ abstract class AbstractMatchTest extends TestCase
      *
      * @param  array<int, string>  $prefixes
      * @param  array<int, string>  $suffixes
+     *
      * @return array<int, mixed> a list of triplets [variant, i, j] where [i,j] is the start/end of the pattern, inclusive
      */
     protected function generatePasswords(string $pattern, array $prefixes, array $suffixes): array
     {
         $output = [];
 
-        if (!in_array('', $prefixes)) {
+        if (! in_array('', $prefixes)) {
             array_unshift($prefixes, '');
         }
-        if (!in_array('', $suffixes)) {
+        if (! in_array('', $suffixes)) {
             array_unshift($suffixes, '');
         }
 
@@ -39,7 +40,7 @@ protected function generatePasswords(string $pattern, array $prefixes, array $su
                 $output[] = [
                     $prefix . $pattern . $suffix,
                     $i,
-                    $j
+                    $j,
                 ];
             }
         }
@@ -72,7 +73,7 @@ protected function checkMatches(
         $this->assertCount(
             count($patterns),
             $matches,
-            $prefix . ": matches.length == " . count($patterns)
+            $prefix . ': matches.length == ' . count($patterns)
         );
 
         foreach ($patterns as $k => $pattern) {
@@ -84,17 +85,17 @@ protected function checkMatches(
             $this->assertSame(
                 $patternName,
                 $match->pattern,
-                "$prefix matches[$k].pattern == '$patternName'"
+                "{$prefix} matches[{$k}].pattern == '{$patternName}'"
             );
             $this->assertSame(
                 [$i, $j],
                 [$match->begin, $match->end],
-                "$prefix matches[$k] should have [i, j] of [$i, $j]"
+                "{$prefix} matches[{$k}] should have [i, j] of [{$i}, {$j}]"
             );
             $this->assertSame(
                 $pattern,
                 $match->token,
-                "$prefix matches[$k].token == '$pattern'"
+                "{$prefix} matches[{$k}].token == '{$pattern}'"
             );
 
             foreach ($props as $propName => $propList) {
@@ -103,7 +104,7 @@ protected function checkMatches(
                 $this->assertSame(
                     $propList[$k],
                     $match->$propName,
-                    "$prefix matches[$k].$propName == $propMessage"
+                    "{$prefix} matches[{$k}].{$propName} == {$propMessage}"
                 );
             }
         }

test/Matchers/BruteforceTest.php

@@ -13,7 +13,7 @@ public function testMatch(): void
         $password = 'uH2nvQbugW';
 
         $this->checkMatches(
-            "matches entire string",
+            'matches entire string',
             Bruteforce::match($password),
             'bruteforce',
             [$password],
@@ -27,7 +27,7 @@ public function testMultibyteMatch(): void
         $password = '中华人民共和国';
 
         $this->checkMatches(
-            "matches entire string with multibyte characters",
+            'matches entire string with multibyte characters',
             Bruteforce::match($password),
             'bruteforce',
             [$password],
@@ -47,6 +47,6 @@ public function testGuessesMultibyteCharacter(): void
     {
         $token = '🙂'; // smiley face emoji
         $match = new Bruteforce($token, 0, 1, $token);
-        $this->assertEqualsWithDelta(11.0, $match->getGuesses(), PHP_FLOAT_EPSILON, "multibyte character treated as one character");
+        $this->assertEqualsWithDelta(11.0, $match->getGuesses(), PHP_FLOAT_EPSILON, 'multibyte character treated as one character');
     }
 }