Skip to content

Commit c7cbdb5

Browse files
PowerKiKiPowerKiKi
committed
Rename *FilterJoins into *FilterGroupJoin for consistency
1 parent 0dbb405 commit c7cbdb5

File tree

6 files changed

+30
-27
lines changed

6 files changed

+30
-27
lines changed

‎src/Factory/Type/FilterJoinsTypeFactory.php‎ renamed to ‎src/Factory/Type/FilterGroupJoinTypeFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* A factory to create an InputObjectType from a Doctrine entity to
1212
* specify joins.
1313
*/
14-
final class FilterJoinsTypeFactory extends AbstractTypeFactory
14+
final class FilterGroupJoinTypeFactory extends AbstractTypeFactory
1515
{
1616
/**
1717
* Create an InputObjectType from a Doctrine entity to
@@ -44,7 +44,7 @@ public function create(string $className, string $typeName): Type
4444
*/
4545
public function getField(string $className): array
4646
{
47-
$joinsType = $this->types->getFilterJoins($className);
47+
$joinsType = $this->types->getFilterGroupJoin($className);
4848

4949
$joinsField = [
5050
'name' => 'joins',

‎src/Factory/Type/FilterTypeFactory.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
final class FilterTypeFactory extends AbstractTypeFactory
1717
{
1818
/**
19-
* @var FilterJoinsTypeFactory
19+
* @var FilterGroupJoinTypeFactory
2020
*/
21-
private $filterJoinsTypeFactory;
21+
private $filterGroupJoinTypeFactory;
2222

2323
/**
2424
* @var FilterGroupConditionTypeFactory
2525
*/
2626
private $filterGroupConditionTypeFactory;
2727

28-
public function __construct(Types $types, EntityManager $entityManager, FilterJoinsTypeFactory $filterJoinsTypeFactory, FilterGroupConditionTypeFactory $filterGroupConditionTypeFactory)
28+
public function __construct(Types $types, EntityManager $entityManager, FilterGroupJoinTypeFactory $filterGroupJoinTypeFactory, FilterGroupConditionTypeFactory $filterGroupConditionTypeFactory)
2929
{
3030
parent::__construct($types, $entityManager);
31-
$this->filterJoinsTypeFactory = $filterJoinsTypeFactory;
31+
$this->filterGroupJoinTypeFactory = $filterGroupJoinTypeFactory;
3232
$this->filterGroupConditionTypeFactory = $filterGroupConditionTypeFactory;
3333
}
3434

@@ -91,7 +91,7 @@ private function getGroupType(string $className, string $typeName): InputObjectT
9191
'description' => 'The logic operator to be used within all conditions in this group',
9292
'defaultValue' => 'AND',
9393
],
94-
$this->filterJoinsTypeFactory->getField($className),
94+
$this->filterGroupJoinTypeFactory->getField($className),
9595
$this->filterGroupConditionTypeFactory->getField($className),
9696
],
9797
]);

‎src/Factory/Type/JoinOnTypeFactory.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
final class JoinOnTypeFactory extends AbstractTypeFactory
1717
{
1818
/**
19-
* @var FilterJoinsTypeFactory
19+
* @var FilterGroupJoinTypeFactory
2020
*/
21-
private $filterJoinsTypeFactory;
21+
private $filterGroupJoinTypeFactory;
2222

2323
/**
2424
* @var FilterGroupConditionTypeFactory
2525
*/
2626
private $filterGroupConditionTypeFactory;
2727

28-
public function __construct(Types $types, EntityManager $entityManager, FilterJoinsTypeFactory $filterJoinsTypeFactory, FilterGroupConditionTypeFactory $filterGroupConditionTypeFactory)
28+
public function __construct(Types $types, EntityManager $entityManager, FilterGroupJoinTypeFactory $filterGroupJoinTypeFactory, FilterGroupConditionTypeFactory $filterGroupConditionTypeFactory)
2929
{
3030
parent::__construct($types, $entityManager);
31-
$this->filterJoinsTypeFactory = $filterJoinsTypeFactory;
31+
$this->filterGroupJoinTypeFactory = $filterGroupJoinTypeFactory;
3232
$this->filterGroupConditionTypeFactory = $filterGroupConditionTypeFactory;
3333
}
3434

@@ -52,7 +52,7 @@ public function create(string $className, string $typeName): Type
5252
'type' => $this->types->get('JoinType'),
5353
'defaultValue' => 'innerJoin',
5454
],
55-
$this->filterJoinsTypeFactory->getField($className),
55+
$this->filterGroupJoinTypeFactory->getField($className),
5656
$this->filterGroupConditionTypeFactory->getField($className),
5757
];
5858
},

‎src/Types.php‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use GraphQL\Doctrine\Factory\Type\AbstractTypeFactory;
1717
use GraphQL\Doctrine\Factory\Type\EntityIDTypeFactory;
1818
use GraphQL\Doctrine\Factory\Type\FilterGroupConditionTypeFactory;
19-
use GraphQL\Doctrine\Factory\Type\FilterJoinsTypeFactory;
19+
use GraphQL\Doctrine\Factory\Type\FilterGroupJoinTypeFactory;
2020
use GraphQL\Doctrine\Factory\Type\FilterTypeFactory;
2121
use GraphQL\Doctrine\Factory\Type\InputTypeFactory;
2222
use GraphQL\Doctrine\Factory\Type\JoinOnTypeFactory;
@@ -93,10 +93,13 @@ final class Types
9393
private $joinOnTypeFactory;
9494

9595
/**
96-
* @var FilterJoinsTypeFactory
96+
* @var FilterGroupJoinTypeFactory
9797
*/
98-
private $filterJoinsTypeFactory;
98+
private $filterGroupJoinTypeFactory;
9999

100+
/**
101+
* @var FilterGroupConditionTypeFactory
102+
*/
100103
private $filterGroupConditionTypeFactory;
101104

102105
public function __construct(EntityManager $entityManager, ?ContainerInterface $customTypes = null)
@@ -108,11 +111,11 @@ public function __construct(EntityManager $entityManager, ?ContainerInterface $c
108111
$this->partialInputTypeFactory = new PartialInputTypeFactory($this, $entityManager);
109112
$this->sortingTypeFactory = new SortingTypeFactory($this, $entityManager);
110113
$this->entityIDTypeFactory = new EntityIDTypeFactory($this, $entityManager);
111-
$this->filterJoinsTypeFactory = new FilterJoinsTypeFactory($this, $entityManager);
114+
$this->filterGroupJoinTypeFactory = new FilterGroupJoinTypeFactory($this, $entityManager);
112115
$this->filterGroupConditionTypeFactory = new FilterGroupConditionTypeFactory($this, $entityManager);
113116
$this->filteredQueryBuilderFactory = new FilteredQueryBuilderFactory($this, $entityManager, $this->sortingTypeFactory);
114-
$this->filterTypeFactory = new FilterTypeFactory($this, $entityManager, $this->filterJoinsTypeFactory, $this->filterGroupConditionTypeFactory);
115-
$this->joinOnTypeFactory = new JoinOnTypeFactory($this, $entityManager, $this->filterJoinsTypeFactory, $this->filterGroupConditionTypeFactory);
117+
$this->filterTypeFactory = new FilterTypeFactory($this, $entityManager, $this->filterGroupJoinTypeFactory, $this->filterGroupConditionTypeFactory);
118+
$this->joinOnTypeFactory = new JoinOnTypeFactory($this, $entityManager, $this->filterGroupJoinTypeFactory, $this->filterGroupConditionTypeFactory);
116119

117120
$entityManager->getConfiguration()->newDefaultAnnotationDriver();
118121
AnnotationRegistry::registerLoader('class_exists');
@@ -300,10 +303,10 @@ public function getJoinOn(string $className): InputObjectType
300303
*
301304
* @return InputObjectType
302305
*/
303-
public function getFilterJoins(string $className): InputObjectType
306+
public function getFilterGroupJoin(string $className): InputObjectType
304307
{
305308
/** @var InputObjectType $type */
306-
$type = $this->getViaFactory($className, Utils::getTypeName($className) . 'FilterJoins', $this->filterJoinsTypeFactory);
309+
$type = $this->getViaFactory($className, Utils::getTypeName($className) . 'FilterGroupJoin', $this->filterGroupJoinTypeFactory);
307310

308311
return $type;
309312
}

‎tests/data/ModelWithTraitsFilter.graphqls‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ input ModelWithTraitsFilterGroup {
6666
"""
6767
Optional joins to either filter the query or fetch related objects from DB in a single query
6868
"""
69-
joins: ModelWithTraitsFilterJoins
69+
joins: ModelWithTraitsFilterGroupJoin
7070

7171
"""Conditions to be applied on fields"""
7272
conditions: [ModelWithTraitsFilterGroupCondition!]
@@ -97,7 +97,7 @@ input ModelWithTraitsFilterGroupConditionId {
9797
}
9898

9999
"""Type to specify join tables in a filter"""
100-
input ModelWithTraitsFilterJoins {
100+
input ModelWithTraitsFilterGroupJoin {
101101

102102
}
103103

‎tests/data/PostFilter.graphqls‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ input JoinOnPost {
132132
"""
133133
Optional joins to either filter the query or fetch related objects from DB in a single query
134134
"""
135-
joins: PostFilterJoins
135+
joins: PostFilterGroupJoin
136136

137137
"""Conditions to be applied on fields"""
138138
conditions: [PostFilterGroupCondition!]
@@ -144,7 +144,7 @@ input JoinOnUser {
144144
"""
145145
Optional joins to either filter the query or fetch related objects from DB in a single query
146146
"""
147-
joins: UserFilterJoins
147+
joins: UserFilterGroupJoin
148148

149149
"""Conditions to be applied on fields"""
150150
conditions: [UserFilterGroupCondition!]
@@ -258,7 +258,7 @@ input PostFilterGroup {
258258
"""
259259
Optional joins to either filter the query or fetch related objects from DB in a single query
260260
"""
261-
joins: PostFilterJoins
261+
joins: PostFilterGroupJoin
262262

263263
"""Conditions to be applied on fields"""
264264
conditions: [PostFilterGroupCondition!]
@@ -376,7 +376,7 @@ input PostFilterGroupConditionUser {
376376
}
377377

378378
"""Type to specify join tables in a filter"""
379-
input PostFilterJoins {
379+
input PostFilterGroupJoin {
380380
user: JoinOnUser
381381
}
382382

@@ -497,7 +497,7 @@ input UserFilterGroupConditionPosts {
497497
}
498498

499499
"""Type to specify join tables in a filter"""
500-
input UserFilterJoins {
500+
input UserFilterGroupJoin {
501501
posts: JoinOnPost
502502
manager: JoinOnUser
503503
}

0 commit comments

Comments
 (0)