Merge pull request #3 from ismailbaskin/master

Use property accessor component for extensible textProperty
tetranz · Oct 7, 2015 · df1b044 · df1b044
2 parents 62fbf5d + 45cfef2
commit df1b044
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/Form/DataTransformer/EntitiesToPropertyTransformer.php b/Form/DataTransformer/EntitiesToPropertyTransformer.php
@@ -5,6 +5,7 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\PropertyAccess\PropertyAccess;
 
 /**
  * Data transformer for multiple mode (i.e., multiple = true)
@@ -40,14 +41,16 @@ public function transform($entities)
         // return an array of initial values as html encoded json
         $data = array();
 
+        $accessor = PropertyAccess::createPropertyAccessor();
+
         foreach($entities as $entity) {
 
             $text = is_null($this->textProperty)
                     ? (string) $entity
-                    : $entity->{'get' . $this->textProperty}();
+                    : $accessor->getValue($entity, $this->textProperty);
 
             $data[] = array(
-                'id' => $entity->getId(),
+                'id' => $accessor->getValue($entity, 'id'),
                 'text' => $text
             );
         }

diff --git a/Form/DataTransformer/EntityToPropertyTransformer.php b/Form/DataTransformer/EntityToPropertyTransformer.php
@@ -4,6 +4,7 @@
 
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\PropertyAccess\PropertyAccess;
 
 /**
  * Data transformer for single mode (i.e., multiple = false)
@@ -36,14 +37,16 @@ public function transform($entity)
             return '';
         }
 
+        $accessor = PropertyAccess::createPropertyAccessor();
+
         // return the initial values as html encoded json
 
         $text = is_null($this->textProperty)
-            ? (string) $entity
-            : $entity->{'get' . $this->textProperty}();
+            ? (string)$entity
+            : $accessor->getValue($entity, $this->textProperty);
 
         $data = array(
-            'id' => $entity->getId(),
+            'id' => $accessor->getValue($entity, 'id'),
             'text' => $text
         );
 
@@ -63,6 +66,7 @@ public function reverseTransform($value)
         }
 
         $repo = $this->em->getRepository($this->className);
+
         return $repo->find($value);
     }
 }
diff --git a/composer.json b/composer.json
@@ -11,7 +11,8 @@
         }
     ],
     "require": {
-        "symfony/symfony": ">=2.2"
+        "symfony/symfony": ">=2.2",
+        "doctrine/orm": ">=2.2"
     },
     "autoload": {
         "psr-0": { "Tetranz\\Select2EntityBundle": "" }