FIX: Remove unnecessary UploadTest\Validator

Its use-case had been previously replaced by the use_is_uploaded_file config option
silverstripe · Oct 3, 2018 · fbd8843 · fbd8843
1 parent e7c45d9
commit fbd8843
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 58 deletions.
diff --git a/tests/php/UploadTest.php b/tests/php/UploadTest.php
@@ -74,7 +74,7 @@ public function testUpload()
             'error' => UPLOAD_ERR_OK,
         );
 
-        $v = new UploadTest\Validator();
+        $v = new Upload_Validator();
 
         // test upload into default folder
         $u1 = new Upload();
@@ -134,7 +134,7 @@ public function testAllowedFilesize()
 
         // test upload into default folder
         $u1 = new Upload();
-        $v = new UploadTest\Validator();
+        $v = new Upload_Validator();
 
         $v->setAllowedMaxFileSize(array('txt' => 10));
         $u1->setValidator($v);
@@ -261,7 +261,7 @@ public function testGetAllowedMaxFileSize()
             'txt' => 1000
         );
         Upload_Validator::config()->set('default_max_file_size', $configMaxFileSizes);
-        $v = new UploadTest\Validator();
+        $v = new Upload_Validator();
 
         $retrievedSize = $v->getAllowedMaxFileSize('[image]');
         $this->assertEquals(
@@ -282,7 +282,7 @@ public function testGetAllowedMaxFileSize()
             '[document]' => 2000,
             'txt' => '4k'
         );
-        $v = new UploadTest\Validator();
+        $v = new Upload_Validator();
         $v->setAllowedMaxFileSize($maxFileSizes);
 
         $retrievedSize = $v->getAllowedMaxFileSize('[document]');
@@ -313,7 +313,7 @@ public function testGetAllowedMaxFileSize()
         );
 
         // Check a wildcard max file size against a file with an extension
-        $v = new UploadTest\Validator();
+        $v = new Upload_Validator();
         $v->setAllowedMaxFileSize(2000);
 
         $retrievedSize = $v->getAllowedMaxFileSize('.jpg');
@@ -344,7 +344,7 @@ public function testAllowedSizeOnFileWithNoExtension()
             'error' => UPLOAD_ERR_OK,
         );
 
-        $v = new UploadTest\Validator();
+        $v = new Upload_Validator();
         $v->setAllowedMaxFileSize(array('' => 10));
 
         // test upload into default folder
@@ -373,7 +373,7 @@ public function testUploadDoesNotAllowUnknownExtension()
             'error' => UPLOAD_ERR_OK,
         );
 
-        $v = new UploadTest\Validator();
+        $v = new Upload_Validator();
         $v->setAllowedExtensions(array('txt'));
 
         // test upload into default folder
@@ -402,7 +402,7 @@ public function testUploadAcceptsAllowedExtension()
             'error' => UPLOAD_ERR_OK,
         );
 
-        $v = new UploadTest\Validator();
+        $v = new Upload_Validator();
         $v->setAllowedExtensions(array('txt'));
 
         // test upload into default folder
@@ -434,7 +434,7 @@ public function testUploadDeniesNoExtensionFilesIfNoEmptyStringSetForValidatorEx
             'error' => UPLOAD_ERR_OK,
         );
 
-        $v = new UploadTest\Validator();
+        $v = new Upload_Validator();
         $v->setAllowedExtensions(array('txt'));
 
         // test upload into default folder
@@ -533,7 +533,7 @@ public function testUploadFileWithNoExtensionTwiceAppendsNumber()
             'error' => UPLOAD_ERR_OK,
         );
 
-        $v = new UploadTest\Validator();
+        $v = new Upload_Validator();
         $v->setAllowedExtensions(array(''));
 
         // test upload into default folder
@@ -591,7 +591,7 @@ public function testReplaceFile()
             'error' => UPLOAD_ERR_OK,
         );
 
-        $v = new UploadTest\Validator();
+        $v = new Upload_Validator();
         $v->setAllowedExtensions(array(''));
 
         // test upload into default folder
@@ -650,7 +650,7 @@ public function testReplaceFileWithLoadIntoFile()
             'error' => UPLOAD_ERR_OK,
         );
 
-        $v = new UploadTest\Validator();
+        $v = new Upload_Validator();
 
         // test upload into default folder
         $u = new Upload();
@@ -731,7 +731,7 @@ public function testDeleteResampledImagesOnUpload()
                 'error' => UPLOAD_ERR_OK,
             );
 
-            $v = new UploadTest\Validator();
+            $v = new Upload_Validator();
 
             // test upload into default folder
             $u = new Upload();
@@ -772,7 +772,7 @@ public function testFileVersioningWithAnExistingFile()
                 'error' => UPLOAD_ERR_OK,
             );
 
-            $v = new UploadTest\Validator();
+            $v = new Upload_Validator();
 
             // test upload into default folder
             $u = new Upload();

diff --git a/tests/php/UploadTest/Validator.php b/tests/php/UploadTest/Validator.php