Несколько новых фасадов.

Author: ProklUng

Resources/config/services.yaml

@@ -22,22 +22,27 @@ services:
   bitrix_ordinary_tools.cmain:
     class: CMain
 
-  bitrix_ordinary_tools.application_d7:
-    factory: ['Bitrix\Main\Application', 'getInstance']
+  Prokl\BitrixOrdinaryToolsBundle\Services\Application\BitrixGlobals: ~
+
+  # $APPLICATION
+  application.instance:
     class: CMain
+    factory: ['@Prokl\BitrixOrdinaryToolsBundle\Services\Application\BitrixGlobals', 'instance']
+
+  bitrix_ordinary_tools.application_d7:
+    factory: ['@Prokl\BitrixOrdinaryToolsBundle\Services\Application\BitrixGlobals', 'instanceD7']
+    class: Bitrix\Main\Application
+
+  # Битриксовый EventManager
+  bitrix_ordinary_tools.event_manager:
+    factory: ['@Prokl\BitrixOrdinaryToolsBundle\Services\Application\BitrixGlobals', 'eventManager']
+    class: Bitrix\Main\EventManager
 
   # Битриксовый кэшер
   bitrix_ordinary_tools.bitrix_cacher:
     public: false
     class: CPHPCache
 
-  Prokl\BitrixOrdinaryToolsBundle\Services\Application\GetApplication: ~
-
-  # $APPLICATION
-  application.instance:
-    class: CMain
-    factory: ['@Prokl\BitrixOrdinaryToolsBundle\Services\Application\GetApplication', 'instance']
-
   # Обертка над CFile.
   bitrix_ordinary_tools.cfile_wrapper:
     class: Prokl\BitrixOrdinaryToolsBundle\Services\Utils\CFileWrapper

Services/Application/BitrixGlobals.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace Prokl\BitrixOrdinaryToolsBundle\Services\Application;
+
+use Bitrix\Main\Application;
+use Bitrix\Main\EventManager;
+use CMain;
+use RuntimeException;
+
+/**
+ * Class BitrixGlobals
+ * $APPLICATION для инжекции в сервисы и контроллеры.
+ * @package Prokl\BitrixOrdinaryToolsBundle\Services\Application
+ *
+ * @since 11.10.2020
+ */
+class BitrixGlobals
+{
+    /**
+     * $APPLICATION.
+     *
+     * @return CMain
+     * @throws RuntimeException
+     */
+    public function instance() : CMain
+    {
+        if (empty($GLOBALS['APPLICATION'])) {
+            throw new RuntimeException('Bitrix is not initialized.');
+        }
+
+        return $GLOBALS['APPLICATION'];
+    }
+
+    /**
+     * Инстанц Application D7.
+     *
+     * @return Application
+     */
+    public function instanceD7() : Application
+    {
+        return Application::getInstance();
+    }
+
+    /**
+     * EventManager.
+     *
+     * @return EventManager
+     */
+    public function eventManager() : EventManager
+    {
+        return EventManager::getInstance();
+    }
+}

Services/Application/GetApplication.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Prokl\BitrixOrdinaryToolsBundle\Services\Facades;
+
+use Prokl\FacadeBundle\Services\AbstractFacade;
+
+/**
+ * Class EventManager
+ * @package Prokl\BitrixOrdinaryToolsBundle\Services\Facades
+ *
+ */
+class EventManager extends AbstractFacade
+{
+    /**
+     * @inheritDoc
+     */
+    protected static function getFacadeAccessor() : string
+    {
+        return 'bitrix_ordinary_tools.event_manager';
+    }
+}