From 0a390eae98ed058d9eaca2c8f745638a225e6185 Mon Sep 17 00:00:00 2001 From: Tchama Date: Mon, 3 Aug 2020 13:04:54 +0200 Subject: [PATCH] sf4, setting new path for all config yaml files, and replace 'controller' path syntax in routes definitions --- DependencyInjection/ChillPersonExtension.php | 36 ++++++++--------- .../config/routing.yml => config/routes.yaml | 40 +++++++++---------- .../services.yml => config/services.yaml | 0 .../services/actions.yaml | 0 .../services/alt_names.yaml | 0 .../services/command.yaml | 0 .../services/controller.yaml | 0 .../services/exports.yaml | 0 .../services/exports_accompanying_period.yaml | 0 .../services/fixtures.yaml | 2 +- .../form.yml => config/services/form.yaml | 0 .../menu.yml => config/services/menu.yaml | 0 .../services/privacyEvent.yaml | 0 .../services/repository.yaml | 0 .../search.yml => config/services/search.yaml | 0 .../services/search_by_phone.yaml | 0 .../services/templating.yaml | 0 .../services/widgets.yaml | 0 .../validation.yml => config/validation.yaml | 0 19 files changed, 39 insertions(+), 39 deletions(-) rename Resources/config/routing.yml => config/routes.yaml (54%) rename Resources/config/services.yml => config/services.yaml (100%) rename Resources/config/services/actions.yml => config/services/actions.yaml (100%) rename Resources/config/services/alt_names.yml => config/services/alt_names.yaml (100%) rename Resources/config/services/command.yml => config/services/command.yaml (100%) rename Resources/config/services/controller.yml => config/services/controller.yaml (100%) rename Resources/config/services/exports.yml => config/services/exports.yaml (100%) rename Resources/config/services/exports_accompanying_period.yml => config/services/exports_accompanying_period.yaml (100%) rename Resources/config/services/fixtures.yml => config/services/fixtures.yaml (67%) rename Resources/config/services/form.yml => config/services/form.yaml (100%) rename Resources/config/services/menu.yml => config/services/menu.yaml (100%) rename Resources/config/services/privacyEvent.yml => config/services/privacyEvent.yaml (100%) rename Resources/config/services/repository.yml => config/services/repository.yaml (100%) rename Resources/config/services/search.yml => config/services/search.yaml (100%) rename Resources/config/services/search_by_phone.yml => config/services/search_by_phone.yaml (100%) rename Resources/config/services/templating.yml => config/services/templating.yaml (100%) rename Resources/config/services/widgets.yml => config/services/widgets.yaml (100%) rename Resources/config/validation.yml => config/validation.yaml (100%) diff --git a/DependencyInjection/ChillPersonExtension.php b/DependencyInjection/ChillPersonExtension.php index b9f17a1c5..825a27e8f 100644 --- a/DependencyInjection/ChillPersonExtension.php +++ b/DependencyInjection/ChillPersonExtension.php @@ -51,31 +51,31 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac $this->handlePersonFieldsParameters($container, $config['person_fields']); $this->handleAccompanyingPeriodsFieldsParameters($container, $config['accompanying_periods_fields']); - $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); - $loader->load('services.yml'); - $loader->load('services/widgets.yml'); - $loader->load('services/exports.yml'); - $loader->load('services/fixtures.yml'); - $loader->load('services/controller.yml'); - $loader->load('services/search.yml'); - $loader->load('services/menu.yml'); - $loader->load('services/privacyEvent.yml'); - $loader->load('services/command.yml'); - $loader->load('services/actions.yml'); - $loader->load('services/form.yml'); - $loader->load('services/repository.yml'); - $loader->load('services/templating.yml'); - $loader->load('services/alt_names.yml'); + $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config')); + $loader->load('services.yaml'); + $loader->load('services/widgets.yaml'); + $loader->load('services/exports.yaml'); + $loader->load('services/fixtures.yaml'); + $loader->load('services/controller.yaml'); + $loader->load('services/search.yaml'); + $loader->load('services/menu.yaml'); + $loader->load('services/privacyEvent.yaml'); + $loader->load('services/command.yaml'); + $loader->load('services/actions.yaml'); + $loader->load('services/form.yaml'); + $loader->load('services/repository.yaml'); + $loader->load('services/templating.yaml'); + $loader->load('services/alt_names.yaml'); // load service advanced search only if configure if ($config['search']['search_by_phone'] != 'never') { - $loader->load('services/search_by_phone.yml'); + $loader->load('services/search_by_phone.yaml'); $container->setParameter('chill_person.search.search_by_phone', $config['search']['search_by_phone']); } if ($container->getParameter('chill_person.accompanying_period') !== 'hidden') { - $loader->load('services/exports_accompanying_period.yml'); + $loader->load('services/exports_accompanying_period.yaml'); } } @@ -159,7 +159,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac $container->prependExtensionConfig('chill_main', array( 'routing' => array( 'resources' => array( - '@ChillPersonBundle/Resources/config/routing.yml' + '@ChillPersonBundle/config/routes.yaml' ) ) )); diff --git a/Resources/config/routing.yml b/config/routes.yaml similarity index 54% rename from Resources/config/routing.yml rename to config/routes.yaml index 5c072b257..0e3834f91 100644 --- a/Resources/config/routing.yml +++ b/config/routes.yaml @@ -1,30 +1,30 @@ chill_person_view: path: /{_locale}/person/{person_id}/general - defaults: { _controller: ChillPersonBundle:Person:view } + controller: Chill\PersonBundle\Controller\PersonController::viewAction chill_person_general_edit: path: /{_locale}/person/{person_id}/general/edit - defaults: {_controller: ChillPersonBundle:Person:edit } + controller: Chill\PersonBundle\Controller\PersonController::editAction chill_person_general_update: path: /{_locale}/person/{person_id}/general/update - defaults: {_controller: ChillPersonBundle:Person:update } + controller: Chill\PersonBundle\Controller\PersonController::updateAction chill_person_new: path: /{_locale}/person/new - defaults: {_controller: ChillPersonBundle:Person:new } + controller: Chill\PersonBundle\Controller\PersonController::newAction chill_person_review: path: /{_locale}/person/review - defaults: {_controller: ChillPersonBundle:Person:review } + controller: Chill\PersonBundle\Controller\PersonController::reviewAction chill_person_create: path: /{_locale}/person/create - defaults: {_controller: ChillPersonBundle:Person:create } + controller: Chill\PersonBundle\Controller\PersonController::createAction chill_person_search: path: /{_locale}/person/search - defaults: { _controller: ChillPersonBundle:Person:search } + controller: Chill\PersonBundle\Controller\PersonController::searchAction options: menus: main: @@ -33,52 +33,52 @@ chill_person_search: chill_person_accompanying_period_list: path: /{_locale}/person/{person_id}/accompanying-period - defaults: { _controller: ChillPersonBundle:AccompanyingPeriod:list } + controller: Chill\PersonBundle\Controller\AccompanyingPeriodController::listAction chill_person_accompanying_period_create: path: /{_locale}/person/{person_id}/accompanying-period/create - defaults: { _controller: ChillPersonBundle:AccompanyingPeriod:create } + controller: Chill\PersonBundle\Controller\AccompanyingPeriodController::createAction chill_person_accompanying_period_update: path: /{_locale}/person/{person_id}/accompanying-period/{period_id}/update - defaults: { _controller: ChillPersonBundle:AccompanyingPeriod:update } + controller: Chill\PersonBundle\Controller\AccompanyingPeriodController::updateAction chill_person_accompanying_period_close: path: /{_locale}/person/{person_id}/accompanying-period/close - defaults: { _controller: ChillPersonBundle:AccompanyingPeriod:close } + controller: Chill\PersonBundle\Controller\AccompanyingPeriodController::closeAction chill_person_accompanying_period_open: path: /{_locale}/person/{person_id}/accompanying-period/open - defaults: { _controller: ChillPersonBundle:AccompanyingPeriod:open } + controller: Chill\PersonBundle\Controller\AccompanyingPeriodController::openAction chill_person_accompanying_period_re_open: path: /{_locale}/person/{person_id}/accompanying-period/{period_id}/re-open - defaults: { _controller: ChillPersonBundle:AccompanyingPeriod:reOpen } + controller: Chill\PersonBundle\Controller\AccompanyingPeriodController::reOpenAction chill_person_address_list: path: /{_locale}/person/{person_id}/address/list - defaults: { _controller: ChillPersonBundle:PersonAddress:list } + controller: Chill\PersonBundle\Controller\PersonAddressController::listAction chill_person_address_create: path: /{_locale}/person/{person_id}/address/create - defaults: { _controller: ChillPersonBundle:PersonAddress:create } + controller: Chill\PersonBundle\Controller\PersonAddressController::createAction methods: [POST] chill_person_address_new: path: /{_locale}/person/{person_id}/address/new - defaults: { _controller: ChillPersonBundle:PersonAddress:new } + controller: Chill\PersonBundle\Controller\PersonAddressController::newAction chill_person_address_edit: path: /{_locale}/person/{person_id}/address/{address_id}/edit - defaults: { _controller: ChillPersonBundle:PersonAddress:edit } + controller: Chill\PersonBundle\Controller\PersonAddressController::editAction chill_person_address_update: path: /{_locale}/person/{person_id}/address/{address_id}/update - defaults: { _controller: ChillPersonBundle:PersonAddress:update } + controller: Chill\PersonBundle\Controller\PersonAddressController::updateAction chill_person_timeline: path: /{_locale}/person/{person_id}/timeline - defaults: { _controller: ChillPersonBundle:TimelinePerson:person } + controller: Chill\PersonBundle\Controller\TimelinePersonController::personAction options: menus: person: @@ -87,4 +87,4 @@ chill_person_timeline: chill_person_admin: path: "/{_locale}/admin/person" - defaults: { _controller: ChillPersonBundle:Admin:index } \ No newline at end of file + controller: Chill\PersonBundle\Controller\AdminController::indexAction \ No newline at end of file diff --git a/Resources/config/services.yml b/config/services.yaml similarity index 100% rename from Resources/config/services.yml rename to config/services.yaml diff --git a/Resources/config/services/actions.yml b/config/services/actions.yaml similarity index 100% rename from Resources/config/services/actions.yml rename to config/services/actions.yaml diff --git a/Resources/config/services/alt_names.yml b/config/services/alt_names.yaml similarity index 100% rename from Resources/config/services/alt_names.yml rename to config/services/alt_names.yaml diff --git a/Resources/config/services/command.yml b/config/services/command.yaml similarity index 100% rename from Resources/config/services/command.yml rename to config/services/command.yaml diff --git a/Resources/config/services/controller.yml b/config/services/controller.yaml similarity index 100% rename from Resources/config/services/controller.yml rename to config/services/controller.yaml diff --git a/Resources/config/services/exports.yml b/config/services/exports.yaml similarity index 100% rename from Resources/config/services/exports.yml rename to config/services/exports.yaml diff --git a/Resources/config/services/exports_accompanying_period.yml b/config/services/exports_accompanying_period.yaml similarity index 100% rename from Resources/config/services/exports_accompanying_period.yml rename to config/services/exports_accompanying_period.yaml diff --git a/Resources/config/services/fixtures.yml b/config/services/fixtures.yaml similarity index 67% rename from Resources/config/services/fixtures.yml rename to config/services/fixtures.yaml index 205aeda4a..c4a71cc4a 100644 --- a/Resources/config/services/fixtures.yml +++ b/config/services/fixtures.yaml @@ -1,4 +1,4 @@ services: Chill\PersonBundle\DataFixtures\ORM\: - resource: ../../../DataFixtures/ORM + resource: ../../DataFixtures/ORM tags: [ 'doctrine.fixture.orm' ] diff --git a/Resources/config/services/form.yml b/config/services/form.yaml similarity index 100% rename from Resources/config/services/form.yml rename to config/services/form.yaml diff --git a/Resources/config/services/menu.yml b/config/services/menu.yaml similarity index 100% rename from Resources/config/services/menu.yml rename to config/services/menu.yaml diff --git a/Resources/config/services/privacyEvent.yml b/config/services/privacyEvent.yaml similarity index 100% rename from Resources/config/services/privacyEvent.yml rename to config/services/privacyEvent.yaml diff --git a/Resources/config/services/repository.yml b/config/services/repository.yaml similarity index 100% rename from Resources/config/services/repository.yml rename to config/services/repository.yaml diff --git a/Resources/config/services/search.yml b/config/services/search.yaml similarity index 100% rename from Resources/config/services/search.yml rename to config/services/search.yaml diff --git a/Resources/config/services/search_by_phone.yml b/config/services/search_by_phone.yaml similarity index 100% rename from Resources/config/services/search_by_phone.yml rename to config/services/search_by_phone.yaml diff --git a/Resources/config/services/templating.yml b/config/services/templating.yaml similarity index 100% rename from Resources/config/services/templating.yml rename to config/services/templating.yaml diff --git a/Resources/config/services/widgets.yml b/config/services/widgets.yaml similarity index 100% rename from Resources/config/services/widgets.yml rename to config/services/widgets.yaml diff --git a/Resources/config/validation.yml b/config/validation.yaml similarity index 100% rename from Resources/config/validation.yml rename to config/validation.yaml