From 632b53e6f15fb42ebe35ecec3c4da43e91730ae8 Mon Sep 17 00:00:00 2001 From: Mario Blazek Date: Thu, 14 Dec 2017 14:34:49 +0100 Subject: [PATCH] Removed .class parameters (#41) * Service definition by Symfony best practices * Set all services private --- .../Resources/config/fieldtype_form_types.yml | 8 +- .../config/form_fieldtype_handlers.yml | 108 +++++++++--------- bundle/Resources/config/form_types.yml | 70 +++++------- bundle/Resources/config/services.yml | 18 ++- 4 files changed, 96 insertions(+), 108 deletions(-) diff --git a/bundle/Resources/config/fieldtype_form_types.yml b/bundle/Resources/config/fieldtype_form_types.yml index 2a1530d..61b75a2 100644 --- a/bundle/Resources/config/fieldtype_form_types.yml +++ b/bundle/Resources/config/fieldtype_form_types.yml @@ -1,18 +1,18 @@ parameters: - netgen.ezforms.form.type.fieldtype.ezuser_create.class: Netgen\Bundle\EzFormsBundle\Form\Type\FieldType\UserCreateType - netgen.ezforms.form.type.fieldtype.ezuser_update.class: Netgen\Bundle\EzFormsBundle\Form\Type\FieldType\UserUpdateType netgen.ezforms.form.type.fieldtype.ezuser.parameters.min_password_length: 10 services: netgen.ezforms.form.type.fieldtype.ezuser_create: - class: "%netgen.ezforms.form.type.fieldtype.ezuser_create.class%" + class: Netgen\Bundle\EzFormsBundle\Form\Type\FieldType\UserCreateType +# public: false arguments: - "%netgen.ezforms.form.type.fieldtype.ezuser.parameters.min_password_length%" tags: - { name: form.type, alias: ezforms_ezuser_create } netgen.ezforms.form.type.fieldtype.ezuser_update: - class: "%netgen.ezforms.form.type.fieldtype.ezuser_update.class%" + class: Netgen\Bundle\EzFormsBundle\Form\Type\FieldType\UserUpdateType +# public: false arguments: - "%netgen.ezforms.form.type.fieldtype.ezuser.parameters.min_password_length%" tags: diff --git a/bundle/Resources/config/form_fieldtype_handlers.yml b/bundle/Resources/config/form_fieldtype_handlers.yml index 0da2782..1e3b88a 100644 --- a/bundle/Resources/config/form_fieldtype_handlers.yml +++ b/bundle/Resources/config/form_fieldtype_handlers.yml @@ -1,118 +1,116 @@ -parameters: - netgen.ezforms.form.fieldtype_handler.ezimage.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Image - netgen.ezforms.form.fieldtype_handler.ezstring.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\TextLine - netgen.ezforms.form.fieldtype_handler.eztext.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\TextBlock - netgen.ezforms.form.fieldtype_handler.ezuser.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\User - netgen.ezforms.form.fieldtype_handler.ezemail.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Email - netgen.ezforms.form.fieldtype_handler.ezselection.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Selection - netgen.ezforms.form.fieldtype_handler.ezboolean.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Checkbox - netgen.ezforms.form.fieldtype_handler.ezdate.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Date - netgen.ezforms.form.fieldtype_handler.ezdatetime.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\DateAndTime - netgen.ezforms.form.fieldtype_handler.ezinteger.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\IntegerHandler - netgen.ezforms.form.fieldtype_handler.ezfloat.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\FloatHandler - netgen.ezforms.form.fieldtype_handler.ezurl.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Url - netgen.ezforms.form.fieldtype_handler.ezcountry.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Country - netgen.ezforms.form.fieldtype_handler.eztime.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Time - netgen.ezforms.form.fieldtype_handler.ezisbn.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Isbn - netgen.ezforms.form.fieldtype_handler.ezbinaryfile.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\BinaryFile - netgen.ezforms.form.fieldtype_handler.ezgmaplocation.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\MapLocation - netgen.ezforms.form.fieldtype_handler.ezobjectrelation.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Relation - services: netgen.ezforms.form.fieldtype_handler.ezimage: - class: "%netgen.ezforms.form.fieldtype_handler.ezimage.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Image + public: false tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: ezimage} + - { name: netgen.ezforms.form.fieldtype_handler, alias: ezimage } netgen.ezforms.form.fieldtype_handler.ezstring: - class: "%netgen.ezforms.form.fieldtype_handler.ezstring.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\TextLine + public: false tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: ezstring} + - { name: netgen.ezforms.form.fieldtype_handler, alias: ezstring } netgen.ezforms.form.fieldtype_handler.eztext: - class: "%netgen.ezforms.form.fieldtype_handler.eztext.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\TextBlock + public: false tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: eztext} + - { name: netgen.ezforms.form.fieldtype_handler, alias: eztext } netgen.ezforms.form.fieldtype_handler.ezuser: - class: "%netgen.ezforms.form.fieldtype_handler.ezuser.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\User + public: false tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: ezuser} + - { name: netgen.ezforms.form.fieldtype_handler, alias: ezuser } netgen.ezforms.form.fieldtype_handler.ezemail: - class: "%netgen.ezforms.form.fieldtype_handler.ezemail.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Email + public: false tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: ezemail} + - { name: netgen.ezforms.form.fieldtype_handler, alias: ezemail } netgen.ezforms.form.fieldtype_handler.ezselection: - class: "%netgen.ezforms.form.fieldtype_handler.ezselection.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Selection + public: false tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: ezselection} + - { name: netgen.ezforms.form.fieldtype_handler, alias: ezselection } netgen.ezforms.form.fieldtype_handler.ezboolean: - class: "%netgen.ezforms.form.fieldtype_handler.ezboolean.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Checkbox + public: false arguments: [ "@ezpublish.field_helper" ] tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: ezboolean} + - { name: netgen.ezforms.form.fieldtype_handler, alias: ezboolean } netgen.ezforms.form.fieldtype_handler.ezdate: - class: "%netgen.ezforms.form.fieldtype_handler.ezdate.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Date + public: false tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: ezdate} + - { name: netgen.ezforms.form.fieldtype_handler, alias: ezdate } netgen.ezforms.form.fieldtype_handler.ezdatetime: - class: "%netgen.ezforms.form.fieldtype_handler.ezdatetime.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\DateAndTime + public: false tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: ezdatetime} + - { name: netgen.ezforms.form.fieldtype_handler, alias: ezdatetime } netgen.ezforms.form.fieldtype_handler.ezinteger: - class: "%netgen.ezforms.form.fieldtype_handler.ezinteger.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\IntegerHandler + public: false arguments: [ "@ezpublish.field_helper" ] tags: - {name: netgen.ezforms.form.fieldtype_handler, alias: ezinteger} netgen.ezforms.form.fieldtype_handler.ezfloat: - class: "%netgen.ezforms.form.fieldtype_handler.ezfloat.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\FloatHandler + public: false arguments: [ "@ezpublish.field_helper" ] tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: ezfloat} + - { name: netgen.ezforms.form.fieldtype_handler, alias: ezfloat } netgen.ezforms.form.fieldtype_handler.ezurl: - class: "%netgen.ezforms.form.fieldtype_handler.ezurl.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Url + public: false tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: ezurl} + - { name: netgen.ezforms.form.fieldtype_handler, alias: ezurl } netgen.ezforms.form.fieldtype_handler.ezcountry: - class: "%netgen.ezforms.form.fieldtype_handler.ezcountry.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Country + public: false arguments: - "%ezpublish.fieldType.ezcountry.data%" tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: ezcountry} + - { name: netgen.ezforms.form.fieldtype_handler, alias: ezcountry } netgen.ezforms.form.fieldtype_handler.eztime: - class: "%netgen.ezforms.form.fieldtype_handler.eztime.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Time + public: false tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: eztime} + - { name: netgen.ezforms.form.fieldtype_handler, alias: eztime } netgen.ezforms.form.fieldtype_handler.ezisbn: - class: "%netgen.ezforms.form.fieldtype_handler.ezisbn.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Isbn + public: false tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: ezisbn} + - { name: netgen.ezforms.form.fieldtype_handler, alias: ezisbn } netgen.ezforms.form.fieldtype_handler.ezbinaryfile: - class: "%netgen.ezforms.form.fieldtype_handler.ezbinaryfile.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\BinaryFile + public: false tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: ezbinaryfile} + - { name: netgen.ezforms.form.fieldtype_handler, alias: ezbinaryfile } netgen.ezforms.form.fieldtype_handler.ezgmaplocation: - class: "%netgen.ezforms.form.fieldtype_handler.ezgmaplocation.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\MapLocation + public: false tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: ezgmaplocation} + - { name: netgen.ezforms.form.fieldtype_handler, alias: ezgmaplocation } netgen.ezforms.form.fieldtype_handler.ezobjectrelation: - class: "%netgen.ezforms.form.fieldtype_handler.ezobjectrelation.class%" + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandler\Relation + public: false arguments: - "@ezpublish.api.repository" - "@ezpublish.translation_helper" tags: - - {name: netgen.ezforms.form.fieldtype_handler, alias: ezobjectrelation} \ No newline at end of file + - { name: netgen.ezforms.form.fieldtype_handler, alias: ezobjectrelation } diff --git a/bundle/Resources/config/form_types.yml b/bundle/Resources/config/form_types.yml index 3d0b1c0..5c8b53f 100644 --- a/bundle/Resources/config/form_types.yml +++ b/bundle/Resources/config/form_types.yml @@ -1,97 +1,89 @@ -parameters: - netgen.ezforms.form.data_mapper.create_content.class: Netgen\Bundle\EzFormsBundle\Form\DataMapper\CreateContentMapper - netgen.ezforms.form.type.create_content.class: Netgen\Bundle\EzFormsBundle\Form\Type\CreateContentType - - netgen.ezforms.form.data_mapper.create_user.class: Netgen\Bundle\EzFormsBundle\Form\DataMapper\CreateUserMapper - netgen.ezforms.form.type.create_user.class: Netgen\Bundle\EzFormsBundle\Form\Type\CreateUserType - - netgen.ezforms.form.data_mapper.update_content.class: Netgen\Bundle\EzFormsBundle\Form\DataMapper\UpdateContentMapper - netgen.ezforms.form.type.update_content.class: Netgen\Bundle\EzFormsBundle\Form\Type\UpdateContentType - - netgen.ezforms.form.data_mapper.update_user.class: Netgen\Bundle\EzFormsBundle\Form\DataMapper\UpdateUserMapper - netgen.ezforms.form.type.update_user.class: Netgen\Bundle\EzFormsBundle\Form\Type\UpdateUserType - - netgen.ezforms.form.url_type.class: Netgen\Bundle\EzFormsBundle\Form\Type\UrlType - - netgen.ezforms.form.map_type.class: Netgen\Bundle\EzFormsBundle\Form\Type\MapType - - netgen.ezforms.form.data_mapper.info_collection.class: Netgen\Bundle\EzFormsBundle\Form\DataMapper\InformationCollectionMapper - netgen.ezforms.form.type.info_collection.class: Netgen\Bundle\EzFormsBundle\Form\Type\InformationCollectionType - services: netgen.ezforms.form.data_mapper.create_content: - class: "%netgen.ezforms.form.data_mapper.create_content.class%" + class: Netgen\Bundle\EzFormsBundle\Form\DataMapper\CreateContentMapper + public: false arguments: - "@netgen.ezforms.form.fieldtype_handler_registry" netgen.ezforms.form.type.create_content: - class: "%netgen.ezforms.form.type.create_content.class%" + class: Netgen\Bundle\EzFormsBundle\Form\Type\CreateContentType +# public: false arguments: - "@netgen.ezforms.form.fieldtype_handler_registry" - "@netgen.ezforms.form.data_mapper.create_content" tags: - - {name: form.type, alias: ezforms_create_content} + - { name: form.type, alias: ezforms_create_content } netgen.ezforms.form.data_mapper.create_user: - class: "%netgen.ezforms.form.data_mapper.create_user.class%" + class: Netgen\Bundle\EzFormsBundle\Form\DataMapper\CreateUserMapper + public: false arguments: - "@netgen.ezforms.form.fieldtype_handler_registry" netgen.ezforms.form.type.create_user: - class: "%netgen.ezforms.form.type.create_user.class%" + class: Netgen\Bundle\EzFormsBundle\Form\Type\CreateUserType +# public: false arguments: - "@netgen.ezforms.form.fieldtype_handler_registry" - "@netgen.ezforms.form.data_mapper.create_user" tags: - - {name: form.type, alias: ezforms_create_user} + - { name: form.type, alias: ezforms_create_user } netgen.ezforms.form.data_mapper.update_content: - class: "%netgen.ezforms.form.data_mapper.update_content.class%" + class: Netgen\Bundle\EzFormsBundle\Form\DataMapper\UpdateContentMapper + public: false arguments: - "@netgen.ezforms.form.fieldtype_handler_registry" netgen.ezforms.form.type.update_content: - class: "%netgen.ezforms.form.type.update_content.class%" + class: Netgen\Bundle\EzFormsBundle\Form\Type\UpdateContentType +# public: false arguments: - "@netgen.ezforms.form.fieldtype_handler_registry" - "@netgen.ezforms.form.data_mapper.update_content" tags: - - {name: form.type, alias: ezforms_update_content} + - { name: form.type, alias: ezforms_update_content } netgen.ezforms.form.data_mapper.update_user: - class: "%netgen.ezforms.form.data_mapper.update_user.class%" + class: Netgen\Bundle\EzFormsBundle\Form\DataMapper\UpdateUserMapper + public: false arguments: - "@netgen.ezforms.form.fieldtype_handler_registry" netgen.ezforms.form.type.update_user: - class: "%netgen.ezforms.form.type.update_user.class%" + class: Netgen\Bundle\EzFormsBundle\Form\Type\UpdateUserType +# public: false arguments: - "@netgen.ezforms.form.fieldtype_handler_registry" - "@netgen.ezforms.form.data_mapper.update_user" tags: - - {name: form.type, alias: ezforms_update_user} + - { name: form.type, alias: ezforms_update_user } netgen.ezforms.form.url_type: - class: "%netgen.ezforms.form.url_type.class%" + class: Netgen\Bundle\EzFormsBundle\Form\Type\UrlType +# public: false tags: - - {name: form.type, alias: ezforms_url} + - { name: form.type, alias: ezforms_url } netgen.ezforms.form.map_type: - class: "%netgen.ezforms.form.map_type.class%" + class: Netgen\Bundle\EzFormsBundle\Form\Type\MapType +# public: false tags: - - {name: form.type, alias: ezforms_map} + - { name: form.type, alias: ezforms_map } netgen.ezforms.form.data_mapper.info_collection: - class: "%netgen.ezforms.form.data_mapper.info_collection.class%" + class: Netgen\Bundle\EzFormsBundle\Form\DataMapper\InformationCollectionMapper + public: false arguments: - "@netgen.ezforms.form.fieldtype_handler_registry" netgen.ezforms.form.type.info_collection: - class: "%netgen.ezforms.form.type.info_collection.class%" + class: Netgen\Bundle\EzFormsBundle\Form\Type\InformationCollectionType +# public: false arguments: - "@netgen.ezforms.form.fieldtype_handler_registry" - "@netgen.ezforms.form.data_mapper.info_collection" calls: - [setLanguages, [$languages$]] tags: - - {name: form.type, alias: ezforms_information_collection} + - { name: form.type, alias: ezforms_information_collection } diff --git a/bundle/Resources/config/services.yml b/bundle/Resources/config/services.yml index a72d353..e3416be 100644 --- a/bundle/Resources/config/services.yml +++ b/bundle/Resources/config/services.yml @@ -1,19 +1,17 @@ imports: - - {resource: form_fieldtype_handlers.yml} - - {resource: fieldtype_form_types.yml} - - {resource: form_types.yml} - -parameters: - netgen.ezforms.form.fieldtype_handler_registry.class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandlerRegistry - netgen.ezforms.form.extension.fieldtype.class: Netgen\Bundle\EzFormsBundle\Form\Extension\FieldTypeTypeExtension + - { resource: form_fieldtype_handlers.yml } + - { resource: fieldtype_form_types.yml } + - { resource: form_types.yml } services: # Services tagged with 'netgen.ezforms.form.fieldtype_handler' will be registered # to this one during service container compilation. See imported resources. netgen.ezforms.form.fieldtype_handler_registry: - class: "%netgen.ezforms.form.fieldtype_handler_registry.class%" + public: false + class: Netgen\Bundle\EzFormsBundle\Form\FieldTypeHandlerRegistry netgen.ezforms.form.extension.fieldtype: - class: "%netgen.ezforms.form.extension.fieldtype.class%" + class: Netgen\Bundle\EzFormsBundle\Form\Extension\FieldTypeTypeExtension +# public: false tags: - - {name: form.type_extension, alias: form, extended_type: Symfony\Component\Form\Extension\Core\Type\FormType} + - { name: form.type_extension, alias: form, extended_type: Symfony\Component\Form\Extension\Core\Type\FormType }