Merge remote-tracking branch 'origin/MAGETWO-59924' into BUGS

# Conflicts:
#	app/code/Magento/Catalog/Model/Category/DataProvider.php

Author: slavvka

app/code/Magento/Catalog/Model/Category/DataProvider.php

@@ -15,6 +15,8 @@
 use Magento\Eav\Model\Entity\Type;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
 use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filesystem;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\Form\Field;
@@ -126,6 +128,11 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      */
     private $arrayManager;
 
+    /**
+     * @var Filesystem
+     */
+    private $fileInfo;
+
     /**
      * DataProvider constructor
      *
@@ -483,8 +490,16 @@ private function convertValues($category, $categoryData)
             if ($attribute->getBackend() instanceof ImageBackendModel) {
                 unset($categoryData[$attributeCode]);
 
-                $categoryData[$attributeCode][0]['name'] = $category->getData($attributeCode);
-                $categoryData[$attributeCode][0]['url'] = $category->getImageUrl($attributeCode);
+                $fileName = $category->getData($attributeCode);
+                if ($this->getFileInfo()->isExist($fileName)) {
+                    $stat = $this->getFileInfo()->getStat($fileName);
+                    $mime = $this->getFileInfo()->getMimeType($fileName);
+
+                    $categoryData[$attributeCode][0]['name'] = $fileName;
+                    $categoryData[$attributeCode][0]['url'] = $category->getImageUrl($attributeCode);
+                    $categoryData['image'][0]['size'] = isset($stat) ? $stat['size'] : 0;
+                    $categoryData['image'][0]['type'] = $mime;
+                }
             }
         }
 
@@ -605,4 +620,19 @@ private function getArrayManager()
 
         return $this->arrayManager;
     }
+
+    /**
+     * Get FileInfo instance
+     *
+     * @return FileInfo
+     *
+     * @deprecated
+     */
+    private function getFileInfo()
+    {
+        if ($this->fileInfo === null) {
+            $this->fileInfo = ObjectManager::getInstance()->get(FileInfo::class);
+        }
+        return $this->fileInfo;
+    }
 }

app/code/Magento/Catalog/Model/Category/FileInfo.php

@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Model\Category;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\File\Mime;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+
+/**
+ * Class FileInfo
+ *
+ * Provides information about requested file
+ */
+class FileInfo
+{
+    /**
+     * Path in /pub/media directory
+     */
+    const ENTITY_MEDIA_PATH = '/catalog/category';
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var Mime
+     */
+    private $mime;
+
+    /**
+     * @var WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @param Filesystem $filesystem
+     * @param Mime $mime
+     */
+    public function __construct(
+        Filesystem $filesystem,
+        Mime $mime
+    ) {
+        $this->filesystem = $filesystem;
+        $this->mime = $mime;
+    }
+
+    /**
+     * Get WriteInterface instance
+     *
+     * @return WriteInterface
+     */
+    private function getMediaDirectory()
+    {
+        if ($this->mediaDirectory === null) {
+            $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        }
+        return $this->mediaDirectory;
+    }
+
+    /**
+     * Retrieve MIME type of requested file
+     *
+     * @param string $fileName
+     * @return string
+     */
+    public function getMimeType($fileName)
+    {
+        $filePath = self::ENTITY_MEDIA_PATH . '/' . ltrim($fileName, '/');
+        $absoluteFilePath = $this->getMediaDirectory()->getAbsolutePath($filePath);
+
+        $result = $this->mime->getMimeType($absoluteFilePath);
+        return $result;
+    }
+
+    /**
+     * Get file statistics data
+     *
+     * @param string $fileName
+     * @return array
+     */
+    public function getStat($fileName)
+    {
+        $filePath = self::ENTITY_MEDIA_PATH . '/' . ltrim($fileName, '/');
+
+        $result = $this->getMediaDirectory()->stat($filePath);
+        return $result;
+    }
+
+    /**
+     * Check if the file exists
+     *
+     * @param string $fileName
+     * @return bool
+     */
+    public function isExist($fileName)
+    {
+        $filePath = self::ENTITY_MEDIA_PATH . '/' . ltrim($fileName, '/');
+
+        $result = $this->getMediaDirectory()->isExist($filePath);
+        return $result;
+    }
+}