Merge pull request #3 from bookboon/feature/sf4

Feature/sf4

Author: lkm

composer.json

@@ -14,8 +14,10 @@
         }
     ],
     "require": {
-        "php": ">=5.6.0",
-        "bookboon/api": "^3.0"
+        "php": ">=5.6",
+        "symfony/dependency-injection": "~4.0",
+        "symfony/config": "~4.0",
+        "bookboon/api": "~3.0"
     },
     "autoload": {
         "psr-4": {

src/Bookboon/ApiBundle/DependencyInjection/BookboonApiExtension.php

@@ -2,6 +2,7 @@
 
 namespace Bookboon\ApiBundle\DependencyInjection;
 
+use Bookboon\Api\Cache\Cache;
 use Bookboon\ApiBundle\Configuration\ApiConfiguration;
 use Bookboon\ApiBundle\Helper\ConfigurationHolder;
 use Symfony\Component\Config\FileLocator;
@@ -24,11 +25,11 @@ public function load(array $configs, ContainerBuilder $container)
     {
         $config = $this->processConfiguration($this->getConfiguration($configs, $container), $configs);
 
-        $container->register("bookboonapi.config", ConfigurationHolder::class)
+        $container->register(ConfigurationHolder::class, ConfigurationHolder::class)
             ->addArgument($config)
             ->setPublic(false);
 
-        $container->setAlias("bookboonapi.cache", $config['cache_service']);
+        $container->setAlias(Cache::class, $config['cache_service']);
 
         $loader = new YamlFileLoader(
             $container,

src/Bookboon/ApiBundle/DependencyInjection/Configuration.php

@@ -2,6 +2,7 @@
 
 namespace Bookboon\ApiBundle\DependencyInjection;
 
+use Bookboon\Api\Cache\RedisCache;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
@@ -23,9 +24,9 @@ public function getConfigTreeBuilder()
             ->scalarNode('branding')->end()
             ->scalarNode('rotation')->end()
             ->scalarNode('currency')->end()
-            ->scalarNode('client_id')->defaultNull()->end()
+            ->scalarNode('impersonator_id')->defaultNull()->end()
             ->scalarNode('redirect')->defaultNull()->end()
-            ->scalarNode('cache_service')->defaultValue("bookboonapi.cache.redis")->end()
+            ->scalarNode('cache_service')->defaultValue(RedisCache::class)->end()
             ->arrayNode('languages')->isRequired()->prototype('scalar')->end()->end()
             ->arrayNode('scopes')->isRequired()->prototype('scalar')->end()->end()
             ->integerNode('premiumlevel')->end()

src/Bookboon/ApiBundle/Helper/ConfigurationHolder.php

@@ -75,9 +75,9 @@ public function getCurrency()
     /**
      * @return string
      */
-    public function getClientId()
+    public function getImpersonatorId()
     {
-        return isset($this->_config['client_id']) ? $this->_config['client_id'] : null;
+        return isset($this->_config['impersonator_id']) ? $this->_config['impersonator_id'] : null;
     }
 
 

src/Bookboon/ApiBundle/Resources/config/services.yml

@@ -1,13 +1,11 @@
 services:
-    bookboonapi.cache.redis:
-        class: Bookboon\Api\Cache\RedisCache
+    Bookboon\Api\Cache\RedisCache:
         public: false
         arguments: []
 
-    bookboonapi:
-        class: Bookboon\Api\Bookboon
+    Bookboon\Api\Bookboon:
         public: true
         factory: ['Bookboon\ApiBundle\Service\ApiFactory', create]
         arguments:
-           - "@bookboonapi.config"
-           - "@bookboonapi.cache"
+           - '@Bookboon\ApiBundle\Helper\ConfigurationHolder'
+           - '@Bookboon\Api\Cache\Cache'