Boilerplate вынесен в отдельный пакет

Author: ProklUng

README.md

@@ -9,7 +9,6 @@
 
 - Выпилил битриксовый сервис-локатор в пользу отдельного симфонического контейнера
 - Исправил некоторое количество ошибок
-- Добавил к командам префикс `bitrix-`, чтобы избежать конфликта с командами оригинального бандла `RabbitMqBundle`
 - Добавлен отдельный раннер консольных команд
 - Адаптирована работа с `RPC_Server` и `RPC_Clients` 
 - Адаптирована работа с `Anon consumer`
@@ -76,31 +75,26 @@ $consumer->consume(50);
 
 Загрузите пакет, используя пакетный менеджер composer:
 
-composer.json основного проектаЖ
+composer.json основного проекта:
 
 ```json
   "extra": {
     "installer-paths": {
       "./bitrix/modules/{$name}/": ["type:bitrix-d7-module", "type:bitrix-module"],
       "./bitrix/components/{$name}/": ["type:bitrix-d7-component", "type:bitrix-component"],
       "./bitrix/templates/{$name}/": ["type:bitrix-d7-template", "type:bitrix-theme"]
-    }
-  }
-```
-
-composer.json:
-
-```json
+    },
     "repositories": [
         {
             "type": "git",
             "url": "https://github.com/proklung/bitrix.rabbitmq.module"
         }
     ]
+  }
 ```
 
 ```bash
-$ composer require proklung/bitrix-rabbitmq-module
+$ composer require proklung/bitrix.rabbitmq.module
 ```
 
 Установите модуль `proklung.rabbitmq` в административном интерфейсе сайта `bitrix/admin/partner_modules.php`
@@ -254,12 +248,12 @@ class RandomIntServer
 
 Доступны некоторые команды, которые упрощают работу:
 
-* `bitrix-rabbitmq:consumer`        Executes a consumer
-* `bitrix-rabbitmq:delete`          Delete a consumer's queue
-* `bitrix-rabbitmq:purge`           Purge a consumer's queue
-* `bitrix-abbitmq:setup-fabric`     Sets up the Rabbit MQ fabric
-* `bitrix-rabbitmq:stdin-producer`  Executes a producer that reads data from STDIN
-* `bitrix-rabbitmq:rpc-server`      Start RPC server
+* `rabbitmq:consumer`        Executes a consumer
+* `rabbitmq:delete`          Delete a consumer's queue
+* `rabbitmq:purge`           Purge a consumer's queue
+* `rabbitmq:setup-fabric`     Sets up the Rabbit MQ fabric
+* `rabbitmq:stdin-producer`  Executes a producer that reads data from STDIN
+* `rabbitmq:rpc-server`      Start RPC server
 
 В папке `/install/bin` модуля лежит файл `rabbitmq`. При установке модуля система попробует скопировать его в директорию,
 `bin`, лежащую двумя уровнями выше `DOCUMENT_ROOT`. Если такой директории не существует, то сделано ничего не будет. Придется

composer.json

@@ -17,6 +17,13 @@
     }
   ],
 
+  "repositories": [
+    {
+      "type": "git",
+      "url": "https://github.com/proklung/bitrix.containerable.boilerplate"
+    }
+  ],
+
   "support": {
     "issues": "https://github.com/ProklUng/bitrix.rabbitmq.module/issues",
     "source": "https://github.com/ProklUng/bitrix.rabbitmq.module"
@@ -31,6 +38,7 @@
     "composer/installers": "~1",
     "php-amqplib/php-amqplib": "^2.12.1 || ^3",
     "psr/log": "^1.1.3",
+    "proklung/bitrix-containerable-boilerplate": "^1.0",
     "ext-json": "*"
   },
   "require-dev": {

install/bin/rabbitmq

@@ -3,8 +3,8 @@
 
 use Bitrix\Main\DB\ConnectionException;
 use Bitrix\Main\Loader;
+use ProklUng\ContainerBoilerplate\CLI\ConsoleCommandConfigurator;
 use Proklung\RabbitMq\Integration\CLI\CommandsSetup;
-use Proklung\RabbitMq\Integration\CLI\ConsoleCommandConfigurator;
 use Proklung\RabbitMq\Integration\DI\Services;
 use Symfony\Component\Console\Application;
 

install/version.php

@@ -4,6 +4,6 @@
  */
 
 $arModuleVersion = [
-	'VERSION' => '1.1.1',
-	'VERSION_DATE' => '2021-07-13 15:00:00',
+	'VERSION' => '1.2.0',
+	'VERSION_DATE' => '2021-07-15 12:00:00',
 ];

lib/Command/ConsumerCommand.php

@@ -8,7 +8,7 @@ protected function configure()
     {
         parent::configure();
         $this->setDescription('Executes a consumer');
-        $this->setName('bitrix-rabbitmq:consumer');
+        $this->setName('rabbitmq:consumer');
     }
 
     protected function getConsumerService()

lib/Command/DeleteCommand.php

@@ -19,7 +19,7 @@ protected function configure()
              ->setDescription('Delete a consumer\'s queue')
              ->addOption('no-confirmation', null, InputOption::VALUE_NONE, 'Whether it must be confirmed before deleting');
 
-        $this->setName('bitrix-rabbitmq:delete');
+        $this->setName('rabbitmq:delete');
     }
 
     /**

lib/Command/PurgeConsumerCommand.php

@@ -19,7 +19,7 @@ protected function configure()
              ->setDescription('Purge a consumer\'s queue')
              ->addOption('no-confirmation', null, InputOption::VALUE_NONE, 'Whether it must be confirmed before purging');
 
-        $this->setName('bitrix-rabbitmq:purge');
+        $this->setName('rabbitmq:purge');
     }
 
     /**

lib/Command/RpcServerCommand.php

@@ -14,7 +14,7 @@ protected function configure()
         parent::configure();
 
         $this
-            ->setName('bitrix-rabbitmq:rpc-server')
+            ->setName('rabbitmq:rpc-server')
             ->setDescription('Start an RPC server')
             ->addArgument('name', InputArgument::REQUIRED, 'Server Name')
             ->addOption('messages', 'm', InputOption::VALUE_OPTIONAL, 'Messages to consume', 0)

lib/Command/SetupFabricCommand.php

@@ -12,7 +12,7 @@ class SetupFabricCommand extends BaseRabbitMqCommand
     protected function configure()
     {
         $this
-            ->setName('bitrix-rabbitmq:setup-fabric')
+            ->setName('rabbitmq:setup-fabric')
             ->setDescription('Sets up the Rabbit MQ fabric')
             ->addOption('debug', 'd', InputOption::VALUE_NONE, 'Enable Debugging')
         ;

lib/Command/StdInProducerCommand.php

@@ -17,7 +17,7 @@ protected function configure()
         parent::configure();
 
         $this
-            ->setName('bitrix-rabbitmq:stdin-producer')
+            ->setName('rabbitmq:stdin-producer')
             ->addArgument('name', InputArgument::REQUIRED, 'Producer Name')
             ->setDescription('Executes a producer that reads data from STDIN')
             ->addOption('route', 'r', InputOption::VALUE_OPTIONAL, 'Routing Key', '')