Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Resources/views/Generator/AssociationTemplate.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
QueryBuilder $qb,
$value,
$operator = Comparison::EQ,
$entityName = '{{ entityDql }}',
$entityName = self::NAME,
$columnName = '{{ columnDql }}',
): QueryBuilder {
//get a uniq index
Expand Down Expand Up @@ -49,7 +49,7 @@
public static function filterIn{{ column }}(
QueryBuilder $qb,
$values,
$entityName = '{{ entityDql }}',
$entityName = self::NAME,
$columnName = '{{ columnDql }}',
): QueryBuilder {
//get a uniq index
Expand Down Expand Up @@ -89,7 +89,7 @@
public static function filterNotIn{{ column }}(
QueryBuilder $qb,
$values,
$entityName = '{{ entityDql }}',
$entityName = self::NAME,
$columnName = '{{ columnDql }}',
): QueryBuilder {
//get a uniq index
Expand All @@ -115,7 +115,7 @@

public static function join{{ column }}(
QueryBuilder $qb,
$entityName = '{{ entityDql }}',
$entityName = self::NAME,
$columnName = '{{ columnDql }}',
$entityDqlTargeted = '{{ entityDqlTargeted }}',
): QueryBuilder {
Expand All @@ -126,7 +126,7 @@

public static function leftJoin{{ column }}(
QueryBuilder $qb,
$entityName = '{{ entityDql }}',
$entityName = self::NAME,
$columnName = '{{ columnDql }}',
$entityDqlTargeted = '{{ entityDqlTargeted }}',
): QueryBuilder {
Expand Down
6 changes: 3 additions & 3 deletions src/Resources/views/Generator/ColumnTemplate.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
QueryBuilder $qb,
$value,
$operator = Comparison::EQ,
$entityName = '{{ entityDql }}',
$entityName = self::NAME,
$columnName = '{{ columnDql }}',
): QueryBuilder {
if ($value === null) {
Expand All @@ -27,7 +27,7 @@
public static function filterIn{{ column }}(
QueryBuilder $qb,
$value,
$entityName = '{{ entityDql }}',
$entityName = self::NAME,
$columnName = '{{ columnDql }}',
): QueryBuilder {
if ($value === null) {
Expand All @@ -46,7 +46,7 @@
public static function filterNotIn{{ column }}(
QueryBuilder $qb,
$value,
$entityName = '{{ entityDql }}',
$entityName = self::NAME,
$columnName = '{{ columnDql }}',
): QueryBuilder {
if ($value === null) {
Expand Down
13 changes: 7 additions & 6 deletions src/Resources/views/Generator/TopRepositoryTemplate.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ use Symfony\Contracts\Cache\ItemInterface;
*/
class {{ entityClassname }}Base extends {{ extendClass }}
{
const NAME = '{{ entityDql }}';
protected static $parameterIndex = 0;

public function __construct(
Expand All @@ -34,17 +35,17 @@ class {{ entityClassname }}Base extends {{ extendClass }}

public static function getName(): string
{
return '{{ entityDql }}';
return self::NAME;
}

public static function getParameterIndex(): string
{
return '{{ entityDql }}'.static::$parameterIndex++;
return self::NAME.static::$parameterIndex++;
}

public function getNewQueryBuilder(): QueryBuilder
{
return $this->createQueryBuilder('{{ entityDql }}');
return $this->createQueryBuilder(self::NAME);
}

private function getCachedResult(
Expand Down Expand Up @@ -192,7 +193,7 @@ class {{ entityClassname }}Base extends {{ extendClass }}

public function getQueryBuilderCount(
QueryBuilder $qb,
$entityName = '{{ entityDql }}',
$entityName = self::NAME,
bool $useQueryCache = false,
?string $cacheId = null,
array $resultCacheTags = [],
Expand Down Expand Up @@ -241,8 +242,8 @@ class {{ entityClassname }}Base extends {{ extendClass }}

public function getDeleteQueryBuilder(
): QueryBuilder {
$qb = $this->createQueryBuilder('{{ entityDql }}');
$qb->delete($this->getEntityName(), '{{ entityDql }}');
$qb = $this->createQueryBuilder(self::NAME);
$qb->delete($this->getEntityName(), self::NAME);

return $qb;
}
Expand Down
41 changes: 21 additions & 20 deletions tests/Repository/MyClassRepositoryBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
*/
class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository
{
const NAME = 'myClass';
protected static $parameterIndex = 0;

public function __construct(
Expand All @@ -34,17 +35,17 @@ public function __construct(

public static function getName(): string
{
return 'myClass';
return self::NAME;
}

public static function getParameterIndex(): string
{
return 'myClass'.static::$parameterIndex++;
return self::NAME.static::$parameterIndex++;
}

public function getNewQueryBuilder(): QueryBuilder
{
return $this->createQueryBuilder('myClass');
return $this->createQueryBuilder(self::NAME);
}

private function getCachedResult(
Expand Down Expand Up @@ -192,7 +193,7 @@ public function getQueryBuilderSingleScalarResult(

public function getQueryBuilderCount(
QueryBuilder $qb,
$entityName = 'myClass',
$entityName = self::NAME,
bool $useQueryCache = false,
?string $cacheId = null,
array $resultCacheTags = [],
Expand Down Expand Up @@ -241,8 +242,8 @@ public function exists(

public function getDeleteQueryBuilder(
): QueryBuilder {
$qb = $this->createQueryBuilder('myClass');
$qb->delete($this->getEntityName(), 'myClass');
$qb = $this->createQueryBuilder(self::NAME);
$qb->delete($this->getEntityName(), self::NAME);

return $qb;
}
Expand Down Expand Up @@ -305,7 +306,7 @@ public static function filterById(
QueryBuilder $qb,
$value,
$operator = Comparison::EQ,
$entityName = 'myClass',
$entityName = self::NAME,
$columnName = 'id',
): QueryBuilder {
if ($value === null) {
Expand All @@ -329,7 +330,7 @@ public static function filterById(
public static function filterInId(
QueryBuilder $qb,
$value,
$entityName = 'myClass',
$entityName = self::NAME,
$columnName = 'id',
): QueryBuilder {
if ($value === null) {
Expand All @@ -348,7 +349,7 @@ public static function filterInId(
public static function filterNotInId(
QueryBuilder $qb,
$value,
$entityName = 'myClass',
$entityName = self::NAME,
$columnName = 'id',
): QueryBuilder {
if ($value === null) {
Expand Down Expand Up @@ -440,7 +441,7 @@ public static function filterByNumber(
QueryBuilder $qb,
$value,
$operator = Comparison::EQ,
$entityName = 'myClass',
$entityName = self::NAME,
$columnName = 'number',
): QueryBuilder {
if ($value === null) {
Expand All @@ -464,7 +465,7 @@ public static function filterByNumber(
public static function filterInNumber(
QueryBuilder $qb,
$value,
$entityName = 'myClass',
$entityName = self::NAME,
$columnName = 'number',
): QueryBuilder {
if ($value === null) {
Expand All @@ -483,7 +484,7 @@ public static function filterInNumber(
public static function filterNotInNumber(
QueryBuilder $qb,
$value,
$entityName = 'myClass',
$entityName = self::NAME,
$columnName = 'number',
): QueryBuilder {
if ($value === null) {
Expand Down Expand Up @@ -575,7 +576,7 @@ public static function filterByName(
QueryBuilder $qb,
$value,
$operator = Comparison::EQ,
$entityName = 'myClass',
$entityName = self::NAME,
$columnName = 'name',
): QueryBuilder {
if ($value === null) {
Expand All @@ -599,7 +600,7 @@ public static function filterByName(
public static function filterInName(
QueryBuilder $qb,
$value,
$entityName = 'myClass',
$entityName = self::NAME,
$columnName = 'name',
): QueryBuilder {
if ($value === null) {
Expand All @@ -618,7 +619,7 @@ public static function filterInName(
public static function filterNotInName(
QueryBuilder $qb,
$value,
$entityName = 'myClass',
$entityName = self::NAME,
$columnName = 'name',
): QueryBuilder {
if ($value === null) {
Expand Down Expand Up @@ -710,7 +711,7 @@ public static function filterByForeignClasses(
QueryBuilder $qb,
$value,
$operator = Comparison::EQ,
$entityName = 'myClass',
$entityName = self::NAME,
$columnName = 'foreignClasses',
): QueryBuilder {
//get a uniq index
Expand Down Expand Up @@ -751,7 +752,7 @@ public static function filterByForeignClasses(
public static function filterInForeignClasses(
QueryBuilder $qb,
$values,
$entityName = 'myClass',
$entityName = self::NAME,
$columnName = 'foreignClasses',
): QueryBuilder {
//get a uniq index
Expand Down Expand Up @@ -791,7 +792,7 @@ public static function filterInForeignClasses(
public static function filterNotInForeignClasses(
QueryBuilder $qb,
$values,
$entityName = 'myClass',
$entityName = self::NAME,
$columnName = 'foreignClasses',
): QueryBuilder {
//get a uniq index
Expand All @@ -817,7 +818,7 @@ public static function filterNotInForeignClasses(

public static function joinForeignClasses(
QueryBuilder $qb,
$entityName = 'myClass',
$entityName = self::NAME,
$columnName = 'foreignClasses',
$entityDqlTargeted = 'foreignClass',
): QueryBuilder {
Expand All @@ -828,7 +829,7 @@ public static function joinForeignClasses(

public static function leftJoinForeignClasses(
QueryBuilder $qb,
$entityName = 'myClass',
$entityName = self::NAME,
$columnName = 'foreignClasses',
$entityDqlTargeted = 'foreignClass',
): QueryBuilder {
Expand Down
Loading
Loading