Merge pull request #2 from StoreFactory/feature/fixed-bundle-structure

Fixed bundle structure

Author: tristanbes

CompilerPass/DynmaicServiceCacheCompilerPass.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * ZohoSubscription Bundle
+ *
+ * @author Tristan Bessoussa <tristan.bessoussa@gmail.com>
+ */
+
+namespace StoreFactory\ZohoSubscriptionBundle\CompilerPass;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+class DynamicServiceCacheCompilerPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if ($container->getParameter('my_poseo.api.cache_service_id') !== null) {
+            $container
+                ->getDefinition('zoho.api.manager')
+                ->addArgument(new Reference($container->getParameter('zoho_subscription.cache.service')))
+            ;
+        }
+    }
+}

DependencyInjection/Configuration.php

@@ -20,6 +20,38 @@ public function getConfigTreeBuilder()
         $treeBuilder = new TreeBuilder();
         $rootNode = $treeBuilder->root('zoho_subscription');
 
+        $rootNode
+            ->children()
+                ->arrayNode('api')
+                    ->children()
+                        ->scalarNode('key')
+                            ->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')
+                            ->isRequired()
+                            ->info('Organization ID from Zoho Subscription')
+                        ->end()
+                    ->end()
+                ->childrenNode('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)
+                        ->end()
+                        ->integerNode('ttl')
+                            ->info('Defines the TTL of the cache')
+                            ->defaultValue(null)
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+        ;
+
         return $treeBuilder;
     }
 }

DependencyInjection/ZohoSubscriptionExtension.php

@@ -23,5 +23,12 @@ public function load(array $configs, ContainerBuilder $container)
         $config        = $this->processConfiguration($configuration, $configs);
         $loader        = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
 
+        $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.cache.service', $config['cache']['service']);
+        $container->setParameter('zoho_subscription.cache.enabled', $config['cache']['enabled']);
+        $container->setParameter('zoho_subscription.cache.ttl', $config['cache']['ttl']);
     }
 }

Manager/AddonManager.php

@@ -3,14 +3,18 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="zoho.subscription_manager" class="StoreFactory\ZohoSubscriptionBundle\Manager\ZohoSubscriptionManager">
-            <argument type="service" id="zoho_subscription.plan"></argument>
-            <argument type="service" id="zoho_subscription.addon"></argument>
-            <argument type="service" id="snc_redis.default"></argument>
+
+        <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>%zoho_cache_ttl%</argument>
-            <argument>%zoho_token%</argument>
-            <argument>%zoho_organization_id%</argument>
+            <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>
+
+
     </services>
 </container>

Manager/DefaultManager.php

@@ -7,9 +7,19 @@
  * @author Tristan Bessoussa <tristan.bessoussa@gmail.com>
  */
 
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
+use StoreFactory\ZohoSubscriptionBundle\CompilerPass\DynamicServiceCacheCompilerPass;
+
 class ZohoSubscriptionBundle extends Bundle
 {
-
+    /**
+     * {@inheritdoc}
+     */
+    public function build(ContainerBuilder $container)
+    {
+        parent::build($container);
+        $container->addCompilerPass(new DynamicServiceCacheCompilerPass());
+    }
 }

Manager/PlanManager.php

@@ -6,9 +6,17 @@
             "StoreFactory\\ZohoSubscriptionBundle\\": ""
         }
     },
+    "authors": [
+        {
+            "name": "Tristan Bessoussa",
+            "email": "tristan.bessoussa@gmail.com"
+        }
+    ],
     "description": "Zoho Subscription Bundle uses the zoho-subscription-api PHP client library",
     "require": {
-        "storefactory/zoho-subscription-api": "^1.0"
+        "php": ">=5.4.0",
+        "symfony/framework-bundle": "^2.2",
+        "storefactory/zoho-subscription-api": "dev-master"
     },
     "minimum-stability": "stable"
 }