Skip to content

Commit dd75900

Browse files
committed
Fix Phpstan warnings and run CS fixer
1 parent e2009bf commit dd75900

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

src/Filesystem/Glide/GlideTransformUrlGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function transformUrl(string $path, array|string $filter, Config $config)
2828
{
2929
$filter = match (true) { // @phpstan-ignore-line https://github.com/phpstan/phpstan/issues/8937
3030
\is_string($filter) => ['p' => $filter], // is glide "preset"
31-
\is_array($filter) && !array_is_list($filter) => $filter, // is standard glide parameters
31+
\is_array($filter) && !\array_is_list($filter) => $filter, // is standard glide parameters
3232
\is_array($filter) => ['p' => \implode(',', $filter)], // is array of "presets"
3333
};
3434

src/Filesystem/Symfony/HttpKernel/PendingFileValueResolver.php

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Zenstruck\Filesystem\Symfony\HttpKernel;
1313

14-
1514
use Symfony\Component\HttpFoundation\Request;
1615
use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
1716
use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
@@ -46,19 +45,22 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
4645
return [];
4746
}
4847

49-
$path = $attributes[0]?->path
48+
/** @var UploadedFile|null $attribute */
49+
$attribute = $attributes[0];
50+
51+
$path = $attribute?->path
5052
?? $argument->getName();
5153

5254
return [
5355
$this->extractor()->extractFilesFromRequest(
5456
$request,
5557
$path,
56-
!is_a(
58+
!\is_a(
5759
$argument->getType() ?? PendingFile::class,
5860
PendingFile::class,
5961
true
6062
),
61-
$attributes[0]?->image || PendingImage::class === $argument->getType()
63+
$attribute?->image || PendingImage::class === $argument->getType()
6264
),
6365
];
6466
}
@@ -90,14 +92,22 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
9092
$attributes = $argument->getAttributes(UploadedFile::class);
9193
\assert(!empty($attributes));
9294

93-
$path = $attributes[0]?->path
95+
/** @var UploadedFile|null $attribute */
96+
$attribute = $attributes[0];
97+
98+
$path = $attribute?->path
9499
?? $argument->getName();
95100

96101
return [
97102
$this->extractor()->extractFilesFromRequest(
98103
$request,
99104
$path,
100-
$argument->getType()
105+
!\is_a(
106+
$argument->getType() ?? PendingFile::class,
107+
PendingFile::class,
108+
true
109+
),
110+
$attribute?->image || PendingImage::class === $argument->getType()
101111
),
102112
];
103113
}

src/Filesystem/Symfony/HttpKernel/RequestFilesExtractor.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Zenstruck\Filesystem\Symfony\HttpKernel;
1313

14-
1514
use League\Flysystem\FilesystemException;
1615
use Symfony\Component\HttpFoundation\File\UploadedFile;
1716
use Symfony\Component\HttpFoundation\Request;
@@ -85,7 +84,8 @@ public static function supports(ArgumentMetadata $argument): bool
8584

8685
if (empty($attributes)) {
8786
$type = $argument->getType();
88-
return $type && is_a($type, PendingFile::class, true);
87+
88+
return $type && \is_a($type, PendingFile::class, true);
8989
}
9090

9191
return true;

0 commit comments

Comments
 (0)