Чистка

ProklUng · May 29, 2021 · 8f3722a · 8f3722a
1 parent 06170d0
commit 8f3722a
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 168 deletions.
diff --git a/local/classes/Bundles/Traits/LoadBundleRoutes.php b/local/classes/Bundles/Traits/LoadBundleRoutes.php
diff --git a/local/classes/Services/IconSvgLoaders.php b/local/classes/Services/IconSvgLoaders.php
@@ -2,8 +2,7 @@
 
 namespace Local\Services;
 
-use League\Flysystem\FileNotFoundException;
-use League\Flysystem\Filesystem;
+use RuntimeException;
 
 /**
  * Class IconSvgLoaders
@@ -14,11 +13,6 @@
  */
 class IconSvgLoaders
 {
-    /**
-     * @var Filesystem $filesystem Файловая система.
-     */
-    private $filesystem;
-
     /**
      * @var string $iconPath Путь к файлу с иконками.
      */
@@ -29,39 +23,46 @@ class IconSvgLoaders
      */
     private $buildPath;
 
+    /**
+     * @var string $documentRoot DOCUMENT_ROOT.
+     */
+    private $documentRoot;
+
     /**
      * IconSvgLoaders constructor.
      *
-     * @param Filesystem $filesystem Файловая система.
-     * @param string     $buildPath  Путь к сборке.
-     * @param string     $iconPath   Путь к файлу с иконками.
+     * @param string $documentRoot DOCUMENT_ROOT.
+     * @param string $buildPath    Путь к сборке.
+     * @param string $iconPath     Путь к файлу с иконками.
      */
     public function __construct(
-        Filesystem $filesystem,
+        string $documentRoot,
         string $buildPath,
         string $iconPath
     ) {
-        $this->filesystem = $filesystem;
         $this->iconPath = $iconPath;
         $this->buildPath = $buildPath;
+        $this->documentRoot = $documentRoot;
     }
 
     /**
      * Загрузить.
      *
      * @return string
-     * @throws FileNotFoundException Файл не найден.
+     * @throws RuntimeException Файл не найден.
      */
     public function load() : string
     {
-        $content = $this->filesystem->read(
-            '/' . $this->buildPath . $this->iconPath
+        $content = file_get_contents(
+            $this->documentRoot . '/' . $this->buildPath . $this->iconPath
         );
 
-        if (!$content) {
-            $content = '';
+        if ($content === false) {
+            throw new RuntimeException(
+                'File with icons ' .  $this->iconPath . ' not found'
+            );
         }
 
         return $content;
     }
-}
+}
diff --git a/local/classes/Services/Responses/JsonResponse.php b/local/classes/Services/Responses/JsonResponse.php
diff --git a/local/classes/Services/Responses/JsonResponseError.php b/local/classes/Services/Responses/JsonResponseError.php
diff --git a/local/configs/services/assets.yaml b/local/configs/services/assets.yaml
@@ -26,7 +26,7 @@ services:
   # Загрузчик иконок SVG.
   icons.svg:
     class: Local\Services\IconSvgLoaders
-    arguments: ['@filesystem.instance', '@build.path',  '/images/icons.svg']
+    arguments: ['%kernel.project_dir%', '@build.path',  '/images/icons.svg']
 
   # Загрузить иконки SVG.
   icons.svg.load:

diff --git a/local/configs/services/filesystem.yaml b/local/configs/services/filesystem.yaml
@@ -11,7 +11,7 @@ services:
 
   # Адаптер локальной файловой системы.
   filesystem.local.adapter:
-    class: Local\Services\Filesystem\LocalFilesystemAdapter
+    class: Local\Services\Filesystem\LocalLeagueFilesystemAdapter
     arguments: ['%kernel.project_dir%/']
 
   filesystem.local.adapter.factory:

diff --git a/local/configs/services/utils.yaml b/local/configs/services/utils.yaml
@@ -9,19 +9,6 @@ services:
     autoconfigure: true
     public: true
 
-  Symfony\Component\HttpFoundation\Response:
-    class: Symfony\Component\HttpFoundation\Response
-
-  # Json OK response.
-  json.response:
-    class: Local\Services\Responses\JsonResponse
-    arguments: ['@Symfony\Component\HttpFoundation\Response']
-
-  # Json error response.
-  json.response.error:
-    class: Local\Services\Responses\JsonResponseError
-    arguments: ['@Symfony\Component\HttpFoundation\Response', '400']
-
   # Адаптированный Pipeline.
   Prokl\Pipeline\Hub:
     arguments: ['@service_container']