diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 37e756b..9d491d1 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -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", @@ -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. diff --git a/.gitignore b/.gitignore index dc79fa3..806efe3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,6 @@ Tests/Functional/cache Tests/Functional/log vendor .phpunit.result.cache -.php-cs-fixer.cache \ No newline at end of file +.php-cs-fixer.cache +clover.xml +.vscode \ No newline at end of file diff --git a/src/Configuration/ElFinderConfigurationProviderInterface.php b/src/Configuration/ElFinderConfigurationProviderInterface.php index 85ba188..0d6f6e1 100644 --- a/src/Configuration/ElFinderConfigurationProviderInterface.php +++ b/src/Configuration/ElFinderConfigurationProviderInterface.php @@ -2,9 +2,6 @@ namespace FM\ElfinderBundle\Configuration; -/** - * Interface ElFinderConfigurationProviderInterface. - */ interface ElFinderConfigurationProviderInterface { public function getConfiguration(string $instance): array; diff --git a/src/Configuration/ElFinderConfigurationReader.php b/src/Configuration/ElFinderConfigurationReader.php index aedebcf..f1d0598 100644 --- a/src/Configuration/ElFinderConfigurationReader.php +++ b/src/Configuration/ElFinderConfigurationReader.php @@ -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']) { diff --git a/tests/Configuration/ElFinderConfigurationReaderTest.php b/tests/Configuration/ElFinderConfigurationReaderTest.php index 23726cb..817da1f 100644 --- a/tests/Configuration/ElFinderConfigurationReaderTest.php +++ b/tests/Configuration/ElFinderConfigurationReaderTest.php @@ -115,6 +115,7 @@ private function getConfigurationReader($attributesObject) 'archivers' => '', 'fileMode' => '', 'quarantine' => null, + 'trash_hash' => null, ], ], ], @@ -169,6 +170,7 @@ private function getConfigurationReader($attributesObject) 'archivers' => '', 'fileMode' => '', 'quarantine' => null, + 'trash_hash' => null, ], ], ], @@ -223,6 +225,7 @@ private function getConfigurationReader($attributesObject) 'archivers' => '', 'fileMode' => '', 'quarantine' => null, + 'trash_hash' => null, ], ], ], @@ -277,6 +280,7 @@ private function getConfigurationReader($attributesObject) 'archivers' => '', 'fileMode' => '', 'quarantine' => null, + 'trash_hash' => null, ], ], ], diff --git a/tests/DependencyInjection/ConfigurationLoadTest.php b/tests/DependencyInjection/ConfigurationLoadTest.php index d946d33..cdea321 100644 --- a/tests/DependencyInjection/ConfigurationLoadTest.php +++ b/tests/DependencyInjection/ConfigurationLoadTest.php @@ -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