Fix detecting file extension

Author: rkit

src/models/File.php

@@ -153,26 +153,31 @@ private function fillMetaInfo()
         $this->name = $this->generateName();
     }
 
+    /**
+     * Get extension By MimeType
+     *
+     * @param string $mimeType MimeType of the file
+     * @return string
+     */
     private function getExtensionByMimeType($mimeType)
     {
         $extensions = FileHelper::getExtensionsByMimeType($mimeType);
-        $pathInfo = pathinfo($this->path);
-        $titleInfo = pathinfo($this->title);
+        $pathExtension = pathinfo($this->path, PATHINFO_EXTENSION);
+        $titleExtension = pathinfo($this->title, PATHINFO_EXTENSION);
 
-        if (isset($pathInfo['extension'])) {
-            $extension = $pathInfo['extension'];
-        } elseif (isset($titleInfo['extension'])) {
-            $extension = $titleInfo['extension'];
+        if (array_search($pathExtension, $extensions) !== false) {
+            return $pathExtension;
+        } elseif (array_search($titleExtension, $extensions) !== false) {
+            return $titleExtension;
         } else {
             $extension = explode('/', $mimeType);
             $extension = end($extension);
+            if (array_search($extension, $extensions) !== false) {
+                return $extension;
+            }
         }
 
-        if (array_search($extension, $extensions) !== false) {
-            return $extension;
-        }
-
-        return current($extensions);
+        return current($extensions); // @codeCoverageIgnore
     }
 
     /**

tests/FileUploadTest.php

@@ -434,12 +434,12 @@ public function testManualCreateFileWithoutExtension()
         $this->assertTrue($file->extension === 'png');
     }
 
-    public function testManualCreateFileWitExtensionInTitle()
+    public function testManualCreateFileWithExtensionInTitle()
     {
         $file = $this->prepareFile('file-300-without-extension', 'test_with_extension_in_title');
 
         $model = new News();
-        $file = $model->createFile('image_id', $file, 'title.jpg', true);
+        $file = $model->createFile('image_id', $file, 'title.png', true);
         $this->assertTrue($file->extension === 'png');
     }