From 82bc0f7ff7c8f8be1b4413e6f79a83e65966789e Mon Sep 17 00:00:00 2001
From: ProklUng <funtik21975@gmail.com>
Date: Mon, 26 Jul 2021 08:42:31 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...gurator.php => BaseRoutesConfigurator.php} |  4 ++--
 Services/Agnostic/BitrixRoutes.php            | 19 +++++++++++++++++++
 Services/Agnostic/SymfonyRoutes.php           | 19 +++++++++++++++++++
 Tests/Cases/AgnosticRoutesLoaderTest.php      | 12 ++++++------
 readme.MD                                     | 12 ++++++------
 5 files changed, 52 insertions(+), 14 deletions(-)
 rename Services/Agnostic/{RoutesConfigurator.php => BaseRoutesConfigurator.php} (98%)
 create mode 100644 Services/Agnostic/BitrixRoutes.php
 create mode 100644 Services/Agnostic/SymfonyRoutes.php

diff --git a/Services/Agnostic/RoutesConfigurator.php b/Services/Agnostic/BaseRoutesConfigurator.php
similarity index 98%
rename from Services/Agnostic/RoutesConfigurator.php
rename to Services/Agnostic/BaseRoutesConfigurator.php
index 19a9751..e131140 100644
--- a/Services/Agnostic/RoutesConfigurator.php
+++ b/Services/Agnostic/BaseRoutesConfigurator.php
@@ -19,13 +19,13 @@
 use Symfony\Component\Routing\RouterInterface;
 
 /**
- * Class RoutesConfigurator
+ * Class BaseRoutesConfigurator
  * Независимый от контейнера загрузчик роутов.
  * @package Prokl\BitrixSymfonyRouterBundle\Services\Agnostic
  *
  * @since 24.07.2021
  */
-class RoutesConfigurator
+class BaseRoutesConfigurator
 {
     /**
      * @var RouterInterface $router Роутер.
diff --git a/Services/Agnostic/BitrixRoutes.php b/Services/Agnostic/BitrixRoutes.php
new file mode 100644
index 0000000..6109cbb
--- /dev/null
+++ b/Services/Agnostic/BitrixRoutes.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Prokl\BitrixSymfonyRouterBundle\Services\Agnostic;
+
+use Symfony\Component\Routing\RouterInterface;
+
+/**
+ * Class BitrixRoutes
+ * @package Prokl\BitrixSymfonyRouterBundle\Services\Agnostic
+ *
+ * @since 26.07.2021
+ */
+class BitrixRoutes extends BaseRoutesConfigurator
+{
+    /**
+     * @var RouterInterface $router Роутер.
+     */
+    protected static $router;
+}
\ No newline at end of file
diff --git a/Services/Agnostic/SymfonyRoutes.php b/Services/Agnostic/SymfonyRoutes.php
new file mode 100644
index 0000000..e639c9b
--- /dev/null
+++ b/Services/Agnostic/SymfonyRoutes.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Prokl\BitrixSymfonyRouterBundle\Services\Agnostic;
+
+use Symfony\Component\Routing\RouterInterface;
+
+/**
+ * Class SymfonyRoutes
+ * @package Prokl\BitrixSymfonyRouterBundle\Services\Agnostic
+ *
+ * @since 26.07.2021
+ */
+class SymfonyRoutes extends BaseRoutesConfigurator
+{
+    /**
+     * @var RouterInterface $router Роутер.
+     */
+    protected static $router;
+}
\ No newline at end of file
diff --git a/Tests/Cases/AgnosticRoutesLoaderTest.php b/Tests/Cases/AgnosticRoutesLoaderTest.php
index 26073d2..9324ed4 100644
--- a/Tests/Cases/AgnosticRoutesLoaderTest.php
+++ b/Tests/Cases/AgnosticRoutesLoaderTest.php
@@ -2,21 +2,21 @@
 
 namespace Prokl\BitrixSymfonyRouterBundle\Tests\Cases;
 
-use Prokl\BitrixSymfonyRouterBundle\Services\Agnostic\RoutesConfigurator;
+use Prokl\BitrixSymfonyRouterBundle\Services\Agnostic\BaseRoutesConfigurator;
 use Prokl\TestingTools\Base\BaseTestCase;
 use Symfony\Component\Filesystem\Filesystem;
 
 /**
  * Class AgnosticRoutesLoaderTest
  * @package Prokl\BitrixSymfonyRouterBundle\Tests
- * @coversDefaultClass RoutesConfigurator
+ * @coversDefaultClass BaseRoutesConfigurator
  *
  * @since 24.07.2021
  */
 class AgnosticRoutesLoaderTest extends BaseTestCase
 {
     /**
-     * @var RoutesConfigurator $obTestObject Тестируемый объект.
+     * @var BaseRoutesConfigurator $obTestObject Тестируемый объект.
      */
     protected $obTestObject;
 
@@ -44,7 +44,7 @@ protected function setUp(): void
 
         $this->filesystem = new Filesystem();
 
-        $this->obTestObject = new RoutesConfigurator(
+        $this->obTestObject = new BaseRoutesConfigurator(
             $this->routesConfig,
             null,
             true
@@ -85,7 +85,7 @@ public function testGetRoutes() : void
      */
     public function testCaching() : void
     {
-        $this->obTestObject = new RoutesConfigurator(
+        $this->obTestObject = new BaseRoutesConfigurator(
             $this->routesConfig,
             $this->cacheDir,
             true
@@ -103,7 +103,7 @@ public function testCaching() : void
      */
     public function testPurgeCache(): void
     {
-        $this->obTestObject = new RoutesConfigurator(
+        $this->obTestObject = new BaseRoutesConfigurator(
             $this->routesConfig,
             $this->cacheDir,
             true
diff --git a/readme.MD b/readme.MD
index c84acea..a198e80 100644
--- a/readme.MD
+++ b/readme.MD
@@ -37,14 +37,14 @@
 ```php
 use Prokl\ServiceProvider\ServiceProvider;
 use Bitrix\Main\Routing\Controllers\PublicPageController;
-use Prokl\BitrixSymfonyRouterBundle\Services\Agnostic\RoutesConfigurator;
+use Prokl\BitrixSymfonyRouterBundle\Services\Agnostic\BaseRoutesConfigurator;
 use Prokl\BitrixSymfonyRouterBundle\Services\Utils\BitrixRouteConvertor;
 use Bitrix\Main\Routing\RoutingConfigurator;
 
 // Не обязательно. Смотри ниже.
 $container = ServiceProvider::instance();
 
-$agnosticRouter = new RoutesConfigurator(
+$agnosticRouter = new BaseRoutesConfigurator(
     $_SERVER['DOCUMENT_ROOT'] . '/local/configs/bitrix_routes.yaml', // Конфиг роутов
     $_SERVER['DOCUMENT_ROOT'] . '/bitrix/cache/routes', // Кэш; если null - без кэширования.
     $_ENV['DEBUG']
@@ -119,11 +119,11 @@ public_page:
 `init.php`:
 
 ```php
-use Prokl\BitrixSymfonyRouterBundle\Services\Agnostic\RoutesConfigurator;
+use Prokl\BitrixSymfonyRouterBundle\Services\Agnostic\BaseRoutesConfigurator;
 use Prokl\BitrixSymfonyRouterBundle\Services\Agnostic\Router;
 use Prokl\BitrixSymfonyRouterBundle\Services\Agnostic\BitrixInitializerRouter;
 
-$agnosticRouter = new RoutesConfigurator(
+$agnosticRouter = new BaseRoutesConfigurator(
     $_SERVER['DOCUMENT_ROOT'] . '/local/configs/standalone_routes.yaml',
     $_SERVER['DOCUMENT_ROOT'] . '/bitrix/cache/routes_agnostic', // Кэш; если null - без кэширования.
     $_ENV['DEBUG'] // Режим отладки или нет
@@ -141,8 +141,8 @@ $agnosticRouterInstance = new Router(
 
 ## Прочее
 
-1) Экземпляр `Symfony\Component\Routing\Router` можно получить снаружи так:
+1) Экземпляр `Symfony\Component\Routing\Router` (роуты Symfony) можно получить снаружи так:
 
 ```php
-$router = \Prokl\BitrixSymfonyRouterBundle\Services\Agnostic\RoutesConfigurator::getInstance();
+$router = \Prokl\BitrixSymfonyRouterBundle\Services\Agnostic\SymfonyRoutes::getInstance();
 ```
\ No newline at end of file