Skip to content

Commit 3bca3e2

Browse files
committed
Оптимизации
1 parent 6601523 commit 3bca3e2

File tree

6 files changed

+12
-50
lines changed

6 files changed

+12
-50
lines changed

composer.json

+9-15
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
],
1414
"license": "MIT",
1515
"repositories": [
16+
{
17+
"type": "git",
18+
"url": "https://github.com/proklung/bitrix.core.symfony"
19+
},
1620
{
1721
"type": "git",
1822
"url": "https://github.com/proklung/core.framework.extension.bundle"
@@ -33,10 +37,6 @@
3337
"type": "git",
3438
"url": "https://github.com/proklung/framework-tools-bundle"
3539
},
36-
{
37-
"type": "git",
38-
"url": "https://github.com/proklung/bitrix.core.symfony"
39-
},
4040
{
4141
"type": "git",
4242
"url": "https://github.com/proklung/bitrix.tools.pack.bundle"
@@ -56,27 +56,20 @@
5656
"psr/container": "1.0.*",
5757
"proklung/core-framework-extension-bundle": "^1.6",
5858
"proklung/core-argument-resolvers-bundle": "^1.1",
59+
"proklung/bitrixsymfonyrouterbundle": "^1.3",
5960
"arrilot/bitrix-migrations": "dev-master",
6061
"arrilot/bitrix-models": "dev-master",
6162
"maximaster/tools.twig": "dev-master",
6263
"bitrix-expert/bbc": "^1.0",
64+
"proklung/jedi-light": "^1.0",
6365
"illuminate/support": "^6.0 || ^7.0",
6466
"vlucas/phpdotenv": "3.* || ^4",
6567
"symfony/dotenv": "^5.2",
6668
"symfony/monolog-bundle": "^3.7",
67-
"proklung/jedi-light": "^1.0",
68-
"proklung/bitrix.module.generator": "^1.0",
6969
"proklung/facade-bundle": "^1.0",
70-
"proklung/bitrixoggraphbundle": "^1.0",
7170
"proklung/bitrixstaticpagemakerbundle": "^1.0",
72-
"proklung/symfony-maker-bundle": "^1.0",
73-
"proklung/bitrixsymfonyrouterbundle": "^1.3",
74-
"proklung/collection-extender-bundle": "^1.0",
7571
"proklung/bitrix-custom-properties-bundle": "^1.0",
76-
"proklung/api-exception-bundle": "^1.0",
7772
"proklung/bitrix-webform-bundle": "^1.0",
78-
"proklung/controller-sanitizer-validator": "^1.2",
79-
"proklung/bitrix-blade-bundle": "^1.2",
8073
"proklung/pipeline-symfony": "^1.0",
8174
"proklung/db-command": "^1.0",
8275
"proklung/bitrix-iblock-element-validator-bundle": "^1.0",
@@ -86,13 +79,14 @@
8679
},
8780
"require-dev": {
8881
"proklung/phpunit-testing-tools": "^1.5",
82+
"proklung/symfony-maker-bundle": "^1.0",
83+
"proklung/bitrix.module.generator": "^1.0",
84+
"symfony/maker-bundle": "^1.33",
8985
"squizlabs/php_codesniffer": "^3",
90-
"symfony/debug": "^4.4 || ^5.0",
9186
"symfony/var-dumper": "^4.4 || ^5.0",
9287
"ergebnis/phpstan-rules": "^0.15.3",
9388
"phpstan/phpstan-strict-rules": "^0.12.7",
9489
"slam/phpstan-extensions": "^5.1",
95-
"symfony/maker-bundle": "^1.33",
9690
"mmucklo/krumo": "^0.6.0",
9791
"icanhazstring/composer-unused": "^0.7.5"
9892
},

local/configs/packages/bitrix_og_graph.yaml

-6
This file was deleted.

local/configs/packages/symfony_blade.yaml

-4
This file was deleted.

local/configs/standalone_bundles.php

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
<?php
22

33
return [
4-
Prokl\FrameworkExtensionBundle\FrameworkExtensionBundle::class => ['all' => true],
54
Prokl\CustomFrameworkExtensionsBundle\CustomFrameworkExtensionsBundle::class => ['all' => true],
65
Prokl\CustomArgumentResolverBundle\CustomArgumentResolverBundle::class => ['all' => true],
76
Prokl\BitrixSymfonyRouterBundle\SymfonyRouterBundle::class => ['all' => true],
87
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
9-
Prokl\BitrixIblockElementValidatorBundle\BitrixIblockElementValidatorBundle::class => ['all' => true],
108
Symfony\Bundle\MakerBundle\MakerBundle::class => ['all' => true],
11-
Prokl\BundleMakerBundle\BundleMakerBundle::class => ['all' => true],
9+
Prokl\BitrixIblockElementValidatorBundle\BitrixIblockElementValidatorBundle::class => ['all' => true],
10+
Prokl\FrameworkExtensionBundle\FrameworkExtensionBundle::class => ['all' => true],
1211
Prokl\StaticPageMakerBundle\StaticPageMakerBundle::class => ['all' => true],
1312
Prokl\BitrixWebformBundle\BitrixWebformBundle::class => ['all' => true],
14-
Prokl\ApiExceptionBundle\M6WebApiExceptionBundle::class => ['all' => true],
15-
Prokl\BitrixOgGraphBundle\BitrixOgGraphBundle::class => ['all' => true],
16-
Prokl\SymfonyBladeBundle\SymfonyBladeBundle::class => ['all' => true],
1713
Prokl\FacadeBundle\FacadeBundle::class => ['all' => true],
18-
Prokl\CollectionExtenderBundle\CollectionExtenderBundle::class => ['all' => true],
1914
Prokl\TwigExtensionsPackBundle\TwigExtensionsPackBundle::class => ['all' => true],
2015
Prokl\BitrixOrdinaryToolsBundle\BitrixOrdinaryToolsBundle::class => ['all' => true],
16+
Prokl\BundleMakerBundle\BundleMakerBundle::class => ['dev' => true],
2117
];

local/php_interface/init.php

-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use Bitrix\Main\Loader;
99
use Prokl\ServiceProvider\ServiceProvider;
1010
use Symfony\Component\Security\Csrf\CsrfTokenManager;
11-
use Prokl\CollectionExtenderBundle\Services\Extender;
1211

1312
Loader::includeModule('iblock');
1413

@@ -20,7 +19,6 @@
2019
// так как автолоад (в нашем случае) регистрируется до ядра,
2120
// Твиг не успевает зарегистрироваться
2221
// необходимо это действие повтроить еще раз:
23-
2422
maximasterRegisterTwigTemplateEngine();
2523

2624
Arrilot\BitrixModels\ServiceProvider::register();
@@ -35,9 +33,5 @@
3533
'local/configs/services.yaml'
3634
);
3735

38-
// Макросы для коллекций Laravel.
39-
container()->get(Extender::class);
40-
4136
include_once 'events.php';
42-
include_once 'symfony_events.php';
4337

local/php_interface/symfony_events.php

-12
This file was deleted.

0 commit comments

Comments
 (0)