From cb272f08bbf97f9caee93ec112a0b3f139974c31 Mon Sep 17 00:00:00 2001
From: William Espindola <oi@williamespindola.com.br>
Date: Thu, 17 Sep 2015 15:23:46 -0300
Subject: [PATCH 1/5] Create Services encapsulate logic of relationa and
 doctrine

---
 .gitignore                                    |  2 +-
 composer.json                                 |  3 +-
 src/Extension/FieldTwigExtension.php          | 29 ++++---
 src/Service/DoctrineFieldService.php          | 48 +++++++++++
 src/Service/DoctrineOptionService.php         | 38 +++++++++
 src/Service/RespectFieldService.php           | 48 +++++++++++
 src/Service/RespectOptionService.php          | 39 +++++++++
 src/Storage/ORM/RespectRelational.php         | 27 ++++---
 ...on-twig-instance-and-get-field-object.phpt | 28 +++++++
 .../Storage/ORM/RespectRelationalTest.php     | 79 +++++++++++++++----
 10 files changed, 306 insertions(+), 35 deletions(-)
 create mode 100644 src/Service/DoctrineFieldService.php
 create mode 100644 src/Service/DoctrineOptionService.php
 create mode 100644 src/Service/RespectFieldService.php
 create mode 100644 src/Service/RespectOptionService.php
 create mode 100644 tests/functional/phpt/1-extension-twig-instance-and-get-field-object.phpt

diff --git a/.gitignore b/.gitignore
index f02a2f8..751f6c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 build
 composer.lock
 docs
-vendor
+vendor
\ No newline at end of file
diff --git a/composer.json b/composer.json
index c4108e1..2513e4f 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,8 @@
   "require": {
     "php" : ">=5.4",
     "ocramius/generated-hydrator": "1.1.0",
-    "symfony/console": "~2.7"
+    "symfony/console": "~2.7",
+    "doctrine/orm": "2.5.0"
   },
   "require-dev": {
     "phpunit/phpunit" : "4.*",
diff --git a/src/Extension/FieldTwigExtension.php b/src/Extension/FieldTwigExtension.php
index 0604742..52ddad0 100644
--- a/src/Extension/FieldTwigExtension.php
+++ b/src/Extension/FieldTwigExtension.php
@@ -6,7 +6,12 @@
 use Twig_Function_Method;
 use WilliamEspindola\Field\Repository\FieldRepository;
 use WilliamEspindola\Field\Repository\OptionRepository;
+use Respect\Relational\Mapper;
 
+/**
+ * Class FieldTwigExtension
+ * @package WilliamEspindola\Field\Extension
+ */
 class FieldTwigExtension extends Twig_Extension
 {
     /**
@@ -19,12 +24,22 @@ class FieldTwigExtension extends Twig_Extension
      */
     protected $optionService;
 
+    /**
+     * @param FieldRepository $fieldRepository
+     * @param OptionRepository $optionRepository
+     */
     public function __construct(
         FieldRepository $fieldRepository,
         OptionRepository $optionRepository
     ) {
         $this->fieldRepository = $fieldRepository;
         $this->optionRepository = $optionRepository;
+
+        if ($this->fieldRepository->getStorage()->getMapper() instanceof Mapper) {
+            $this->fieldService = new RespectFieldService($this->fieldRepository);
+        } else {
+            $this->fieldService = new DoctrineFieldService($this->fieldRepository);
+        }
     }
 
     /**
@@ -45,7 +60,7 @@ public function getFunctions()
      */
     public function getField($name)
     {
-        return $this->fieldRepository->findOne(['name' => $name]);
+        return $this->fieldService->findOneByName($name);
     }
 
     /**
@@ -54,13 +69,9 @@ public function getField($name)
      */
     public function getOptionsOfField($name)
     {
-        $field = $this->fieldRepository->findOne(['name' => $name]);
-        $field->options = $this->optionRepository->findBy(
-            ['field_id' => $field->getId()],
-            Sql::orderBy('id')
-        );
+        $field = $this->fieldService->findOneByName($name);
 
-        return $field;
+        return $this->optionService->getOptionsOfField($field, 'id');
     }
 
     /**
@@ -69,9 +80,7 @@ public function getOptionsOfField($name)
      */
     public function getFieldValue($name)
     {
-        $field = $this->fieldRepository->findOne(['name' => $name]);
-
-        return $field->getValue();
+        return $this->fieldService->findOneByNameAndGetValue($name);
     }
 
     /**
diff --git a/src/Service/DoctrineFieldService.php b/src/Service/DoctrineFieldService.php
new file mode 100644
index 0000000..9a028ef
--- /dev/null
+++ b/src/Service/DoctrineFieldService.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace WilliamEspindola\Field\Service;
+
+use WilliamEspindola\Field\Repository\RepositoryInterface;
+
+/**
+ * Class DoctrineFieldService
+ * @package WilliamEspindola\Field\Service
+ */
+class DoctrineFieldService
+{
+    /**
+     * @var \WilliamEspindola\Field\Repository\RepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @param RepositoryInterface $repository
+     */
+    public function __construct(RepositoryInterface $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * @param String $name
+     * @return Object WilliamEspindola\Field\Entity\Field
+     */
+    public function findOneByName($name)
+    {
+        return $this->repository->findBy(['name' => $name], ['order' => 'name']);
+    }
+
+    /**
+     * @param String $name
+     * @return String Value of field
+     */
+    public function findOneByNameAndGetValue($name)
+    {
+        $fields = $this->repository->findBy(['name' => $name], ['order' => 'name']);
+
+        if (!$fields)
+            return;
+
+        return $fields[0]->getValue();
+    }
+} 
\ No newline at end of file
diff --git a/src/Service/DoctrineOptionService.php b/src/Service/DoctrineOptionService.php
new file mode 100644
index 0000000..8ec19f5
--- /dev/null
+++ b/src/Service/DoctrineOptionService.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace WilliamEspindola\Field\Service;
+
+use WilliamEspindola\Field\Repository\RepositoryInterface;
+
+/**
+ * Class DoctrineOptionService
+ * @package WilliamEspindola\Field\Service
+ */
+class DoctrineOptionService
+{
+    /**
+     * @var RepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @param RepositoryInterface $repository
+     */
+    public function __costruct(RepositoryInterface $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * @param Object $field
+     * @param String $order
+     * @return ArrayObject Options of field
+     */
+    public function getOptionsOfField($field, $order)
+    {
+        return $this->optionRepository->findBy(
+            ['field_id' => $field->getId()],
+            ['order' => $order]
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/Service/RespectFieldService.php b/src/Service/RespectFieldService.php
new file mode 100644
index 0000000..b4cf2c2
--- /dev/null
+++ b/src/Service/RespectFieldService.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace WilliamEspindola\Field\Service;
+
+use WilliamEspindola\Field\Repository\RepositoryInterface;
+
+/**
+ * Class RespectFieldService
+ * @package WilliamEspindola\Field\Service
+ */
+class RespectFieldService
+{
+    /**
+     * @var \WilliamEspindola\Field\Repository\RepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @param RepositoryInterface $repository
+     */
+    public function __construct(RepositoryInterface $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * @param String $name
+     * @return Object Field object
+     */
+    public function findOneByName($name)
+    {
+        return $this->repository->findBy(['name' => $name], ['order by name asc']);
+    }
+
+    /**
+     * @param String $name
+     * @return String Value of field
+     */
+    public function findOneByNameAndGetValue($name)
+    {
+        $fields = $this->repository->findBy(['name' => $name], ['order by name asc']);
+
+        if (!$fields)
+            return;
+
+        return $fields[0]->value;
+    }
+} 
\ No newline at end of file
diff --git a/src/Service/RespectOptionService.php b/src/Service/RespectOptionService.php
new file mode 100644
index 0000000..a4c8d68
--- /dev/null
+++ b/src/Service/RespectOptionService.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace WilliamEspindola\Field\Service;
+
+use Respect\Relational\Sql;
+use WilliamEspindola\Field\Repository\RepositoryInterface;
+
+/**
+ * Class RespectOptionService
+ * @package WilliamEspindola\Field\Service
+ */
+class RespectOptionService
+{
+    /**
+     * @var RepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @param RepositoryInterface $repository
+     */
+    public function __costruct(RepositoryInterface $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * @param Object $field
+     * @param String $order
+     * @return ArrayObject Options of field
+     */
+    public function getOptionsOfField($field, $order)
+    {
+        return $this->optionRepository->findBy(
+            ['field_id' => $field->id],
+            Sql::orderBy($order)
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/Storage/ORM/RespectRelational.php b/src/Storage/ORM/RespectRelational.php
index 49ed7d9..eabd04a 100644
--- a/src/Storage/ORM/RespectRelational.php
+++ b/src/Storage/ORM/RespectRelational.php
@@ -22,6 +22,11 @@ class RespectRelational implements StorageORMInterface
      */
     protected $mapper;
 
+    /**
+     * @var string table name
+     */
+    protected $repository;
+
     public function __construct(Mapper $mapper)
     {
         $this->setMapper($mapper);
@@ -46,23 +51,27 @@ public function getMapper()
         return $this->mapper;
     }
 
-    public function getRepository()
-    {
-        $repository = $this->repository;
-        $reflect = new \ReflectionClass(new $repository);
-        $tableName = strtolower($reflect->getShortName());
-        return $this->getMapper()->$tableName;
-    }
-
     public function setRepository($repository)
     {
+        if (empty($repository))
+            throw new Argument('repository param can not be null');
+
+        if (class_exists($repository)) {
+            $reflect    = new \ReflectionClass(new $repository);
+            $repository = strtolower($reflect->getShortName());
+        }
+
         $this->repository = $repository;
 
         return $this;
     }
 
+    public function getRepository()
+    {
+        return $this->getMapper()->$this->repository;
+    }
+
     /**
-     * @param $tableName
      * @return array
      */
     public function findAll()
diff --git a/tests/functional/phpt/1-extension-twig-instance-and-get-field-object.phpt b/tests/functional/phpt/1-extension-twig-instance-and-get-field-object.phpt
new file mode 100644
index 0000000..79d621a
--- /dev/null
+++ b/tests/functional/phpt/1-extension-twig-instance-and-get-field-object.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Teste instance the FieldTEigExtension and get field Object
+--FILE--
+<?php
+require 'vendor/autoload.php';
+
+use WilliamEspindola\Field\Extension\FieldTwigExtension;
+use WilliamEspindola\Field\Repository\FieldRepository;
+use WilliamEspindola\Field\Repository\OptionRepository;
+use WilliamEspindola\Field\Storage\ORM\RespectRelational;
+use Doctrine\ORM\Tools\Setup;
+use WilliamEspindola\Field\Storage\ORM\Doctrine;
+
+$conn               = ['driver' => 'pdo_sqlite', 'memory' => true];
+$configXml          = __DIR__ . "../../../config/xml";
+
+$setUp              = Setup::createXMLMetadataConfiguration([$configXml], true);
+$storage            = new Doctrine($conn, $setUp);
+
+$fieldRepository    = new FieldRepository($storage);
+$optionRepository   = new OptionRepository($storage);
+
+$extension          = FieldTwigExtension($fieldRepository, $optionRepository);
+
+echo gettype($extension->getField('field-name'));
+?>
+--EXPECT--
+object
\ No newline at end of file
diff --git a/tests/unit/Storage/ORM/RespectRelationalTest.php b/tests/unit/Storage/ORM/RespectRelationalTest.php
index 372c7a3..db0708d 100644
--- a/tests/unit/Storage/ORM/RespectRelationalTest.php
+++ b/tests/unit/Storage/ORM/RespectRelationalTest.php
@@ -2,13 +2,15 @@
 
 use WilliamEspindola\Field\Storage\ORM\RespectRelational;
 
+use Respect\Relational\Mapper;
+
 class RespectRelationalTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
         $this->mapper = $this->getMockBuilder('Respect\Relational\Mapper')
-            ->disableOriginalConstructor()
-            ->getMock();
+                            ->disableOriginalConstructor()
+                            ->getMock();
 
         $this->mapper->expects($this->any())
                     ->method(new PHPUnit_Framework_Constraint_IsAnything())
@@ -35,26 +37,75 @@ public function testSetMapperWithValidParameterShouldReturnMapperInGetMapper()
         );
     }
 
-    public function testToDefineAnEntityNameSpaceForMapperWithValidDataShouldWork()
+    public function testGetMapperShouldReturnMockedInstance()
     {
         $instance = new RespectRelational($this->mapper);
-        $namespace = '\\My\Namespace\\Entity\\';
-        $instance->setEntityNamespace($namespace);
+        $this->assertInstanceOf(
+            'Respect\Relational\Mapper',
+            $instance->getMapper(),
+            'The instance returned by getMapper is not instance of Respect\Relational\Mapper'
+        );
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function testSetRepositoryWithInvalidValueShouldThrowAndException()
+    {
+        $instance   = new RespectRelational($this->mapper);
+
+        $instance->setRepository('');
+    }
+
+    public function testSetRepositoryWithAValidNamespaceShouldWork()
+    {
+        $instance   = new RespectRelational($this->mapper);
+        $stubClass  = $this->getMock('MyNamespace\MyClass');
+
+        $instance->setRepository('MyNamespace\MyClass');
 
         $this->assertEquals(
-            $this->mapper->entityNamespace,
-            $namespace,
-            "Namespace isn't equals"
+            'myclass',
+            PHPUnit_Framework_Assert::readAttribute($instance, 'repository'),
+            'The attribute repository is not instance of the string class name: myclass'
         );
     }
 
-    public function testGetMapperShouldReturnMockedInstance()
+    public function testSetRepositoryWithValidStringShouldWork()
     {
-        $instance = new RespectRelational($this->mapper);
-        $this->assertInstanceOf(
-            'Respect\Relational\Mapper',
-            $instance->getMapper(),
-            'The instance returned by getMapper is not instance of Respect\Relational\Mapper'
+        $instance   = new RespectRelational($this->mapper);
+
+        $instance->setRepository('mytable');
+
+        $this->assertEquals(
+            'mytable',
+            PHPUnit_Framework_Assert::readAttribute($instance, 'repository'),
+            'The attribute repository is not instance of the string table name: mytable'
+        );
+    }
+
+    public function testGetRepositoryShouldReturnMockedInstance()
+    {
+        $conn = $this->getMock(
+            'PDO',
+            array('lastInsertId'),
+            array('sqlite::memory:')
+        );
+        $conn->exec('CREATE TABLE mytable(id INTEGER PRIMARY KEY)');
+        $conn->expects($this->any())
+            ->method('lastInsertId')
+            ->will($this->throwException(new \PDOException));
+
+
+        $mapper = new Mapper($conn);
+
+        $instance = new RespectRelational($mapper);
+        $instance->setRepository('mytable');
+
+        $this->assertEquals(
+            'mytable',
+            $instance->getRepository(),
+            'is not mytable'
         );
     }
 } 
\ No newline at end of file

From 8b228a213c21001b8422f1090b3dea361ca2cad6 Mon Sep 17 00:00:00 2001
From: William Espindola <oi@williamespindola.com.br>
Date: Thu, 17 Sep 2015 20:44:37 -0300
Subject: [PATCH 2/5] Refatoring Twig extension and create services to work
 than

---
 composer.json                                 |  3 +-
 ...mEspindola.Field.Entity.Collection.dcm.xml |  2 +-
 ...ndola.Field.Entity.CollectionField.dcm.xml |  2 +-
 ...illiamEspindola.Field.Entity.Field.dcm.xml |  2 +-
 ...iamEspindola.Field.Entity.Options.dcm.xml} |  4 +--
 src/Entity/{Option.php => Options.php}        | 26 +++++++--------
 src/Extension/FieldTwigExtension.php          | 33 +++++--------------
 src/Repository/OptionRepository.php           |  2 +-
 src/Service/DoctrineFieldService.php          | 12 +++++--
 src/Service/DoctrineOptionService.php         |  6 ++--
 src/Service/RespectOptionService.php          |  2 +-
 src/Storage/ORM/RespectRelational.php         |  2 +-
 ...on-twig-instance-and-get-field-object.phpt | 26 +++++++++++----
 ...mEspindola.Field.Entity.Collection.dcm.xml | 15 +++++++++
 ...ndola.Field.Entity.CollectionField.dcm.xml | 15 +++++++++
 ...illiamEspindola.Field.Entity.Field.dcm.xml | 17 ++++++++++
 ...liamEspindola.Field.Entity.Options.dcm.xml | 16 +++++++++
 17 files changed, 128 insertions(+), 57 deletions(-)
 rename config/xml/{option.dcm.xml => WilliamEspindola.Field.Entity.Options.dcm.xml} (82%)
 rename src/Entity/{Option.php => Options.php} (57%)
 create mode 100644 tests/functional/phpt/xml/WilliamEspindola.Field.Entity.Collection.dcm.xml
 create mode 100644 tests/functional/phpt/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
 create mode 100644 tests/functional/phpt/xml/WilliamEspindola.Field.Entity.Field.dcm.xml
 create mode 100644 tests/functional/phpt/xml/WilliamEspindola.Field.Entity.Options.dcm.xml

diff --git a/composer.json b/composer.json
index 2513e4f..95207c6 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,8 @@
     "php" : ">=5.4",
     "ocramius/generated-hydrator": "1.1.0",
     "symfony/console": "~2.7",
-    "doctrine/orm": "2.5.0"
+    "doctrine/orm": "2.5.0",
+    "twig/twig": "1.9"
   },
   "require-dev": {
     "phpunit/phpunit" : "4.*",
diff --git a/config/xml/WilliamEspindola.Field.Entity.Collection.dcm.xml b/config/xml/WilliamEspindola.Field.Entity.Collection.dcm.xml
index e363c65..652f433 100644
--- a/config/xml/WilliamEspindola.Field.Entity.Collection.dcm.xml
+++ b/config/xml/WilliamEspindola.Field.Entity.Collection.dcm.xml
@@ -4,7 +4,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
 
-    <entity name="WilliamEspindola\Field\Entity\Collection">
+    <entity name="WilliamEspindola\Field\Entity\Collection" table="collection">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>
diff --git a/config/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml b/config/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
index ef7c2ed..8048c96 100644
--- a/config/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
+++ b/config/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
@@ -4,7 +4,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
 
-    <entity name="WilliamEspindola\Field\Entity\CollectionField">
+    <entity name="WilliamEspindola\Field\Entity\CollectionField" table="collection_field">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>
diff --git a/config/xml/WilliamEspindola.Field.Entity.Field.dcm.xml b/config/xml/WilliamEspindola.Field.Entity.Field.dcm.xml
index fd36f59..bdda98a 100644
--- a/config/xml/WilliamEspindola.Field.Entity.Field.dcm.xml
+++ b/config/xml/WilliamEspindola.Field.Entity.Field.dcm.xml
@@ -4,7 +4,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
 
-    <entity name="WilliamEspindola\Field\Entity\Field">
+    <entity name="WilliamEspindola\Field\Entity\Field" table="field">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>
diff --git a/config/xml/option.dcm.xml b/config/xml/WilliamEspindola.Field.Entity.Options.dcm.xml
similarity index 82%
rename from config/xml/option.dcm.xml
rename to config/xml/WilliamEspindola.Field.Entity.Options.dcm.xml
index 027a4aa..5ef5399 100644
--- a/config/xml/option.dcm.xml
+++ b/config/xml/WilliamEspindola.Field.Entity.Options.dcm.xml
@@ -4,12 +4,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
 
-    <entity name="option">
+    <entity name="WilliamEspindola\Field\Entity\Options" table="options">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>
 
-        <field name="option" type="string" />
+        <field name="value" type="string" />
 
         <many-to-one target-entity="WilliamEspindola\Field\Entity\Field" field="field" />
     </entity>
diff --git a/src/Entity/Option.php b/src/Entity/Options.php
similarity index 57%
rename from src/Entity/Option.php
rename to src/Entity/Options.php
index e94d5c9..6d67df9 100644
--- a/src/Entity/Option.php
+++ b/src/Entity/Options.php
@@ -2,7 +2,7 @@
 
 namespace WilliamEspindola\Field\Entity;
 
-class Option implements EntityInterface
+class Options implements EntityInterface
 {
     /**
      * @var integer
@@ -12,27 +12,27 @@ class Option implements EntityInterface
     /**
      * @var text
      */
-    private $option;
+    private $value;
 
     /**
      * $var object WilliamEspindola\Field\Entity\Field
      */
-    private $field_id;
+    private $field;
 
     /**
-     * @param mixed $field_id
+     * @param mixed $field
      */
-    public function setFieldId($field_id)
+    public function setField($field)
     {
-        $this->field_id = $field_id;
+        $this->field = $field;
     }
 
     /**
      * @return mixed
      */
-    public function getFieldId()
+    public function getField()
     {
-        return $this->field_id;
+        return $this->field;
     }
 
     /**
@@ -52,18 +52,18 @@ public function getId()
     }
 
     /**
-     * @param text $option
+     * @param text $value
      */
-    public function setOption($option)
+    public function setValue($value)
     {
-        $this->option = $option;
+        $this->value = $value;
     }
 
     /**
      * @return text
      */
-    public function getOption()
+    public function getValue()
     {
-        return $this->option;
+        return $this->value;
     }
 }
\ No newline at end of file
diff --git a/src/Extension/FieldTwigExtension.php b/src/Extension/FieldTwigExtension.php
index 52ddad0..5818562 100644
--- a/src/Extension/FieldTwigExtension.php
+++ b/src/Extension/FieldTwigExtension.php
@@ -5,7 +5,8 @@
 use Twig_Extension;
 use Twig_Function_Method;
 use WilliamEspindola\Field\Repository\FieldRepository;
-use WilliamEspindola\Field\Repository\OptionRepository;
+use WilliamEspindola\Field\Service\DoctrineFieldService;
+use WilliamEspindola\Field\Service\RespectFieldService;
 use Respect\Relational\Mapper;
 
 /**
@@ -15,30 +16,25 @@
 class FieldTwigExtension extends Twig_Extension
 {
     /**
-     * @var \WilliamEspindola\Field\Repository\FieldRepository
+     * @var
      */
-    protected $fieldRepository;
+    protected $fieldService;
 
     /**
-     * @var \WilliamEspindola\Field\Repository\OptionRepository
+     * @var
      */
     protected $optionService;
 
     /**
      * @param FieldRepository $fieldRepository
-     * @param OptionRepository $optionRepository
      */
     public function __construct(
-        FieldRepository $fieldRepository,
-        OptionRepository $optionRepository
+        FieldRepository $fieldRepository
     ) {
-        $this->fieldRepository = $fieldRepository;
-        $this->optionRepository = $optionRepository;
-
-        if ($this->fieldRepository->getStorage()->getMapper() instanceof Mapper) {
-            $this->fieldService = new RespectFieldService($this->fieldRepository);
+        if ($fieldRepository->getStorage()->getMapper() instanceof Mapper) {
+            $this->fieldService = new RespectFieldService($fieldRepository);
         } else {
-            $this->fieldService = new DoctrineFieldService($this->fieldRepository);
+            $this->fieldService = new DoctrineFieldService($fieldRepository);
         }
     }
 
@@ -63,17 +59,6 @@ public function getField($name)
         return $this->fieldService->findOneByName($name);
     }
 
-    /**
-     * @param $name Name of Field
-     * @return array Field Object with your options
-     */
-    public function getOptionsOfField($name)
-    {
-        $field = $this->fieldService->findOneByName($name);
-
-        return $this->optionService->getOptionsOfField($field, 'id');
-    }
-
     /**
      * @param $name Name of Field
      * @return string Value of field
diff --git a/src/Repository/OptionRepository.php b/src/Repository/OptionRepository.php
index 5502748..25b42c8 100644
--- a/src/Repository/OptionRepository.php
+++ b/src/Repository/OptionRepository.php
@@ -10,6 +10,6 @@ class OptionRepository
 {
     public function __construct(StorageORMInterface $storage)
     {
-        $this->setStorage($storage, 'WilliamEspindola\Field\Entity\Option');
+        $this->setStorage($storage, 'WilliamEspindola\Field\Entity\Options');
     }
 }
\ No newline at end of file
diff --git a/src/Service/DoctrineFieldService.php b/src/Service/DoctrineFieldService.php
index 9a028ef..1854d36 100644
--- a/src/Service/DoctrineFieldService.php
+++ b/src/Service/DoctrineFieldService.php
@@ -29,7 +29,12 @@ public function __construct(RepositoryInterface $repository)
      */
     public function findOneByName($name)
     {
-        return $this->repository->findBy(['name' => $name], ['order' => 'name']);
+        $field = $this->repository->findBy(
+            ['name' => $name],
+            [['name' => 'ASC'], null, null]
+        );
+
+        return $field ? $field[0] : false;
     }
 
     /**
@@ -38,7 +43,10 @@ public function findOneByName($name)
      */
     public function findOneByNameAndGetValue($name)
     {
-        $fields = $this->repository->findBy(['name' => $name], ['order' => 'name']);
+        $fields = $this->repository->findBy(
+            ['name' => $name],
+            [['name' => 'ASC'], null, null]
+        );
 
         if (!$fields)
             return;
diff --git a/src/Service/DoctrineOptionService.php b/src/Service/DoctrineOptionService.php
index 8ec19f5..0636208 100644
--- a/src/Service/DoctrineOptionService.php
+++ b/src/Service/DoctrineOptionService.php
@@ -28,11 +28,11 @@ public function __costruct(RepositoryInterface $repository)
      * @param String $order
      * @return ArrayObject Options of field
      */
-    public function getOptionsOfField($field, $order)
+    public function getOptionsOfField($field, Array $order)
     {
-        return $this->optionRepository->findBy(
+        return $this->repository->findBy(
             ['field_id' => $field->getId()],
-            ['order' => $order]
+            [$order, null, null]
         );
     }
 }
\ No newline at end of file
diff --git a/src/Service/RespectOptionService.php b/src/Service/RespectOptionService.php
index a4c8d68..ade3301 100644
--- a/src/Service/RespectOptionService.php
+++ b/src/Service/RespectOptionService.php
@@ -31,7 +31,7 @@ public function __costruct(RepositoryInterface $repository)
      */
     public function getOptionsOfField($field, $order)
     {
-        return $this->optionRepository->findBy(
+        return $this->repository->findBy(
             ['field_id' => $field->id],
             Sql::orderBy($order)
         );
diff --git a/src/Storage/ORM/RespectRelational.php b/src/Storage/ORM/RespectRelational.php
index eabd04a..b14a7bf 100644
--- a/src/Storage/ORM/RespectRelational.php
+++ b/src/Storage/ORM/RespectRelational.php
@@ -58,7 +58,7 @@ public function setRepository($repository)
 
         if (class_exists($repository)) {
             $reflect    = new \ReflectionClass(new $repository);
-            $repository = strtolower($reflect->getShortName());
+            $repository = strtolower($reflect->getShowrtName());
         }
 
         $this->repository = $repository;
diff --git a/tests/functional/phpt/1-extension-twig-instance-and-get-field-object.phpt b/tests/functional/phpt/1-extension-twig-instance-and-get-field-object.phpt
index 79d621a..a3c42a5 100644
--- a/tests/functional/phpt/1-extension-twig-instance-and-get-field-object.phpt
+++ b/tests/functional/phpt/1-extension-twig-instance-and-get-field-object.phpt
@@ -6,23 +6,37 @@ require 'vendor/autoload.php';
 
 use WilliamEspindola\Field\Extension\FieldTwigExtension;
 use WilliamEspindola\Field\Repository\FieldRepository;
-use WilliamEspindola\Field\Repository\OptionRepository;
-use WilliamEspindola\Field\Storage\ORM\RespectRelational;
 use Doctrine\ORM\Tools\Setup;
 use WilliamEspindola\Field\Storage\ORM\Doctrine;
 
-$conn               = ['driver' => 'pdo_sqlite', 'memory' => true];
-$configXml          = __DIR__ . "../../../config/xml";
+$conn               = ['driver' => 'pdo_mysql', 'user' => 'root', 'password' => '123', 'dbname' => 'field'];
+$configXml          = __DIR__ . "/xml/";
 
 $setUp              = Setup::createXMLMetadataConfiguration([$configXml], true);
 $storage            = new Doctrine($conn, $setUp);
 
+$stmt = $storage->getMapper()->getConnection()->prepare("
+CREATE TABLE IF NOT EXISTS field (
+  id INTEGER PRIMARY KEY,
+  name TEXT NOT NULL,
+  type TEXT NOT NULL,
+  value TEXT NULL,
+  label TEXT NOT NULL
+);
+INSERT INTO field (id, name, type, value, label) VALUES (1, 'field-name', 'text', 'field-name', 'field-name');
+");
+$stmt->execute();
+$stmt->closeCursor();
+
 $fieldRepository    = new FieldRepository($storage);
-$optionRepository   = new OptionRepository($storage);
 
-$extension          = FieldTwigExtension($fieldRepository, $optionRepository);
+$extension          = new FieldTwigExtension($fieldRepository);
 
 echo gettype($extension->getField('field-name'));
+
+$stmt = $storage->getMapper()->getConnection()->prepare("DROP TABLE field;");
+$stmt->execute();
+$stmt->closeCursor();
 ?>
 --EXPECT--
 object
\ No newline at end of file
diff --git a/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.Collection.dcm.xml b/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.Collection.dcm.xml
new file mode 100644
index 0000000..652f433
--- /dev/null
+++ b/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.Collection.dcm.xml
@@ -0,0 +1,15 @@
+<!-- config/xml/Collection.dcm.xml -->
+<doctrine-mapping
+    xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
+
+    <entity name="WilliamEspindola\Field\Entity\Collection" table="collection">
+        <id name="id" type="integer">
+            <generator strategy="AUTO" />
+        </id>
+
+        <field name="name" type="string" />
+        <field name="label" type="string" />
+    </entity>
+</doctrine-mapping>
\ No newline at end of file
diff --git a/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml b/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
new file mode 100644
index 0000000..8048c96
--- /dev/null
+++ b/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
@@ -0,0 +1,15 @@
+<!-- config/xml/CollectionField.dcm.xml -->
+<doctrine-mapping
+    xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
+
+    <entity name="WilliamEspindola\Field\Entity\CollectionField" table="collection_field">
+        <id name="id" type="integer">
+            <generator strategy="AUTO" />
+        </id>
+
+        <many-to-one field="field" target-entity="WilliamEspindola\Field\Entity\Field" />
+        <many-to-one field="collection" target-entity="WilliamEspindola\Field\Entity\Collection" />
+    </entity>
+</doctrine-mapping>
\ No newline at end of file
diff --git a/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.Field.dcm.xml b/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.Field.dcm.xml
new file mode 100644
index 0000000..bdda98a
--- /dev/null
+++ b/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.Field.dcm.xml
@@ -0,0 +1,17 @@
+<!-- config/xml/Field.dcm.xml -->
+<doctrine-mapping
+    xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
+
+    <entity name="WilliamEspindola\Field\Entity\Field" table="field">
+        <id name="id" type="integer">
+            <generator strategy="AUTO" />
+        </id>
+
+        <field name="name" type="string" />
+        <field name="type" type="string" />
+        <field name="value" type="text" />
+        <field name="label" type="string" />
+    </entity>
+</doctrine-mapping>
\ No newline at end of file
diff --git a/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.Options.dcm.xml b/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.Options.dcm.xml
new file mode 100644
index 0000000..5ef5399
--- /dev/null
+++ b/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.Options.dcm.xml
@@ -0,0 +1,16 @@
+<!-- config/xml/Option.dcm.xml -->
+<doctrine-mapping
+    xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
+
+    <entity name="WilliamEspindola\Field\Entity\Options" table="options">
+        <id name="id" type="integer">
+            <generator strategy="AUTO" />
+        </id>
+
+        <field name="value" type="string" />
+
+        <many-to-one target-entity="WilliamEspindola\Field\Entity\Field" field="field" />
+    </entity>
+</doctrine-mapping>
\ No newline at end of file

From d78c098220ace8130e11a4bec70fec31009b3297 Mon Sep 17 00:00:00 2001
From: William Espindola <oi@williamespindola.com.br>
Date: Thu, 17 Sep 2015 21:11:55 -0300
Subject: [PATCH 3/5] Create testes to getField with respect relationa

---
 composer.json                                 |  4 +-
 src/Service/RespectFieldService.php           |  4 +-
 src/Storage/ORM/RespectRelational.php         |  4 +-
 ...-and-get-field-object-using-doctrine.phpt} |  0
 ...ce-and-get-field-object-using-respect.phpt | 37 +++++++++++++++++++
 5 files changed, 43 insertions(+), 6 deletions(-)
 rename tests/functional/phpt/{1-extension-twig-instance-and-get-field-object.phpt => 1-extension-twig-instance-and-get-field-object-using-doctrine.phpt} (100%)
 create mode 100644 tests/functional/phpt/1-extension-twig-instance-and-get-field-object-using-respect.phpt

diff --git a/composer.json b/composer.json
index 95207c6..c4108e1 100644
--- a/composer.json
+++ b/composer.json
@@ -20,9 +20,7 @@
   "require": {
     "php" : ">=5.4",
     "ocramius/generated-hydrator": "1.1.0",
-    "symfony/console": "~2.7",
-    "doctrine/orm": "2.5.0",
-    "twig/twig": "1.9"
+    "symfony/console": "~2.7"
   },
   "require-dev": {
     "phpunit/phpunit" : "4.*",
diff --git a/src/Service/RespectFieldService.php b/src/Service/RespectFieldService.php
index b4cf2c2..04c6cd4 100644
--- a/src/Service/RespectFieldService.php
+++ b/src/Service/RespectFieldService.php
@@ -29,7 +29,9 @@ public function __construct(RepositoryInterface $repository)
      */
     public function findOneByName($name)
     {
-        return $this->repository->findBy(['name' => $name], ['order by name asc']);
+        $field = $this->repository->findBy(['name' => $name], ['order by name asc']);
+
+        return $field ? $field[0] : false;
     }
 
     /**
diff --git a/src/Storage/ORM/RespectRelational.php b/src/Storage/ORM/RespectRelational.php
index b14a7bf..566b26d 100644
--- a/src/Storage/ORM/RespectRelational.php
+++ b/src/Storage/ORM/RespectRelational.php
@@ -58,7 +58,7 @@ public function setRepository($repository)
 
         if (class_exists($repository)) {
             $reflect    = new \ReflectionClass(new $repository);
-            $repository = strtolower($reflect->getShowrtName());
+            $repository = strtolower($reflect->getShortName());
         }
 
         $this->repository = $repository;
@@ -68,7 +68,7 @@ public function setRepository($repository)
 
     public function getRepository()
     {
-        return $this->getMapper()->$this->repository;
+        return $this->getMapper()->{$this->repository};
     }
 
     /**
diff --git a/tests/functional/phpt/1-extension-twig-instance-and-get-field-object.phpt b/tests/functional/phpt/1-extension-twig-instance-and-get-field-object-using-doctrine.phpt
similarity index 100%
rename from tests/functional/phpt/1-extension-twig-instance-and-get-field-object.phpt
rename to tests/functional/phpt/1-extension-twig-instance-and-get-field-object-using-doctrine.phpt
diff --git a/tests/functional/phpt/1-extension-twig-instance-and-get-field-object-using-respect.phpt b/tests/functional/phpt/1-extension-twig-instance-and-get-field-object-using-respect.phpt
new file mode 100644
index 0000000..21720b1
--- /dev/null
+++ b/tests/functional/phpt/1-extension-twig-instance-and-get-field-object-using-respect.phpt
@@ -0,0 +1,37 @@
+--TEST--
+Teste instance the FieldTEigExtension and get field Object
+--FILE--
+<?php
+require 'vendor/autoload.php';
+
+use WilliamEspindola\Field\Extension\FieldTwigExtension;
+use WilliamEspindola\Field\Repository\FieldRepository;
+use WilliamEspindola\Field\Storage\ORM\RespectRelational;
+use Respect\Relational\Mapper;
+use Respect\Relational\Db;
+
+$db                 = new Db(new PDO("mysql:host=localhost;dbname=field", 'root', '123'));
+$mapper             = new Mapper($db);
+$storage            = new RespectRelational($mapper);
+
+$db->query("
+CREATE TABLE IF NOT EXISTS field (
+  id INTEGER PRIMARY KEY,
+  name TEXT NOT NULL,
+  type TEXT NOT NULL,
+  value TEXT NULL,
+  label TEXT NOT NULL
+);
+INSERT INTO field (id, name, type, value, label) VALUES (1, 'field-name', 'text', 'field-name', 'field-name');
+")->exec();
+
+$fieldRepository    = new FieldRepository($storage);
+
+$extension          = new FieldTwigExtension($fieldRepository);
+
+echo gettype($extension->getField('field-name'));
+
+$db->query("DROP TABLE field;")->exec();
+?>
+--EXPECT--
+object
\ No newline at end of file

From 8f02e88770a7fb12e4bb8c3a3e560aef5ce125f2 Mon Sep 17 00:00:00 2001
From: William Espindola <oi@williamespindola.com.br>
Date: Thu, 17 Sep 2015 21:14:04 -0300
Subject: [PATCH 4/5] Teste integration to retrive field value with respect and
 doctrine

---
 ...ce-and-get-field-value-using-doctrine.phpt | 42 +++++++++++++++++++
 ...nce-and-get-field-value-using-respect.phpt | 37 ++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 tests/functional/phpt/1-extension-twig-instance-and-get-field-value-using-doctrine.phpt
 create mode 100644 tests/functional/phpt/1-extension-twig-instance-and-get-field-value-using-respect.phpt

diff --git a/tests/functional/phpt/1-extension-twig-instance-and-get-field-value-using-doctrine.phpt b/tests/functional/phpt/1-extension-twig-instance-and-get-field-value-using-doctrine.phpt
new file mode 100644
index 0000000..e881b9e
--- /dev/null
+++ b/tests/functional/phpt/1-extension-twig-instance-and-get-field-value-using-doctrine.phpt
@@ -0,0 +1,42 @@
+--TEST--
+Teste instance the FieldTEigExtension and get field Object
+--FILE--
+<?php
+require 'vendor/autoload.php';
+
+use WilliamEspindola\Field\Extension\FieldTwigExtension;
+use WilliamEspindola\Field\Repository\FieldRepository;
+use Doctrine\ORM\Tools\Setup;
+use WilliamEspindola\Field\Storage\ORM\Doctrine;
+
+$conn               = ['driver' => 'pdo_mysql', 'user' => 'root', 'password' => '123', 'dbname' => 'field'];
+$configXml          = __DIR__ . "/xml/";
+
+$setUp              = Setup::createXMLMetadataConfiguration([$configXml], true);
+$storage            = new Doctrine($conn, $setUp);
+
+$stmt = $storage->getMapper()->getConnection()->prepare("
+CREATE TABLE IF NOT EXISTS field (
+  id INTEGER PRIMARY KEY,
+  name TEXT NOT NULL,
+  type TEXT NOT NULL,
+  value TEXT NULL,
+  label TEXT NOT NULL
+);
+INSERT INTO field (id, name, type, value, label) VALUES (1, 'field-name', 'text', 'field-name', 'field-name');
+");
+$stmt->execute();
+$stmt->closeCursor();
+
+$fieldRepository    = new FieldRepository($storage);
+
+$extension          = new FieldTwigExtension($fieldRepository);
+
+echo $extension->getFieldValue('field-name');
+
+$stmt = $storage->getMapper()->getConnection()->prepare("DROP TABLE field;");
+$stmt->execute();
+$stmt->closeCursor();
+?>
+--EXPECT--
+field-name
\ No newline at end of file
diff --git a/tests/functional/phpt/1-extension-twig-instance-and-get-field-value-using-respect.phpt b/tests/functional/phpt/1-extension-twig-instance-and-get-field-value-using-respect.phpt
new file mode 100644
index 0000000..e8700b6
--- /dev/null
+++ b/tests/functional/phpt/1-extension-twig-instance-and-get-field-value-using-respect.phpt
@@ -0,0 +1,37 @@
+--TEST--
+Teste instance the FieldTEigExtension and get field Object
+--FILE--
+<?php
+require 'vendor/autoload.php';
+
+use WilliamEspindola\Field\Extension\FieldTwigExtension;
+use WilliamEspindola\Field\Repository\FieldRepository;
+use WilliamEspindola\Field\Storage\ORM\RespectRelational;
+use Respect\Relational\Mapper;
+use Respect\Relational\Db;
+
+$db                 = new Db(new PDO("mysql:host=localhost;dbname=field", 'root', '123'));
+$mapper             = new Mapper($db);
+$storage            = new RespectRelational($mapper);
+
+$db->query("
+CREATE TABLE IF NOT EXISTS field (
+  id INTEGER PRIMARY KEY,
+  name TEXT NOT NULL,
+  type TEXT NOT NULL,
+  value TEXT NULL,
+  label TEXT NOT NULL
+);
+INSERT INTO field (id, name, type, value, label) VALUES (1, 'field-name', 'text', 'field-name', 'field-name');
+")->exec();
+
+$fieldRepository    = new FieldRepository($storage);
+
+$extension          = new FieldTwigExtension($fieldRepository);
+
+echo $extension->getFieldValue('field-name');
+
+$db->query("DROP TABLE field;")->exec();
+?>
+--EXPECT--
+field-name
\ No newline at end of file

From 695f1464b74b8ed57063aac87611f7aec1b1c69b Mon Sep 17 00:00:00 2001
From: William Espindola <oi@williamespindola.com.br>
Date: Thu, 17 Sep 2015 21:18:39 -0300
Subject: [PATCH 5/5] Rename collection_field to collection field and remove
 MER

---
 ...ndola.Field.Entity.CollectionField.dcm.xml |   2 +-
 data/mysql-schema.sql                         |  47 ------------------
 data/schema-0.3.mwb                           | Bin 9745 -> 0 bytes
 data/schema-0.3.mwb.bak                       | Bin 9641 -> 0 bytes
 data/schema-0.3.sql                           |   4 +-
 ...ndola.Field.Entity.CollectionField.dcm.xml |   2 +-
 6 files changed, 4 insertions(+), 51 deletions(-)
 delete mode 100644 data/mysql-schema.sql
 delete mode 100644 data/schema-0.3.mwb
 delete mode 100644 data/schema-0.3.mwb.bak

diff --git a/config/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml b/config/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
index 8048c96..4d057d6 100644
--- a/config/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
+++ b/config/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
@@ -4,7 +4,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
 
-    <entity name="WilliamEspindola\Field\Entity\CollectionField" table="collection_field">
+    <entity name="WilliamEspindola\Field\Entity\CollectionField" table="collectionfield">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>
diff --git a/data/mysql-schema.sql b/data/mysql-schema.sql
deleted file mode 100644
index d781ab5..0000000
--- a/data/mysql-schema.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-CREATE TABLE IF NOT EXISTS `field` (
-  `id` INT NOT NULL AUTO_INCREMENT,
-  `name` VARCHAR(255) NOT NULL,
-  `type` VARCHAR(255) NOT NULL,
-  `value` TEXT NULL,
-  `label` VARCHAR(255) NOT NULL,
-  PRIMARY KEY (`id`))
-  ENGINE = InnoDB;
-
-CREATE TABLE IF NOT EXISTS `option` (
-  `id` INT NOT NULL,
-  `option` TEXT NULL,
-  `field_id` INT NOT NULL,
-  PRIMARY KEY (`id`),
-  INDEX `fk_options_field_idx` (`field_id` ASC),
-  CONSTRAINT `fk_options_field`
-  FOREIGN KEY (`field_id`)
-  REFERENCES `field` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION)
-  ENGINE = InnoDB;
-
-CREATE TABLE IF NOT EXISTS `collection` (
-  `id` INT NOT NULL AUTO_INCREMENT,
-  `name` VARCHAR(255) NOT NULL,
-  `label` VARCHAR(255) NOT NULL,
-  PRIMARY KEY (`id`))
-  ENGINE = InnoDB;
-
-CREATE TABLE IF NOT EXISTS `collectionfield` (
-  `collection_id` INT NOT NULL,
-  `field_id` INT NOT NULL,
-  `id` INT NOT NULL AUTO_INCREMENT,
-  PRIMARY KEY (`id`, `collection_id`, `field_id`),
-  INDEX `fk_collection_has_field_field1_idx` (`field_id` ASC),
-  INDEX `fk_collection_has_field_collection1_idx` (`collection_id` ASC),
-  CONSTRAINT `fk_collection_has_field_collection1`
-  FOREIGN KEY (`collection_id`)
-  REFERENCES `collection` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
-  CONSTRAINT `fk_collection_has_field_field1`
-  FOREIGN KEY (`field_id`)
-  REFERENCES `field` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION)
-  ENGINE = InnoDB;
\ No newline at end of file
diff --git a/data/schema-0.3.mwb b/data/schema-0.3.mwb
deleted file mode 100644
index 67a60d92bed07d4afe2c7091b335fb90f391efe4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9745
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

diff --git a/data/schema-0.3.mwb.bak b/data/schema-0.3.mwb.bak
deleted file mode 100644
index c283dc782258b9ab2908d35b27abb35096540933..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9641
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

diff --git a/data/schema-0.3.sql b/data/schema-0.3.sql
index 4b6c5b9..a26d294 100644
--- a/data/schema-0.3.sql
+++ b/data/schema-0.3.sql
@@ -53,9 +53,9 @@ ENGINE = InnoDB;
 
 
 -- -----------------------------------------------------
--- Table `mydb`.`collection_field`
+-- Table `mydb`.`collectionfield`
 -- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `mydb`.`collection_field` (
+CREATE TABLE IF NOT EXISTS `mydb`.`collectionfield` (
   `collection_id` INT NOT NULL,
   `field_id` INT NOT NULL,
   `id` INT NOT NULL AUTO_INCREMENT,
diff --git a/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml b/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
index 8048c96..4d057d6 100644
--- a/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
+++ b/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
@@ -4,7 +4,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
 
-    <entity name="WilliamEspindola\Field\Entity\CollectionField" table="collection_field">
+    <entity name="WilliamEspindola\Field\Entity\CollectionField" table="collectionfield">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>