From bed8d5bb3316f01e226096b26d694a2523384136 Mon Sep 17 00:00:00 2001 From: Gassan Gousseinov Date: Fri, 5 Jul 2024 14:06:59 +0200 Subject: [PATCH] moved config from yaml to php + removed doctrine annotation --- README.md | 4 +- composer.json | 3 +- .../DoctrineRelationVisualizerExtension.php | 4 +- src/Resources/config/routes.php | 9 ++++ src/Resources/config/routing.yml | 2 +- src/Resources/config/services.php | 44 +++++++++++++++++++ src/Resources/config/services.yml | 29 ------------ 7 files changed, 59 insertions(+), 36 deletions(-) create mode 100644 src/Resources/config/routes.php create mode 100644 src/Resources/config/services.php delete mode 100644 src/Resources/config/services.yml diff --git a/README.md b/README.md index d66f506..cc1b498 100644 --- a/README.md +++ b/README.md @@ -26,14 +26,14 @@ Add the bundle to `config/bundles.php` Add the file `config/routes/dev/visualizer.yaml` tbn_doctrine_relation_visualizer: - resource: "@DoctrineRelationVisualizerBundle/Resources/config/routing.yml" + resource: "@DoctrineRelationVisualizerBundle/Resources/config/routes.php" ## Customize bundle (optionnal) Add the file `config/packages/dev/doctrine_relation_visualizer.yaml` doctrine_relation_visualizer: - position_filepath: '%kernel.project_dir%/config%' + position_filepath: '%kernel.project_dir%/config' display_columns: true area_width: 4000 area_height: 3000 diff --git a/composer.json b/composer.json index 2a4f5ad..7f084e1 100644 --- a/composer.json +++ b/composer.json @@ -10,8 +10,7 @@ "php": "^8.1", "symfony/framework-bundle": "^5.4|^6.3|^7.1", "doctrine/doctrine-bundle": "^2.12", - "doctrine/orm": "^3.0", - "doctrine/annotations": "^2.0", + "doctrine/orm": "^2.4|^3.0", "symfony/serializer": "^5.4|^6.3|^7.1", "symfony/property-access": "^5.4|^6.3|^7.1" }, diff --git a/src/DependencyInjection/DoctrineRelationVisualizerExtension.php b/src/DependencyInjection/DoctrineRelationVisualizerExtension.php index 0462bb6..cb84935 100644 --- a/src/DependencyInjection/DoctrineRelationVisualizerExtension.php +++ b/src/DependencyInjection/DoctrineRelationVisualizerExtension.php @@ -19,7 +19,7 @@ public function load(array $configs, ContainerBuilder $container) $container->setParameter('tbn.entity_relation_visualizer.'.$key, $value); } - $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); - $loader->load('services.yml'); + $loader = new Loader\PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); + $loader->load('services.php'); } } diff --git a/src/Resources/config/routes.php b/src/Resources/config/routes.php new file mode 100644 index 0000000..8e84a79 --- /dev/null +++ b/src/Resources/config/routes.php @@ -0,0 +1,9 @@ +import('@DoctrineRelationVisualizerBundle/Controller/', 'attribute') + ->prefix('/'); +}; diff --git a/src/Resources/config/routing.yml b/src/Resources/config/routing.yml index 9a8014b..a79ee9d 100644 --- a/src/Resources/config/routing.yml +++ b/src/Resources/config/routing.yml @@ -1,4 +1,4 @@ controllers: resource: "@DoctrineRelationVisualizerBundle/Controller/" - type: annotation + type: attribute prefix: / diff --git a/src/Resources/config/services.php b/src/Resources/config/services.php new file mode 100644 index 0000000..7329f58 --- /dev/null +++ b/src/Resources/config/services.php @@ -0,0 +1,44 @@ +services(); + + $services->set(VisualizerController::class) + ->public() + ->args([ + service(EntityService::class), + service(Persister::class), + service('serializer'), + param('doctrine.default_entity_manager'), + param('doctrine.entity_managers'), + param('tbn.entity_relation_visualizer.display_columns'), + param('tbn.entity_relation_visualizer.area_width'), + param('tbn.entity_relation_visualizer.area_height'), + ]) + ->call('setContainer', [service('Psr\Container\ContainerInterface')]) + ->tag('container.service_subscriber') + ; + + $services->set(EntityService::class) + ->public() + ->args([ + service('doctrine') + ]) + ; + + $services->set(Persister::class) + ->public() + ->args([ + param('tbn.entity_relation_visualizer.position_filepath') + ]) + ; + + $services->set(DoctrineRelationVisualizerExtension::class); +}; diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml deleted file mode 100644 index 49f0768..0000000 --- a/src/Resources/config/services.yml +++ /dev/null @@ -1,29 +0,0 @@ -services: - Tbn\DoctrineRelationVisualizerBundle\Controller\VisualizerController: - public: true - class: 'Tbn\DoctrineRelationVisualizerBundle\Controller\VisualizerController' - arguments: - - '@Tbn\DoctrineRelationVisualizerBundle\Services\EntityService' - - '@Tbn\DoctrineRelationVisualizerBundle\Services\Persister' - - '@serializer' - - '%doctrine.default_entity_manager%' - - '%doctrine.entity_managers%' - - '%tbn.entity_relation_visualizer.display_columns%' - - '%tbn.entity_relation_visualizer.area_width%' - - '%tbn.entity_relation_visualizer.area_height%' - calls: - - ['setContainer', ['@Psr\Container\ContainerInterface']] - tags: [container.service_subscriber] - Tbn\DoctrineRelationVisualizerBundle\Services\EntityService: - public: true - class: 'Tbn\DoctrineRelationVisualizerBundle\Services\EntityService' - arguments: - - '@doctrine' - Tbn\DoctrineRelationVisualizerBundle\Services\Persister: - public: true - class: 'Tbn\DoctrineRelationVisualizerBundle\Services\Persister' - arguments: - - '%tbn.entity_relation_visualizer.position_filepath%' - Tbn\DoctrineRelationVisualizerBundle\DependencyInjection\DoctrineRelationVisualizerLoader: - public: true - class: 'Tbn\DoctrineRelationVisualizerBundle\DependencyInjection\DoctrineRelationVisualizerLoader'