Merge pull request #1 from tetranz/master

Update master

Author: peter-gribanov

README.md

@@ -326,7 +326,7 @@ Because the handling of requests is usually very similar you can use a service w
 
 ### Templating
 
-If you need [Templating](https://select2.github.io/examples.html#templating) in Select2, you could consider the following example that shows the country flag next to each option.
+If you need [Templating](https://select2.org/dropdown#templating) in Select2, you could consider the following example that shows the country flag next to each option.
 
 Your custom transformer should return data like this:
 ```javascript

Resources/config/services.xml

@@ -12,7 +12,8 @@
             <argument>%tetranz_select2_entity.config%</argument>
         </service>
         <service id="tetranz_select2entity.autocomplete_service" class="Tetranz\Select2EntityBundle\Service\AutocompleteService">
-            <argument type="service" id="service_container" />
+            <argument type="service" id="form.factory" />
+            <argument type="service" id="doctrine" />
         </service>
     </services>
 

Service/AutocompleteService.php

@@ -2,23 +2,34 @@
 
 namespace Tetranz\Select2EntityBundle\Service;
 
+use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityRepository;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormTypeInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 
-class AutocompleteService implements ContainerAwareInterface
+class AutocompleteService
 {
-    use ContainerAwareTrait;
+    /**
+     * @var FormFactoryInterface
+     */
+    private $formFactory;
 
+    /**
+     * @var ManagerRegistry
+     */
+    private $doctrine;
 
-    public function __construct(ContainerInterface $container)
+    /**
+     * @param FormFactoryInterface $formFactory
+     * @param ManagerRegistry      $doctrine
+     */
+    public function __construct(FormFactoryInterface $formFactory, ManagerRegistry $doctrine)
     {
-        $this->setContainer($container);
-    }
+        $this->formFactory = $formFactory;
+        $this->doctrine = $doctrine;
+    }   
 
     /**
      * @param Request                  $request
@@ -28,11 +39,11 @@ public function __construct(ContainerInterface $container)
      */
     public function getAutocompleteResults(Request $request, $type)
     {
-        $form = $this->container->get('form.factory')->create($type);
+        $form = $this->formFactory->create($type);
         $fieldOptions = $form->get($request->get('field_name'))->getConfig()->getOptions();
 
         /** @var EntityRepository $repo */
-        $repo = $this->container->get('doctrine')->getRepository($fieldOptions['class']);
+        $repo = $this->doctrine->getRepository($fieldOptions['class']);
 
         $term = $request->get('q');
 
@@ -54,8 +65,7 @@ public function getAutocompleteResults(Request $request, $type)
             ->setFirstResult($offset)
         ;
 
-
-        if (array_key_exists('callback', $fieldOptions)) {
+        if (is_callable($fieldOptions['callback'])) {
             $cb = $fieldOptions['callback'];
 
             $cb($countQB, $request);
@@ -75,4 +85,4 @@ public function getAutocompleteResults(Request $request, $type)
 
         return $result;
     }
-}
+}