Various Fixes

- Enable mime type wildcards
- Fix too big/small error messages
- Fix `UploadFromUrl::extendOptions`

Author: bboure

src/FileFromUrlValidator.php

@@ -85,19 +85,40 @@ protected function validateValue($file)
         switch ($file->error) {
             case UPLOAD_ERR_OK:
                 if ($this->maxSize !== null && $file->size > $this->maxSize) {
-                    return [$this->tooBig, ['file' => $file->name, 'limit' => $this->getSizeLimit()]];
+                    return [
+                        $this->tooBig,
+                        [
+                            'file' => $file->name,
+                            'limit' => $this->getSizeLimit(),
+                            'formattedLimit' => Yii::$app->formatter->asShortSize($this->getSizeLimit()),
+                        ]
+                    ];
                 } elseif ($this->minSize !== null && $file->size < $this->minSize) {
-                    return [$this->tooSmall, ['file' => $file->name, 'limit' => $this->minSize]];
+                    return [
+                        $this->tooSmall,
+                        [
+                            'file' => $value->name,
+                            'limit' => $this->minSize,
+                            'formattedLimit' => Yii::$app->formatter->asShortSize($this->minSize),
+                        ],
+                    ];
                 } elseif (!empty($this->extensions) && !$this->validateExtension($file)) {
                     return [$this->wrongExtension, ['file' => $file->name, 'extensions' => implode(', ', $this->extensions)]];
-                } elseif (!empty($this->mimeTypes) &&  !in_array($file->type, $this->mimeTypes, false)) {
+                } elseif (!empty($this->mimeTypes) &&  !$this->validateMimeType($file)) {
                     return [$this->wrongMimeType, ['file' => $file->name, 'mimeTypes' => implode(', ', $this->mimeTypes)]];
                 }
-                
+
                 return null;
             case UPLOAD_ERR_INI_SIZE:
             case UPLOAD_ERR_FORM_SIZE:
-                return [$this->tooBig, ['file' => $file->name, 'limit' => $this->getSizeLimit()]];
+                return [
+                    $this->tooBig,
+                    [
+                        'file' => $file->name,
+                        'limit' => $this->getSizeLimit(),
+                        'formattedLimit' => Yii::$app->formatter->asShortSize($this->getSizeLimit()),
+                    ]
+                ];
             case UPLOAD_ERR_PARTIAL:
                 Yii::warning('File was only partially uploaded: ' . $file->name, __METHOD__);
                 break;
@@ -136,4 +157,22 @@ protected function validateExtension($file)
         }
         return true;
     }
+
+    private function buildMimeTypeRegexp($mask)
+    {
+        return '/^' . str_replace('\*', '.*', preg_quote($mask, '/')) . '$/';
+    }
+
+    protected function validateMimeType($file)
+    {
+        foreach ($this->mimeTypes as $mimeType) {
+            if ($mimeType === $file->type) {
+                return true;
+            }
+            if (strpos($mimeType, '*') !== false && preg_match($this->buildMimeTypeRegexp($mimeType), $file->type)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

src/UploadFromUrl.php

@@ -131,9 +131,11 @@ protected static function extendOptions(array $options)
             $options['error'] = UPLOAD_ERR_NO_FILE;
         }
 
-        $options['name'] = pathinfo($parsed_url['path'], PATHINFO_BASENAME);
-        $options['baseName'] = pathinfo($parsed_url['path'], PATHINFO_FILENAME);
-        $options['extension'] = mb_strtolower(pathinfo($parsed_url['path'], PATHINFO_EXTENSION));
+        $options['name'] = isset($parsed_url['path']) ? pathinfo($parsed_url['path'], PATHINFO_BASENAME) : '';
+        $options['baseName'] = isset($parsed_url['path']) ? pathinfo($parsed_url['path'], PATHINFO_FILENAME) : '';
+        $options['extension'] = isset($parsed_url['path'])
+            ? mb_strtolower(pathinfo($parsed_url['path'], PATHINFO_EXTENSION))
+            : '';
         $options['size'] = isset($headers['Content-Length']) ? $headers['Content-Length'] : 0;
         $options['type'] = isset($headers['Content-Type'])
             ? $headers['Content-Type']