Merge branch 'hotfix/5.0.2' into develop

src/Grid/Columns/ActionColumn.php

@@ -6,7 +6,6 @@
 use Exception;
 use Pfilsx\DataGrid\DataGridException;
 use Pfilsx\DataGrid\Grid\Items\DataGridItemInterface;
-use Twig\Template;
 
 class ActionColumn extends AbstractColumn
 {
@@ -54,7 +53,8 @@ public function getCellContent($entity)
                 return $this->template->renderBlock('action_button', [
                     'url' => $this->generateUrl($entity, $matches[1]),
                     'action' => $matches[1],
-                    'entity' => $entity
+                    'entity' => $entity,
+                    'identifier' => $this->identifier
                 ]);
             }
             return '';

src/Grid/DataGrid.php

@@ -10,7 +10,6 @@
 use Pfilsx\DataGrid\DataGridServiceContainer;
 use Pfilsx\DataGrid\Grid\Columns\AbstractColumn;
 use Pfilsx\DataGrid\Grid\Providers\DataProviderInterface;
-use Twig\Template;
 use Twig\TemplateWrapper;
 
 /**
@@ -213,7 +212,7 @@ protected function setTranslationDomain(?string $domain)
     protected function handleRequest(): void
     {
         $request = $this->container->getRequest()->getCurrentRequest();
-        $queryParams = $request !== null ? $request->query->get('data_grid', []) : [];
+        $queryParams = $request !== null ? $request->query->get('data_grid') ?? [] : [];
 
         $this->handleSorting($queryParams);
 

src/Grid/Providers/ArrayDataProvider.php

@@ -5,11 +5,11 @@
 
 
 use DateTime;
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Pfilsx\DataGrid\DataGridException;
 use Pfilsx\DataGrid\Grid\Items\ArrayGridItem;
 use Pfilsx\DataGrid\Grid\Items\DataGridItem;
 use Pfilsx\DataGrid\Grid\Items\EntityGridItem;
+use Symfony\Bridge\Doctrine\ManagerRegistry;
 
 class ArrayDataProvider extends DataProvider
 {

src/Grid/Providers/DataProvider.php

@@ -5,14 +5,14 @@
 
 
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\Mapping\ClassMetadata;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ObjectManager;
 use Pfilsx\DataGrid\DataGridException;
 use Pfilsx\DataGrid\Grid\Pager;
+use Symfony\Bridge\Doctrine\ManagerRegistry;
 
 abstract class DataProvider implements DataProviderInterface
 {

src/Grid/Providers/RepositoryDataProvider.php

@@ -6,9 +6,9 @@
 
 use DateTime;
 use Doctrine\Common\Collections\Criteria;
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityRepository;
 use Pfilsx\DataGrid\Grid\Items\EntityGridItem;
+use Symfony\Bridge\Doctrine\ManagerRegistry;
 
 class RepositoryDataProvider extends DataProvider
 {

src/Resources/doc/columns/ActionColumn.rst

@@ -29,7 +29,7 @@ Can be used to override default button rendering.
 
     $builder->addColumn(self::ACTION_COLUMN, [
         'buttons' => [
-            'show' => function(Object $entity, string $url){
+            'show' => function(Object $entity, string $url) {
                 return '<a href="'.$url.'?id='.$entity->id.'">Show</a>';
             }
         ]
@@ -58,7 +58,11 @@ Can be used to override default url generation function.
 .. code-block:: php
 
     $builder->addActionColumn([
-        'urlGenerator' => function($entity, string $action, RouterInterface $router){
+        'urlGenerator' => function($entity, string $action, RouterInterface $router) {
                 return $router->generate('entity-'.$action, ['guid' => $entity->getId()]);
         }
     ]);
+
+identifier - string(default: null)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Can be used to override default identifier field.

src/Resources/doc/configuration.rst

@@ -10,7 +10,7 @@ Configuration Reference
                 # template used for rendering grid blocks
                 template: 'grid/grid.blocks.html.twig'
                 # message used in case of no data found
-                noDataMessage: 'Записей не найдено'
+                noDataMessage: 'No records found'
                 # pagination configuration
                 pagination_enabled: true
                 # num of data rows on each page

tests/DataGridServiceContainerTest.php

@@ -5,7 +5,7 @@
 
 
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Symfony\Bridge\Doctrine\ManagerRegistry;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;