From 2421604aa16e3f953cc61bcfe228c5b6314685b0 Mon Sep 17 00:00:00 2001
From: Cristiano Magro <cristiano.magro@vola.it>
Date: Tue, 27 Aug 2019 11:21:41 +0200
Subject: [PATCH] Refactor per usare la classe FiltroExt
---
tests/Vola/UploadFile/FilesFilterTest.php | 5 +++--
src/Vola/UploadFile/FilesFilter.class.php | 13 +++++--------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/Vola/UploadFile/FilesFilter.class.php b/src/Vola/UploadFile/FilesFilter.class.php
index 2acc743..6172a18 100644
--- a/src/Vola/UploadFile/FilesFilter.class.php
+++ b/src/Vola/UploadFile/FilesFilter.class.php
@@ -16,14 +16,11 @@
public function addExt($extension = '')
{
- if ($extension != ''){
- switch(strtolower($extension)) {
- case 'gif':
- $this->filtro[] = json_decode('{"title":"Image files", "extensions":"gif"}', true);
- break;
- case 'doc':
- $this->filtro[] = json_decode('{"title":"Documenti", "extensions":"doc"}', true);
- break;
+ if ($extension != '') {
+ $titolo = $this->decodeTitolo($extension);
+ if ($titolo != null) {
+ $filtro = new FilterExt($titolo, $extension);
+ $this->filtro[] = json_decode($filtro->getFilter());
}
}
return $this;
diff --git a/tests/Vola/UploadFile/FilesFilterTest.php b/tests/Vola/UploadFile/FilesFilterTest.php
index d9334f7..7c32d26 100644
--- a/tests/Vola/UploadFile/FilesFilterTest.php
+++ b/tests/Vola/UploadFile/FilesFilterTest.php
@@ -47,8 +47,9 @@
[['fasullo'], '[]'],
[['gif'], '[{"title":"Image files","extensions":"gif"}]'],
[['doc'], '[{"title":"Documenti","extensions":"doc"}]'],
- [['DOC'], '[{"title":"Documenti","extensions":"doc"}]'],
- [['DOc', 'gif'],'[{"title":"Documenti","extensions":"doc"},{"title":"Image files","extensions":"gif"}]'],
+ [['DOC'], '[{"title":"Documenti","extensions":"DOC"}]'],
+ [['txt'], '[{"title":"Documenti","extensions":"txt"}]'],
+ [['DOc', 'gif'],'[{"title":"Documenti","extensions":"DOc"},{"title":"Image files","extensions":"gif"}]'],
];
}
--
Gitblit v1.8.0