From 89afdb8d044807661cfc3cb63203110cd3d69a4e Mon Sep 17 00:00:00 2001 From: Jakub Caban Date: Fri, 24 Feb 2023 14:39:07 +0100 Subject: [PATCH] CS fixer run --- .../Doctrine/EventListener/NodeLifecycleListener.php | 2 -- src/Filesystem/Glide/GlideTransformUrlGenerator.php | 2 +- src/Filesystem/Node/File/Image/TemporaryImage.php | 1 - src/Filesystem/Node/File/PendingFile.php | 2 +- src/Filesystem/Node/File/TemporaryFile.php | 6 +++--- src/Filesystem/Symfony/HttpFoundation/ArchiveResponse.php | 2 +- .../Symfony/HttpKernel/PendingFileValueResolver.php | 5 ++--- src/Filesystem/Symfony/HttpKernel/RequestFilesExtractor.php | 4 ++-- src/Filesystem/TemporaryFilesystem.php | 2 +- 9 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/Filesystem/Doctrine/EventListener/NodeLifecycleListener.php b/src/Filesystem/Doctrine/EventListener/NodeLifecycleListener.php index 5323d658..035f1ce5 100644 --- a/src/Filesystem/Doctrine/EventListener/NodeLifecycleListener.php +++ b/src/Filesystem/Doctrine/EventListener/NodeLifecycleListener.php @@ -29,7 +29,6 @@ use Zenstruck\Filesystem\Node\File; use Zenstruck\Filesystem\Node\File\Image; use Zenstruck\Filesystem\Node\File\Image\LazyImage; -use Zenstruck\Filesystem\Node\File\Image\PendingImage; use Zenstruck\Filesystem\Node\File\Image\SerializableImage; use Zenstruck\Filesystem\Node\File\LazyFile; use Zenstruck\Filesystem\Node\File\PendingFile; @@ -37,7 +36,6 @@ use Zenstruck\Filesystem\Node\File\TemporaryFile; use Zenstruck\Filesystem\Node\Mapping; use Zenstruck\Filesystem\Node\PathGenerator; -use Zenstruck\Filesystem\TemporaryFilesystem; /** * @author Kevin Bond diff --git a/src/Filesystem/Glide/GlideTransformUrlGenerator.php b/src/Filesystem/Glide/GlideTransformUrlGenerator.php index 8e597387..33f9820f 100644 --- a/src/Filesystem/Glide/GlideTransformUrlGenerator.php +++ b/src/Filesystem/Glide/GlideTransformUrlGenerator.php @@ -28,7 +28,7 @@ public function transformUrl(string $path, array|string $filter, Config $config) { $filter = match (true) { // @phpstan-ignore-line https://github.com/phpstan/phpstan/issues/8937 \is_string($filter) => ['p' => $filter], // is glide "preset" - \is_array($filter) && !array_is_list($filter) => $filter, // is standard glide parameters + \is_array($filter) && !\array_is_list($filter) => $filter, // is standard glide parameters \is_array($filter) => ['p' => \implode(',', $filter)], // is array of "presets" }; diff --git a/src/Filesystem/Node/File/Image/TemporaryImage.php b/src/Filesystem/Node/File/Image/TemporaryImage.php index ee6e8742..6e692f05 100644 --- a/src/Filesystem/Node/File/Image/TemporaryImage.php +++ b/src/Filesystem/Node/File/Image/TemporaryImage.php @@ -11,7 +11,6 @@ namespace Zenstruck\Filesystem\Node\File\Image; -use Zenstruck\Filesystem\Node\File; use Zenstruck\Filesystem\Node\File\Image; use Zenstruck\Filesystem\Node\File\TemporaryFile; diff --git a/src/Filesystem/Node/File/PendingFile.php b/src/Filesystem/Node/File/PendingFile.php index 43d0de60..a90893bc 100644 --- a/src/Filesystem/Node/File/PendingFile.php +++ b/src/Filesystem/Node/File/PendingFile.php @@ -68,7 +68,7 @@ public function saveTo(Filesystem $filesystem, string|callable|null $path = null public function saveToTemporary(Filesystem $filesystem): File { do { - $directory = (string) microtime(); + $directory = (string) \microtime(); } while ($filesystem->has($directory)); return $filesystem->write($directory.'/.'.$this->path()->name(), $this); diff --git a/src/Filesystem/Node/File/TemporaryFile.php b/src/Filesystem/Node/File/TemporaryFile.php index 6de7ed3d..c0cf7355 100644 --- a/src/Filesystem/Node/File/TemporaryFile.php +++ b/src/Filesystem/Node/File/TemporaryFile.php @@ -40,7 +40,7 @@ public function ensureImage(): Image $image = $this->ensureTemporary( $this->inner()->ensureImage() ); - assert($image instanceof TemporaryImage); + \assert($image instanceof TemporaryImage); return $image; } @@ -53,7 +53,7 @@ protected function inner(): File /** * @throws FilesystemException */ - private function ensureTemporary(Node $node): TemporaryFile + private function ensureTemporary(Node $node): self { if ($node instanceof self) { return $node; @@ -63,6 +63,6 @@ private function ensureTemporary(Node $node): TemporaryFile return new TemporaryImage($node); } - return new TemporaryFile($node->ensureFile()); + return new self($node->ensureFile()); } } diff --git a/src/Filesystem/Symfony/HttpFoundation/ArchiveResponse.php b/src/Filesystem/Symfony/HttpFoundation/ArchiveResponse.php index 109548af..04aa0570 100644 --- a/src/Filesystem/Symfony/HttpFoundation/ArchiveResponse.php +++ b/src/Filesystem/Symfony/HttpFoundation/ArchiveResponse.php @@ -35,7 +35,7 @@ private function __construct(\SplFileInfo $file, ?string $filename, int $status, /** * @param File|Directory|\SplFileInfo|non-empty-array $what - * @param string|null $filename Content-Disposition filename + * @param string|null $filename Content-Disposition filename * @param array{ * commit_progress?: callable(float):void * } $config diff --git a/src/Filesystem/Symfony/HttpKernel/PendingFileValueResolver.php b/src/Filesystem/Symfony/HttpKernel/PendingFileValueResolver.php index d0c2e770..8fed8da3 100644 --- a/src/Filesystem/Symfony/HttpKernel/PendingFileValueResolver.php +++ b/src/Filesystem/Symfony/HttpKernel/PendingFileValueResolver.php @@ -11,7 +11,6 @@ namespace Zenstruck\Filesystem\Symfony\HttpKernel; - use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface; use Symfony\Component\HttpKernel\Controller\ValueResolverInterface; @@ -55,7 +54,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable $this->extractor()->extractFilesFromRequest( $request, $path, - !is_a( + !\is_a( $argument->getType() ?? PendingFile::class, PendingFile::class, true @@ -101,7 +100,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable $this->extractor()->extractFilesFromRequest( $request, $path, - !is_a( + !\is_a( $argument->getType() ?? PendingFile::class, PendingFile::class, true diff --git a/src/Filesystem/Symfony/HttpKernel/RequestFilesExtractor.php b/src/Filesystem/Symfony/HttpKernel/RequestFilesExtractor.php index a416fcc6..fc56ed84 100644 --- a/src/Filesystem/Symfony/HttpKernel/RequestFilesExtractor.php +++ b/src/Filesystem/Symfony/HttpKernel/RequestFilesExtractor.php @@ -11,7 +11,6 @@ namespace Zenstruck\Filesystem\Symfony\HttpKernel; - use League\Flysystem\FilesystemException; use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\Request; @@ -85,7 +84,8 @@ public static function supports(ArgumentMetadata $argument): bool if (empty($attributes)) { $type = $argument->getType(); - return $type && is_a($type, PendingFile::class, true); + + return $type && \is_a($type, PendingFile::class, true); } return true; diff --git a/src/Filesystem/TemporaryFilesystem.php b/src/Filesystem/TemporaryFilesystem.php index f0e009ee..f31b5c6b 100644 --- a/src/Filesystem/TemporaryFilesystem.php +++ b/src/Filesystem/TemporaryFilesystem.php @@ -52,7 +52,7 @@ public function image(string $path): Image $image = $this->ensureTemporary( $this->inner()->image($path) ); - assert($image instanceof TemporaryImage); + \assert($image instanceof TemporaryImage); return $image; }