Изничтожение ненужного сеттера.

ProklUng · Jul 17, 2021 · 90b0301 · 90b0301
1 parent 6de2e8e
commit 90b0301
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 21 deletions.
diff --git a/src/CompilerContainer.php b/src/CompilerContainer.php
@@ -3,6 +3,7 @@
 namespace ProklUng\ContainerBoilerplate;
 
 use InvalidArgumentException;
+use ProklUng\ContainerBoilerplate\Resource\FileBitrixSettingsResource;
 use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
 use Symfony\Component\Config\ConfigCache;
 use Symfony\Component\DependencyInjection\Container;
@@ -40,10 +41,13 @@ class CompilerContainer
      * CompilerContainer constructor.
      *
      * @param string $projectRoot DOCUMENT_ROOT.
+     * @param string $moduleId    ID модуля.
      */
-    public function __construct(string $projectRoot)
+    public function __construct(string $projectRoot, string $moduleId)
     {
         $this->projectRoot = $projectRoot;
+        $this->moduleId = $moduleId;
+
         $this->filesystem = new Filesystem();
     }
 
@@ -65,7 +69,7 @@ public function isConfigFresh(string $configFile = '/bitrix/.settings.php') : bo
 
         $content = file_get_contents($this->projectRoot . $meta);
 
-        /** @var \ProklUng\ContainerBoilerplate\Resource\FileBitrixSettingsResource $checker */
+        /** @var FileBitrixSettingsResource $checker */
         $checker = unserialize($content);
         // Кривизна в мета-файле = конфиг потенциально не свежий.
         if ($checker === false) {
@@ -86,7 +90,7 @@ public function isConfigFresh(string $configFile = '/bitrix/.settings.php') : bo
      */
     public function createConfigMeta(string $configFile = '/bitrix/.settings.php') : void
     {
-        $checker = new \ProklUng\ContainerBoilerplate\Resource\FileBitrixSettingsResource($this->projectRoot . $configFile);
+        $checker = new FileBitrixSettingsResource($this->projectRoot . $configFile);
 
         @file_put_contents($this->projectRoot . $configFile . '.meta', serialize($checker));
     }
@@ -189,20 +193,6 @@ public function cacheContainer(
         return new $classCompiledContainerName();
     }
 
-    /**
-     * Задать ID модуля.
-     *
-     * @param string $moduleId ID модуля.
-     *
-     * @return CompilerContainer
-     */
-    public function setModuleId(string $moduleId): self
-    {
-        $this->moduleId = $moduleId;
-
-        return $this;
-    }
-
     /**
      * Если надо создать директорию для компилированного контейнера.
      *

diff --git a/src/DI/AbstractServiceContainer.php b/src/DI/AbstractServiceContainer.php
@@ -82,14 +82,12 @@ public function load() : void
             return;
         }
 
-        $this->createContainer();
-        $compilerContainer = new CompilerContainer($_SERVER['DOCUMENT_ROOT']);
-
         if (!$this->moduleId) {
             throw new LogicException('Children of AbstractServiceContainer must define moduleId property.');
         }
 
-        $compilerContainer->setModuleId($this->moduleId);
+        $this->createContainer();
+        $compilerContainer = new CompilerContainer($_SERVER['DOCUMENT_ROOT'], $this->moduleId);
 
         // Кэшировать контейнер?
         if (!in_array($this->environment, $this->parameters['compile_container_envs'], true)) {