Merge remote-tracking branch 'origin/master' into issue133_user_current_location

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

@@ -1,4 +1,8 @@
 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,10 +1,9 @@
 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'
         tags:
             - { name: console.command }
 

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

@@ -1,12 +1,13 @@
 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']
@@ -28,10 +29,6 @@ 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,4 +1,8 @@
 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,3 +1,7 @@
 ---
 services:
-  'Chill\MainBundle\Doctrine\Migrations\VersionComparator': ~
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    Chill\MainBundle\Doctrine\Migrations\VersionComparator: ~

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

@@ -1,9 +1,13 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill.main.export_element_validator:
         class: Chill\MainBundle\Validator\Constraints\Export\ExportElementConstraintValidator
         tags:
             - { name: validator.constraint_validator }
-       
+
 #    deprecated in favor of spreadsheet_formatter
 #    chill.main.export.csv_formatter:
 #        class: Chill\MainBundle\Export\Formatter\CSVFormatter
@@ -11,7 +15,7 @@ services:
 #            - "@translator"
 #        tags:
 #            - { name: chill.export_formatter, alias: 'csv' }
-            
+
     chill.main.export.spreadsheet_formatter:
         class: Chill\MainBundle\Export\Formatter\SpreadSheetFormatter
         arguments:
@@ -19,7 +23,7 @@ services:
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'spreadsheet' }
-            
+
     chill.main.export.list_formatter:
         class: Chill\MainBundle\Export\Formatter\CSVListFormatter
         arguments:
@@ -27,7 +31,7 @@ services:
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'csvlist' }
-            
+
     chill.main.export.list_spreadsheet_formatter:
         class: Chill\MainBundle\Export\Formatter\SpreadsheetListFormatter
         arguments:
@@ -35,7 +39,7 @@ services:
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'spreadlist' }
-            
+
     chill.main.export.pivoted_list_formatter:
         class: Chill\MainBundle\Export\Formatter\CSVPivotedListFormatter
         arguments:
@@ -43,4 +47,3 @@ services:
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'csv_pivoted_list' }
-            

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

@@ -1,4 +1,8 @@
 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,4 +1,7 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
 
     chill.main.form.type.translatable.string:
         class: Chill\MainBundle\Form\Type\TranslatableStringFormType
@@ -39,9 +42,7 @@ services:
         tags:
             - { name: form.type, alias: select2_chill_language }
 
-    Chill\MainBundle\Form\Type\PickCenterType:
-        autowire: true
-        autoconfigure: true
+    Chill\MainBundle\Form\Type\PickCenterType: ~
 
     chill.main.form.type.composed_role_scope:
         class: Chill\MainBundle\Form\Type\ComposedRoleScopeType
@@ -62,9 +63,7 @@ services:
         tags:
             - { name: form.type }
 
-    Chill\MainBundle\Form\ChoiceLoader\PostalCodeChoiceLoader:
-        autowire: true
-        autoconfigure: true
+    Chill\MainBundle\Form\ChoiceLoader\PostalCodeChoiceLoader: ~
 
     chill.main.form.type.export:
         class: Chill\MainBundle\Form\Type\Export\ExportType
@@ -96,14 +95,10 @@ services:
         arguments:
             - '@Chill\MainBundle\Export\ExportManager'
 
-    Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer:
-        autowire: true
-        autoconfigure: true
+    Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer: ~
 
     chill.main.form.advanced_search_type:
         class: Chill\MainBundle\Form\AdvancedSearchType
-        autowire: true
-        autoconfigure: true
         arguments:
             - "@chill_main.search_provider"
         tags:
@@ -116,9 +111,7 @@ services:
         tags:
             - { name: form.type }
 
-    Chill\MainBundle\Form\UserType:
-        autowire: true
-        autoconfigure: true
+    Chill\MainBundle\Form\UserType: ~
 
     Chill\MainBundle\Form\PermissionsGroupType:
         tags:
@@ -131,10 +124,9 @@ services:
         tags:
             - { name: form.type }
 
+    Chill\MainBundle\Form\Type\PickAddressType: ~
 
-    Chill\MainBundle\Form\Type\PickAddressType:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Form\DataTransform\AddressToIdDataTransformer: ~
 
     Chill\MainBundle\Form\DataTransform\AddressToIdDataTransformer:
         autoconfigure: true
@@ -147,3 +139,5 @@ services:
     Chill\MainBundle\Form\UserCurrentLocationType:
         autowire: true
         autoconfigure: true
+
+    Chill\MainBundle\Form\Type\LocationFormType: ~

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

@@ -1,4 +1,8 @@
 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,9 +1,11 @@
 services:
-    Chill\MainBundle\Routing\MenuBuilder\:
-        resource: '../../Routing/MenuBuilder'
+    _defaults:
         autowire: true
         autoconfigure: true
 
+    Chill\MainBundle\Routing\MenuBuilder\:
+        resource: '../../Routing/MenuBuilder'
+
     Chill\MainBundle\Routing\MenuBuilder\UserMenuBuilder:
         arguments:
             $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'

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

@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Notification\Mailer:
         arguments:
             $logger: '@Psr\Log\LoggerInterface'
@@ -9,6 +13,4 @@ services:
             $translator: '@Symfony\Component\Translation\TranslatorInterface'
             $routeParameters: '%chill_main.notifications%'
 
-    Chill\MainBundle\Notification\NotificationRenderer:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Notification\NotificationRenderer: ~

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

@@ -1,9 +1,11 @@
 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,19 +1,21 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Phonenumber\PhonenumberHelper:
         arguments:
-            $logger: '@Psr\Log\LoggerInterface'
             $config: '%chill_main.phone_helper%'
             $cachePool: '@cache.user_data'
-            
+
     Chill\MainBundle\Phonenumber\Templating:
         arguments:
             $phonenumberHelper: '@Chill\MainBundle\Phonenumber\PhonenumberHelper'
         tags:
             - { name: twig.extension }
-    
+
     Chill\MainBundle\Validation\Validator\ValidPhonenumber:
         arguments:
-            $logger: '@Psr\Log\LoggerInterface'
             $phonenumberHelper: '@Chill\MainBundle\Phonenumber\PhonenumberHelper'
         tags:
             - { name: validator.constraint_validator }

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

@@ -1,10 +1,13 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Redis\RedisConnectionFactory:
         arguments:
             $parameters: "%chill_main.redis%"
         tags:
             - { name: kernel.event_subcriber }
-            
+
     Chill\MainBundle\Redis\ChillRedis:
         factory: [ '@Chill\MainBundle\Redis\RedisConnectionFactory', 'create' ]
-            

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

@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill.main.menu_composer:
         class: Chill\MainBundle\Routing\MenuComposer
         arguments:
@@ -6,7 +10,7 @@ services:
             - '@Knp\Menu\FactoryInterface'
             - '@Symfony\Component\Translation\TranslatorInterface'
     Chill\MainBundle\Routing\MenuComposer: '@chill.main.menu_composer'
-    
+
     chill.main.routes_loader:
         class: Chill\MainBundle\Routing\Loader\ChillRoutesLoader
         arguments:

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

@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill_main.search_provider:
         class: Chill\MainBundle\Search\SearchProvider
 
@@ -7,8 +11,13 @@ services:
     Chill\MainBundle\Search\SearchApi:
         autowire: true
         autoconfigure: true
+        arguments:
+            $providers: !tagged_iterator chill.search_api_provider
 
     Chill\MainBundle\Search\Entity\:
+        resource: '../../Search/Entity'
+
+    Chill\MainBundle\Search\Utils\:
         autowire: true
         autoconfigure: true
-        resource: '../../Search/Entity'
+        resource: './../Search/Utils/'

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

@@ -3,46 +3,35 @@ services:
         autowire: true
         autoconfigure: true
 
-    # do not autowire the directory Security/Resolver
     Chill\MainBundle\Security\Resolver\CenterResolverDispatcher:
         arguments:
             - !tagged_iterator chill_main.center_resolver
 
+    Chill\MainBundle\Security\Resolver\CenterResolverManager:
+        arguments:
+            - !tagged_iterator chill_main.center_resolver
+    Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface: '@Chill\MainBundle\Security\Resolver\CenterResolverManager'
+
     Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher:
         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\DefaultCenterResolver: ~
 
-    Chill\MainBundle\Security\Resolver\DefaultScopeResolver:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Security\Resolver\DefaultScopeResolver: ~
 
-    # do not autowire the directory Security/Resolver
-    Chill\MainBundle\Security\Resolver\ResolverTwigExtension:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Security\Resolver\ResolverTwigExtension: ~
 
-    # do not autowire the directory Security/Resolver
-    Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory:
-        autowire: true
+    Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory: ~
 
-    # 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\MainBundle\Security\ParentRoleHelper: ~
 
     chill.main.role_provider:
         class: Chill\MainBundle\Security\RoleProvider
@@ -54,20 +43,16 @@ services:
     Symfony\Component\Security\Core\User\UserProviderInterface: "@chill.main.user_provider"
 
     Chill\MainBundle\Security\Authorization\ChillExportVoter:
-        arguments:
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
         tags:
             - { name: security.voter }
 
     Chill\MainBundle\Security\PasswordRecover\TokenManager:
         arguments:
             $secret: '%kernel.secret%'
-            $logger: '@Psr\Log\LoggerInterface'
 
     Chill\MainBundle\Security\PasswordRecover\RecoverPasswordHelper:
         arguments:
             $tokenManager: '@Chill\MainBundle\Security\PasswordRecover\TokenManager'
-            $urlGenerator: '@Symfony\Component\Routing\Generator\UrlGeneratorInterface'
             $mailer: '@Chill\MainBundle\Notification\Mailer'
             $routeParameters: "%chill_main.notifications%"
 
@@ -80,11 +65,9 @@ services:
     Chill\MainBundle\Security\PasswordRecover\PasswordRecoverLocker:
         arguments:
             $chillRedis: '@Chill\MainBundle\Redis\ChillRedis'
-            $logger: '@Psr\Log\LoggerInterface'
 
     Chill\MainBundle\Security\PasswordRecover\PasswordRecoverVoter:
         arguments:
             $locker: '@Chill\MainBundle\Security\PasswordRecover\PasswordRecoverLocker'
-            $requestStack: '@Symfony\Component\HttpFoundation\RequestStack'
         tags:
             - { name: security.voter }

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

@@ -1,11 +1,13 @@
 ---
 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,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
 #    twig_intl:
 #        class: Twig_Extensions_Extension_Intl
 #        tags:
@@ -32,8 +36,6 @@ services:
             - { name: twig.extension }
 
     Chill\MainBundle\Templating\Entity\CommentRender:
-        autoconfigure: true
-        autowire: true
         tags:
             - { name: 'chill.render_entity' }
 
@@ -41,17 +43,11 @@ services:
         tags:
             - { name: twig.extension }
 
-    Chill\MainBundle\Templating\Entity\AddressRender:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Templating\Entity\AddressRender: ~
 
-    Chill\MainBundle\Templating\Entity\UserRender:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Templating\Entity\UserRender: ~
 
     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,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill_main.timeline_builder:
         class: Chill\MainBundle\Timeline\TimelineBuilder
         arguments:

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

@@ -1,11 +1,15 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill_main.validator_user_circle_consistency:
         class: Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistencyValidator
         arguments:
             - "@chill.main.security.authorization.helper"
         tags:
             - { name: "validator.constraint_validator" }
-            
+
     Chill\MainBundle\Validation\Validator\UserUniqueEmailAndUsername:
         arguments:
             $em: '@Doctrine\ORM\EntityManagerInterface'

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

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