Adding type cast to ValidationData (fixes #28)

lcobucci · Sep 2, 2015 · 589ff72 · 589ff72
1 parent 9874909
commit 589ff72
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 38 deletions.
diff --git a/src/ValidationData.php b/src/ValidationData.php
@@ -49,7 +49,7 @@ public function __construct($currentTime = null)
      */
     public function setId($id)
     {
-        $this->items['jti'] = $id;
+        $this->items['jti'] = (string) $id;
     }
 
     /**
@@ -59,7 +59,7 @@ public function setId($id)
      */
     public function setIssuer($issuer)
     {
-        $this->items['iss'] = $issuer;
+        $this->items['iss'] = (string) $issuer;
     }
 
     /**
@@ -69,7 +69,7 @@ public function setIssuer($issuer)
      */
     public function setAudience($audience)
     {
-        $this->items['aud'] = $audience;
+        $this->items['aud'] = (string) $audience;
     }
 
     /**
@@ -79,7 +79,7 @@ public function setAudience($audience)
      */
     public function setSubject($subject)
     {
-        $this->items['sub'] = $subject;
+        $this->items['sub'] = (string) $subject;
     }
 
     /**
@@ -89,9 +89,9 @@ public function setSubject($subject)
      */
     public function setCurrentTime($currentTime)
     {
-        $this->items['iat'] = $currentTime;
-        $this->items['nbf'] = $currentTime;
-        $this->items['exp'] = $currentTime;
+        $this->items['iat'] = (int) $currentTime;
+        $this->items['nbf'] = (int) $currentTime;
+        $this->items['exp'] = (int) $currentTime;
     }
 
     /**

diff --git a/test/ValidationDataTest.php b/test/ValidationDataTest.php
@@ -20,83 +20,82 @@ class ValidationDataTest extends \PHPUnit_Framework_TestCase
      */
     public function constructorShouldConfigureTheItems()
     {
+        $expected = $this->createExpectedData();
         $data = new ValidationData(1);
-        $items = ['jti' => null, 'iss' => null, 'aud' => null, 'sub' => null];
-        $items['iat'] = $items['nbf'] = $items['exp'] = 1;
 
-        $this->assertAttributeEquals($items, 'items', $data);
+        $this->assertAttributeSame($expected, 'items', $data);
     }
 
     /**
      * @test
      *
+     * @dataProvider claimValues
+     *
      * @uses Lcobucci\JWT\ValidationData::__construct
      *
      * @covers Lcobucci\JWT\ValidationData::setId
      */
-    public function setIdShouldChangeTheId()
+    public function setIdShouldChangeTheId($id)
     {
+        $expected = $this->createExpectedData($id);
         $data = new ValidationData(1);
-        $data->setId(1);
-
-        $items = ['jti' => 1, 'iss' => null, 'aud' => null, 'sub' => null];
-        $items['iat'] = $items['nbf'] = $items['exp'] = 1;
+        $data->setId($id);
 
-        $this->assertAttributeEquals($items, 'items', $data);
+        $this->assertAttributeSame($expected, 'items', $data);
     }
 
     /**
      * @test
      *
+     * @dataProvider claimValues
+     *
      * @uses Lcobucci\JWT\ValidationData::__construct
      *
      * @covers Lcobucci\JWT\ValidationData::setIssuer
      */
-    public function setIssuerShouldChangeTheIssuer()
+    public function setIssuerShouldChangeTheIssuer($iss)
     {
+        $expected = $this->createExpectedData(null, null, $iss);
         $data = new ValidationData(1);
-        $data->setIssuer('test');
+        $data->setIssuer($iss);
 
-        $items = ['jti' => null, 'iss' => 'test', 'aud' => null, 'sub' => null];
-        $items['iat'] = $items['nbf'] = $items['exp'] = 1;
-
-        $this->assertAttributeEquals($items, 'items', $data);
+        $this->assertAttributeSame($expected, 'items', $data);
     }
 
     /**
      * @test
      *
+     * @dataProvider claimValues
+     *
      * @uses Lcobucci\JWT\ValidationData::__construct
      *
      * @covers Lcobucci\JWT\ValidationData::setAudience
      */
-    public function setAudienceShouldChangeTheAudience()
+    public function setAudienceShouldChangeTheAudience($aud)
     {
+        $expected = $this->createExpectedData(null, null, null, $aud);
         $data = new ValidationData(1);
-        $data->setAudience('test');
+        $data->setAudience($aud);
 
-        $items = ['jti' => null, 'iss' => null, 'aud' => 'test', 'sub' => null];
-        $items['iat'] = $items['nbf'] = $items['exp'] = 1;
-
-        $this->assertAttributeEquals($items, 'items', $data);
+        $this->assertAttributeSame($expected, 'items', $data);
     }
 
     /**
      * @test
      *
+     * @dataProvider claimValues
+     *
      * @uses Lcobucci\JWT\ValidationData::__construct
      *
      * @covers Lcobucci\JWT\ValidationData::setSubject
      */
-    public function setSubjectShouldChangeTheSubject()
+    public function setSubjectShouldChangeTheSubject($sub)
     {
+        $expected = $this->createExpectedData(null, $sub);
         $data = new ValidationData(1);
-        $data->setSubject('test');
-
-        $items = ['jti' => null, 'iss' => null, 'aud' => null, 'sub' => 'test'];
-        $items['iat'] = $items['nbf'] = $items['exp'] = 1;
+        $data->setSubject($sub);
 
-        $this->assertAttributeEquals($items, 'items', $data);
+        $this->assertAttributeSame($expected, 'items', $data);
     }
 
     /**
@@ -108,13 +107,11 @@ public function setSubjectShouldChangeTheSubject()
      */
     public function setCurrentTimeShouldChangeTheTimeBasedValues()
     {
+        $expected = $this->createExpectedData(null, null, null, null, 2);
         $data = new ValidationData(1);
         $data->setCurrentTime(2);
 
-        $items = ['jti' => null, 'iss' => null, 'aud' => null, 'sub' => null];
-        $items['iat'] = $items['nbf'] = $items['exp'] = 2;
-
-        $this->assertAttributeEquals($items, 'items', $data);
+        $this->assertAttributeSame($expected, 'items', $data);
     }
 
     /**
@@ -186,4 +183,42 @@ public function getShouldReturnNullWhenItemIsNotDefined()
 
         $this->assertNull($data->get('test'));
     }
+
+    /**
+     * @return array
+     */
+    public function claimValues()
+    {
+        return [
+            [1],
+            ['test']
+        ];
+    }
+
+    /**
+     * @param string $id
+     * @param string $sub
+     * @param string $iss
+     * @param string $aud
+     * @param int $time
+     *
+     * @return array
+     */
+    private function createExpectedData(
+        $id = null,
+        $sub = null,
+        $iss = null,
+        $aud = null,
+        $time = 1
+    ) {
+        return [
+            'jti' => $id !== null ? (string) $id : null,
+            'iss' => $iss !== null ? (string) $iss : null,
+            'aud' => $aud !== null ? (string) $aud : null,
+            'sub' => $sub !== null ? (string) $sub : null,
+            'iat' => $time,
+            'nbf' => $time,
+            'exp' => $time
+        ];
+    }
 }