Базовый Твиг вынесен в отдельный бандл

ProklUng · Aug 15, 2021 · 71a1408 · 71a1408
1 parent 366691b
commit 71a1408
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -21,6 +21,10 @@
       "type": "git",
       "url": "https://github.com/proklung/core.framework.extension.bundle"
     },
+    {
+      "type": "git",
+      "url": "https://github.com/proklung/bitrix.twig.bundle"
+    },
     {
       "type": "git",
       "url": "https://github.com/proklung/core.argument.resolvers.bundle"
@@ -57,6 +61,7 @@
     "proklung/core-framework-extension-bundle": "^1.7",
     "proklung/core-argument-resolvers-bundle": "^1.1",
     "proklung/bitrixsymfonyrouterbundle": "^1.3",
+    "proklung/bitrix-twig-bundle": "^1.0",
     "arrilot/bitrix-migrations": "dev-master",
     "arrilot/bitrix-models": "dev-master",
     "maximaster/tools.twig": "dev-master",
@@ -74,8 +79,7 @@
     "proklung/db-command": "^1.0",
     "proklung/bitrix-iblock-element-validator-bundle": "^1.0",
     "proklung/framework-tools-bundle": "^1.5",
-    "proklung/twig-extensions-bundle": "^1.6",
-    "proklung/bitrix-tools-pack-bundle": "^1.6"
+    "proklung/twig-extensions-bundle": "^1.6"
   },
   "require-dev": {
     "proklung/phpunit-testing-tools": "^1.5",

diff --git a/local/configs/packages/framework.yaml b/local/configs/packages/framework.yaml
@@ -5,6 +5,8 @@ framework:
 
     cache: false
     cache_dir: '%kernel.project_dir%/bitrix/cache/twig'
+    globals:
+      secret_key: 'xxxx'
 
   validation:
     enabled: true

diff --git a/local/configs/standalone_bundles.php b/local/configs/standalone_bundles.php
@@ -3,15 +3,15 @@
 return [
     Prokl\CustomFrameworkExtensionsBundle\CustomFrameworkExtensionsBundle::class => ['all' => true],
     Prokl\CustomArgumentResolverBundle\CustomArgumentResolverBundle::class => ['all' => true],
+    Prokl\BitrixTwigBundle\BitrixTwigBundle::class => ['all' => true],
+    Prokl\FrameworkExtensionBundle\FrameworkExtensionBundle::class => ['all' => true],
     Prokl\BitrixSymfonyRouterBundle\SymfonyRouterBundle::class => ['all' => true],
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
     Symfony\Bundle\MakerBundle\MakerBundle::class => ['all' => true],
     Prokl\BitrixIblockElementValidatorBundle\BitrixIblockElementValidatorBundle::class => ['all' => true],
-    Prokl\FrameworkExtensionBundle\FrameworkExtensionBundle::class => ['all' => true],
     Prokl\StaticPageMakerBundle\StaticPageMakerBundle::class => ['all' => true],
     Prokl\BitrixWebformBundle\BitrixWebformBundle::class => ['all' => true],
     Prokl\FacadeBundle\FacadeBundle::class => ['all' => true],
     Prokl\TwigExtensionsPackBundle\TwigExtensionsPackBundle::class => ['all' => true],
-    Prokl\BitrixOrdinaryToolsBundle\BitrixOrdinaryToolsBundle::class => ['all' => true],
     Prokl\BundleMakerBundle\BundleMakerBundle::class => ['dev' => true],
 ];