From 52f9dad51af6f51bc0eedf4af99a8c311feeaa03 Mon Sep 17 00:00:00 2001 From: ProklUng Date: Thu, 12 Aug 2021 08:30:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D1=81=D1=88=D0=B8=D1=80=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D0=B0=D1=8F=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3?= =?UTF-8?q?=D1=83=D1=80=D0=B0=D1=86=D0=B8=D1=8F=20Twig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 19 +++++++++++++++++++ composer.json | 8 ++++---- .../default/bitrix/.settings_extra.php | 11 +++++++++++ environments/dev/bitrix/.settings_extra.php | 17 ++++++++++++++--- environments/prod/bitrix/.settings_extra.php | 17 ++++++++++++++--- 5 files changed, 62 insertions(+), 10 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e7bb291 --- /dev/null +++ b/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2020-2021 Fedor Gavrilov + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/composer.json b/composer.json index 627d717..e2c556c 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ "require": { "proklung/bitrix-core-symfony": "^1.3.5", "psr/container": "1.0.*", - "proklung/core-framework-extension-bundle": "^1.6", + "proklung/core-framework-extension-bundle": "^1.7", "proklung/core-argument-resolvers-bundle": "^1.1", "proklung/bitrixsymfonyrouterbundle": "^1.3", "arrilot/bitrix-migrations": "dev-master", @@ -68,14 +68,14 @@ "symfony/monolog-bundle": "^3.7", "proklung/facade-bundle": "^1.0", "proklung/bitrixstaticpagemakerbundle": "^1.0", - "proklung/bitrix-custom-properties-bundle": "^1.0", + "proklung/bitrix-custom-properties-bundle": "^1.1", "proklung/bitrix-webform-bundle": "^1.0", "proklung/pipeline-symfony": "^1.0", "proklung/db-command": "^1.0", "proklung/bitrix-iblock-element-validator-bundle": "^1.0", "proklung/framework-tools-bundle": "^1.5", - "proklung/twig-extensions-bundle": "^1.4", - "proklung/bitrix-tools-pack-bundle": "^1.5" + "proklung/twig-extensions-bundle": "^1.6", + "proklung/bitrix-tools-pack-bundle": "^1.6" }, "require-dev": { "proklung/phpunit-testing-tools": "^1.5", diff --git a/environments/default/bitrix/.settings_extra.php b/environments/default/bitrix/.settings_extra.php index f6bface..1521c21 100644 --- a/environments/default/bitrix/.settings_extra.php +++ b/environments/default/bitrix/.settings_extra.php @@ -22,6 +22,17 @@ // Переменные arResult будут доступны не в result, а напрямую 'extract_result' => false, + + // Пространства имен + 'namespaces' => [], + + // Globals + 'globals' => [ + 'app' => \Bitrix\Main\Application::getInstance() + ], + + // Runtimes + 'runtimes' => [], ) ) ) diff --git a/environments/dev/bitrix/.settings_extra.php b/environments/dev/bitrix/.settings_extra.php index 76b3785..1fd4180 100644 --- a/environments/dev/bitrix/.settings_extra.php +++ b/environments/dev/bitrix/.settings_extra.php @@ -14,16 +14,27 @@ //кеш хранится в уникальной директории. Должен быть полный абсолютный путь 'cache' => $_SERVER['DOCUMENT_ROOT'] . '/bitrix/cache/maximaster/tools.twig', - //Автообновление включается только в момент очистки кеша - 'auto_reload' => isset( $_GET[ 'clear_cache' ] ) && strtoupper($_GET[ 'clear_cache' ]) == 'Y', + //Автообновление включается только в момент очистки кеша ИЛИ в режиме дебага + 'auto_reload' => ((isset($_GET[ 'clear_cache' ]) && strtoupper($_GET[ 'clear_cache' ]) == 'Y')) || env('DEBUG', false), //Автоэскейп отключен, т.к. битрикс по-умолчанию его сам делает 'autoescape' => false, // Переменные arResult будут доступны не в result, а напрямую 'extract_result' => false, + + // Пространства имен + 'namespaces' => [], + + // Globals + 'globals' => [ + 'app' => \Bitrix\Main\Application::getInstance() + ], + + // Runtimes + 'runtimes' => [], ) ) ) ), -); +); \ No newline at end of file diff --git a/environments/prod/bitrix/.settings_extra.php b/environments/prod/bitrix/.settings_extra.php index 76b3785..1fd4180 100644 --- a/environments/prod/bitrix/.settings_extra.php +++ b/environments/prod/bitrix/.settings_extra.php @@ -14,16 +14,27 @@ //кеш хранится в уникальной директории. Должен быть полный абсолютный путь 'cache' => $_SERVER['DOCUMENT_ROOT'] . '/bitrix/cache/maximaster/tools.twig', - //Автообновление включается только в момент очистки кеша - 'auto_reload' => isset( $_GET[ 'clear_cache' ] ) && strtoupper($_GET[ 'clear_cache' ]) == 'Y', + //Автообновление включается только в момент очистки кеша ИЛИ в режиме дебага + 'auto_reload' => ((isset($_GET[ 'clear_cache' ]) && strtoupper($_GET[ 'clear_cache' ]) == 'Y')) || env('DEBUG', false), //Автоэскейп отключен, т.к. битрикс по-умолчанию его сам делает 'autoescape' => false, // Переменные arResult будут доступны не в result, а напрямую 'extract_result' => false, + + // Пространства имен + 'namespaces' => [], + + // Globals + 'globals' => [ + 'app' => \Bitrix\Main\Application::getInstance() + ], + + // Runtimes + 'runtimes' => [], ) ) ) ), -); +); \ No newline at end of file