diff --git a/src/Resources/views/Generator/ColumnTemplate.html.twig b/src/Resources/views/Generator/ColumnTemplate.html.twig index c8f0a09..4949a5d 100644 --- a/src/Resources/views/Generator/ColumnTemplate.html.twig +++ b/src/Resources/views/Generator/ColumnTemplate.html.twig @@ -58,12 +58,13 @@ public function findBy{{ column }}( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): array { $qb = $this->getNewQueryBuilder(); - static::filterBy{{ column }}($qb, $value); + static::filterBy{{ column }}($qb, $value, $operator); return $this->getQueryBuilderResult( qb: $qb, @@ -75,13 +76,14 @@ public function findOneBy{{ column }}( mixed $value, + $operator = Comparison::EQ, bool $allowNull = false, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): ?\{{ entityClasspath }} { $qb = $this->getNewQueryBuilder(); - static::filterBy{{ column }}($qb, $value); + static::filterBy{{ column }}($qb, $value, $operator); if ($allowNull) { return $this->getQueryBuilderOneOrNullResult( @@ -102,12 +104,13 @@ public function countBy{{ column }}( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): int { $qb = $this->getNewQueryBuilder(); - static::filterBy{{ column }}($qb, $value); + static::filterBy{{ column }}($qb, $value, $operator); return static::getQueryBuilderCount( qb: $qb, @@ -119,12 +122,13 @@ public function existsBy{{ column }}( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): bool { $qb = $this->getNewQueryBuilder(); - static::filterBy{{ column }}($qb, $value); + static::filterBy{{ column }}($qb, $value, $operator); return static::existsByQueryBuilder( qb: $qb, diff --git a/tests/Repository/MyClassRepositoryBase.php b/tests/Repository/MyClassRepositoryBase.php index 950e22c..38c02dd 100644 --- a/tests/Repository/MyClassRepositoryBase.php +++ b/tests/Repository/MyClassRepositoryBase.php @@ -419,12 +419,13 @@ public static function filterNotInId( public function findById( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): array { $qb = $this->getNewQueryBuilder(); - static::filterById($qb, $value); + static::filterById($qb, $value, $operator); return $this->getQueryBuilderResult( qb: $qb, @@ -436,13 +437,14 @@ public function findById( public function findOneById( mixed $value, + $operator = Comparison::EQ, bool $allowNull = false, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): ?\Tbn\QueryBuilderRepositoryGeneratorBundle\Tests\Entity\MyClass { $qb = $this->getNewQueryBuilder(); - static::filterById($qb, $value); + static::filterById($qb, $value, $operator); if ($allowNull) { return $this->getQueryBuilderOneOrNullResult( @@ -463,12 +465,13 @@ public function findOneById( public function countById( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): int { $qb = $this->getNewQueryBuilder(); - static::filterById($qb, $value); + static::filterById($qb, $value, $operator); return static::getQueryBuilderCount( qb: $qb, @@ -480,12 +483,13 @@ public function countById( public function existsById( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): bool { $qb = $this->getNewQueryBuilder(); - static::filterById($qb, $value); + static::filterById($qb, $value, $operator); return static::existsByQueryBuilder( qb: $qb, @@ -564,12 +568,13 @@ public static function filterNotInNumber( public function findByNumber( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): array { $qb = $this->getNewQueryBuilder(); - static::filterByNumber($qb, $value); + static::filterByNumber($qb, $value, $operator); return $this->getQueryBuilderResult( qb: $qb, @@ -581,13 +586,14 @@ public function findByNumber( public function findOneByNumber( mixed $value, + $operator = Comparison::EQ, bool $allowNull = false, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): ?\Tbn\QueryBuilderRepositoryGeneratorBundle\Tests\Entity\MyClass { $qb = $this->getNewQueryBuilder(); - static::filterByNumber($qb, $value); + static::filterByNumber($qb, $value, $operator); if ($allowNull) { return $this->getQueryBuilderOneOrNullResult( @@ -608,12 +614,13 @@ public function findOneByNumber( public function countByNumber( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): int { $qb = $this->getNewQueryBuilder(); - static::filterByNumber($qb, $value); + static::filterByNumber($qb, $value, $operator); return static::getQueryBuilderCount( qb: $qb, @@ -625,12 +632,13 @@ public function countByNumber( public function existsByNumber( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): bool { $qb = $this->getNewQueryBuilder(); - static::filterByNumber($qb, $value); + static::filterByNumber($qb, $value, $operator); return static::existsByQueryBuilder( qb: $qb, @@ -709,12 +717,13 @@ public static function filterNotInName( public function findByName( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): array { $qb = $this->getNewQueryBuilder(); - static::filterByName($qb, $value); + static::filterByName($qb, $value, $operator); return $this->getQueryBuilderResult( qb: $qb, @@ -726,13 +735,14 @@ public function findByName( public function findOneByName( mixed $value, + $operator = Comparison::EQ, bool $allowNull = false, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): ?\Tbn\QueryBuilderRepositoryGeneratorBundle\Tests\Entity\MyClass { $qb = $this->getNewQueryBuilder(); - static::filterByName($qb, $value); + static::filterByName($qb, $value, $operator); if ($allowNull) { return $this->getQueryBuilderOneOrNullResult( @@ -753,12 +763,13 @@ public function findOneByName( public function countByName( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): int { $qb = $this->getNewQueryBuilder(); - static::filterByName($qb, $value); + static::filterByName($qb, $value, $operator); return static::getQueryBuilderCount( qb: $qb, @@ -770,12 +781,13 @@ public function countByName( public function existsByName( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): bool { $qb = $this->getNewQueryBuilder(); - static::filterByName($qb, $value); + static::filterByName($qb, $value, $operator); return static::existsByQueryBuilder( qb: $qb, diff --git a/tests/Service/ExpectedMyClassRepositoryBase.txt b/tests/Service/ExpectedMyClassRepositoryBase.txt index 950e22c..38c02dd 100644 --- a/tests/Service/ExpectedMyClassRepositoryBase.txt +++ b/tests/Service/ExpectedMyClassRepositoryBase.txt @@ -419,12 +419,13 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S public function findById( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): array { $qb = $this->getNewQueryBuilder(); - static::filterById($qb, $value); + static::filterById($qb, $value, $operator); return $this->getQueryBuilderResult( qb: $qb, @@ -436,13 +437,14 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S public function findOneById( mixed $value, + $operator = Comparison::EQ, bool $allowNull = false, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): ?\Tbn\QueryBuilderRepositoryGeneratorBundle\Tests\Entity\MyClass { $qb = $this->getNewQueryBuilder(); - static::filterById($qb, $value); + static::filterById($qb, $value, $operator); if ($allowNull) { return $this->getQueryBuilderOneOrNullResult( @@ -463,12 +465,13 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S public function countById( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): int { $qb = $this->getNewQueryBuilder(); - static::filterById($qb, $value); + static::filterById($qb, $value, $operator); return static::getQueryBuilderCount( qb: $qb, @@ -480,12 +483,13 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S public function existsById( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): bool { $qb = $this->getNewQueryBuilder(); - static::filterById($qb, $value); + static::filterById($qb, $value, $operator); return static::existsByQueryBuilder( qb: $qb, @@ -564,12 +568,13 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S public function findByNumber( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): array { $qb = $this->getNewQueryBuilder(); - static::filterByNumber($qb, $value); + static::filterByNumber($qb, $value, $operator); return $this->getQueryBuilderResult( qb: $qb, @@ -581,13 +586,14 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S public function findOneByNumber( mixed $value, + $operator = Comparison::EQ, bool $allowNull = false, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): ?\Tbn\QueryBuilderRepositoryGeneratorBundle\Tests\Entity\MyClass { $qb = $this->getNewQueryBuilder(); - static::filterByNumber($qb, $value); + static::filterByNumber($qb, $value, $operator); if ($allowNull) { return $this->getQueryBuilderOneOrNullResult( @@ -608,12 +614,13 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S public function countByNumber( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): int { $qb = $this->getNewQueryBuilder(); - static::filterByNumber($qb, $value); + static::filterByNumber($qb, $value, $operator); return static::getQueryBuilderCount( qb: $qb, @@ -625,12 +632,13 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S public function existsByNumber( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): bool { $qb = $this->getNewQueryBuilder(); - static::filterByNumber($qb, $value); + static::filterByNumber($qb, $value, $operator); return static::existsByQueryBuilder( qb: $qb, @@ -709,12 +717,13 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S public function findByName( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): array { $qb = $this->getNewQueryBuilder(); - static::filterByName($qb, $value); + static::filterByName($qb, $value, $operator); return $this->getQueryBuilderResult( qb: $qb, @@ -726,13 +735,14 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S public function findOneByName( mixed $value, + $operator = Comparison::EQ, bool $allowNull = false, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): ?\Tbn\QueryBuilderRepositoryGeneratorBundle\Tests\Entity\MyClass { $qb = $this->getNewQueryBuilder(); - static::filterByName($qb, $value); + static::filterByName($qb, $value, $operator); if ($allowNull) { return $this->getQueryBuilderOneOrNullResult( @@ -753,12 +763,13 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S public function countByName( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): int { $qb = $this->getNewQueryBuilder(); - static::filterByName($qb, $value); + static::filterByName($qb, $value, $operator); return static::getQueryBuilderCount( qb: $qb, @@ -770,12 +781,13 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S public function existsByName( mixed $value, + $operator = Comparison::EQ, bool $useQueryCache = false, ?string $cacheId = null, array $resultCacheTags = [], ): bool { $qb = $this->getNewQueryBuilder(); - static::filterByName($qb, $value); + static::filterByName($qb, $value, $operator); return static::existsByQueryBuilder( qb: $qb,