Fix several errors

EXSyst · Oct 20, 2015 · bb512c1 · bb512c1
1 parent 0c7f045
commit bb512c1
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/TOTP/TOTP.php b/TOTP/TOTP.php
@@ -54,7 +54,7 @@ public static function generateTOTP($stamp, $key)
      */
     public function validate($key, $totp, $stamp = null)
     {
-        return $this->validator($key, $totp, $stamp);
+        return $this->validator->validate($key, $totp, $stamp);
     }
 
     /**

diff --git a/TOTP/TOTPTimeManager.php b/TOTP/TOTPTimeManager.php
@@ -41,7 +41,7 @@ public function setStampLength($stampLength = null)
             $stampLength = self::DEFAULT_STAMP_LENGTH;
         }
         $stampLength = intval($stampLength);
-        if (empty($stampLength) or $stampLength < 0) {
+        if (empty($stampLength) || $stampLength < 0) {
             throw new InvalidArgumentException('Stamp length must be greater than 0 and positive.');
         }
         $this->stampLength = $stampLength;

diff --git a/TOTP/TOTPValidator.php b/TOTP/TOTPValidator.php
@@ -21,7 +21,11 @@ class TOTPValidator
     /**
      * @var TOTPTimeManager
      */
-    protected $timeManager;
+    private $timeManager;
+    /**
+     * @var int|null
+     */
+    private $window;
 
     /**
      * @param TOTPTimeManager|int|null $stampLength Stamp length in seconds

diff --git a/TOTP/Tests/KeyGenerationTest.php → Tests/TOTP/KeyGenerationTest.php b/TOTP/Tests/KeyGenerationTest.php → Tests/TOTP/KeyGenerationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace EXSyst\Component\Security\TOTP\Tests;
+namespace EXSyst\Component\Security\Tests\TOTP;
 
 use EXSyst\Component\Security\TOTP\TOTPKeyGenerator;
 
@@ -22,7 +22,7 @@ public function testKeyGeneration()
         for ($i = 0; $i < 15; ++$i) {
             $length = rand(8, 100);
             $key = TOTPKeyGenerator::generate($length);
-            $this->assertRegExp(sprintf('#[ABCDEFGHIJKLMNOPQRSTUVWXYZ234567]{%d}#', $length), $key);
+            $this->assertRegExp(sprintf('#[%s]{%d}#', $this->characters, $length), $key);
         }
     }
 }
diff --git a/TOTP/Tests/TimeManagerTest.php → Tests/TOTP/TimeManagerTest.php b/TOTP/Tests/TimeManagerTest.php → Tests/TOTP/TimeManagerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace EXSyst\Component\Security\TOTP\Tests;
+namespace EXSyst\Component\Security\Tests\TOTP;
 
 use EXSyst\Component\Security\TOTP\TOTPTimeManager;
 

diff --git a/TOTP/Tests/ValidatorTest.php → Tests/TOTP/ValidatorTest.php b/TOTP/Tests/ValidatorTest.php → Tests/TOTP/ValidatorTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace EXSyst\Component\Security\TOTP\Tests;
+namespace EXSyst\Component\Security\Tests\TOTP;
 
 use EXSyst\Component\Security\TOTP\TOTPGenerator;
 use EXSyst\Component\Security\TOTP\TOTPKeyGenerator;

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -12,7 +12,6 @@
     <testsuites>
         <testsuite name="EXSyst Security Component Test Suite">
             <directory>./Tests/</directory>
-            <directory>./TOTP/Tests/</directory>
         </testsuite>
     </testsuites>
     <filter>
@@ -21,7 +20,6 @@
             <exclude>
                 <directory>./vendor</directory>
                 <directory>./Tests/</directory>
-                <directory>./TOTP/Tests/</directory>
             </exclude>
         </whitelist>
     </filter>