stwe · stephanvierkant · Jul 3, 2019 · Jul 16, 2019 · Jul 17, 2019 · Jul 17, 2019
diff --git a/Datatable/AbstractDatatable.php b/Datatable/AbstractDatatable.php
@@ -12,7 +12,6 @@
 namespace Sg\DatatablesBundle\Datatable;
 
 use Sg\DatatablesBundle\Datatable\Column\ColumnBuilder;
-
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Translation\TranslatorInterface;
@@ -164,6 +163,7 @@ abstract class AbstractDatatable implements DatatableInterface
      * @param RouterInterface               $router
      * @param EntityManagerInterface        $em
      * @param Twig_Environment              $twig
+     * @param iterable                      $columnTypes
      *
      * @throws Exception
      */
@@ -173,7 +173,8 @@ public function __construct(
         TranslatorInterface $translator,
         RouterInterface $router,
         EntityManagerInterface $em,
-        Twig_Environment $twig
+        Twig_Environment $twig,
+        iterable $columnTypes
     ) {
         $this->validateName();
 
@@ -191,7 +192,7 @@ public function __construct(
         $this->twig = $twig;
 
         $metadata = $em->getClassMetadata($this->getEntity());
-        $this->columnBuilder = new ColumnBuilder($metadata, $twig, $this->getName(), $em);
+        $this->columnBuilder = new ColumnBuilder($metadata, $twig, $this->getName(), $em, $columnTypes);
 
         $this->ajax = new Ajax();
         $this->options = new Options();

diff --git a/Datatable/Column/ColumnBuilder.php b/Datatable/Column/ColumnBuilder.php
@@ -11,13 +11,17 @@
 
 namespace Sg\DatatablesBundle\Datatable\Column;
 
-use Sg\DatatablesBundle\Datatable\Factory;
-
 use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\MappingException;
 use Doctrine\ORM\EntityManagerInterface;
+use Sg\DatatablesBundle\Datatable\Factory;
 use Twig_Environment;
 use Exception;
+use function array_key_exists;
+use function sprintf;
+use function trigger_error;
+use const E_USER_DEPRECATED;
+use function get_class;
 
 /**
  * Class ColumnBuilder
@@ -83,9 +87,12 @@ class ColumnBuilder
      */
     private $entityClassName;
 
-    //-------------------------------------------------
-    // Ctor.
-    //-------------------------------------------------
+    /**
+     * Column services
+     *
+     * @var \Symfony\Component\DependencyInjection\Argument\RewindableGenerator
+     */
+    private $columnTypes;
 
     /**
      * ColumnBuilder constructor.
@@ -94,8 +101,9 @@ class ColumnBuilder
      * @param Twig_Environment       $twig
      * @param string                 $datatableName
      * @param EntityManagerInterface $em
+     * @param iterable               $columnTypes
      */
-    public function __construct(ClassMetadata $metadata, Twig_Environment $twig, $datatableName, EntityManagerInterface $em)
+    public function __construct(ClassMetadata $metadata, Twig_Environment $twig, $datatableName, EntityManagerInterface $em, iterable $columnTypes)
     {
         $this->metadata = $metadata;
         $this->twig = $twig;
@@ -106,6 +114,7 @@ public function __construct(ClassMetadata $metadata, Twig_Environment $twig, $da
         $this->columnNames = array();
         $this->uniqueColumns = array();
         $this->entityClassName = $metadata->getName();
+        $this->columnTypes = $columnTypes;
     }
 
     //-------------------------------------------------
@@ -124,7 +133,22 @@ public function __construct(ClassMetadata $metadata, Twig_Environment $twig, $da
      */
     public function add($dql, $class, array $options = array())
     {
-        $column = Factory::create($class, ColumnInterface::class);
+        if (is_object($class)) {
+            $column = Factory::create($class, ColumnInterface::class);
+            @trigger_error(sprintf('Using an object as column type is deprecated since 1.3 and will be removed in 2.0. Use a class name (FQCN) instead.'), E_USER_DEPRECATED);
+        } else {
+            $columns = [];
+            foreach ($this->columnTypes as $column) {
+                $columns[get_class($column)] = $column;
+            }
+
+            if (! array_key_exists($class, $columns)) {
+                throw new \RuntimeException(sprintf('Column %s is not a service', $class));
+            }
+
+            $column = clone $columns[$class];
+        }
+
         $column->initOptions();
 
         $this->handleDqlProperties($dql, $options, $column);

diff --git a/Datatable/Factory.php b/Datatable/Factory.php
@@ -31,7 +31,7 @@ class Factory
      */
     public static function create($class, $interface)
     {
-        if (empty($class) || !is_string($class) && !$class instanceof $interface) {
+        if (empty($class) || ( ! is_string($class) && ! $class instanceof $interface)) {
             throw new Exception("Factory::create(): String or $interface expected.");
         }
 
@@ -44,11 +44,11 @@ public static function create($class, $interface)
 
             if (!$instance instanceof $interface) {
                 throw new Exception("Factory::create(): String or $interface expected.");
-            } else {
-                return $instance;
             }
-        } else {
-            throw new Exception("Factory::create(): $class is not callable.");
+
+            return $instance;
         }
+
+        throw new Exception("Factory::create(): $class is not callable.");
     }
 }
diff --git a/DependencyInjection/SgDatatablesExtension.php b/DependencyInjection/SgDatatablesExtension.php
@@ -11,6 +11,7 @@
 
 namespace Sg\DatatablesBundle\DependencyInjection;
 
+use Sg\DatatablesBundle\Datatable\Column\ColumnInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -36,6 +37,9 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('services.yml');
 
         $container->setParameter('sg_datatables.datatable.query', $config['datatable']['query']);
+        $container->registerForAutoconfiguration(ColumnInterface::class)
+                  ->addTag('sg_datatables.column')
+        ;
     }
 
     /**

diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -1,12 +1,16 @@
 services:
-    sg_datatables.twig.extension:
-        class: Sg\DatatablesBundle\Twig\DatatableTwigExtension
-        public: false
-        tags:
-            - { name: twig.extension }
+    _defaults:
+        autoconfigure: true
+        autowire: true
 
-    sg_datatables.datatable.abstract:
-        class: Sg\DatatablesBundle\Datatable\AbstractDatatable
+    _instanceof:
+        Sg\DatatablesBundle\Datatable\Column\Column:
+            tags: ['sg_datatables.column']
+
+    Sg\DatatablesBundle\Datatable\Column\:
+        resource: '../../Datatable/Column/*'
+
+    Sg\DatatablesBundle\Datatable\AbstractDatatable:
         abstract: true
         arguments:
             - '@security.authorization_checker'
@@ -15,15 +19,14 @@ services:
             - '@router'
             - '@doctrine.orm.entity_manager'
             - '@twig'
+            - ! tagged sg_datatables.column
 
-    sg_datatables.response:
-        class: Sg\DatatablesBundle\Response\DatatableResponse
+    Sg\DatatablesBundle\Response\DatatableResponse:
         public: true
         arguments:
             - '@request_stack'
 
-    sg_datatables.factory:
-        class: Sg\DatatablesBundle\Datatable\DatatableFactory
+    Sg\DatatablesBundle\Datatable\DatatableFactory:
         public: true
         arguments:
             - '@security.authorization_checker'
@@ -32,3 +35,20 @@ services:
             - '@router'
             - '@doctrine.orm.entity_manager'
             - '@twig'
+
+    Sg\DatatablesBundle\Twig\DatatableTwigExtension: ~
+
+    # aliases for backwards compatibility, will be removed in 2.0
+    sg_datatables.twig.extension:
+        alias: Sg\DatatablesBundle\Twig\DatatableTwigExtension
+
+    sg_datatables.datatable.abstract:
+        alias: Sg\DatatablesBundle\Datatable\AbstractDatatable
+
+    sg_datatables.response:
+        alias: Sg\DatatablesBundle\Response\DatatableResponse
+        public: true
+
+    sg_datatables.factory:
+        alias: Sg\DatatablesBundle\Datatable\DatatableFactory
+        public: true
diff --git a/Resources/doc/cache.md b/Resources/doc/cache.md
@@ -12,9 +12,10 @@ Doctrine Query when creating response for DataTable.
 
 ``` php
 <?php
+use Sg\DatatablesBundle\Response\DatatableResponse;
 // ...
 if ($isAjax) {
-    $responseService = $this->get('sg_datatables.response');
+    $responseService = $this->get(DatatableResponse::class);
     $responseService->setDatatable($datatable);
 
     $datatableQueryBuilder = $responseService->getDatatableQueryBuilder();

diff --git a/Resources/doc/installation.md b/Resources/doc/installation.md
@@ -365,14 +365,19 @@ class PostDatatable extends AbstractDatatable
 # app/config/services.yml
 
 services:
-    app.datatable.post:
-        class: AppBundle\Datatables\PostDatatable
-        parent: sg_datatables.datatable.abstract
+    _defaults:
+        autoconfigure: true
+        autowire: true
+    AppBundle\Datatables\PostDatatable:
+      bind:
+        $columnTypes: !tagged sg_datatables.column
 ```
 
 ### Step 3: The Controller actions
 
 ``` php
+use Sg\DatatablesBundle\Datatable\DatatableFactory;
+use Sg\DatatablesBundle\Response\DatatableResponse;
 /**
  * Lists all Post entities.
  *
@@ -393,11 +398,11 @@ public function indexAction(Request $request)
 
     // or use the DatatableFactory
     /** @var DatatableInterface $datatable */
-    $datatable = $this->get('sg_datatables.factory')->create(PostDatatable::class);
+    $datatable = $this->get(DatatableFactory::class)->create(PostDatatable::class);
     $datatable->buildDatatable();
 
     if ($isAjax) {
-        $responseService = $this->get('sg_datatables.response');
+        $responseService = $this->get(DatatableResponse::class);
         $responseService->setDatatable($datatable);
         $responseService->getDatatableQueryBuilder();
 

diff --git a/Resources/doc/query.md b/Resources/doc/query.md
@@ -40,12 +40,14 @@ class Post
 Now you can view all posts created by `root`. The additional `where statement` now works like a filter.
 
 ``` php
+use Sg\DatatablesBundle\Response\DatatableResponse;
+
 public function indexAction(Request $request)
 {
     // ...
 
     if ($request->isXmlHttpRequest()) {
-        $responseService = $this->get('sg_datatables.response');
+        $responseService = $this->get(DatatableResponse::class);
         $responseService->setDatatable($datatable);
 
         $datatableQueryBuilder = $responseService->getDatatableQueryBuilder();