Выпилил bitrix-expert/monolog-adapter за ненадобностью и устарелостью.

ProklUng · Jul 22, 2021 · c46699a · c46699a
1 parent c195f28
commit c46699a
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 115 deletions.
diff --git a/composer.json b/composer.json
@@ -64,19 +64,18 @@
   ],
 
   "require": {
-    "proklung/bitrix-core-symfony": "^1.0",
-    "proklung/core-framework-extension-bundle": "^1.0",
+    "proklung/bitrix-core-symfony": "^1.2.1",
+    "proklung/core-framework-extension-bundle": "^1.1",
     "proklung/core-argument-resolvers-bundle": "^1.0",
     "proklung/container-locator-bundle": "^1.0",
-    "arrilot/bitrix-migrations": "^2.2",
+    "arrilot/bitrix-migrations": "^2.6",
     "arrilot/bitrix-models": "dev-master",
     "maximaster/tools.twig": "^1.1",
     "bitrix-expert/bbc": "^1.0",
     "illuminate/support": "^6.0",
     "illuminate/database": "^6.0",
     "illuminate/container": "^6.0",
     "vlucas/phpdotenv": "3.*",
-    "bitrix-expert/monolog-adapter": "^1.0",
     "mmucklo/krumo": "^0.6.0",
     "symfony/dotenv": "^5.2",
     "symfony/mailer": "^5.2",
@@ -86,8 +85,8 @@
     "league/flysystem": "^1.0",
     "webarchitect609/bitrix-iblock-property-type": "^1.2",
     "webarchitect609/bitrix-user-type": "^0.7.2",
-    "webarchitect609/bitrix-cache": "^1.6",
-    "spatie/data-transfer-object": "^2.5",
+    "webarchitect609/bitrix-cache": "^1.9",
+    "spatie/data-transfer-object": "^2.8",
     "mark-gerarts/automapper-plus-bundle": "^1.3",
     "proklung/jedi-light": "^1.0",
     "proklung/bitrix.module.generator": "^1.0",
@@ -96,41 +95,41 @@
     "proklung/bitrixoggraphbundle": "^1.0",
     "proklung/bitrixstaticpagemakerbundle": "^1.0",
     "proklung/symfony-maker-bundle": "^1.0",
-    "proklung/annotatedparamresolverbundle": "^1.0",
+    "proklung/annotatedparamresolverbundle": "^1.2",
     "proklung/bitrixannotatedresolversbundle": "^1.0",
     "proklung/bitrixckeditorbundle": "^1.0",
-    "proklung/bitrixsymfonyrouterbundle": "^1.0",
+    "proklung/bitrixsymfonyrouterbundle": "^1.1",
     "proklung/collection-extender-bundle": "^1.0",
     "proklung/bitrix-custom-properties-bundle": "^1.0",
     "proklung/api-exception-bundle": "^1.0",
     "proklung/bitrix-webform-bundle": "^1.0",
     "proklung/bitrix-webform-bundle-kantecom": "^1.0",
-    "proklung/controller-sanitizer-validator": "^1.0",
-    "proklung/bitrix-blade-bundle": "^1.0",
+    "proklung/controller-sanitizer-validator": "^1.2",
+    "proklung/bitrix-blade-bundle": "^1.1",
     "proklung/request-validator-bundle": "^1.0",
     "proklung/symfony-guzzle-bundle": "^1.0",
     "proklung/arguments-resolvers-bundle": "^1.0",
     "proklung/pipeline-symfony": "^1.0",
     "proklung/base-exception": "^1.0",
     "proklung/db-command": "^1.0",
-    "proklung/bitrix-model-bundle": "^1.0",
+    "proklung/bitrix-model-bundle": "^1.6",
     "proklung/symfony-middleware-bundle": "^1.0",
-    "proklung/cache-proxificator": "^1.1",
+    "proklung/cache-proxificator": "^1.2",
     "proklung/bitrix-menu-builder-bundle": "^1.0",
     "proklung/bitrix-fixture-database-generator-bundle": "^1.0",
     "proklung/request-log-bundle": "^1.0",
     "proklung/bitrix-iblock-element-validator-bundle": "^1.0",
     "proklung/framework-tools-bundle": "^1.0",
     "proklung/twig-extensions-bundle": "^1.1",
     "proklung/custom-request-responser-bundle": "^1.0",
-    "proklung/bitrix-tools-pack-bundle": "^1.0",
+    "proklung/bitrix-tools-pack-bundle": "^1.2",
     "proklung/url-signer-bundle": "^1.0",
     "proklung/task-scheduler-bundle": "^1.0",
     "proklung/dto-mapper-bundle": "^1.0"
 
   },
   "require-dev": {
-    "proklung/phpunit-testing-tools": "^1.0",
+    "proklung/phpunit-testing-tools": "^1.4",
     "squizlabs/php_codesniffer": "^3",
     "symfony/debug": "^4.4",
     "symfony/var-dumper": "^4.4",

diff --git a/environments/default/bitrix/.settings.php b/environments/default/bitrix/.settings.php
@@ -69,12 +69,6 @@
                     'ignore_silence' => false,
                     'assertion_throws_exception' => true,
                     'assertion_error_type' => 256,
-                    'log' => array(
-                        'class_name' => '\Bex\Monolog\ExceptionHandlerLog',
-                        'settings' => array(
-                            'logger' => 'app'
-                        ),
-                    ),
                 ),
             'readonly' => false,
         ),

diff --git a/environments/default/bitrix/.settings_extra.php b/environments/default/bitrix/.settings_extra.php
@@ -26,31 +26,4 @@
             )
         )
     ),
-
-    'monolog' => array(
-        'value' => array(
-            'handlers' => array(
-                'default' => array(
-                    'class' => '\Monolog\Handler\StreamHandler',
-                    'level' => 'DEBUG',
-                    'stream' => env('LOG_FILE_PATH', '/home/bitrix/logs/bitrix-project.log'),
-                ),
-                'feedback_event_log' => array(
-                    'class' => '\Bex\Monolog\Handler\BitrixHandler',
-                    'level' => 'DEBUG',
-                    'event' => 'TYPE_FOR_EVENT_LOG',
-                    'module' => 'awesome.module'
-                ),
-            ),
-            'loggers' => array(
-                'app' => array(
-                    'handlers'=> array('default'),
-                ),
-                'feedback' => array(
-                    'handlers'=> array('feedback_event_log'),
-                )
-            )
-        ),
-        'readonly' => false
-    )
 );
diff --git a/environments/dev/bitrix/.settings.php b/environments/dev/bitrix/.settings.php
@@ -44,12 +44,6 @@
                     'ignore_silence' => false,
                     'assertion_throws_exception' => true,
                     'assertion_error_type' => 256,
-                    'log' => array(
-                        'class_name' => '\Bex\Monolog\ExceptionHandlerLog',
-                        'settings' => array(
-                            'logger' => 'app'
-                        ),
-                    ),
                 ),
             'readonly' => false,
         ),

diff --git a/environments/dev/bitrix/.settings_extra.php b/environments/dev/bitrix/.settings_extra.php
@@ -26,31 +26,4 @@
             )
         )
     ),
-
-    'monolog' => array(
-        'value' => array(
-            'handlers' => array(
-                'default' => array(
-                    'class' => '\Monolog\Handler\StreamHandler',
-                    'level' => 'DEBUG',
-                    'stream' => realpath(__DIR__).'/../logs/app.log'
-                ),
-                'feedback_event_log' => array(
-                    'class' => '\Bex\Monolog\Handler\BitrixHandler',
-                    'level' => 'DEBUG',
-                    'event' => 'TYPE_FOR_EVENT_LOG',
-                    'module' => 'awesome.module'
-                ),
-            ),
-            'loggers' => array(
-                'app' => array(
-                    'handlers'=> array('default'),
-                ),
-                'feedback' => array(
-                    'handlers'=> array('feedback_event_log'),
-                )
-            )
-        ),
-        'readonly' => false
-    )
 );
diff --git a/environments/prod/bitrix/.settings.php b/environments/prod/bitrix/.settings.php
@@ -44,12 +44,6 @@
                     'ignore_silence' => false,
                     'assertion_throws_exception' => true,
                     'assertion_error_type' => 256,
-                    'log' => array(
-                        'class_name' => '\Bex\Monolog\ExceptionHandlerLog',
-                        'settings' => array(
-                            'logger' => 'app'
-                        ),
-                    ),
                 ),
             'readonly' => false,
         ),

diff --git a/environments/prod/bitrix/.settings_extra.php b/environments/prod/bitrix/.settings_extra.php
@@ -26,31 +26,4 @@
             )
         )
     ),
-
-    'monolog' => array(
-        'value' => array(
-            'handlers' => array(
-                'default' => array(
-                    'class' => '\Monolog\Handler\StreamHandler',
-                    'level' => 'DEBUG',
-                    'stream' => realpath(__DIR__).'/../logs/app.log'
-                ),
-                'feedback_event_log' => array(
-                    'class' => '\Bex\Monolog\Handler\BitrixHandler',
-                    'level' => 'DEBUG',
-                    'event' => 'TYPE_FOR_EVENT_LOG',
-                    'module' => 'awesome.module'
-                ),
-            ),
-            'loggers' => array(
-                'app' => array(
-                    'handlers'=> array('default'),
-                ),
-                'feedback' => array(
-                    'handlers'=> array('feedback_event_log'),
-                )
-            )
-        ),
-        'readonly' => false
-    )
 );
diff --git a/local/php_interface/init.php b/local/php_interface/init.php
@@ -26,8 +26,6 @@
 Arrilot\BitrixModels\ServiceProvider::register();
 Arrilot\BitrixModels\ServiceProvider::registerEloquent();
 
-Bex\Monolog\MonologAdapter::loadConfiguration();
-
 // Symfony сервис-провайдер
 $symfonyServiceProvider = new ServiceProvider(
     'local/configs/services.yaml'