Skip to content

[#492] Prevent Request bootstrap circular dependency via UploadedFile lazy init #493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
armanist merged 2 commits into from
May 1, 2026
Merged

[#492] Prevent Request bootstrap circular dependency via UploadedFile lazy init #493

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3362f6b
[#492] Prevent Request bootstrap circular dependency via UploadedFile…
armanist May 1, 2026
e512b45
[#492] Preserve strict MIME overrides when setAllowedMimeTypes is used
armanist May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 64 additions & 25 deletions src/Storage/UploadedFile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class UploadedFile extends SplFileInfo
/**
* Local File System
*/
protected LocalFilesystemAdapterInterface $localFileSystem;
protected ?LocalFilesystemAdapterInterface $localFileSystem = null;

/**
* Remove File System
Expand Down Expand Up @@ -113,28 +113,24 @@ class UploadedFile extends SplFileInfo
*/
protected int $errorCode;

/**
* Whether mime types were loaded from config
*/
protected bool $mimeTypesLoaded = false;

/**
* Whether mime types were explicitly set by caller
*/
protected bool $mimeTypesOverridden = false;

/**
* @param array<string, mixed> $meta
* @throws ConfigException|DiException|BaseException|ReflectionException
*/
public function __construct(array $meta)
{
$adapter = fs()->getAdapter();

if (!$adapter instanceof LocalFilesystemAdapterInterface) {
throw FileSystemException::notInstanceOf(
get_class($adapter),
LocalFilesystemAdapterInterface::class
);
}

$this->localFileSystem = $adapter;

$this->originalName = $meta['name'];
$this->errorCode = $meta['error'];

$this->loadAllowedMimeTypesFromConfig();

parent::__construct($meta['tmp_name']);
}

Expand All @@ -145,6 +141,8 @@ public function __construct(array $meta)
public function setAllowedMimeTypes(array $allowedMimeTypes, bool $merge = true): UploadedFile
{
$this->setAllowedMimeTypesMap($allowedMimeTypes, $merge);
$this->mimeTypesOverridden = true;
$this->mimeTypesLoaded = true;
return $this;
}

Expand All @@ -154,7 +152,7 @@ public function setAllowedMimeTypes(array $allowedMimeTypes, bool $merge = true)
public function getName(): string
{
if (!$this->name) {
$this->name = $this->localFileSystem->fileName($this->originalName ?? '');
$this->name = $this->getLocalFileSystem()->fileName($this->originalName ?? '');
}

return $this->name;
Expand Down Expand Up @@ -192,7 +190,7 @@ public function getRemoteFileSystem(): ?FilesystemAdapterInterface
public function getExtension(): string
{
if (!$this->extension) {
$this->extension = strtolower($this->localFileSystem->extension($this->originalName ?? ''));
$this->extension = strtolower($this->getLocalFileSystem()->extension($this->originalName ?? ''));
}

return $this->extension;
Expand Down Expand Up @@ -268,15 +266,18 @@ public function getDimensions(): array
* @param string $dest
* @param bool $overwrite
* @return bool
* @throws FileUploadException|FileSystemException|ImageResizeException|BaseException
* @throws FileUploadException|FileSystemException|ImageResizeException|BaseException|ReflectionException
*/
public function save(string $dest, bool $overwrite = false): bool
{
$this->ensureAllowedMimeTypesLoaded();
Comment thread
armanist marked this conversation as resolved.
$localFileSystem = $this->getLocalFileSystem();

if ($this->errorCode !== UPLOAD_ERR_OK) {
throw new FileUploadException($this->getErrorMessage());
}

if (!$this->localFileSystem->isFile($this->getPathname())) {
if (!$localFileSystem->isFile($this->getPathname())) {
throw FileUploadException::fileNotFound($this->getPathname());
}

Expand All @@ -287,15 +288,15 @@ public function save(string $dest, bool $overwrite = false): bool
$filePath = $dest . DS . $this->getNameWithExtension();

if (!$this->remoteFileSystem) {
if (!$this->localFileSystem->isDirectory($dest)) {
if (!$localFileSystem->isDirectory($dest)) {
throw FileSystemException::directoryNotExists($dest);
}

if (!$this->localFileSystem->isWritable($dest)) {
if (!$localFileSystem->isWritable($dest)) {
throw FileSystemException::directoryNotWritable($dest);
}

if ($overwrite === false && $this->localFileSystem->exists($filePath)) {
if ($overwrite === false && $localFileSystem->exists($filePath)) {
throw FileSystemException::fileAlreadyExists($filePath);
}
}
Expand Down Expand Up @@ -369,13 +370,51 @@ public function isImage(string $filePath): bool
*/
protected function moveUploadedFile(string $filePath): bool
{
$localFileSystem = $this->getLocalFileSystem();

if ($this->remoteFileSystem) {
return (bool) $this->remoteFileSystem->put($filePath, $this->localFileSystem->get($this->getPathname()));
return (bool) $this->remoteFileSystem->put($filePath, $localFileSystem->get($this->getPathname()));
} elseif ($this->isUploaded()) {
return move_uploaded_file($this->getPathname(), $filePath);
} else {
return $this->localFileSystem->copy($this->getPathname(), $filePath);
return $localFileSystem->copy($this->getPathname(), $filePath);
}
}

/**
* @throws ConfigException|DiException|BaseException|ReflectionException
*/
private function getLocalFileSystem(): LocalFilesystemAdapterInterface
{
if ($this->localFileSystem) {
return $this->localFileSystem;
}

$adapter = fs()->getAdapter();

if (!$adapter instanceof LocalFilesystemAdapterInterface) {
throw FileSystemException::notInstanceOf(
get_class($adapter),
LocalFilesystemAdapterInterface::class
);
}

$this->localFileSystem = $adapter;

return $this->localFileSystem;
}

/**
* @throws FileUploadException|LoaderException|ConfigException|DiException|ReflectionException
*/
private function ensureAllowedMimeTypesLoaded(): void
{
if ($this->mimeTypesLoaded || $this->mimeTypesOverridden) {
return;
}

$this->loadAllowedMimeTypesFromConfig();
$this->mimeTypesLoaded = true;
}

/**
Expand All @@ -387,7 +426,7 @@ protected function allowed(string $extension, string $mimeType): bool
$mimeType = strtolower($mimeType);

return isset($this->allowedMimeTypes[$mimeType]) &&
in_array($extension, (array) $this->allowedMimeTypes[$mimeType], true);
in_array($extension, $this->allowedMimeTypes[$mimeType], true);
}

/**
Expand Down
Loading