Рефакторинг.

Author: ProklUng

configs/route_config_template.php.tmpl

@@ -1,10 +1,8 @@
 <?php
 
 use Bitrix\Main\Routing\RoutingConfigurator;
-use Prokl\BitrixSymfonyRouterBundle\Services\Agnostic\RoutesLoader;
-use Prokl\BitrixSymfonyRouterBundle\Services\Utils\BitrixRouteConvertor;
 use Proklung\Symfony\Router\Utils\Loader;
-use ProklUng\Module\Boilerplate\Options\ModuleManager;
+use Proklung\Symfony\Router\Utils\OptionsManager;
 
 // init kernel
 require_once($_SERVER["DOCUMENT_ROOT"]."/bitrix/modules/main/include/prolog_before.php");
@@ -13,8 +11,7 @@ if (!\Bitrix\Main\Loader::includeModule('proklung.symfony.router')) {
     return function (RoutingConfigurator $routes) {};
 }
 
-$moduleManager = new ModuleManager('proklung.symfony.router');
-$phpConfigFile = $moduleManager->get('php_router_config_path');
+$phpConfigFile = OptionsManager::option('php_router_config_path');
 
 $routeConvertor = Loader::get($phpConfigFile);
 

install/admin/symfony_router_index.php

@@ -3,9 +3,6 @@
 use ProklUng\Module\Boilerplate\Module;
 
 require_once $_SERVER['DOCUMENT_ROOT'].'/bitrix/modules/main/include/prolog_admin_before.php';
-
-// @todo: Здесь - какой-то системный код, читающие данные и всё такое
-
 require_once $_SERVER['DOCUMENT_ROOT'].'/bitrix/modules/main/include/prolog_admin_after.php';
 
 // Странный эффект: на новой версии Битрикса на этой стадии класс модуля не инстанцирован.

lib/RoutesLoader.php renamed to lib/BaseRoutesConfigurator.php

@@ -19,18 +19,18 @@
 use Symfony\Component\Routing\RouterInterface;
 
 /**
- * Class RoutesLoader
+ * Class BaseRoutesConfigurator
  * Независимый от контейнера загрузчик роутов.
  * @package Proklung\Symfony\Router
  *
  * @since 24.07.2021
  */
-class RoutesLoader
+class BaseRoutesConfigurator
 {
     /**
      * @var RouterInterface $router Роутер.
      */
-    private static $router;
+    protected static $router;
 
     /**
      * @var ResourceCheckerConfigCacheFactory $cacheFactory

lib/BitrixRoutes.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Proklung\Symfony\Router;
+
+use Symfony\Component\Routing\RouterInterface;
+
+/**
+ * Class BitrixRoutes
+ * @package Proklung\Symfony\Router
+ *
+ * @since 26.07.2021
+ */
+class BitrixRoutes extends BaseRoutesConfigurator
+{
+    /**
+     * @var RouterInterface $router Роутер.
+     */
+    protected static $router;
+}

lib/SymfonyRoutes.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Proklung\Symfony\Router;
+
+use Symfony\Component\Routing\RouterInterface;
+
+/**
+ * Class SymfonyRoutes
+ * @package Proklung\Symfony\Router
+ *
+ * @since 26.07.2021
+ */
+class SymfonyRoutes extends BaseRoutesConfigurator
+{
+    /**
+     * @var RouterInterface $router Роутер.
+     */
+    protected static $router;
+}

lib/Utils/Loader.php

@@ -3,8 +3,9 @@
 namespace Proklung\Symfony\Router\Utils;
 
 use Proklung\Symfony\Router\BitrixInitializerRouter;
+use Proklung\Symfony\Router\BitrixRoutes;
 use Proklung\Symfony\Router\Router;
-use Proklung\Symfony\Router\RoutesLoader;
+use Proklung\Symfony\Router\SymfonyRoutes;
 
 /**
  * Class Loader
@@ -96,7 +97,7 @@ public static function from(?string $yamlConfig = null, ?string $cachePath = nul
     public function loadRouter(?string $yamlConfig = null, ?string $cachePath = null) : ?Router
     {
         if ($yamlConfig && @file_exists($_SERVER['DOCUMENT_ROOT'] . $yamlConfig)) {
-            $agnosticRouter = new RoutesLoader(
+            $agnosticRouter = new SymfonyRoutes(
                 $_SERVER['DOCUMENT_ROOT'] . $yamlConfig,
                 $cachePath ? $_SERVER['DOCUMENT_ROOT'] . $cachePath : null,
                 (bool)$_ENV['DEBUG']
@@ -122,7 +123,7 @@ public function loadRouter(?string $yamlConfig = null, ?string $cachePath = null
     public function loadRouterNative(?string $yamlConfig = null, ?string $cachePath = null) : ?BitrixRouteConvertor
     {
         if ($yamlConfig && @file_exists($_SERVER['DOCUMENT_ROOT'] . $yamlConfig)) {
-            $agnosticRouter = new RoutesLoader(
+            $agnosticRouter = new BitrixRoutes(
                 $_SERVER['DOCUMENT_ROOT'] . $yamlConfig,
                 $cachePath ? $_SERVER['DOCUMENT_ROOT'] . $cachePath : null,
                 (bool)$_ENV['DEBUG']

readme.MD

@@ -113,8 +113,8 @@ Loader::includeModule('proklung.symfony.router');
 
 ## Прочее
 
-1) Экземпляр `Symfony\Component\Routing\Router` можно получить снаружи так:
+1) Экземпляр `Symfony\Component\Routing\Router` (роуты Symfony) можно получить снаружи так:
 
 ```php
-$router = \Proklung\Symfony\Router\RoutesLoader::getInstance();
+$router = \Proklung\Symfony\Router\SymfonyRoutes::getInstance();
 ```