Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions doc/fields.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1127,8 +1127,8 @@ the full address is only visible on the detail and edit pages::

[$local, $domain] = explode('@', $email, 2);
$field->setFormattedValue(substr($local, 0, 1).'***@'.$domain);
}
}
}
}

.. tip::

Expand Down
9 changes: 5 additions & 4 deletions src/Field/Configurator/FileConfigurator.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,12 @@ public function configure(FieldDto $field, EntityDto $entityDto, AdminContext $c
// Disable download_path for Flysystem (URLs are built via flysystem_url_prefix)
$field->setFormTypeOption('download_path', null);
} else {
$relativeUploadDir = u($relativeUploadDir)->trimStart(\DIRECTORY_SEPARATOR)->ensureEnd(\DIRECTORY_SEPARATOR)->toString();
$isStreamWrapper = filter_var($relativeUploadDir, \FILTER_VALIDATE_URL);
if (false !== $isStreamWrapper) {
$absoluteUploadDir = $relativeUploadDir;
$isStreamWrapper = false !== filter_var($relativeUploadDir, \FILTER_VALIDATE_URL);
$isAbsolutePath = str_starts_with($relativeUploadDir, \DIRECTORY_SEPARATOR);
if ($isStreamWrapper || $isAbsolutePath) {
$absoluteUploadDir = u($relativeUploadDir)->ensureEnd(\DIRECTORY_SEPARATOR)->toString();
} else {
$relativeUploadDir = u($relativeUploadDir)->trimStart(\DIRECTORY_SEPARATOR)->ensureEnd(\DIRECTORY_SEPARATOR)->toString();
$absoluteUploadDir = u($relativeUploadDir)->ensureStart($this->projectDir.\DIRECTORY_SEPARATOR)->toString();
}
$field->setFormTypeOption('upload_dir', $absoluteUploadDir);
Expand Down
9 changes: 5 additions & 4 deletions src/Field/Configurator/ImageConfigurator.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,12 @@ public function configure(FieldDto $field, EntityDto $entityDto, AdminContext $c
// Disable download_path for Flysystem (URLs are built via flysystem_url_prefix)
$field->setFormTypeOption('download_path', null);
} else {
$relativeUploadDir = u($relativeUploadDir)->trimStart(\DIRECTORY_SEPARATOR)->ensureEnd(\DIRECTORY_SEPARATOR)->toString();
$isStreamWrapper = filter_var($relativeUploadDir, \FILTER_VALIDATE_URL);
if (false !== $isStreamWrapper) {
$absoluteUploadDir = $relativeUploadDir;
$isStreamWrapper = false !== filter_var($relativeUploadDir, \FILTER_VALIDATE_URL);
$isAbsolutePath = str_starts_with($relativeUploadDir, \DIRECTORY_SEPARATOR);
if ($isStreamWrapper || $isAbsolutePath) {
$absoluteUploadDir = u($relativeUploadDir)->ensureEnd(\DIRECTORY_SEPARATOR)->toString();
} else {
$relativeUploadDir = u($relativeUploadDir)->trimStart(\DIRECTORY_SEPARATOR)->ensureEnd(\DIRECTORY_SEPARATOR)->toString();
$absoluteUploadDir = u($relativeUploadDir)->ensureStart($this->projectDir.\DIRECTORY_SEPARATOR)->toString();
}
$field->setFormTypeOption('upload_dir', $absoluteUploadDir);
Expand Down
3 changes: 2 additions & 1 deletion src/Field/FileField.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ public function setBasePath(string $path): self
}

/**
* Relative to project's root directory (e.g. use 'public/uploads/' for `<your-project-dir>/public/uploads/`)
* Relative paths are resolved from the project's root directory (e.g. 'public/uploads/' for `<your-project-dir>/public/uploads/`).
* Absolute filesystem paths are also supported (e.g. '/mnt/data/uploads/'), and so are stream wrappers (e.g. 's3://bucket/path/').
* Default upload dir: `<your-project-dir>/public/uploads/files/`.
*/
public function setUploadDir(string $uploadDirPath): self
Expand Down
3 changes: 2 additions & 1 deletion src/Field/ImageField.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ public function setBasePath(string $path): self
}

/**
* Relative to project's root directory (e.g. use 'public/uploads/' for `<your-project-dir>/public/uploads/`)
* Relative paths are resolved from the project's root directory (e.g. 'public/uploads/' for `<your-project-dir>/public/uploads/`).
* Absolute filesystem paths are also supported (e.g. '/mnt/data/uploads/'), and so are stream wrappers (e.g. 's3://bucket/path/').
* Default upload dir: `<your-project-dir>/public/uploads/images/`.
*/
public function setUploadDir(string $uploadDirPath): self
Expand Down
Loading