added tests

BlueImp/UploadHandler.php

@@ -265,17 +265,18 @@ protected function trim_file_name($file_name, $type, $index) {
             preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) {
             $file_name .= '.'.$matches[1];
         }
+        $acceptedFileTypesRegex = $this->options['accept_file_types'];
         if ($this->options['discard_aborted_uploads']) {
-            while($this->is_basename_existing($this->options['upload_dir'], $file_name)) {
+            while($this->is_basename_existing($this->options['upload_dir'], $file_name, $acceptedFileTypesRegex)) {
                 $file_name = $this->upcount_name($file_name);
             }
         }
         return $file_name;
     }
 
-    protected function is_basename_existing($dir, $fileName)
+    protected function is_basename_existing($dir, $fileName, $acceptedFileTypesRegex)
     {
-        $extensions = $this->get_accepted_extensions_from_options_regex($this->options['accept_file_types']);
+        $extensions = $this->get_accepted_extensions_from_options_regex($acceptedFileTypesRegex);
         $pathParts = pathinfo($fileName);
         $nameWithoutExtension = $pathParts['filename'];
         foreach ($extensions as $extension) {
@@ -286,9 +287,9 @@ protected function is_basename_existing($dir, $fileName)
         return false;
     }
 
-    protected function get_accepted_extensions_from_options_regex($regex)
+    protected function get_accepted_extensions_from_options_regex($acceptedFileTypesRegex)
     {
-        preg_match_all('(\.[a-z]+)', $regex, $matches);
+        preg_match_all('(\.[a-z]+)', $acceptedFileTypesRegex, $matches);
         $extensions = $matches[0];
         $extensions[] = '';
 

Test/BlueImp/UploadHandlerTest.php

@@ -12,7 +12,6 @@
  */
 class UploadHandlerTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      *
      */
@@ -31,6 +30,22 @@ public function testGetExtensionsFromRegex()
         $this->assertEquals('', $extensions[5]);
     }
 
+    /**
+     *
+     */
+    public function testIsBasenameExisting()
+    {
+        $regex = '/(\.jpg|\.jpeg|\.gif|\.png|\.pdf)$/i';
+        $dir = __DIR__ . '/../upload-dir/';
+        $uploadHandler = new UploadHandlerMock();
+
+        $result = $uploadHandler->is_basename_existing_wrapper($dir, 'test.png', $regex);
+        $this->assertTrue($result);
+
+        $result = $uploadHandler->is_basename_existing_wrapper($dir, 'I-do-not-exist.jpg', $regex);
+        $this->assertFalse($result);
+    }
+
     /**
      *
      */
@@ -65,9 +80,9 @@ public function get_accepted_extensions_from_options_regex_wrapper($regex)
         return $this->get_accepted_extensions_from_options_regex($regex);
     }
 
-    public function is_basename_existing_wrapper()
+    public function is_basename_existing_wrapper($directory, $filename, $regex)
     {
-        return $this->is_basename_existing();
+        return $this->is_basename_existing($directory, $filename, $regex);
     }
 }