Merge branch 'master' of github.com:StoreFactory/ZohoSubscriptionBundle

# Conflicts:
#	.gitignore

Author: tristanbes

…Pass/DynmaicServiceCacheCompilerPass.php …Pass/DynamicServiceCacheCompilerPass.phpCompilerPass/DynmaicServiceCacheCompilerPass.php renamed to CompilerPass/DynamicServiceCacheCompilerPass.php CompilerPass/DynmaicServiceCacheCompilerPass.php renamed to CompilerPass/DynamicServiceCacheCompilerPass.php

@@ -19,10 +19,10 @@ class DynamicServiceCacheCompilerPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        if ($container->getParameter('my_poseo.api.cache_service_id') !== null) {
+        if ($container->getParameter('zoho_subscription.cache.service') !== null) {
             $container
                 ->getDefinition('zoho.api.manager')
-                ->addArgument(new Reference($container->getParameter('zoho_subscription.cache.service')))
+                ->replaceArgument(2, new Reference($container->getParameter('zoho_subscription.cache.service')))
             ;
         }
     }

DependencyInjection/Configuration.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace StoreFactory\ZohoSubscriptionBundle\Manager;
+namespace StoreFactory\ZohoSubscriptionBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -28,20 +28,17 @@ public function getConfigTreeBuilder()
                             ->isRequired()
                             ->info('The service is not free. You must provide an API Key which can be found on : https://www.zoho.com/subscriptions/')
                         ->end()
-                        ->scalarNode('organisation_id')
+                        ->scalarNode('organization_id')
                             ->isRequired()
                             ->info('Organization ID from Zoho Subscription')
                         ->end()
                     ->end()
-                ->childrenNode('cache')
+                ->end()
+                ->arrayNode('cache')
                     ->children()
-                        ->booleanNode('enabled')
-                            ->info('If cache is active or not')
-                            ->defaultValue(false)
-                        ->end()
                         ->scalarNode('service')
                             ->info('Defines the service id of the cache that will be used')
-                            ->defaultValue(null)
+                            ->defaultValue('zoho.array.cache')
                         ->end()
                         ->integerNode('ttl')
                             ->info('Defines the TTL of the cache')

DependencyInjection/ZohoSubscriptionExtension.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace StoreFactory\ZohoSubscriptionBundle\Manager;
+namespace StoreFactory\ZohoSubscriptionBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Loader;
@@ -12,7 +12,7 @@
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
  */
-class MyPoseoExtension extends Extension
+class ZohoSubscriptionExtension extends Extension
 {
     /**
      * {@inheritDoc}
@@ -26,9 +26,8 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('services.xml');
 
         $container->setParameter('zoho_subscription.api_key', $config['api']['key']);
-        $container->setParameter('zoho_subscription.org_id', $config['api']['organisation_id']);
+        $container->setParameter('zoho_subscription.org_id', $config['api']['organization_id']);
         $container->setParameter('zoho_subscription.cache.service', $config['cache']['service']);
-        $container->setParameter('zoho_subscription.cache.enabled', $config['cache']['enabled']);
         $container->setParameter('zoho_subscription.cache.ttl', $config['cache']['ttl']);
     }
 }

Resources/config/services.xml

@@ -7,13 +7,17 @@
         <service id="zoho.api.manager" class="Zoho\Subscription\Client\Client" abstract="true">
             <argument>%zoho_subscription.api_key%</argument>
             <argument>%zoho_subscription.org_id%</argument>
-            <argument>%zoho_cache_enabled%</argument>
-            <argument />
+            <argument>null</argument>
             <argument>%zoho_subscription.cache.ttl%</argument>
         </service>
 
         <service id="zoho.api.addon" class="Zoho\Subscription\Api\Addon" parent="zoho.api.manager"></service>
         <service id="zoho.api.plan" class="Zoho\Subscription\Api\Plan" parent="zoho.api.manager"></service>
+        <service id="zoho.api.invoice" class="Zoho\Subscription\Api\Invoice" parent="zoho.api.manager"></service>
+        <service id="zoho.api.customer" class="Zoho\Subscription\Api\Customer" parent="zoho.api.manager"></service>
+        <service id="zoho.api.subscription" class="Zoho\Subscription\Api\Subscription" parent="zoho.api.manager"></service>
+
+        <service id="zoho.array.cache" class="Doctrine\Common\Cache\ArrayCache"></service>
 
 
     </services>

ZohoSubscriptionBundle.php

@@ -7,6 +7,8 @@
  * @author Tristan Bessoussa <tristan.bessoussa@gmail.com>
  */
 
+namespace StoreFactory\ZohoSubscriptionBundle;
+
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;