Skip to content

Commit 7209acf

Browse files
soyukasoyuka
authored
style: various cs fixes (#6504)
* cs: fixes * chore: phpstan fixes
1 parent 15e4671 commit 7209acf

21 files changed

+181
-181
lines changed

‎AbstractPaginator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function __construct(DoctrinePaginator $paginator)
3333
$query = $paginator->getQuery();
3434

3535
if (null === ($firstResult = $query->getFirstResult()) || $firstResult < 0 || null === $maxResults = $query->getMaxResults()) { // @phpstan-ignore-line
36-
throw new InvalidArgumentException(sprintf('"%1$s::setFirstResult()" or/and "%1$s::setMaxResults()" was/were not applied to the query.', Query::class));
36+
throw new InvalidArgumentException(\sprintf('"%1$s::setFirstResult()" or/and "%1$s::setMaxResults()" was/were not applied to the query.', Query::class));
3737
}
3838

3939
$this->paginator = $paginator;

‎Extension/EagerLoadingExtension.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ private function joinRelations(QueryBuilder $queryBuilder, QueryNameGeneratorInt
186186
$method = $isLeftJoin ? 'leftJoin' : 'innerJoin';
187187

188188
$associationAlias = $queryNameGenerator->generateJoinAlias($association);
189-
$queryBuilder->{$method}(sprintf('%s.%s', $parentAlias, $association), $associationAlias);
189+
$queryBuilder->{$method}(\sprintf('%s.%s', $parentAlias, $association), $associationAlias);
190190
++$joinCount;
191191
}
192192

@@ -264,7 +264,7 @@ private function addSelect(QueryBuilder $queryBuilder, string $entity, string $a
264264
}
265265
}
266266

267-
$queryBuilder->addSelect(sprintf('partial %s.{%s}', $associationAlias, implode(',', $select)));
267+
$queryBuilder->addSelect(\sprintf('partial %s.{%s}', $associationAlias, implode(',', $select)));
268268
}
269269

270270
private function addSelectOnce(QueryBuilder $queryBuilder, string $alias): void

‎Extension/OrderExtension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
6767
$field = "{$rootAlias}.{$field}";
6868
} else {
6969
$alias = QueryBuilderHelper::addJoinOnce($queryBuilder, $queryNameGenerator, $rootAlias, substr($field, 0, $pos));
70-
$field = sprintf('%s.%s', $alias, substr($field, $pos + 1));
70+
$field = \sprintf('%s.%s', $alias, substr($field, $pos + 1));
7171
}
7272
$queryBuilder->addOrderBy($field, $order);
7373
}

‎Filter/BooleanFilter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
142142
$valueParameter = $queryNameGenerator->generateParameterName($field);
143143

144144
$queryBuilder
145-
->andWhere(sprintf('%s.%s = :%s', $alias, $field, $valueParameter))
145+
->andWhere(\sprintf('%s.%s = :%s', $alias, $field, $valueParameter))
146146
->setParameter($valueParameter, $value);
147147
}
148148
}

‎Filter/DateFilter.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ protected function filterProperty(string $property, $values, QueryBuilder $query
161161
$type = (string) $this->getDoctrineFieldType($property, $resourceClass);
162162

163163
if (self::EXCLUDE_NULL === $nullManagement) {
164-
$queryBuilder->andWhere($queryBuilder->expr()->isNotNull(sprintf('%s.%s', $alias, $field)));
164+
$queryBuilder->andWhere($queryBuilder->expr()->isNotNull(\sprintf('%s.%s', $alias, $field)));
165165
}
166166

167167
if (isset($values[self::PARAMETER_BEFORE])) {
@@ -234,7 +234,7 @@ protected function addWhere(QueryBuilder $queryBuilder, QueryNameGeneratorInterf
234234
} catch (\Exception) {
235235
// Silently ignore this filter if it can not be transformed to a \DateTime
236236
$this->logger->notice('Invalid filter ignored', [
237-
'exception' => new InvalidArgumentException(sprintf('The field "%s" has a wrong date format. Use one accepted by the \DateTime constructor', $field)),
237+
'exception' => new InvalidArgumentException(\sprintf('The field "%s" has a wrong date format. Use one accepted by the \DateTime constructor', $field)),
238238
]);
239239

240240
return;
@@ -247,7 +247,7 @@ protected function addWhere(QueryBuilder $queryBuilder, QueryNameGeneratorInterf
247247
self::PARAMETER_AFTER => '>=',
248248
self::PARAMETER_STRICTLY_AFTER => '>',
249249
];
250-
$baseWhere = sprintf('%s.%s %s :%s', $alias, $field, $operatorValue[$operator], $valueParameter);
250+
$baseWhere = \sprintf('%s.%s %s :%s', $alias, $field, $operatorValue[$operator], $valueParameter);
251251

252252
if (null === $nullManagement || self::EXCLUDE_NULL === $nullManagement) {
253253
$queryBuilder->andWhere($baseWhere);
@@ -258,12 +258,12 @@ protected function addWhere(QueryBuilder $queryBuilder, QueryNameGeneratorInterf
258258
) {
259259
$queryBuilder->andWhere($queryBuilder->expr()->orX(
260260
$baseWhere,
261-
$queryBuilder->expr()->isNull(sprintf('%s.%s', $alias, $field))
261+
$queryBuilder->expr()->isNull(\sprintf('%s.%s', $alias, $field))
262262
));
263263
} else {
264264
$queryBuilder->andWhere($queryBuilder->expr()->andX(
265265
$baseWhere,
266-
$queryBuilder->expr()->isNotNull(sprintf('%s.%s', $alias, $field))
266+
$queryBuilder->expr()->isNotNull(\sprintf('%s.%s', $alias, $field))
267267
));
268268
}
269269

‎Filter/ExistsFilter.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
164164
if ($metadata->hasAssociation($field)) {
165165
if ($metadata->isCollectionValuedAssociation($field)) {
166166
$queryBuilder
167-
->andWhere(sprintf('%s.%s %s EMPTY', $alias, $field, $value ? 'IS NOT' : 'IS'));
167+
->andWhere(\sprintf('%s.%s %s EMPTY', $alias, $field, $value ? 'IS NOT' : 'IS'));
168168

169169
return;
170170
}
@@ -173,20 +173,20 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
173173
$alias = QueryBuilderHelper::addJoinOnce($queryBuilder, $queryNameGenerator, $alias, $field, Join::LEFT_JOIN);
174174

175175
$queryBuilder
176-
->andWhere(sprintf('%s %s NULL', $alias, $value ? 'IS NOT' : 'IS'));
176+
->andWhere(\sprintf('%s %s NULL', $alias, $value ? 'IS NOT' : 'IS'));
177177

178178
return;
179179
}
180180

181181
$queryBuilder
182-
->andWhere(sprintf('%s.%s %s NULL', $alias, $field, $value ? 'IS NOT' : 'IS'));
182+
->andWhere(\sprintf('%s.%s %s NULL', $alias, $field, $value ? 'IS NOT' : 'IS'));
183183

184184
return;
185185
}
186186

187187
if ($metadata->hasField($field)) {
188188
$queryBuilder
189-
->andWhere(sprintf('%s.%s %s NULL', $alias, $field, $value ? 'IS NOT' : 'IS'));
189+
->andWhere(\sprintf('%s.%s %s NULL', $alias, $field, $value ? 'IS NOT' : 'IS'));
190190
}
191191
}
192192

‎Filter/NumericFilter.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,11 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
152152

153153
if (1 === \count($values)) {
154154
$queryBuilder
155-
->andWhere(sprintf('%s.%s = :%s', $alias, $field, $valueParameter))
155+
->andWhere(\sprintf('%s.%s = :%s', $alias, $field, $valueParameter))
156156
->setParameter($valueParameter, $values[0], (string) $this->getDoctrineFieldType($property, $resourceClass));
157157
} else {
158158
$queryBuilder
159-
->andWhere(sprintf('%s.%s IN (:%s)', $alias, $field, $valueParameter))
159+
->andWhere(\sprintf('%s.%s IN (:%s)', $alias, $field, $valueParameter))
160160
->setParameter($valueParameter, $values);
161161
}
162162
}

‎Filter/OrderFilter.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,12 +263,12 @@ protected function filterProperty(string $property, $direction, QueryBuilder $qu
263263
if (null !== $nullsComparison = $this->properties[$property]['nulls_comparison'] ?? $this->orderNullsComparison) {
264264
$nullsDirection = self::NULLS_DIRECTION_MAP[$nullsComparison][$direction];
265265

266-
$nullRankHiddenField = sprintf('_%s_%s_null_rank', $alias, str_replace('.', '_', $field));
266+
$nullRankHiddenField = \sprintf('_%s_%s_null_rank', $alias, str_replace('.', '_', $field));
267267

268-
$queryBuilder->addSelect(sprintf('CASE WHEN %s.%s IS NULL THEN 0 ELSE 1 END AS HIDDEN %s', $alias, $field, $nullRankHiddenField));
268+
$queryBuilder->addSelect(\sprintf('CASE WHEN %s.%s IS NULL THEN 0 ELSE 1 END AS HIDDEN %s', $alias, $field, $nullRankHiddenField));
269269
$queryBuilder->addOrderBy($nullRankHiddenField, $nullsDirection);
270270
}
271271

272-
$queryBuilder->addOrderBy(sprintf('%s.%s', $alias, $field), $direction);
272+
$queryBuilder->addOrderBy(\sprintf('%s.%s', $alias, $field), $direction);
273273
}
274274
}

‎Filter/RangeFilter.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,16 +164,16 @@ protected function addWhere(QueryBuilder $queryBuilder, QueryNameGeneratorInterf
164164

165165
if ($rangeValue[0] === $rangeValue[1]) {
166166
$queryBuilder
167-
->andWhere(sprintf('%s.%s = :%s', $alias, $field, $valueParameter))
167+
->andWhere(\sprintf('%s.%s = :%s', $alias, $field, $valueParameter))
168168
->setParameter($valueParameter, $rangeValue[0]);
169169

170170
return;
171171
}
172172

173173
$queryBuilder
174-
->andWhere(sprintf('%1$s.%2$s BETWEEN :%3$s_1 AND :%3$s_2', $alias, $field, $valueParameter))
175-
->setParameter(sprintf('%s_1', $valueParameter), $rangeValue[0])
176-
->setParameter(sprintf('%s_2', $valueParameter), $rangeValue[1]);
174+
->andWhere(\sprintf('%1$s.%2$s BETWEEN :%3$s_1 AND :%3$s_2', $alias, $field, $valueParameter))
175+
->setParameter(\sprintf('%s_1', $valueParameter), $rangeValue[0])
176+
->setParameter(\sprintf('%s_2', $valueParameter), $rangeValue[1]);
177177

178178
break;
179179
case self::PARAMETER_GREATER_THAN:
@@ -183,7 +183,7 @@ protected function addWhere(QueryBuilder $queryBuilder, QueryNameGeneratorInterf
183183
}
184184

185185
$queryBuilder
186-
->andWhere(sprintf('%s.%s > :%s', $alias, $field, $valueParameter))
186+
->andWhere(\sprintf('%s.%s > :%s', $alias, $field, $valueParameter))
187187
->setParameter($valueParameter, $value);
188188

189189
break;
@@ -194,7 +194,7 @@ protected function addWhere(QueryBuilder $queryBuilder, QueryNameGeneratorInterf
194194
}
195195

196196
$queryBuilder
197-
->andWhere(sprintf('%s.%s >= :%s', $alias, $field, $valueParameter))
197+
->andWhere(\sprintf('%s.%s >= :%s', $alias, $field, $valueParameter))
198198
->setParameter($valueParameter, $value);
199199

200200
break;
@@ -205,7 +205,7 @@ protected function addWhere(QueryBuilder $queryBuilder, QueryNameGeneratorInterf
205205
}
206206

207207
$queryBuilder
208-
->andWhere(sprintf('%s.%s < :%s', $alias, $field, $valueParameter))
208+
->andWhere(\sprintf('%s.%s < :%s', $alias, $field, $valueParameter))
209209
->setParameter($valueParameter, $value);
210210

211211
break;
@@ -216,7 +216,7 @@ protected function addWhere(QueryBuilder $queryBuilder, QueryNameGeneratorInterf
216216
}
217217

218218
$queryBuilder
219-
->andWhere(sprintf('%s.%s <= :%s', $alias, $field, $valueParameter))
219+
->andWhere(\sprintf('%s.%s <= :%s', $alias, $field, $valueParameter))
220220
->setParameter($valueParameter, $value);
221221

222222
break;

‎Filter/SearchFilter.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
205205

206206
if (!$this->hasValidValues($values, $this->getDoctrineFieldType($property, $resourceClass))) {
207207
$this->logger->notice('Invalid filter ignored', [
208-
'exception' => new InvalidArgumentException(sprintf('Values for field "%s" are not valid according to the doctrine type.', $field)),
208+
'exception' => new InvalidArgumentException(\sprintf('Values for field "%s" are not valid according to the doctrine type.', $field)),
209209
]);
210210

211211
return;
@@ -243,7 +243,7 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
243243
*/
244244
if (!$this->hasValidValues([$value], $doctrineTypeField)) {
245245
$this->logger->notice('Invalid filter ignored', [
246-
'exception' => new InvalidArgumentException(sprintf('Values for field "%s" are not valid according to the doctrine type.', $associationFieldIdentifier)),
246+
'exception' => new InvalidArgumentException(\sprintf('Values for field "%s" are not valid according to the doctrine type.', $associationFieldIdentifier)),
247247
]);
248248

249249
return null;
@@ -260,7 +260,7 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
260260
* Shouldn't this actually fail harder?
261261
*/
262262
$this->logger->notice('Invalid filter ignored', [
263-
'exception' => new InvalidArgumentException(sprintf('Values for field "%s" are not valid according to the doctrine type.', $field)),
263+
'exception' => new InvalidArgumentException(\sprintf('Values for field "%s" are not valid according to the doctrine type.', $field)),
264264
]);
265265

266266
return;
@@ -289,7 +289,7 @@ protected function addWhereByStrategy(string $strategy, QueryBuilder $queryBuild
289289

290290
$wrapCase = $this->createWrapCase($caseSensitive);
291291
$valueParameter = ':'.$queryNameGenerator->generateParameterName($field);
292-
$aliasedField = sprintf('%s.%s', $alias, $field);
292+
$aliasedField = \sprintf('%s.%s', $alias, $field);
293293

294294
if (!$strategy || self::STRATEGY_EXACT === $strategy) {
295295
if (1 === \count($values)) {
@@ -310,7 +310,7 @@ protected function addWhereByStrategy(string $strategy, QueryBuilder $queryBuild
310310
$ors = [];
311311
$parameters = [];
312312
foreach ($values as $key => $value) {
313-
$keyValueParameter = sprintf('%s_%s', $valueParameter, $key);
313+
$keyValueParameter = \sprintf('%s_%s', $valueParameter, $key);
314314
$parameters[] = [$caseSensitive ? $value : strtolower($value), $keyValueParameter];
315315

316316
$ors[] = match ($strategy) {
@@ -336,7 +336,7 @@ protected function addWhereByStrategy(string $strategy, QueryBuilder $queryBuild
336336
$wrapCase((string) $queryBuilder->expr()->concat("'% '", $keyValueParameter, "'%'"))
337337
)
338338
),
339-
default => throw new InvalidArgumentException(sprintf('strategy %s does not exist.', $strategy)),
339+
default => throw new InvalidArgumentException(\sprintf('strategy %s does not exist.', $strategy)),
340340
};
341341
}
342342

@@ -360,7 +360,7 @@ protected function createWrapCase(bool $caseSensitive): \Closure
360360
return $expr;
361361
}
362362

363-
return sprintf('LOWER(%s)', $expr);
363+
return \sprintf('LOWER(%s)', $expr);
364364
};
365365
}
366366

0 commit comments

Comments
 (0)