#29411: Naming update

Author: sivaschenko

app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php

@@ -11,7 +11,7 @@
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\ResultFactory;
-use Magento\MediaGalleryUi\Model\Directories\FolderTree;
+use Magento\MediaGalleryUi\Model\Directories\GetDirectoryTree;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -33,33 +33,35 @@ class GetTree extends Action implements HttpGetActionInterface
     private $logger;
 
     /**
-     * @var FolderTree
+     * @var GetDirectoryTree
      */
-    private $folderTree;
+    private $getDirectoryTree;
 
     /**
      * Constructor
      *
      * @param Action\Context $context
      * @param LoggerInterface $logger
-     * @param FolderTree $folderTree
+     * @param GetDirectoryTree $getDirectoryTree
      */
     public function __construct(
         Action\Context $context,
         LoggerInterface $logger,
-        FolderTree $folderTree
+        GetDirectoryTree $getDirectoryTree
     ) {
         parent::__construct($context);
         $this->logger = $logger;
-        $this->folderTree = $folderTree;
+        $this->getDirectoryTree = $getDirectoryTree;
     }
     /**
      * @inheritdoc
      */
     public function execute()
     {
         try {
-            $responseContent[] = $this->folderTree->buildTree();
+            $responseContent = [
+                $this->getDirectoryTree->execute()
+            ];
             $responseCode = self::HTTP_OK;
         } catch (\Exception $exception) {
             $this->logger->critical($exception);

app/code/Magento/MediaGalleryUi/Model/Directories/FolderTree.php renamed to app/code/Magento/MediaGalleryUi/Model/Directories/GetDirectoryTree.php

@@ -7,58 +7,61 @@
 
 namespace Magento\MediaGalleryUi\Model\Directories;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\Read;
 use Magento\MediaGalleryApi\Api\IsPathExcludedInterface;
 
 /**
- * Build folder tree structure by path
+ * Build media gallery folder tree structure by path
  */
-class FolderTree
+class GetDirectoryTree
 {
     /**
      * @var Filesystem
      */
     private $filesystem;
 
-    /**
-     * @var string
-     */
-    private $path;
-
     /**
      * @var IsPathExcludedInterface
      */
     private $isPathExcluded;
 
     /**
-     * Constructor
-     *
      * @param Filesystem $filesystem
-     * @param string $path
      * @param IsPathExcludedInterface $isPathExcluded
      */
     public function __construct(
         Filesystem $filesystem,
-        string $path,
         IsPathExcludedInterface $isPathExcluded
     ) {
         $this->filesystem = $filesystem;
-        $this->path = $path;
         $this->isPathExcluded = $isPathExcluded;
     }
 
     /**
      * Return directory folder structure in array
      *
-     * @param bool $skipRoot
      * @return array
      * @throws ValidatorException
      */
-    public function buildTree(bool $skipRoot = true): array
+    public function execute(): array
     {
-        return $this->buildFolderTree($this->getDirectories(), $skipRoot);
+        $tree = [
+            'name' => 'root',
+            'path' => '/',
+            'children' => []
+        ];
+        $directories = $this->getDirectories();
+        foreach ($directories as $idx => &$node) {
+            $node['children'] = [];
+            $result = $this->findParent($node, $tree);
+            $parent = &$result['treeNode'];
+
+            $parent['children'][] = &$directories[$idx];
+        }
+        return $tree['children'];
     }
 
     /**
@@ -72,7 +75,7 @@ private function getDirectories(): array
         $directories = [];
 
         /** @var Read $directory */
-        $directory = $this->filesystem->getDirectoryRead($this->path);
+        $directory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
 
         if (!$directory->isDirectory()) {
             return $directories;
@@ -96,30 +99,6 @@ private function getDirectories(): array
         return $directories;
     }
 
-    /**
-     * Build folder tree structure by provided directories path
-     *
-     * @param array $directories
-     * @param bool $skipRoot
-     * @return array
-     */
-    private function buildFolderTree(array $directories, bool $skipRoot): array
-    {
-        $tree = [
-            'name' => 'root',
-            'path' => '/',
-            'children' => []
-        ];
-        foreach ($directories as $idx => &$node) {
-            $node['children'] = [];
-            $result = $this->findParent($node, $tree);
-            $parent = & $result['treeNode'];
-
-            $parent['children'][] =& $directories[$idx];
-        }
-        return $skipRoot ? $tree['children'] : $tree;
-    }
-
     /**
      * Find parent directory
      *

app/code/Magento/MediaGalleryUi/etc/di.xml

@@ -28,11 +28,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\MediaGalleryUi\Model\Directories\FolderTree">
-        <arguments>
-            <argument name="path" xsi:type="string">media</argument>
-        </arguments>
-    </type>
     <type name="Magento\MediaGalleryUi\Model\AssetDetailsProvider\Type">
         <arguments>
             <argument name="types" xsi:type="array">