Skip to content
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.

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

Trash volume usage #533

Merged
merged 3 commits into from
Dec 1, 2024
Merged
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
13 changes: 1 addition & 12 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/php
{
"name": "PHP",
"name": "FM Elfinder Bundle Dev Container",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/php:0-8.2",

Expand All @@ -17,17 +17,6 @@
"streetsidesoftware.code-spell-checker"
]
}
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [8000],

// Use 'portsAttributes' to set default properties for specific forwarded ports. More info: https://code.visualstudio.com/docs/remote/devcontainerjson-reference.
"portsAttributes": {
"8000": {
"label": "Hello Remote World",
"onAutoForward": "notify"
}
}

// Use 'postCreateCommand' to run commands after the container is created.
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ Tests/Functional/cache
Tests/Functional/log
vendor
.phpunit.result.cache
.php-cs-fixer.cache
.php-cs-fixer.cache
clover.xml
.vscode
3 changes: 0 additions & 3 deletions src/Configuration/ElFinderConfigurationProviderInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

namespace FM\ElfinderBundle\Configuration;

/**
* Interface ElFinderConfigurationProviderInterface.
*/
interface ElFinderConfigurationProviderInterface
{
public function getConfiguration(string $instance): array;
Expand Down
1 change: 1 addition & 0 deletions src/Configuration/ElFinderConfigurationReader.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ public function getConfiguration(string $instance): array
'archiveMimes' => $parameter['archive_mimes'],
'archivers' => $parameter['archivers'],
'fileMode' => $parameter['fileMode'],
'trashHash' => $parameter['trash_hash'],
];

if (null !== $parameter['quarantine']) {
Expand Down
4 changes: 4 additions & 0 deletions tests/Configuration/ElFinderConfigurationReaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ private function getConfigurationReader($attributesObject)
'archivers' => '',
'fileMode' => '',
'quarantine' => null,
'trash_hash' => null,
],
],
],
Expand Down Expand Up @@ -169,6 +170,7 @@ private function getConfigurationReader($attributesObject)
'archivers' => '',
'fileMode' => '',
'quarantine' => null,
'trash_hash' => null,
],
],
],
Expand Down Expand Up @@ -223,6 +225,7 @@ private function getConfigurationReader($attributesObject)
'archivers' => '',
'fileMode' => '',
'quarantine' => null,
'trash_hash' => null,
],
],
],
Expand Down Expand Up @@ -277,6 +280,7 @@ private function getConfigurationReader($attributesObject)
'archivers' => '',
'fileMode' => '',
'quarantine' => null,
'trash_hash' => null,
],
],
],
Expand Down
3 changes: 0 additions & 3 deletions tests/DependencyInjection/ConfigurationLoadTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
use Symfony\Component\Config\Definition\ConfigurationInterface;
use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;

/**
* Class ConfigurationLoadTest.
*/
class ConfigurationLoadTest extends AbstractExtensionConfigurationTestCase
{
protected function getContainerExtension(): ExtensionInterface
Expand Down