Merge pull request #20 from williamespindola/fix/extension-field-depe…

…ndency-methods

Fix/extension field dependency methods

.gitignore

@@ -1,4 +1,4 @@
 build
 composer.lock
 docs
-vendor
+vendor

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>

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="collectionfield">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>

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>

config/xml/option.dcm.xml → 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>

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,

src/Entity/Option.php → 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;
     }
 }

src/Extension/FieldTwigExtension.php

@@ -5,26 +5,37 @@
 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;
 
+/**
+ * Class FieldTwigExtension
+ * @package WilliamEspindola\Field\Extension
+ */
 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
+     */
     public function __construct(
-        FieldRepository $fieldRepository,
-        OptionRepository $optionRepository
+        FieldRepository $fieldRepository
     ) {
-        $this->fieldRepository = $fieldRepository;
-        $this->optionRepository = $optionRepository;
+        if ($fieldRepository->getStorage()->getMapper() instanceof Mapper) {
+            $this->fieldService = new RespectFieldService($fieldRepository);
+        } else {
+            $this->fieldService = new DoctrineFieldService($fieldRepository);
+        }
     }
 
     /**
@@ -45,22 +56,7 @@ public function getFunctions()
      */
     public function getField($name)
     {
-        return $this->fieldRepository->findOne(['name' => $name]);
-    }
-
-    /**
-     * @param $name Name of Field
-     * @return array Field Object with your options
-     */
-    public function getOptionsOfField($name)
-    {
-        $field = $this->fieldRepository->findOne(['name' => $name]);
-        $field->options = $this->optionRepository->findBy(
-            ['field_id' => $field->getId()],
-            Sql::orderBy('id')
-        );
-
-        return $field;
+        return $this->fieldService->findOneByName($name);
     }
 
     /**
@@ -69,9 +65,7 @@ public function getOptionsOfField($name)
      */
     public function getFieldValue($name)
     {
-        $field = $this->fieldRepository->findOne(['name' => $name]);
-
-        return $field->getValue();
+        return $this->fieldService->findOneByNameAndGetValue($name);
     }
 
     /**

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');
     }
 }

src/Service/DoctrineFieldService.php

@@ -0,0 +1,56 @@
+<?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)
+    {
+        $field = $this->repository->findBy(
+            ['name' => $name],
+            [['name' => 'ASC'], null, null]
+        );
+
+        return $field ? $field[0] : false;
+    }
+
+    /**
+     * @param String $name
+     * @return String Value of field
+     */
+    public function findOneByNameAndGetValue($name)
+    {
+        $fields = $this->repository->findBy(
+            ['name' => $name],
+            [['name' => 'ASC'], null, null]
+        );
+
+        if (!$fields)
+            return;
+
+        return $fields[0]->getValue();
+    }
+} 

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, Array $order)
+    {
+        return $this->repository->findBy(
+            ['field_id' => $field->getId()],
+            [$order, null, null]
+        );
+    }
+}