MAGETWO-90241: Image Uploader maxFileSize configuration can exceed PHP's upload_max_filesize

Use the minimum of the two configurations if both are present

Author: danmooney2

app/code/Magento/Ui/Component/Form/Element/DataType/Media/Image.php

@@ -64,7 +64,10 @@ public function getComponentName()
     public function prepare()
     {
         // dynamically set max file size based on php ini config if not present in XML
-        $maxFileSize = $this->getConfiguration()['maxFileSize'] ?? $this->fileSize->getMaxFileSize();
+        $maxFileSize = min(array_filter([
+            $this->getConfiguration()['maxFileSize'] ?? null,
+            $this->fileSize->getMaxFileSize()
+        ]));
 
         $data = array_replace_recursive(
             $this->getData(),