From f26fc4f72a0fa045e960bc3152d664a4d7cb2fe8 Mon Sep 17 00:00:00 2001
From: Francis Besset <francis.besset@gmail.com>
Date: Wed, 20 Feb 2013 15:26:26 +0100
Subject: [PATCH] Updated installation doc with Composer

---
 Resources/doc/installation.rst | 63 +++++++++++++++++++++++++++++++---
 Soap/SoapAttachment.php        |  2 +-
 Soap/SoapClientBuilder.php     |  2 +-
 Soap/SoapHeader.php            |  2 +-
 Soap/SoapRequest.php           |  2 +-
 Soap/SoapResponse.php          |  2 +-
 WebServiceContext.php          |  5 +--
 7 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/Resources/doc/installation.rst b/Resources/doc/installation.rst
index 00088a3..2b8f81a 100644
--- a/Resources/doc/installation.rst
+++ b/Resources/doc/installation.rst
@@ -6,6 +6,62 @@ Requirements
 
 Install and enable PHP's SOAP extension.
 
+With Composer
+~~~~~~~~~~~~~
+
+Add `besimple/soap-bundle` (with vendors) in your composer.json:
+
+.. code-block:: json
+
+    {
+        "require": {
+            "besimple/soap-bundle": "dev-master",
+            "besimple/soap-common": "dev-master",
+            "ass/xmlsecurity":      "dev-master"
+        }
+    }
+
+To install the server please add `besimple/soap-server` in your composer.json:
+
+.. code-block:: json
+
+    {
+        "require": {
+            "besimple/soap-server": "dev-master"
+        }
+    }
+
+To install the client please add `besimple/soap-client` in your composer.json:
+
+.. code-block:: json
+
+    {
+        "require": {
+            "besimple/soap-client": "dev-master"
+        }
+    }
+
+.. code-block:: bash
+
+    $ php composer.phar update
+
+Enable the `BeSimpleSoapBundle` in your Kernel class
+
+.. code-block:: php
+
+    // app/AppKernel.php
+    public function registerBundles()
+    {
+        return array(
+            // ...
+            new BeSimple\SoapBundle\BeSimpleSoapBundle(),
+            // ...
+        );
+    }
+
+With deps file (outdated)
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
 Download `BeSimple\\SoapCommon`_ and `BeSimple\\SoapServer`_ (only for the server part) and/or `BeSimple\\SoapClient`_ (only for ther client part).
 
 .. code-block:: ini
@@ -14,11 +70,11 @@ Download `BeSimple\\SoapCommon`_ and `BeSimple\\SoapServer`_ (only for the serve
     [BeSimple\SoapCommon]
         git=https://github.com/BeSimple/BeSimpleSoapCommon.git
         target=besimple-soapcommon
-    
+
     [BeSimple\SoapClient]
         git=https://github.com/BeSimple/BeSimpleSoapClient.git
         target=besimple-soapclient
-    
+
     [BeSimple\SoapServer]
         git=https://github.com/BeSimple/BeSimpleSoapServer.git
         target=besimple-soapserver
@@ -60,7 +116,7 @@ Add `Zend` library in autoload.php
     ));
 
 Installation
-------------
+````````````
 
 `Download`_ the bundle or add in `deps` file
 
@@ -95,7 +151,6 @@ Add `BeSimpleSoapBundle` in your Kernel class
         );
     }
 
-
 .. _`Zend\\Soap`: http://github.com/BeSimple/zend-soap
 .. _`Zend\\Mime`: http://github.com/BeSimple/zend-mime
 .. _`BeSimple\\SoapCommon`: http://github.com/BeSimple/BeSimpleSoapCommon
diff --git a/Soap/SoapAttachment.php b/Soap/SoapAttachment.php
index 15e8a1e..5bd360b 100644
--- a/Soap/SoapAttachment.php
+++ b/Soap/SoapAttachment.php
@@ -37,4 +37,4 @@ class SoapAttachment
     {
         return $this->content;
     }
-}
\ No newline at end of file
+}
diff --git a/Soap/SoapClientBuilder.php b/Soap/SoapClientBuilder.php
index c21993f..977b92b 100644
--- a/Soap/SoapClientBuilder.php
+++ b/Soap/SoapClientBuilder.php
@@ -74,4 +74,4 @@ class SoapClientBuilder extends BaseSoapClientBuilder
             ));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Soap/SoapHeader.php b/Soap/SoapHeader.php
index 22b0fbd..14bf2b3 100644
--- a/Soap/SoapHeader.php
+++ b/Soap/SoapHeader.php
@@ -47,4 +47,4 @@ class SoapHeader
     {
         return new \SoapHeader($this->namespace, $this->name, $this->data);
     }
-}
\ No newline at end of file
+}
diff --git a/Soap/SoapRequest.php b/Soap/SoapRequest.php
index 0b20161..2127670 100644
--- a/Soap/SoapRequest.php
+++ b/Soap/SoapRequest.php
@@ -164,4 +164,4 @@ class SoapRequest extends Request
 
         return $result;
     }
-}
\ No newline at end of file
+}
diff --git a/Soap/SoapResponse.php b/Soap/SoapResponse.php
index 1574b00..cb63f2b 100644
--- a/Soap/SoapResponse.php
+++ b/Soap/SoapResponse.php
@@ -66,4 +66,4 @@ class SoapResponse extends Response
     {
         return $this->soapReturnValue;
     }
-}
\ No newline at end of file
+}
diff --git a/WebServiceContext.php b/WebServiceContext.php
index 2cc879d..d18bb04 100644
--- a/WebServiceContext.php
+++ b/WebServiceContext.php
@@ -42,7 +42,8 @@ class WebServiceContext
     private $serviceBinder;
     private $serverBuilder;
 
-    public function __construct(LoaderInterface $loader, DumperInterface $dumper, Classmap $classmap, TypeRepository $typeRepository, TypeConverterCollection $converters, array $options) {
+    public function __construct(LoaderInterface $loader, DumperInterface $dumper, Classmap $classmap, TypeRepository $typeRepository, TypeConverterCollection $converters, array $options)
+    {
         $this->loader         = $loader;
         $this->wsdlFileDumper = $dumper;
 
@@ -51,7 +52,7 @@ class WebServiceContext
         $this->typeRepository = $typeRepository;
         $this->converters     = $converters;
 
-        $this->options = $options;
+        $this->options        = $options;
     }
 
     public function getServiceDefinition()