Refactoring the Client a bit more, removing arguments that can be dealt with otherwise. Adjusted examples to reflect this change.

Author: wtfzdotnet

README.md

@@ -106,15 +106,15 @@ $client = new \Tmdb\Client($token);
 If you'd like to make unsecure requests ( by __default__ we use secure requests ).
 
 ```php
-$client = new \Tmdb\Client($token, null, false);
+$client = new \Tmdb\Client($token, ['secure' => false]);
 ```
 
 Caching is enabled by default, and uses a slow filesystem handler, which you can either:
 
     Replace the `path` of the storage of, by supplying the option in the client:
 
 ```php
-$client = new \Tmdb\Client($token, null, true, [
+$client = new \Tmdb\Client($token, [
     'cache' => [
         'enabled' => false,
         'path'    => '/tmp/php-tmdb-api.log'
@@ -124,7 +124,7 @@ $client = new \Tmdb\Client($token, null, true, [
     Or replace the whole implementation with another CacheStorage of Doctrine:
 
 ```php
-$client = new \Tmdb\Client($token, null, true, [
+$client = new \Tmdb\Client($token, [
     'cache' => [
         'enabled' => false,
         'storage' => new \Doctrine\Common\Cache\ArrayCache()
@@ -137,7 +137,7 @@ _This will only keep cache in memory during the length of the request,  see the
 If you want to add some logging capabilities ( requires `monolog/monolog` ), defaulting to the filesystem;
 
 ```php
-$client = new \Tmdb\Client($token, null, true, [
+$client = new \Tmdb\Client($token, [
     'log' => [
         'enabled' => true,
         'path'    => '/var/www/php-tmdb-api.log'
@@ -149,7 +149,7 @@ $client = new \Tmdb\Client($token, null, true, [
 However during development you might like some console magic like `ChromePHP` or `FirePHP`;
 
 ```php
-$client = new \Tmdb\Client($token, null, true, [
+$client = new \Tmdb\Client($token, [
     'log' => [
         'enabled' => true,
         'handler' => new \Monolog\Handler\ChromePHPHandler()

UPGRADE-2.0.md

@@ -0,0 +1,26 @@
+Upgrading to 2.0
+----------------
+
+The `Client` constructor has been simplified, and now is initialised as so:
+
+```php
+$client = new \Tmdb\Client($apiToken, $options);
+```
+
+If you used the old constructor, this is how you define the same options from 2.0 and onward:
+
+```php
+$client = new \Tmdb\Client($apiToken, [
+    'adapter' => new FooBarAdapter(),
+    'secure'  => false,
+    '
+]);
+```
+
+If you'd like to set a session for the current request cycle:
+
+```php
+$client = new \Tmdb\Client($apiToken, [
+    'session_token' => new SessionToken(TMDB_SESSION_TOKEN)
+]);
+```

examples/account/api/account.php

@@ -14,10 +14,7 @@
 require_once '../../../apikey.php';
 
 $token = new \Tmdb\ApiToken(TMDB_API_KEY);
-$client = new \Tmdb\Client($token);
-
-$sessionToken = new \Tmdb\SessionToken(TMDB_SESSION_TOKEN);
-$client->setSessionToken($sessionToken);
+$client = new \Tmdb\Client($token, ['session_token' => new \Tmdb\SessionToken(TMDB_SESSION_TOKEN)]);
 
 $account = $client->getAccountApi()->getAccount();
 

examples/account/api/favorite.php

@@ -14,10 +14,7 @@
 require_once '../../../apikey.php';
 
 $token = new \Tmdb\ApiToken(TMDB_API_KEY);
-$client = new \Tmdb\Client($token);
-
-$sessionToken = new \Tmdb\SessionToken(TMDB_SESSION_TOKEN);
-$client->setSessionToken($sessionToken);
+$client = new \Tmdb\Client($token, ['session_token' => new \Tmdb\SessionToken(TMDB_SESSION_TOKEN)]);
 
 $favorite = $client->getAccountApi()->favorite(TMDB_ACCOUNT_ID, 550, true);
 

examples/account/api/favorite_movies.php

@@ -14,10 +14,7 @@
 require_once '../../../apikey.php';
 
 $token = new \Tmdb\ApiToken(TMDB_API_KEY);
-$client = new \Tmdb\Client($token);
-
-$sessionToken = new \Tmdb\SessionToken(TMDB_SESSION_TOKEN);
-$client->setSessionToken($sessionToken);
+$client = new \Tmdb\Client($token, ['session_token' => new \Tmdb\SessionToken(TMDB_SESSION_TOKEN)]);
 
 $favorite_movies = $client->getAccountApi()->getFavoriteMovies(TMDB_ACCOUNT_ID);
 

examples/account/api/lists.php

@@ -14,10 +14,7 @@
 require_once '../../../apikey.php';
 
 $token = new \Tmdb\ApiToken(TMDB_API_KEY);
-$client = new \Tmdb\Client($token);
-
-$sessionToken = new \Tmdb\SessionToken(TMDB_SESSION_TOKEN);
-$client->setSessionToken($sessionToken);
+$client = new \Tmdb\Client($token, ['session_token' => new \Tmdb\SessionToken(TMDB_SESSION_TOKEN)]);
 
 $lists = $client->getAccountApi()->getLists(TMDB_ACCOUNT_ID);
 

examples/account/api/rated_movies.php

@@ -14,10 +14,7 @@
 require_once '../../../apikey.php';
 
 $token = new \Tmdb\ApiToken(TMDB_API_KEY);
-$client = new \Tmdb\Client($token);
-
-$sessionToken = new \Tmdb\SessionToken(TMDB_SESSION_TOKEN);
-$client->setSessionToken($sessionToken);
+$client = new \Tmdb\Client($token, ['session_token' => new \Tmdb\SessionToken(TMDB_SESSION_TOKEN)]);
 
 $rated_movies = $client->getAccountApi()->getRatedMovies(TMDB_ACCOUNT_ID);
 

examples/account/api/watchlist.php

@@ -14,10 +14,7 @@
 require_once '../../../apikey.php';
 
 $token = new \Tmdb\ApiToken(TMDB_API_KEY);
-$client = new \Tmdb\Client($token);
-
-$sessionToken = new \Tmdb\SessionToken(TMDB_SESSION_TOKEN);
-$client->setSessionToken($sessionToken);
+$client = new \Tmdb\Client($token, ['session_token' => new \Tmdb\SessionToken(TMDB_SESSION_TOKEN)]);
 
 $watchlist = $client->getAccountApi()->watchlist(TMDB_ACCOUNT_ID, 97020, true);
 

examples/account/api/watchlist_movies.php

@@ -14,10 +14,7 @@
 require_once '../../../apikey.php';
 
 $token = new \Tmdb\ApiToken(TMDB_API_KEY);
-$client = new \Tmdb\Client($token);
-
-$sessionToken = new \Tmdb\SessionToken(TMDB_SESSION_TOKEN);
-$client->setSessionToken($sessionToken);
+$client = new \Tmdb\Client($token, ['session_token' => new \Tmdb\SessionToken(TMDB_SESSION_TOKEN)]);
 
 $watchlist_movies = $client->getAccountApi()->getMovieWatchlist(TMDB_ACCOUNT_ID);
 

examples/account/model/account.php

@@ -14,10 +14,7 @@
 require_once '../../../apikey.php';
 
 $token  = new \Tmdb\ApiToken(TMDB_API_KEY);
-$client = new \Tmdb\Client($token);
-
-$sessionToken = new \Tmdb\SessionToken(TMDB_SESSION_TOKEN);
-$client->setSessionToken($sessionToken);
+$client = new \Tmdb\Client($token, ['session_token' => new \Tmdb\SessionToken(TMDB_SESSION_TOKEN)]);
 
 $accountRepository = new \Tmdb\Repository\AccountRepository($client);
 $account           = $accountRepository->getAccount();