From ccc6a6db15b5366dca9d65e9e9a83b34fef24666 Mon Sep 17 00:00:00 2001
From: lmammino <lmammino@oryzone.com>
Date: Mon, 21 Jan 2013 11:07:19 +0100
Subject: [PATCH 1/2] Fixed documentation annotation for factories

---
 .../Factory/AclAwareAmazonS3AdapterFactory.php   | 16 ++++------------
 .../Factory/AdapterFactoryInterface.php          |  2 +-
 .../Factory/AmazonS3AdapterFactory.php           | 16 ++++------------
 3 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/DependencyInjection/Factory/AclAwareAmazonS3AdapterFactory.php b/DependencyInjection/Factory/AclAwareAmazonS3AdapterFactory.php
index 410cef2..03fc8a8 100644
--- a/DependencyInjection/Factory/AclAwareAmazonS3AdapterFactory.php
+++ b/DependencyInjection/Factory/AclAwareAmazonS3AdapterFactory.php
@@ -10,12 +10,8 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
 class AclAwareAmazonS3AdapterFactory implements AdapterFactoryInterface
 {
     /**
-    * Creates the adapter, registers it and returns its id
-    *
-    * @param  ContainerBuilder $container  A ContainerBuilder instance
-    * @param  string           $id         The id of the service
-    * @param  array            $config     An array of configuration
-    */
+     * {@inheritDoc}
+     */
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $container
@@ -42,9 +38,7 @@ class AclAwareAmazonS3AdapterFactory implements AdapterFactoryInterface
     }
 
     /**
-     * Returns the key for the factory configuration
-     *
-     * @return string
+     * {@inheritDoc}
      */
     public function getKey()
     {
@@ -52,9 +46,7 @@ class AclAwareAmazonS3AdapterFactory implements AdapterFactoryInterface
     }
 
     /**
-     * Adds configuration nodes for the factory
-     *
-     * @param  NodeBuilder $builder
+     * {@inheritDoc}
      */
     public function addConfiguration(NodeDefinition $builder)
     {
diff --git a/DependencyInjection/Factory/AdapterFactoryInterface.php b/DependencyInjection/Factory/AdapterFactoryInterface.php
index 02fed71..e5985e9 100644
--- a/DependencyInjection/Factory/AdapterFactoryInterface.php
+++ b/DependencyInjection/Factory/AdapterFactoryInterface.php
@@ -31,7 +31,7 @@ interface AdapterFactoryInterface
     /**
      * Adds configuration nodes for the factory
      *
-     * @param  NodeBuilder $builder
+     * @param  NodeDefinition $builder
      */
     function addConfiguration(NodeDefinition $builder);
 }
diff --git a/DependencyInjection/Factory/AmazonS3AdapterFactory.php b/DependencyInjection/Factory/AmazonS3AdapterFactory.php
index 1907ab4..1fb3e2f 100644
--- a/DependencyInjection/Factory/AmazonS3AdapterFactory.php
+++ b/DependencyInjection/Factory/AmazonS3AdapterFactory.php
@@ -10,12 +10,8 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
 class AmazonS3AdapterFactory implements AdapterFactoryInterface
 {
     /**
-    * Creates the adapter, registers it and returns its id
-    *
-    * @param  ContainerBuilder $container  A ContainerBuilder instance
-    * @param  string           $id         The id of the service
-    * @param  array            $config     An array of configuration
-    */
+     * {@inheritDoc}
+     */
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $definition = $container
@@ -31,9 +27,7 @@ class AmazonS3AdapterFactory implements AdapterFactoryInterface
     }
 
     /**
-     * Returns the key for the factory configuration
-     *
-     * @return string
+     * {@inheritDoc}
      */
     public function getKey()
     {
@@ -41,9 +35,7 @@ class AmazonS3AdapterFactory implements AdapterFactoryInterface
     }
 
     /**
-     * Adds configuration nodes for the factory
-     *
-     * @param  NodeBuilder $builder
+     * {@inheritDoc}
      */
     public function addConfiguration(NodeDefinition $builder)
     {

From f9614aa3d92ddaa7bc22fb7980d4df22ce788246 Mon Sep 17 00:00:00 2001
From: lmammino <lmammino@oryzone.com>
Date: Mon, 21 Jan 2013 11:07:30 +0100
Subject: [PATCH 2/2] Updated gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 46ee9aa..4b3852c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 Tests/Resources/cache
+.idea/
+vendor/
+composer.lock