Skip to content

Commit e910b4d

Browse files
phansysfranmomu
authored andcommitted
Remove calls to compact()
1 parent 126a878 commit e910b4d

File tree

8 files changed

+75
-22
lines changed

8 files changed

+75
-22
lines changed

src/Loggable/Entity/Repository/LogEntryRepository.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ public function getLogEntriesQuery($entity)
7979

8080
$objectId = (string) $wrapped->getIdentifier(false, true);
8181
$q = $this->_em->createQuery($dql);
82-
$q->setParameters(compact('objectId', 'objectClass'));
82+
$q->setParameters([
83+
'objectId' => $objectId,
84+
'objectClass' => $objectClass,
85+
]);
8386

8487
return $q;
8588
}
@@ -113,7 +116,11 @@ public function revert($entity, $version = 1)
113116

114117
$objectId = (string) $wrapped->getIdentifier(false, true);
115118
$q = $this->_em->createQuery($dql);
116-
$q->setParameters(compact('objectId', 'objectClass', 'version'));
119+
$q->setParameters([
120+
'objectId' => $objectId,
121+
'objectClass' => $objectClass,
122+
'version' => $version,
123+
]);
117124
$logs = $q->getResult();
118125

119126
if ([] === $logs) {

src/Translatable/Document/Repository/TranslationRepository.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,12 @@ public function translate($document, $field, $locale, $value)
8181
$foreignKey = $meta->getReflectionProperty($meta->getIdentifier()[0])->getValue($document);
8282
$objectClass = $config['useObjectClass'];
8383
$transMeta = $this->dm->getClassMetadata($class);
84-
$trans = $this->findOneBy(compact('locale', 'field', 'objectClass', 'foreignKey'));
84+
$trans = $this->findOneBy([
85+
'locale' => $locale,
86+
'field' => $field,
87+
'objectClass' => $objectClass,
88+
'foreignKey' => $foreignKey,
89+
]);
8590
if (!$trans) {
8691
$trans = $transMeta->newInstance();
8792
$transMeta->getReflectionProperty('foreignKey')->setValue($trans, $foreignKey);

src/Translatable/Entity/Repository/TranslationRepository.php

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,12 @@ public function translate($entity, $field, $locale, $value)
8181
$foreignKey = $meta->getReflectionProperty($meta->getSingleIdentifierFieldName())->getValue($entity);
8282
$objectClass = $config['useObjectClass'];
8383
$transMeta = $this->_em->getClassMetadata($class);
84-
$trans = $this->findOneBy(compact('locale', 'objectClass', 'field', 'foreignKey'));
84+
$trans = $this->findOneBy([
85+
'locale' => $locale,
86+
'objectClass' => $objectClass,
87+
'field' => $field,
88+
'foreignKey' => $foreignKey,
89+
]);
8590
if (!$trans) {
8691
$trans = $transMeta->newInstance();
8792
$transMeta->getReflectionProperty('foreignKey')->setValue($trans, $foreignKey);
@@ -180,7 +185,11 @@ public function findObjectByTranslatedField($field, $value, $class)
180185
$dql .= ' AND trans.field = :field';
181186
$dql .= ' AND trans.content = :value';
182187
$q = $this->_em->createQuery($dql);
183-
$q->setParameters(compact('class', 'field', 'value'));
188+
$q->setParameters([
189+
'class' => $class,
190+
'field' => $field,
191+
'value' => $value,
192+
]);
184193
$q->setMaxResults(1);
185194
$result = $q->getArrayResult();
186195
$id = $result[0]['foreignKey'] ?? null;

src/Translatable/Mapping/Event/Adapter/ORM.php

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@ public function loadTranslations($object, $translationClass, $locale, $objectCla
8080
$dql .= ' AND t.object = :object';
8181

8282
$q = $em->createQuery($dql);
83-
$q->setParameters(compact('object', 'locale'));
83+
$q->setParameters([
84+
'object' => $object,
85+
'locale' => $locale,
86+
]);
8487
$result = $q->getArrayResult();
8588
}
8689
} else {
@@ -93,7 +96,11 @@ public function loadTranslations($object, $translationClass, $locale, $objectCla
9396
$dql .= ' AND t.objectClass = :objectClass';
9497
// fetch results
9598
$q = $em->createQuery($dql);
96-
$q->setParameters(compact('objectId', 'locale', 'objectClass'));
99+
$q->setParameters([
100+
'objectId' => $objectId,
101+
'locale' => $locale,
102+
'objectClass' => $objectClass,
103+
]);
97104
$result = $q->getArrayResult();
98105
}
99106

@@ -136,7 +143,10 @@ public function findTranslation(AbstractWrapper $wrapped, $locale, $field, $tran
136143
'trans.field = :field'
137144
)
138145
;
139-
$qb->setParameters(compact('locale', 'field'));
146+
$qb->setParameters([
147+
'locale' => $locale,
148+
'field' => $field,
149+
]);
140150
if ($this->usesPersonalTranslation($translationClass)) {
141151
$qb->andWhere('trans.object = :object');
142152
if ($wrapped->getIdentifier()) {

src/Tree/Entity/Repository/ClosureTreeRepository.php

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function getPathQuery($node)
8888
$dql .= ' WHERE c.descendant = :node';
8989
$dql .= ' ORDER BY c.depth DESC';
9090
$q = $this->_em->createQuery($dql);
91-
$q->setParameters(compact('node'));
91+
$q->setParameter('node', $node);
9292

9393
return $q;
9494
}
@@ -271,7 +271,7 @@ public function removeFromTree($node)
271271
$dql = "SELECT node FROM {$config['useObjectClass']} node";
272272
$dql .= " WHERE node.{$config['parent']} = :node";
273273
$q = $this->_em->createQuery($dql);
274-
$q->setParameters(compact('node'));
274+
$q->setParameter('node', $node);
275275
$nodesToReparent = $q->getResult();
276276
// process updates in transaction
277277
$this->_em->getConnection()->beginTransaction();
@@ -286,7 +286,10 @@ public function removeFromTree($node)
286286
$dql .= " WHERE node.{$pk} = :id";
287287

288288
$q = $this->_em->createQuery($dql);
289-
$q->setParameters(compact('parent', 'id'));
289+
$q->setParameters([
290+
'parent' => $parent,
291+
'id' => $id,
292+
]);
290293
$q->getSingleScalarResult();
291294

292295
$this->listener
@@ -301,7 +304,7 @@ public function removeFromTree($node)
301304
$dql .= " WHERE node.{$pk} = :nodeId";
302305

303306
$q = $this->_em->createQuery($dql);
304-
$q->setParameters(compact('nodeId'));
307+
$q->setParameter('nodeId', $nodeId);
305308
$q->getSingleScalarResult();
306309
$this->_em->getConnection()->commit();
307310
} catch (\Exception $e) {
@@ -388,7 +391,7 @@ public function getNodesHierarchyQueryBuilder($node = null, $direct = false, arr
388391

389392
if (null !== $node) {
390393
$q->where('c.ancestor = :node');
391-
$q->setParameters(compact('node'));
394+
$q->setParameter('node', $node);
392395
} else {
393396
$q->groupBy('c.descendant');
394397
}

src/Tree/RepositoryInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function getNodesHierarchy($node = null, $direct = false, array $options
5050
* @param string|string[] $direction Sort order ('asc'|'desc'|'ASC'|'DESC'). If $sortByField is an array, this may also be an array with matching number of elements
5151
* @param bool $includeNode Include the root node in results?
5252
*
53-
* @return iterable|null List of children
53+
* @return iterable<int|string, object> List of children
5454
*
5555
* @phpstan-param 'asc'|'desc'|'ASC'|'DESC'|array<int, 'asc'|'desc'|'ASC'|'DESC'> $direction
5656
*/

src/Tree/Strategy/ORM/Closure.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ public function processPostPersist($em, $entity, AdapterInterface $ea)
301301
$dql .= ' JOIN c.ancestor a';
302302
$dql .= ' WHERE c.descendant = :parent';
303303
$q = $em->createQuery($dql);
304-
$q->setParameters(compact('parent'));
304+
$q->setParameter('parent', $parent);
305305
$ancestors = $q->getArrayResult();
306306

307307
if ([] === $ancestors) {
@@ -400,7 +400,10 @@ public function updateNode(EntityManagerInterface $em, $node, $oldParent)
400400
$dql .= ' WHERE c.ancestor = :node';
401401
$dql .= ' AND c.descendant = :parent';
402402
$q = $em->createQuery($dql);
403-
$q->setParameters(compact('node', 'parent'));
403+
$q->setParameters([
404+
'node' => $node,
405+
'parent' => $parent,
406+
]);
404407
if ($q->getSingleScalarResult()) {
405408
throw new UnexpectedValueException("Cannot set child as parent to node: {$nodeId}");
406409
}
@@ -411,7 +414,7 @@ public function updateNode(EntityManagerInterface $em, $node, $oldParent)
411414
$subQuery .= " JOIN {$table} c2 ON c1.descendant = c2.descendant";
412415
$subQuery .= ' WHERE c1.ancestor = :nodeId AND c2.depth > c1.depth';
413416

414-
$ids = $conn->executeQuery($subQuery, compact('nodeId'))->fetchFirstColumn();
417+
$ids = $conn->executeQuery($subQuery, ['nodeId' => $nodeId])->fetchFirstColumn();
415418
if ([] !== $ids) {
416419
// using subquery directly, sqlite acts unfriendly
417420
$query = "DELETE FROM {$table} WHERE id IN (".implode(', ', $ids).')';
@@ -429,7 +432,7 @@ public function updateNode(EntityManagerInterface $em, $node, $oldParent)
429432
$query .= ' WHERE c1.descendant = :parentId';
430433
$query .= ' AND c2.ancestor = :nodeId';
431434

432-
$closures = $conn->executeQuery($query, compact('nodeId', 'parentId'))->fetchAllAssociative();
435+
$closures = $conn->executeQuery($query, ['nodeId' => $nodeId, 'parentId' => $parentId])->fetchAllAssociative();
433436

434437
foreach ($closures as $closure) {
435438
if (!$conn->insert($table, $closure)) {

tests/Gedmo/Tree/NestedTreeRootRepositoryTest.php

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public function testShouldSupportChildrenHierarchyAsHtml(): void
131131
$repo = $this->em->getRepository(self::CATEGORY);
132132
$food = $repo->findOneBy(['title' => 'Food']);
133133
$decorate = true;
134-
$defaultHtmlTree = $repo->childrenHierarchy($food, false, compact('decorate'));
134+
$defaultHtmlTree = $repo->childrenHierarchy($food, false, ['decorate' => $decorate]);
135135

136136
static::assertSame(
137137
'<ul><li>Fruits</li><li>Vegitables<ul><li>Carrots</li><li>Potatoes</li></ul></li></ul>',
@@ -146,7 +146,10 @@ public function testShouldSupportChildrenHierarchyAsHtml(): void
146146
$decoratedHtmlTree = $repo->childrenHierarchy(
147147
$food,
148148
false,
149-
compact('decorate', 'nodeDecorator')
149+
[
150+
'decorate' => $decorate,
151+
'nodeDecorator' => $nodeDecorator,
152+
]
150153
);
151154

152155
static::assertSame(
@@ -165,7 +168,14 @@ public function testShouldSupportChildrenHierarchyAsHtml(): void
165168
$decoratedCliTree = $repo->childrenHierarchy(
166169
$food,
167170
false,
168-
compact('decorate', 'nodeDecorator', 'rootOpen', 'rootClose', 'childOpen', 'childClose')
171+
[
172+
'decorate' => $decorate,
173+
'nodeDecorator' => $nodeDecorator,
174+
'rootOpen' => $rootOpen,
175+
'rootClose' => $rootClose,
176+
'childOpen' => $childOpen,
177+
'childClose' => $childClose,
178+
]
169179
);
170180
static::assertSame(
171181
"-Fruits\n-Vegitables\n--Carrots\n--Potatoes\n",
@@ -185,7 +195,13 @@ public function testShouldSupportChildrenHierarchyAsHtml(): void
185195
$decoratedHtmlTree = $repo->childrenHierarchy(
186196
$food,
187197
false,
188-
compact('decorate', 'rootOpen', 'rootClose', 'childOpen', 'childClose')
198+
[
199+
'decorate' => $decorate,
200+
'rootOpen' => $rootOpen,
201+
'rootClose' => $rootClose,
202+
'childOpen' => $childOpen,
203+
'childClose' => $childClose,
204+
]
189205
);
190206

191207
static::assertSame(

0 commit comments

Comments
 (0)