diff --git a/composer.json b/composer.json index eacf462..627d717 100644 --- a/composer.json +++ b/composer.json @@ -13,6 +13,10 @@ ], "license": "MIT", "repositories": [ + { + "type": "git", + "url": "https://github.com/proklung/bitrix.core.symfony" + }, { "type": "git", "url": "https://github.com/proklung/core.framework.extension.bundle" @@ -33,10 +37,6 @@ "type": "git", "url": "https://github.com/proklung/framework-tools-bundle" }, - { - "type": "git", - "url": "https://github.com/proklung/bitrix.core.symfony" - }, { "type": "git", "url": "https://github.com/proklung/bitrix.tools.pack.bundle" @@ -56,27 +56,20 @@ "psr/container": "1.0.*", "proklung/core-framework-extension-bundle": "^1.6", "proklung/core-argument-resolvers-bundle": "^1.1", + "proklung/bitrixsymfonyrouterbundle": "^1.3", "arrilot/bitrix-migrations": "dev-master", "arrilot/bitrix-models": "dev-master", "maximaster/tools.twig": "dev-master", "bitrix-expert/bbc": "^1.0", + "proklung/jedi-light": "^1.0", "illuminate/support": "^6.0 || ^7.0", "vlucas/phpdotenv": "3.* || ^4", "symfony/dotenv": "^5.2", "symfony/monolog-bundle": "^3.7", - "proklung/jedi-light": "^1.0", - "proklung/bitrix.module.generator": "^1.0", "proklung/facade-bundle": "^1.0", - "proklung/bitrixoggraphbundle": "^1.0", "proklung/bitrixstaticpagemakerbundle": "^1.0", - "proklung/symfony-maker-bundle": "^1.0", - "proklung/bitrixsymfonyrouterbundle": "^1.3", - "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/controller-sanitizer-validator": "^1.2", - "proklung/bitrix-blade-bundle": "^1.2", "proklung/pipeline-symfony": "^1.0", "proklung/db-command": "^1.0", "proklung/bitrix-iblock-element-validator-bundle": "^1.0", @@ -86,13 +79,14 @@ }, "require-dev": { "proklung/phpunit-testing-tools": "^1.5", + "proklung/symfony-maker-bundle": "^1.0", + "proklung/bitrix.module.generator": "^1.0", + "symfony/maker-bundle": "^1.33", "squizlabs/php_codesniffer": "^3", - "symfony/debug": "^4.4 || ^5.0", "symfony/var-dumper": "^4.4 || ^5.0", "ergebnis/phpstan-rules": "^0.15.3", "phpstan/phpstan-strict-rules": "^0.12.7", "slam/phpstan-extensions": "^5.1", - "symfony/maker-bundle": "^1.33", "mmucklo/krumo": "^0.6.0", "icanhazstring/composer-unused": "^0.7.5" }, diff --git a/local/configs/packages/bitrix_og_graph.yaml b/local/configs/packages/bitrix_og_graph.yaml deleted file mode 100644 index 8e9ce13..0000000 --- a/local/configs/packages/bitrix_og_graph.yaml +++ /dev/null @@ -1,6 +0,0 @@ -bitrixoggraph: - enabled: true - # site_name: 'BITRIX-EXAMPLE.LOC' - img: '/favicon.ico' - # fb_admins: '100003346913744' - # article_publisher: 'https://facebook/Gf/' diff --git a/local/configs/packages/symfony_blade.yaml b/local/configs/packages/symfony_blade.yaml deleted file mode 100644 index f820cc5..0000000 --- a/local/configs/packages/symfony_blade.yaml +++ /dev/null @@ -1,4 +0,0 @@ -symfony_blade: - baseViewPath: '%kernel.project_dir%/local/views' - cachePath: '%kernel.project_dir%/bitrix/cache/blade' - readonly: false diff --git a/local/configs/standalone_bundles.php b/local/configs/standalone_bundles.php index aa8f506..503abec 100644 --- a/local/configs/standalone_bundles.php +++ b/local/configs/standalone_bundles.php @@ -1,21 +1,17 @@ ['all' => true], Prokl\CustomFrameworkExtensionsBundle\CustomFrameworkExtensionsBundle::class => ['all' => true], Prokl\CustomArgumentResolverBundle\CustomArgumentResolverBundle::class => ['all' => true], Prokl\BitrixSymfonyRouterBundle\SymfonyRouterBundle::class => ['all' => true], Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], - Prokl\BitrixIblockElementValidatorBundle\BitrixIblockElementValidatorBundle::class => ['all' => true], Symfony\Bundle\MakerBundle\MakerBundle::class => ['all' => true], - Prokl\BundleMakerBundle\BundleMakerBundle::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\ApiExceptionBundle\M6WebApiExceptionBundle::class => ['all' => true], - Prokl\BitrixOgGraphBundle\BitrixOgGraphBundle::class => ['all' => true], - Prokl\SymfonyBladeBundle\SymfonyBladeBundle::class => ['all' => true], Prokl\FacadeBundle\FacadeBundle::class => ['all' => true], - Prokl\CollectionExtenderBundle\CollectionExtenderBundle::class => ['all' => true], Prokl\TwigExtensionsPackBundle\TwigExtensionsPackBundle::class => ['all' => true], Prokl\BitrixOrdinaryToolsBundle\BitrixOrdinaryToolsBundle::class => ['all' => true], + Prokl\BundleMakerBundle\BundleMakerBundle::class => ['dev' => true], ]; diff --git a/local/php_interface/init.php b/local/php_interface/init.php index 13fcd73..fff5550 100644 --- a/local/php_interface/init.php +++ b/local/php_interface/init.php @@ -8,7 +8,6 @@ use Bitrix\Main\Loader; use Prokl\ServiceProvider\ServiceProvider; use Symfony\Component\Security\Csrf\CsrfTokenManager; -use Prokl\CollectionExtenderBundle\Services\Extender; Loader::includeModule('iblock'); @@ -20,7 +19,6 @@ // так как автолоад (в нашем случае) регистрируется до ядра, // Твиг не успевает зарегистрироваться // необходимо это действие повтроить еще раз: - maximasterRegisterTwigTemplateEngine(); Arrilot\BitrixModels\ServiceProvider::register(); @@ -35,9 +33,5 @@ 'local/configs/services.yaml' ); -// Макросы для коллекций Laravel. -container()->get(Extender::class); - include_once 'events.php'; -include_once 'symfony_events.php'; diff --git a/local/php_interface/symfony_events.php b/local/php_interface/symfony_events.php deleted file mode 100644 index a46b889..0000000 --- a/local/php_interface/symfony_events.php +++ /dev/null @@ -1,12 +0,0 @@ -get('bitrix_ordinary_tools.custom_event_dispatcher'); -// Слушатели по умолчанию. - $symfonyEvents->applyListeners(); -} -