BitrixSettingsDiAdapter. Опция ignore

ProklUng · Jul 15, 2021 · b50d7da · b50d7da
1 parent cd25c82
commit b50d7da
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/src/Utils/BitrixSettingsDiAdapter.php b/src/Utils/BitrixSettingsDiAdapter.php
@@ -48,6 +48,14 @@ public function importParameters(
     public function importServices(ContainerBuilder $container, array $services): void
     {
         foreach ($services as $id => $service) {
+            // Ключ ignore в описании сервиса (дабы не попадал в общий контейнер)
+            if (array_key_exists('ignore', $service)
+                &&
+                $service['ignore'] === true
+            ) {
+                continue;
+            }
+
             // Если такой сервис уже есть - игнор.
             if ($container->hasDefinition($id)) {
                 continue;

diff --git a/tests/Cases/Utils/BitrixSettingsDiAdapterTest.php b/tests/Cases/Utils/BitrixSettingsDiAdapterTest.php
@@ -133,6 +133,27 @@ public function testImportServices() : void
         $this->assertSame('bar', $service->getBar(), 'Параметр bar не пробросился.');
     }
 
+    /**
+     * Импорт сервисов. Опция ignore.
+     *
+     * @return void
+     * @throws Exception
+     */
+    public function testImportServicesIgnore() : void
+    {
+        $this->fixture = $this->loadFixture('/.settings_services.php');
+
+        $this->obTestObject->importServices(
+            $this->containerBuilder,
+            $this->fixture['services']['value']
+        );
+
+        $this->assertFalse(
+            $this->containerBuilder->has('foo.service.ignore'),
+            'Опция Ignore не сработала.'
+        );
+    }
+
     /**
      * Импорт сервисов.
      *

diff --git a/tests/fixtures/Settings/.settings_services.php b/tests/fixtures/Settings/.settings_services.php
@@ -33,6 +33,12 @@
                     return new SampleService();
                 }
             ],
+            'foo.service.ignore' => [
+                'constructor' => static function () {
+                    return new SampleService();
+                },
+                'ignore' => true
+            ],
             'someGoodServiceName' => [
                 'className' => SampleWithArguments::class,
                 'constructorParams' => ['foo', 'bar'],