Revert "fix: Autowire and autoconfigure services in chill_main."

This reverts commit d7fbbbf92cfe5233130ed7d5c27aeb9364426436.

src/Bundle/ChillMainBundle/config/services.yaml

@@ -8,21 +8,28 @@ services:
 
     Chill\MainBundle\Repository\:
         resource: '../Repository/'
+        autowire: true
+        autoconfigure: true
 
     Chill\MainBundle\Repository\UserACLAwareRepositoryInterface: '@Chill\MainBundle\Repository\UserACLAwareRepository'
 
     Chill\MainBundle\Serializer\Normalizer\:
         resource: '../Serializer/Normalizer'
+        autoconfigure: true
+        autowire: true
         tags:
             - { name: 'serializer.normalizer', priority: 64 }
 
     Chill\MainBundle\Form\Type\:
         resource: '../Form/Type'
+        autoconfigure: true
+        autowire: true
         tags:
             - { name: form.type }
 
     Chill\MainBundle\Doctrine\Event\:
         resource: '../Doctrine/Event/'
+        autowire: true
         tags:
             - { name: 'doctrine.event_subscriber' }
 

src/Bundle/ChillMainBundle/config/services/cache.yaml

@@ -1,8 +1,4 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     chill_main.tag_aware_cache:
         class: Symfony\Component\Cache\Adapter\TagAwareAdapter
         arguments:

src/Bundle/ChillMainBundle/config/services/command.yaml

@@ -1,9 +1,11 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     Chill\MainBundle\Command\ChillImportUsersCommand:
+        arguments:
+            $em: '@Doctrine\ORM\EntityManagerInterface'
+            $logger: '@Psr\Log\LoggerInterface'
+            $passwordEncoder: '@Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface'
+            $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface'
+            $userRepository: '@Chill\MainBundle\Repository\UserRepository'
         tags:
             - { name: console.command }
 

src/Bundle/ChillMainBundle/config/services/controller.yaml

@@ -1,13 +1,12 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
 
     Chill\MainBundle\Controller\:
+        autowire: true
         resource: '../../Controller'
         tags: ['controller.service_arguments']
 
     Chill\MainBundle\Controller\PasswordController:
+        autowire: true
         arguments:
             $chillLogger: '@monolog.logger.chill'
         tags: ['controller.service_arguments']
@@ -29,6 +28,10 @@ services:
             $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface'
         tags: ['controller.service_arguments']
 
+    Chill\MainBundle\Controller\UserController:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Controller\NotificationController:
         arguments:
             $security: '@Symfony\Component\Security\Core\Security'

src/Bundle/ChillMainBundle/config/services/crud.yaml

@@ -1,8 +1,4 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     Chill\MainBundle\CRUD\Routing\CRUDRoutesLoader:
         arguments:
             $crudConfig: '%chill_main_crud_route_loader_config%'

src/Bundle/ChillMainBundle/config/services/doctrine.yaml

@@ -1,7 +1,3 @@
 ---
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
-    Chill\MainBundle\Doctrine\Migrations\VersionComparator: ~
+  'Chill\MainBundle\Doctrine\Migrations\VersionComparator': ~

src/Bundle/ChillMainBundle/config/services/export.yaml

@@ -1,8 +1,4 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     chill.main.export_element_validator:
         class: Chill\MainBundle\Validator\Constraints\Export\ExportElementConstraintValidator
         tags:
@@ -47,3 +43,4 @@ services:
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'csv_pivoted_list' }
+            

src/Bundle/ChillMainBundle/config/services/fixtures.yaml

@@ -1,8 +1,4 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     Chill\MainBundle\DataFixtures\ORM\:
         resource: ../../DataFixtures/ORM
         tags: [ 'doctrine.fixture.orm' ]

src/Bundle/ChillMainBundle/config/services/form.yaml

@@ -1,7 +1,4 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
 
     chill.main.form.type.translatable.string:
         class: Chill\MainBundle\Form\Type\TranslatableStringFormType
@@ -42,6 +39,10 @@ services:
         tags:
             - { name: form.type, alias: select2_chill_language }
 
+    Chill\MainBundle\Form\Type\PickCenterType:
+        autowire: true
+        autoconfigure: true
+
     chill.main.form.type.composed_role_scope:
         class: Chill\MainBundle\Form\Type\ComposedRoleScopeType
         arguments:
@@ -61,6 +62,10 @@ services:
         tags:
             - { name: form.type }
 
+    Chill\MainBundle\Form\ChoiceLoader\PostalCodeChoiceLoader:
+        autowire: true
+        autoconfigure: true
+
     chill.main.form.type.export:
         class: Chill\MainBundle\Form\Type\Export\ExportType
         tags:
@@ -91,8 +96,14 @@ services:
         arguments:
             - '@Chill\MainBundle\Export\ExportManager'
 
+    Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer:
+        autowire: true
+        autoconfigure: true
+
     chill.main.form.advanced_search_type:
         class: Chill\MainBundle\Form\AdvancedSearchType
+        autowire: true
+        autoconfigure: true
         arguments:
             - "@chill_main.search_provider"
         tags:
@@ -105,6 +116,10 @@ services:
         tags:
             - { name: form.type }
 
+    Chill\MainBundle\Form\UserType:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Form\PermissionsGroupType:
         tags:
             - { name: form.type }
@@ -115,3 +130,16 @@ services:
             - "@security.token_storage"
         tags:
             - { name: form.type }
+
+
+    Chill\MainBundle\Form\Type\PickAddressType:
+        autoconfigure: true
+        autowire: true
+
+    Chill\MainBundle\Form\DataTransform\AddressToIdDataTransformer:
+        autoconfigure: true
+        autowire: true
+
+    Chill\MainBundle\Form\Type\LocationFormType:
+        autowire: true
+        autoconfigure: true

src/Bundle/ChillMainBundle/config/services/logger.yaml

@@ -1,8 +1,4 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     chill.main.logger:
         # a logger to log events from the app (deletion, remove, etc.)
         alias: monolog.logger.chill

src/Bundle/ChillMainBundle/config/services/menu.yaml

@@ -1,10 +1,8 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     Chill\MainBundle\Routing\MenuBuilder\:
         resource: '../../Routing/MenuBuilder'
+        autowire: true
+        autoconfigure: true
 
     Chill\MainBundle\Routing\MenuBuilder\UserMenuBuilder:
         arguments:

src/Bundle/ChillMainBundle/config/services/notification.yaml

@@ -1,8 +1,4 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     Chill\MainBundle\Notification\Mailer:
         arguments:
             $logger: '@Psr\Log\LoggerInterface'
@@ -12,3 +8,7 @@ services:
             $router: '@Symfony\Component\Routing\RouterInterface'
             $translator: '@Symfony\Component\Translation\TranslatorInterface'
             $routeParameters: '%chill_main.notifications%'
+
+    Chill\MainBundle\Notification\NotificationRenderer:
+        autoconfigure: true
+        autowire: true

src/Bundle/ChillMainBundle/config/services/pagination.yaml

@@ -1,11 +1,9 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     chill_main.paginator_factory:
         class: Chill\MainBundle\Pagination\PaginatorFactory
         public: true
+        autowire: true
+        autoconfigure: true
         arguments:
             - "@request_stack"
             - "@router"

src/Bundle/ChillMainBundle/config/services/phonenumber.yaml

@@ -1,8 +1,4 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     Chill\MainBundle\Phonenumber\PhonenumberHelper:
         arguments:
             $logger: '@Psr\Log\LoggerInterface'

src/Bundle/ChillMainBundle/config/services/redis.yaml

@@ -1,8 +1,4 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     Chill\MainBundle\Redis\RedisConnectionFactory:
         arguments:
             $parameters: "%chill_main.redis%"
@@ -11,3 +7,4 @@ services:
             
     Chill\MainBundle\Redis\ChillRedis:
         factory: [ '@Chill\MainBundle\Redis\RedisConnectionFactory', 'create' ]
+            

src/Bundle/ChillMainBundle/config/services/routing.yaml

@@ -1,8 +1,4 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     chill.main.menu_composer:
         class: Chill\MainBundle\Routing\MenuComposer
         arguments:

src/Bundle/ChillMainBundle/config/services/search.yaml

@@ -1,12 +1,14 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     chill_main.search_provider:
         class: Chill\MainBundle\Search\SearchProvider
 
     Chill\MainBundle\Search\SearchProvider: '@chill_main.search_provider'
 
+    Chill\MainBundle\Search\SearchApi:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Search\Entity\:
+        autowire: true
+        autoconfigure: true
         resource: '../../Search/Entity'

src/Bundle/ChillMainBundle/config/services/security.yaml

@@ -12,13 +12,38 @@ services:
         arguments:
             - !tagged_iterator chill_main.scope_resolver
 
+    # do not autowire the directory Security/Resolver
+    Chill\MainBundle\Security\Resolver\DefaultCenterResolver:
+        autoconfigure: true
+        autowire: true
+
+    Chill\MainBundle\Security\Resolver\DefaultScopeResolver:
+        autoconfigure: true
+        autowire: true
+
+    # do not autowire the directory Security/Resolver
+    Chill\MainBundle\Security\Resolver\ResolverTwigExtension:
+        autoconfigure: true
+        autowire: true
+
+    # do not autowire the directory Security/Resolver
+    Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory:
+        autowire: true
+
+    # do not autowire the directory Security/Resolver
     Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface: '@Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory'
 
     chill.main.security.authorization.helper:
         class: Chill\MainBundle\Security\Authorization\AuthorizationHelper
+        autowire: true
+        autoconfigure: true
     Chill\MainBundle\Security\Authorization\AuthorizationHelper: '@chill.main.security.authorization.helper'
     Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface: '@chill.main.security.authorization.helper'
 
+    Chill\MainBundle\Security\ParentRoleHelper:
+        autowire: true
+        autoconfigure: true
+
     chill.main.role_provider:
         class: Chill\MainBundle\Security\RoleProvider
     Chill\MainBundle\Security\RoleProvider: '@chill.main.role_provider'

src/Bundle/ChillMainBundle/config/services/serializer.yaml

@@ -1,13 +1,11 @@
 ---
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
 
     # note: the autowiring for serializers and normalizers is declared
     # into ../services.yaml
 
     Chill\MainBundle\Serializer\Normalizer\DoctrineExistingEntityNormalizer:
+        autowire: true
         tags:
             - { name: 'serializer.normalizer', priority: 8 }
 

src/Bundle/ChillMainBundle/config/services/templating.yaml

@@ -1,8 +1,4 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
 #    twig_intl:
 #        class: Twig_Extensions_Extension_Intl
 #        tags:
@@ -36,6 +32,8 @@ services:
             - { name: twig.extension }
 
     Chill\MainBundle\Templating\Entity\CommentRender:
+        autoconfigure: true
+        autowire: true
         tags:
             - { name: 'chill.render_entity' }
 
@@ -43,7 +41,17 @@ services:
         tags:
             - { name: twig.extension }
 
+    Chill\MainBundle\Templating\Entity\AddressRender:
+        autoconfigure: true
+        autowire: true
+
+    Chill\MainBundle\Templating\Entity\UserRender:
+        autoconfigure: true
+        autowire: true
+
     Chill\MainBundle\Templating\Listing\:
         resource: './../../Templating/Listing'
+        autoconfigure: true
+        autowire: true
 
     Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface: '@Chill\MainBundle\Templating\Listing\FilterOrderHelperFactory'

src/Bundle/ChillMainBundle/config/services/timeline.yaml

@@ -1,8 +1,4 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     chill_main.timeline_builder:
         class: Chill\MainBundle\Timeline\TimelineBuilder
         arguments:

src/Bundle/ChillMainBundle/config/services/validator.yaml

@@ -1,8 +1,4 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     chill_main.validator_user_circle_consistency:
         class: Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistencyValidator
         arguments:

src/Bundle/ChillMainBundle/config/services/widget.yaml

@@ -1,6 +1,2 @@
 services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
     Chill\MainBundle\Templating\UI\CountNotificationUser: ~