obey trash hash param

helios-ag · Dec 1, 2024 · 7d146a6 · 7d146a6
1 parent 87d5f44
commit 7d146a6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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