Merge remote-tracking branch 'origin/master'

phpmyadmin · Apr 7, 2015 · 7487ffe · 7487ffe
2 parents 0cf5bb6 + 184c204
commit 7487ffe
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/test/classes/PMA_File_test.php b/test/classes/PMA_File_test.php
@@ -51,12 +51,11 @@ public function testMIME($file, $mime)
      * Test for PMA_File::getContent
      *
      * @param string $file file string
-     * @param string $mime expected mime
      *
      * @return void
      * @dataProvider compressedFiles
      */
-    public function testBinaryContent($file, $mime)
+    public function testBinaryContent($file)
     {
         $data = '0x' . bin2hex(file_get_contents($file));
         $file = new PMA_File($file);