Small issues / improvements.

johannesx75 · Mar 2, 2014 · bc8be43 · bc8be43
1 parent 8ebbbed
commit bc8be43
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 7 deletions.
diff --git a/lib/Tmdb/ApiToken.php b/lib/Tmdb/ApiToken.php
@@ -11,6 +11,7 @@
  * @version 0.0.1
  */
 namespace Tmdb;
+use Tmdb\Exception\RuntimeException;
 
 /**
  * Class ApiToken
@@ -31,11 +32,16 @@ public function __construct($api_token = null)
     }
 
     /**
-     * @param  null  $apiToken
+     * @param  string           $apiToken
+     * @throws RuntimeException
      * @return $this
      */
     public function setToken($apiToken)
     {
+        if (!is_string($apiToken)) {
+            throw new RuntimeException('The Apitoken must be set.');
+        }
+
         $this->apiToken = $apiToken;
 
         return $this;

diff --git a/lib/Tmdb/Client.php b/lib/Tmdb/Client.php
@@ -151,12 +151,12 @@ private function constructHttpClient(ClientInterface $httpClient = null)
 
             if ($this->cacheEnabled && !empty($this->cachePath)) {
                 if (!class_exists('Doctrine\Common\Cache\FilesystemCache')) {
-                    /** @codeCoverageIgnoreStart */
+                    //@codeCoverageIgnoreStart
                     throw new RuntimeException(
                         'Could not find the doctrine cache library,
                         have you added doctrine-cache to your composer.json?'
                     );
-                    /** @codeCoverageIgnoreEnd */
+                    //@codeCoverageIgnoreEnd
                 }
 
                 $cachePlugin = new CachePlugin(array(
@@ -173,16 +173,16 @@ private function constructHttpClient(ClientInterface $httpClient = null)
 
             if ($this->logEnabled && !empty($this->logPath)) {
                 if (empty($this->logger) && !class_exists('\Monolog\Logger')) {
-                    /** @codeCoverageIgnoreStart */
+                    //@codeCoverageIgnoreStart
                     throw new RuntimeException(
                         'Could not find any logger set and the monolog logger library was not found
                         to provide a default, you have to  set a custom logger on the client or
                         have you forgot adding monolog to your composer.json?'
                     );
-                    /** @codeCoverageIgnoreEnd */
+                    //@codeCoverageIgnoreEnd
                 } else {
-                    $this->logger = new \Monolog\Logger('php-tmdb-api');
-                    $this->logger->pushHandler(
+                    $this->setLogger(new \Monolog\Logger('php-tmdb-api'));
+                    $this->getLogger()->pushHandler(
                         new \Monolog\Handler\StreamHandler(
                             $this->logPath,
                             \Monolog\Logger::DEBUG

diff --git a/test/Tmdb/Tests/ApiTokenTest.php b/test/Tmdb/Tests/ApiTokenTest.php
@@ -26,4 +26,14 @@ public function testSetGet()
 
         $this->assertEquals(self::API_TOKEN, $token->getToken());
     }
+
+    /**
+     * @expectedException Tmdb\Exception\RuntimeException
+     * @test
+     */
+    public function testThrowsErrorOnEmptyApiToken()
+    {
+        $token  = new \Tmdb\ApiToken();
+        $token->setToken(null);
+    }
 }
diff --git a/test/Tmdb/Tests/ClientTest.php b/test/Tmdb/Tests/ClientTest.php
@@ -146,4 +146,30 @@ private function isListenerRegistered($listeners, $class)
 
         return false;
     }
+
+    /**
+     * @test
+     */
+    public function shouldBeAbleSetCache()
+    {
+        $path = '/tmp/php-tmdb-api';
+
+        $this->client->setCaching(true, $path);
+
+        $this->assertEquals(true, $this->client->getCacheEnabled());
+        $this->assertEquals($path, $this->client->getCachePath());
+    }
+
+    /**
+     * @test
+     */
+    public function shouldBeAbleSetLogging()
+    {
+        $path = '/tmp/php-tmdb-api.log';
+
+        $this->client->setLogging(true, $path);
+
+        $this->assertEquals(true, $this->client->getLogEnabled());
+        $this->assertEquals($path, $this->client->getLogPath());
+    }
 }