Updated to the latest version of the api

4 files changed, 47 insertions, 12 deletions

diff --git a/DependencyInjection/SdeBduExtension.php b/DependencyInjection/SdeBduExtension.php
index 78cb4cc..f958e0c 100644
--- a/DependencyInjection/SdeBduExtension.php
+++ b/DependencyInjection/SdeBduExtension.php
@@ -49,12 +49,16 @@ class SdeBduExtension extends Extension
             throw new \InvalidArgumentException('You must provide the sde_bdu.credentials configuration');
         }
 
+        $type = strtoupper($normalizedConfig['credentials']['type']);
+        if (!defined(constant('Bdu_Configuration::TYPE_'.$type))) {
+            throw new \InvalidArgumentException(sprintf('The type "%s" is not supported. It should be one of "people", "group", "appli"', $type));
+        }
         $container->setParameter('sde_bdu.credentials.login', $normalizedConfig['credentials']['login']);
-        $container->setParameter('sde_bdu.credentials.type', $normalizedConfig['credentials']['type']);
+        $container->setParameter('sde_bdu.credentials.type', constant('Bdu_Configuration::TYPE_'.$type));
         $container->setParameter('sde_bdu.credentials.password', $normalizedConfig['credentials']['password']);
 
         if (false === $normalizedConfig['logging']) {
-            $container->getDefinition('sde_bdu.api')->removeMethodCall('setLogger');
+            $container->getDefinition('sde_bdu.configuration')->removeMethodCall('setLogger');
         }
     }
 
diff --git a/Resources/config/api.xml b/Resources/config/api.xml
index cd35aa8..f6afbb1 100644
--- a/Resources/config/api.xml
+++ b/Resources/config/api.xml
@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <container xmlns="http://symfony.com/schema/dic/services"
-    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">
+           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">
 
     <parameters>
         <parameter key="sde_bdu.api.class">Bdu_Api</parameter>
+        <parameter key="sde_bdu.configuration.class">Bdu_Configuration</parameter>
         <parameter key="sde_bdu.logger.class">Sde\BduBundle\Logger\BduLogger</parameter>
         <parameter key="sde_bdu.unit_of_work.class">Bdu_Util_UnitOfWork</parameter>
+        <parameter key="sde_bdu.ldap.class">Bdu_Util_Ldap</parameter>
+        <parameter key="sde_bdu.http.client.class">Bdu_Util_Http_Client</parameter>
+        <parameter key="sde_bdu.http.curl_adapter.class">Bdu_Util_Http_CurlAdapter</parameter>
+        <parameter key="sde_bdu.encoder.class">Bdu_Util_Encoder</parameter>
     </parameters>
 
     <services>
         <service id="sde_bdu.api" class="%sde_bdu.api.class%">
             <argument type="service" id="sde_bdu.unit_of_work" />
+        </service>
+
+        <service id="sde_bdu.configuration" class="%sde_bdu.configuration.class%" public="false">
             <call method="setLogger">
                 <argument type="service" id="sde_bdu.logger" on-invalid="ignore" />
             </call>
@@ -22,10 +30,33 @@
                 <argument>%sde_bdu.credentials.password%</argument>
             </call>
         </service>
-        <service id="sde_bdu.unit_of_work" class="%sde_bdu.unit_of_work.class%" public="false" />
+
+        <service id="sde_bdu.unit_of_work" class="%sde_bdu.unit_of_work.class%" public="false">
+            <argument type="service" id="sde_bdu.configuration" />
+            <argument type="service" id="sde_bdu.ldap" />
+            <argument type="service" id="sde_bdu.http.client" />
+            <argument type="service" id="sde_bdu.encoder" />
+        </service>
+
         <service id="sde_bdu.logger" class="%sde_bdu.logger.class%" public="false">
             <argument type="service" id="logger" on-invalid="ignore" />
             <tag name="monolog.logger" channel="sde_bdu" />
         </service>
+
+        <service id="sde_bdu.ldap" class="%sde_bdu.ldap.class%" public="false">
+            <argument type="service" id="sde_bdu.configuration" />
+            <argument type="service" id="sde_bdu.encoder" />
+        </service>
+
+        <service id="sde_bdu.http.client" class="%sde_bdu.http.client.class%" public="false">
+            <argument type="service" id="sde_bdu.configuration" />
+            <argument type="service" id="sde_bdu.http.curl_adapter" />
+        </service>
+
+        <service id="sde_bdu.http.curl_adapter" class="%sde_bdu.http.curl_adapter.class%" public="false" />
+
+        <service id="sde_bdu.encoder" class="%sde_bdu.encoder.class%" public="false">
+            <argument type="service" id="sde_bdu.configuration" />
+        </service>
     </services>
 </container>
diff --git a/Resources/config/schema/sde_bdu-1.0.xsd b/Resources/config/schema/sde_bdu-1.0.xsd
index 4dbff19..d252887 100644
--- a/Resources/config/schema/sde_bdu-1.0.xsd
+++ b/Resources/config/schema/sde_bdu-1.0.xsd
@@ -11,7 +11,7 @@
         <xsd:all>
             <xsd:element name="credentials" type="credentials" />
         </xsd:all>
-        <xsd:attribute name="logging" type="xsd:boolean">
+        <xsd:attribute name="logging" type="xsd:boolean" />
     </xsd:complexType>
 
     <xsd:complexType name="credentials">
diff --git a/Resources/doc/index.rst b/Resources/doc/index.rst
index bce800e..f85dec0 100644
--- a/Resources/doc/index.rst
+++ b/Resources/doc/index.rst
@@ -3,7 +3,7 @@ Provides integration for the Bdu api for your Symfony2 Project.
 Features
 ========
 
-This bundle allows to easyly use the bdu api in your Symfony2 project
+This bundle allows to easily use the bdu api in your Symfony2 project
 by configuring it through the DIC.
 
 Installation
@@ -14,7 +14,7 @@ Add Bdu_Api to your vendor dir
 
 ::
 
-    git submodule add http://stof.notk.org/git/bdu-api.git vendor/bdu-api
+    git submodule add http://git.notk.org/gitolite/stof/bdu-api.git vendor/bdu-api
 
 Register the Bdu_ prefix
 ------------------------
@@ -32,7 +32,7 @@ Add BduBundle to your src/Bundle dir
 
 ::
 
-    git submodule add http://stof.notk.org/git/BduBundle.git vendor/bundles/Sde/BduBundle
+    git submodule add http://git.notk.org/gitolite/stof/BduBundle.git vendor/bundles/Sde/BduBundle
 
 Register the Sde namespace
 --------------------------
@@ -71,7 +71,7 @@ in YAML::
     sde_bdu:
         credentials:
             login: LOGIN
-            type: TYPE
+            type: TYPE    # people, group or appli
             password: PASSWORD
         logging: %kernel.debug%
 
@@ -87,7 +87,7 @@ or in XML::
 .. Note::
 
     The default value for the logging attribute when not specified is
-    kernel.debug
+    %kernel.debug%
 
 .. Caution::
 
@@ -104,5 +104,5 @@ The logs will be written in your project logs.
 
 ::
 
-    $api = $container->get('sde_bdu.api');
+    $api = $this->get('sde_bdu.api');
     $api->isValidLogin('random');