Introduce afterConfiguration to reuse options (#229)

Author: maxhelias

src/Adapter/Doctrine/FetchJoinORMAdapter.php

@@ -31,12 +31,6 @@ class FetchJoinORMAdapter extends ORMAdapter
 {
     protected $use_simple_total;
 
-    public function configure(array $options)
-    {
-        parent::configure($options);
-        $this->use_simple_total = $options['simple_total_query'];
-    }
-
     protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
@@ -53,6 +47,13 @@ protected function configureOptions(OptionsResolver $resolver)
         return $resolver;
     }
 
+    protected function afterConfiguration(array $options): void
+    {
+        parent::afterConfiguration($options);
+
+        $this->use_simple_total = $options['simple_total_query'];
+    }
+
     protected function prepareQuery(AdapterQuery $query)
     {
         $state = $query->getState();

src/Adapter/Doctrine/ORMAdapter.php

@@ -77,19 +77,7 @@ public function configure(array $options)
         $this->configureOptions($resolver);
         $options = $resolver->resolve($options);
 
-        // Enable automated mode or just get the general default entity manager
-        if (null === ($this->manager = $this->registry->getManagerForClass($options['entity']))) {
-            throw new InvalidConfigurationException(sprintf('Doctrine has no manager for entity "%s", is it correctly imported and referenced?', $options['entity']));
-        }
-        $this->metadata = $this->manager->getClassMetadata($options['entity']);
-        if (empty($options['query'])) {
-            $options['query'] = [new AutomaticQueryBuilder($this->manager, $this->metadata)];
-        }
-
-        // Set options
-        $this->hydrationMode = $options['hydrate'];
-        $this->queryBuilderProcessors = $options['query'];
-        $this->criteriaProcessors = $options['criteria'];
+        $this->afterConfiguration($options);
     }
 
     /**
@@ -316,6 +304,23 @@ protected function configureOptions(OptionsResolver $resolver)
         ;
     }
 
+    protected function afterConfiguration(array $options): void
+    {
+        // Enable automated mode or just get the general default entity manager
+        if (null === ($this->manager = $this->registry->getManagerForClass($options['entity']))) {
+            throw new InvalidConfigurationException(sprintf('Doctrine has no manager for entity "%s", is it correctly imported and referenced?', $options['entity']));
+        }
+        $this->metadata = $this->manager->getClassMetadata($options['entity']);
+        if (empty($options['query'])) {
+            $options['query'] = [new AutomaticQueryBuilder($this->manager, $this->metadata)];
+        }
+
+        // Set options
+        $this->hydrationMode = $options['hydrate'];
+        $this->queryBuilderProcessors = $options['query'];
+        $this->criteriaProcessors = $options['criteria'];
+    }
+
     /**
      * @param callable|QueryBuilderProcessorInterface $provider
      *

tests/Fixtures/AppBundle/DataTable/Adapter/CustomORMAdapter.php

@@ -12,7 +12,6 @@
 
 namespace Tests\Fixtures\AppBundle\DataTable\Adapter;
 
-use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use Omines\DataTablesBundle\Adapter\AdapterQuery;
 use Omines\DataTablesBundle\Adapter\Doctrine\ORMAdapter;
@@ -22,13 +21,6 @@ class CustomORMAdapter extends ORMAdapter
 {
     protected $hydrationMode;
 
-    public function configure(array $options)
-    {
-        parent::configure($options);
-
-        $this->hydrationMode = isset($options['hydrate']) ? $options['hydrate'] : Query::HYDRATE_OBJECT;
-    }
-
     protected function prepareQuery(AdapterQuery $query)
     {
         parent::prepareQuery($query);
@@ -64,4 +56,11 @@ protected function getResults(AdapterQuery $query): \Traversable
             yield $result;
         }
     }
+
+    protected function afterConfiguration(array $options): void
+    {
+        parent::afterConfiguration($options);
+
+        $this->hydrationMode = $options['hydrate'];
+    }
 }