Added compatibility with symfony 3

.gitignore

@@ -7,3 +7,4 @@ composer.lock
 .*.sw[a-z]
 *.un~
 Session.vim
+/.idea

Datatables/Datatable.php

@@ -19,21 +19,22 @@
  *     { "mData": "customer.location.address" }
  *
  * Felix-Antoine Paradis is the author of the original implementation this is
- * built off of, see: https://gist.github.com/1638094 
+ * built off of, see: https://gist.github.com/1638094
  */
 
-namespace LanKit\DatatablesBundle\Datatables;
+namespace Tejadong\DatatablesBundle\Datatables;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Tools\Pagination\Paginator;
-
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\Config\Definition\Exception\Exception;
 use Symfony\Component\HttpFoundation\Response;
+use HTMLPurifier;
+use HTMLPurifier_Config;
 
 class Datatable
 {
@@ -194,15 +195,17 @@ class Datatable
      */
     protected $datatable;
 
+    protected $htmlPurifier;
+
     public function __construct(array $request, EntityRepository $repository, ClassMetadata $metadata, EntityManager $em, $serializer)
     {
         $this->em = $em;
         $this->request = $request;
         $this->repository = $repository;
         $this->metadata = $metadata;
         $this->serializer = $serializer;
-        $this->tableName = Container::camelize($metadata->getTableName());
-        $this->defaultJoinType = self::JOIN_INNER;
+        $this->tableName = Container::camelize(explode('\\', $metadata->getName())[count(explode('\\', $metadata->getName()))-1]);
+        $this->defaultJoinType = self::JOIN_LEFT;
         $this->defaultResultType = self::RESULT_RESPONSE;
         $this->setParameters();
         $this->qb = $em->createQueryBuilder();
@@ -213,6 +216,8 @@ public function __construct(array $request, EntityRepository $repository, ClassM
 
         $identifiers = $this->metadata->getIdentifierFieldNames();
         $this->rootEntityIdentifier = array_shift($identifiers);
+
+        $this->htmlPurifierInit();
     }
 
     /**
@@ -302,23 +307,28 @@ protected function setRelatedEntityColumnInfo(array &$association, array $fields
 
         // loop through the related entities, checking the associations as we go
         $metadata = $this->metadata;
+
         while ($field = array_shift($fields)) {
             $columnName .= empty($columnName) ? $field : ".$field";
             $entityName = lcfirst(Container::camelize($field));
+
             if ($metadata->hasAssociation($entityName)) {
                 $joinOn = "$joinName.$entityName";
-                if ($metadata->isCollectionValuedAssociation($entityName)) {
+
+                if ($metadata->isCollectionValuedAssociation($entityName))
                     $association['containsCollections'] = true;
-                }
-                $metadata = $this->em->getClassMetadata(
-                    $metadata->getAssociationTargetClass($entityName)
-                );
+
+                $metadata = $this->em->getClassMetadata($metadata->getAssociationTargetClass($entityName));
+
                 $joinName .= '_' . $this->getJoinName(
                     $metadata,
-                    Container::camelize($metadata->getTableName()),
+					Container::camelize(explode('\\', $metadata->getName())[count(explode('\\', $metadata->getName()))-1]),
                     $entityName
                 );
-                // The join required to get to the entity in question
+
+                $joinName .= '_' . $entityName;
+
+				// The join required to get to the entity in question
                 if (!isset($this->assignedJoins[$joinName])) {
                     $this->assignedJoins[$joinName]['joinOn'] = $joinOn;
                     $this->assignedJoins[$joinName]['mdataColumn'] = $columnName;
@@ -327,7 +337,7 @@ protected function setRelatedEntityColumnInfo(array &$association, array $fields
             }
             else {
                 throw new Exception(
-                    "Association  '$entityName' not found ($mdataName)",
+                    "Relación '$entityName' no encontrada ($mdataName)",
                     '404'
                 );
             }
@@ -336,7 +346,7 @@ protected function setRelatedEntityColumnInfo(array &$association, array $fields
         // Check the last field on the last related entity of the dotted notation
         if (!$metadata->hasField(lcfirst($lastField))) {
             throw new Exception(
-                "Field '$lastField' on association '$entityName' not found ($mdataName)",
+                "Propiedad '$lastField' en la relación '$entityName' no encontrada ($mdataName)",
                 '404'
             );
         }
@@ -356,15 +366,14 @@ protected function setSingleFieldColumnInfo(array &$association, $fieldName) {
         $fieldName = Container::camelize($fieldName);
 
         if (!$this->metadata->hasField(lcfirst($fieldName))) {
-            throw new Exception(
-                "Field '$fieldName' not found.)",
-                '404'
-            );
-        }
-
-        $association['fieldName'] = $fieldName;
-        $association['entityName'] = $this->tableName;
-        $association['fullName'] = $this->tableName . '.' . lcfirst($fieldName);
+			$association['fieldName'] = $fieldName;
+			$association['entityName'] = null;
+			$association['fullName'] = lcfirst($fieldName);
+        }else{
+			$association['fieldName'] = $fieldName;
+			$association['entityName'] = $this->tableName;
+			$association['fullName'] = $this->tableName . '.' . lcfirst($fieldName);
+		}
     }
 
     /**
@@ -380,7 +389,7 @@ protected function getJoinName(ClassMetadata $metadata, $tableName, $entityName)
 
         // If it is self-referencing then we must avoid collisions
         if ($metadata->getName() == $this->metadata->getName()) {
-            $joinName .= "_$entityName";   
+            $joinName = "$entityName";
         }
 
         return $joinName;
@@ -480,8 +489,25 @@ public function setWhere(QueryBuilder $qb)
             for ($i=0 ; $i < count($this->parameters); $i++) {
                 if (isset($this->request['bSearchable_'.$i]) && $this->request['bSearchable_'.$i] == "true") {
                     $qbParam = "sSearch_global_{$this->associations[$i]['entityName']}_{$this->associations[$i]['fieldName']}";
+                    $fieldType = $this->metadata->getTypeOfField(lcfirst($this->associations[$i]['fieldName']));
+
+                    switch ($fieldType) {
+                        case "datetime":
+                            $fieldName = "DATE_FORMAT(".$this->associations[$i]['fullName'].", '%d/%m/%Y %H:%i:%s')";
+                            break;
+                        case "time":
+                            $fieldName = "DATE_FORMAT(".$this->associations[$i]['fullName'].", '%H:%i:%s')";
+                            break;
+                        case "date":
+                            $fieldName = "DATE_FORMAT(".$this->associations[$i]['fullName'].", '%d/%m/%Y')";
+                            break;
+                        default:
+                            $fieldName = $this->associations[$i]['fullName'];
+                            break;
+                    }
+
                     $orExpr->add($qb->expr()->like(
-                        $this->associations[$i]['fullName'],
+                        $fieldName,
                         ":$qbParam"
                     ));
                     $qb->setParameter($qbParam, "%" . $this->request['sSearch'] . "%");
@@ -495,13 +521,31 @@ public function setWhere(QueryBuilder $qb)
         for ($i=0 ; $i < count($this->parameters); $i++) {
             if (isset($this->request['bSearchable_'.$i]) && $this->request['bSearchable_'.$i] == "true" && $this->request['sSearch_'.$i] != '') {
                 $qbParam = "sSearch_single_{$this->associations[$i]['entityName']}_{$this->associations[$i]['fieldName']}";
+                $fieldType = $this->metadata->getTypeOfField(lcfirst($this->associations[$i]['fieldName']));
+
+                switch ($fieldType) {
+                    case "datetime":
+                        $fieldName = "DATE_FORMAT(".$this->associations[$i]['fullName'].", '%d/%m/%Y %H:%i:%s')";
+                        break;
+                    case "time":
+                        $fieldName = "DATE_FORMAT(".$this->associations[$i]['fullName'].", '%H:%i:%s')";
+                        break;
+                    case "date":
+                        $fieldName = "DATE_FORMAT(".$this->associations[$i]['fullName'].", '%d/%m/%Y')";
+                        break;
+                    default:
+                        $fieldName = $this->associations[$i]['fullName'];
+                        break;
+                }
+
                 $andExpr->add($qb->expr()->like(
-                    $this->associations[$i]['fullName'],
-                    ":$qbParam"
-                ));
+                    $fieldName,
+                    ":$qbParam")
+                );
                 $qb->setParameter($qbParam, "%" . $this->request['sSearch_'.$i] . "%");
             }
         }
+
         if ($andExpr->count() > 0) {
             $qb->andWhere($andExpr);
         }
@@ -549,7 +593,12 @@ public function setSelect(QueryBuilder $qb)
         // Combine all columns to pull
         foreach ($this->associations as $column) {
             $parts = explode('.', $column['fullName']);
-            $columns[$parts[0]][] = $parts[1];
+
+            if(count($parts) > 1){
+                $columns[$parts[0]][] = $parts[1];
+            }else{
+                $columns['Custom'][] = $parts[0];
+            }
         }
 
         // Partial column results on entities require that we include the identifier as part of the selection
@@ -565,7 +614,8 @@ public function setSelect(QueryBuilder $qb)
         }
 
         foreach ($columns as $columnName => $fields) {
-            $partials[] = 'partial ' . $columnName . '.{' . implode(',', $fields) . '}';
+            if($columnName != 'Custom')
+                $partials[] = 'partial ' . $columnName . '.{' . implode(',', $fields) . '}';
         }
 
         $qb->select(implode(',', $partials));
@@ -576,7 +626,7 @@ public function setSelect(QueryBuilder $qb)
      * Method to execute after constructing this object. Configures the object before
      * executing getSearchResults()
      */
-    public function makeSearch() 
+    public function makeSearch()
     {
         $this->setSelect($this->qb);
         $this->setAssociations($this->qb);
@@ -630,7 +680,7 @@ public function executeSearch()
                 while ($field = array_shift($fields)) {
                     $rowRef = &$rowRef[$field];
                     // We ran into a collection based entity. Combine, merge, and continue on...
-                    if (!empty($fields) && !$this->isAssocArray($rowRef)) {
+                    if (!empty($fields) && $rowRef !== null && !$this->isAssocArray($rowRef)) {
                         $children = array();
                         while ($childItem = array_shift($rowRef)) {
                             $children = array_merge_recursive($children, $childItem);
@@ -639,6 +689,10 @@ public function executeSearch()
                     }
                 }
             }
+
+            // Iterate and sanitize
+            $item = $this->purifyRecursive($item);
+
             $output['aaData'][] = $item;
         }
 
@@ -746,7 +800,7 @@ public function getCountAllResults()
 
         return (int) $qb->getQuery()->getSingleScalarResult();
     }
-    
+
     /**
      * @return int Total query results after searches/filtering
      */
@@ -795,4 +849,66 @@ public function getQueryBuilder()
     {
         return  $this->qb;
     }
+
+    public function setCustom($response, $nombre, $clase, $funcion, $parameters = []){
+
+        $data = json_decode($response->getContent(), true);
+
+        foreach($data['aaData'] as $key => $registro){
+
+            $parametros = [];
+
+            if(count($parameters) == 0)
+                $parametros = array($registro['id']);
+            else{
+                $parametros = array_merge(array($registro['id']), $parameters);
+            }
+
+            $data['aaData'][$key][$nombre] = call_user_func_array( array( $clase, $funcion), $parametros );
+        }
+
+        return $response->setContent(json_encode($data));
+
+    }
+
+    private function htmlPurifierInit()
+    {
+        $config = HTMLPurifier_Config::createDefault();
+
+        // Permitir todos los elementos y atributos válidos HTML5, para no limitar nada
+        $config->set('HTML.Allowed', null); // No restringir etiquetas ni atributos
+
+        // Permitir completamente el CSS, para evitar que modifique estilos
+        $config->set('CSS.AllowedProperties', null);
+
+        // No transformar ni corregir el HTML
+        $config->set('HTML.Doctype', 'HTML 4.01 Transitional'); // un doctype flexible
+        $config->set('HTML.Trusted', false); // seguridad contra XSS
+        $config->set('Core.EscapeNonASCIICharacters', false);
+        $config->set('Core.ConvertDocumentToFragment', true);
+
+        // Evitar auto-corrección de etiquetas
+        $config->set('HTML.DefinitionID', 'custom-def');
+        $config->set('HTML.DefinitionRev', 1);
+        $config->set('AutoFormat.AutoParagraph', false);
+        $config->set('AutoFormat.RemoveEmpty', false);
+
+        // Deshabilitar filtro CSS agresivo
+        $config->set('CSS.Trusted', false);
+        $config->set('CSS.AllowImportant', true);
+
+        $this->htmlPurifier = new HTMLPurifier($config);
+    }
+
+    protected function purifyRecursive($data)
+    {
+        foreach ($data as $key => $value) {
+            if (is_string($value)) {
+                $data[$key] = $this->htmlPurifier->purify($value);
+            } elseif (is_array($value)) {
+                $data[$key] = $this->purifyRecursive($value);
+            }
+        }
+        return $data;
+    }
 }

Datatables/DatatableManager.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace LanKit\DatatablesBundle\Datatables;
+namespace Tejadong\DatatablesBundle\Datatables;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Doctrine\Bundle\DoctrineBundle\Registry as DoctrineRegistry;
@@ -50,19 +50,24 @@ protected function getClassName($className) {
      */
     public function getDatatable($class)
     {
+        $symfony_version = \Symfony\Component\HttpKernel\Kernel::VERSION;
+        $request = $symfony_version >= 3
+            ?  $this->container->get('request_stack')->getCurrentRequest()->query->all()
+            : $this->container->get('request')->query->all();
+
         $class = $this->getClassName($class);
 
         $metadata = $this->doctrine->getManager()->getClassMetadata($class);
         $repository = $this->doctrine->getRepository($class);
 
         $datatable = new Datatable(
-            $this->container->get('request')->query->all(),
+            $request,
             $this->doctrine->getRepository($class),
             $this->doctrine->getManager()->getClassMetadata($class),
             $this->doctrine->getManager(),
-            $this->container->get('lankit_datatables.serializer')
+            $this->container->get('tejadong_datatables.serializer')
         );
-        return $datatable->useDoctrinePaginator($this->useDoctrinePaginator); 
+        return $datatable->useDoctrinePaginator($this->useDoctrinePaginator);
     }
 }
 

DependencyInjection/Configuration.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace LanKit\DatatablesBundle\DependencyInjection;
+namespace Tejadong\DatatablesBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -18,7 +18,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('lankit_datatables');
+        $rootNode = $treeBuilder->root('tejadong_datatables');
 
         $rootNode
             ->children()