Merge pull request #8 from bookboon/feature/new-wrapper

Refactor structure and add PSR-16 simple cache as required by bookboo…

Author: lkm

src/Bookboon/ApiBundle/ApiBundle.php ApiBundle.phpsrc/Bookboon/ApiBundle/ApiBundle.php renamed to ApiBundle.php

@@ -0,0 +1,15 @@
+services:
+    bookboon.cache:
+        public: true
+        class: Symfony\Component\Cache\Simple\RedisCache
+        arguments:
+          - '@default_redis_provider'
+          - 'api'
+          - 1800
+
+    Bookboon\Api\Bookboon:
+        public: true
+        factory: ['Bookboon\ApiBundle\Service\ApiFactory', create]
+        arguments:
+           - '@Bookboon\ApiBundle\Helper\ConfigurationHolder'
+           - '@bookboon.cache'

…ndencyInjection/BookboonApiExtension.php …ndencyInjection/BookboonApiExtension.phpsrc/Bookboon/ApiBundle/DependencyInjection/BookboonApiExtension.php renamed to DependencyInjection/BookboonApiExtension.php src/Bookboon/ApiBundle/DependencyInjection/BookboonApiExtension.php renamed to DependencyInjection/BookboonApiExtension.php

@@ -2,22 +2,21 @@
 
 namespace Bookboon\ApiBundle\Service;
 
-
 use Bookboon\Api\Bookboon;
-use Bookboon\Api\Cache\Cache;
 use Bookboon\Api\Client\Headers;
 use Bookboon\Api\Client\Oauth\OauthGrants;
 use Bookboon\Api\Client\OauthClient;
 use Bookboon\ApiBundle\Helper\ConfigurationHolder;
+use Psr\SimpleCache\CacheInterface;
 
 class ApiFactory
 {
     /**
      * @param ConfigurationHolder $config
-     * @param Cache $cache
+     * @param CacheInterface $cache
      * @return Bookboon
      */
-    public static function create(ConfigurationHolder $config, Cache $cache)
+    public static function create(ConfigurationHolder $config, CacheInterface $cache)
     {
         $bookboon = new Bookboon(
             new OauthClient(
@@ -26,7 +25,7 @@ public static function create(ConfigurationHolder $config, Cache $cache)
                 self::headersFromConfig($config),
                 $config->getScopes(),
                 $cache,
-                "",
+                '',
                 null,
                 $config->getOverrideAuthUri(),
                 $config->getOverrideApiUri()
@@ -38,15 +37,15 @@ public static function create(ConfigurationHolder $config, Cache $cache)
         return $bookboon;
     }
 
-    public static function credentialFactory(Bookboon $bookboon, Cache $cache, ConfigurationHolder $config)
+    public static function credentialFactory(Bookboon $bookboon, CacheInterface $cache, ConfigurationHolder $config)
     {
         $token = $cache->get("bookboonapi.{$config->getId()}");
 
-        if ($token === false) {
+        if ($token === null) {
             $token = $bookboon->getClient()->requestAccessToken([], OauthGrants::CLIENT_CREDENTIALS);
 
             $ttl = $token->getExpires() - time();
-            $cache->save("bookboonapi.{$config->getId()}", $token, $ttl);
+            $cache->set("bookboonapi.{$config->getId()}", $token, $ttl);
         }
 
         return $token;
@@ -87,10 +86,10 @@ private static function headersFromConfig(ConfigurationHolder $config)
      */
     private static function createAcceptLanguageString($languages)
     {
-        $acceptLanguage = "";
-        for ($i=0; count($languages) > $i; $i++) {
+        $acceptLanguage = '';
+        for ($i=0, $iMax = count($languages); $iMax > $i; $i++) {
             /* TODO: logic might need to be updated if $i > 10 */
-            $acceptLanguage .= $i == 0 ? $languages[$i] . ',' : $languages[$i] . ';q=' . (1 - $i/10) . ',';
+            $acceptLanguage .= $i === 0 ? $languages[$i] . ',' : $languages[$i] . ';q=' . (1 - $i/10) . ',';
         }
         return rtrim($acceptLanguage,',');
     }

…le/DependencyInjection/Configuration.php DependencyInjection/Configuration.phpsrc/Bookboon/ApiBundle/DependencyInjection/Configuration.php renamed to DependencyInjection/Configuration.php src/Bookboon/ApiBundle/DependencyInjection/Configuration.php renamed to DependencyInjection/Configuration.php

@@ -17,11 +17,12 @@
         "php": ">=5.6",
         "symfony/dependency-injection": "~4.0",
         "symfony/config": "~4.0",
-        "bookboon/api": "~3.14"
+        "bookboon/api": "~4.0",
+        "symfony/cache": "^4.2"
     },
     "autoload": {
         "psr-4": {
-            "": "src"
+            "Bookboon\\ApiBundle\\": ""
         }
     }
 }