#325 Move ttl is_numeric check from build time to runtime to allow …

…use of %env()% (@drbenton) Fix: Move `is_numeric` check from build time to runtime
lexik · Apr 14, 2017 · 5b09887 · 5b09887
2 parents 4b6f328 + 47f3b31
commit 5b09887
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -34,12 +34,6 @@ public function getConfigTreeBuilder()
                 ->end()
                 ->scalarNode('token_ttl')
                     ->defaultValue(3600)
-                    ->validate()
-                        ->ifTrue(function ($ttl) {
-                            return !is_numeric($ttl);
-                        })
-                        ->thenInvalid('The token_ttl must be a numeric value.')
-                    ->end()
                 ->end()
                 ->arrayNode('encoder')
                     ->addDefaultsIfNotSet()

diff --git a/Services/JWSProvider/DefaultJWSProvider.php b/Services/JWSProvider/DefaultJWSProvider.php
@@ -47,6 +47,10 @@ class DefaultJWSProvider implements JWSProviderInterface
      */
     public function __construct(KeyLoaderInterface $keyLoader, $cryptoEngine, $signatureAlgorithm, $ttl)
     {
+        if (!is_numeric($ttl)) {
+            throw new \InvalidArgumentException(sprintf('The TTL should be a numeric value, got %s instead.', $ttl));
+        }
+
         $cryptoEngine = $cryptoEngine == 'openssl' ? 'OpenSSL' : 'SecLib';
 
         if (!$this->isAlgorithmSupportedForEngine($cryptoEngine, $signatureAlgorithm)) {

diff --git a/Services/JWSProvider/LcobucciJWSProvider.php b/Services/JWSProvider/LcobucciJWSProvider.php
@@ -38,6 +38,10 @@ class LcobucciJWSProvider implements JWSProviderInterface
      */
     public function __construct(RawKeyLoader $keyLoader, $cryptoEngine, $signatureAlgorithm, $ttl)
     {
+        if (!is_numeric($ttl)) {
+            throw new \InvalidArgumentException(sprintf('The TTL should be a numeric value, got %s instead.', $ttl));
+        }
+
         $this->keyLoader = $keyLoader;
         $this->signer    = $this->getSignerForAlgorithm($signatureAlgorithm);
         $this->ttl       = $ttl;

diff --git a/Tests/Services/JWSProvider/AbstractJWSProviderTest.php b/Tests/Services/JWSProvider/AbstractJWSProviderTest.php
@@ -117,6 +117,15 @@ public function testInvalidsignatureAlgorithm()
         new static::$providerClass($this->getKeyLoaderMock(), 'openssl', 'wrongAlgorithm', 3600);
     }
 
+    /**
+     * @expectedException        \InvalidArgumentException
+     * @expectedExceptionMessage The TTL should be a numeric value
+     */
+    public function testInvalidTtl()
+    {
+        new static::$providerClass($this->getKeyLoaderMock(), 'openssl', 'wrongAlgorithm', 'invalid_ttl');
+    }
+
     private function getKeyLoaderMock()
     {
         return $this