Skip to content

Commit 986585f

Browse files
authored
Fix symfony 4.4 deprecation notice (#163)
* Avoid The "Doctrine\Bundle\DoctrineBundle\Registry" class implements "Symfony\Bridge\Doctrine\RegistryInterface" that is deprecated since Symfony 4.4, use Doctrine\Persistence\ManagerRegistry instead. message * cs-fixer :) * detail
1 parent ecad024 commit 986585f

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/Adapter/Doctrine/FetchJoinORMAdapter.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
use Doctrine\ORM\Tools\Pagination\Paginator;
1717
use Omines\DataTablesBundle\Adapter\AdapterQuery;
1818
use Omines\DataTablesBundle\Adapter\Doctrine\Event\ORMAdapterQueryEvent;
19-
use Omines\DataTablesBundle\Adapter\Doctrine\ORMAdapterEvents;
2019
use Omines\DataTablesBundle\Column\AbstractColumn;
2120
use Symfony\Component\OptionsResolver\OptionsResolver;
2221

2322
/**
2423
* Similar to ORMAdapter this class allows to access objects from the doctrine ORM.
2524
* Unlike the default ORMAdapter supports Fetch Joins (additional entites are fetched from DB via joins) using
2625
* the Doctrine Paginator.
26+
*
2727
* @author Jan Böhmer
2828
*/
2929
class FetchJoinORMAdapter extends ORMAdapter
@@ -43,7 +43,7 @@ protected function configureOptions(OptionsResolver $resolver)
4343
//Enforce object hydration mode (fetch join only works for objects)
4444
$resolver->addAllowedValues('hydrate', Query::HYDRATE_OBJECT);
4545

46-
/**
46+
/*
4747
* Add the possibility to replace the query for total entity count through a very simple one, to improve performance.
4848
* You can only use this option, if you did not apply any criteria to your total count.
4949
*/
@@ -120,6 +120,7 @@ public function getResults(AdapterQuery $query): \Traversable
120120
public function getCount(QueryBuilder $queryBuilder, $identifier)
121121
{
122122
$paginator = new Paginator($queryBuilder);
123+
123124
return $paginator->count();
124125
}
125126

@@ -130,6 +131,7 @@ protected function getSimpleTotalCount(QueryBuilder $queryBuilder)
130131
*/
131132
/** @var Query\Expr\From $from_expr */
132133
$from_expr = $queryBuilder->getDQLPart('from')[0];
134+
133135
return $this->manager->getRepository($from_expr->getFrom())->count([]);
134136
}
135-
}
137+
}

src/Adapter/Doctrine/ORMAdapter.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
namespace Omines\DataTablesBundle\Adapter\Doctrine;
1414

15-
use Doctrine\Common\Persistence\ManagerRegistry;
1615
use Doctrine\ORM\EntityManager;
1716
use Doctrine\ORM\Query;
1817
use Doctrine\ORM\QueryBuilder;
18+
use Doctrine\Persistence\ManagerRegistry;
1919
use Omines\DataTablesBundle\Adapter\AbstractAdapter;
2020
use Omines\DataTablesBundle\Adapter\AdapterQuery;
2121
use Omines\DataTablesBundle\Adapter\Doctrine\Event\ORMAdapterQueryEvent;
@@ -222,6 +222,7 @@ protected function createQueryBuilder(DataTableState $state): QueryBuilder
222222

223223
/**
224224
* @param $identifier
225+
*
225226
* @return int
226227
*/
227228
protected function getCount(QueryBuilder $queryBuilder, $identifier)
@@ -245,6 +246,7 @@ protected function getCount(QueryBuilder $queryBuilder, $identifier)
245246
/**
246247
* @param $identifier
247248
* @param Query\Expr\GroupBy[] $gbList
249+
*
248250
* @return bool
249251
*/
250252
protected function hasGroupByPart($identifier, array $gbList)
@@ -260,6 +262,7 @@ protected function hasGroupByPart($identifier, array $gbList)
260262

261263
/**
262264
* @param string $field
265+
*
263266
* @return string
264267
*/
265268
protected function mapFieldToPropertyPath($field, array $aliases = [])
@@ -315,6 +318,7 @@ protected function configureOptions(OptionsResolver $resolver)
315318

316319
/**
317320
* @param callable|QueryBuilderProcessorInterface $provider
321+
*
318322
* @return QueryBuilderProcessorInterface
319323
*/
320324
private function normalizeProcessor($provider)

0 commit comments

Comments
 (0)