From a8e3dbf784583d252a2323f66e5586faf67827ba Mon Sep 17 00:00:00 2001
From: Dillon-Brown <dillon.brown@salesagility.com>
Date: Tue, 23 Mar 2021 13:39:25 +0000
Subject: [PATCH] Update core service declarations

Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>
---
 config/core_services.yaml      | 27 +++++++++++++++++++++++++++
 config/extension_services.yaml |  6 ------
 config/services.yaml           |  1 -
 3 files changed, 27 insertions(+), 7 deletions(-)
 delete mode 100644 config/extension_services.yaml

diff --git a/config/core_services.yaml b/config/core_services.yaml
index 25243b602..1febf83f9 100644
--- a/config/core_services.yaml
+++ b/config/core_services.yaml
@@ -66,6 +66,12 @@ services:
   App\Legacy\:
     resource: '../core/legacy/*'
 
+  # makes classes in extensions/ available to be used as services
+  # this creates a service per class whose id is the fully-qualified class name
+  App\Extension\:
+    resource: '../extensions/*'
+    exclude: '../extensions/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
+
   # controllers are imported separately to make sure services can be injected
   # as action arguments even if you don't extend any base controller class
   App\Controller\:
@@ -162,3 +168,24 @@ services:
     # inject all services tagged with subpanel.button.definition.mapper as first argument
     arguments:
       - !tagged { tag: 'subpanel.button.definition.mapper' }
+
+  App\Service\ActionNameMapperInterface: '@App\Legacy\ActionNameMapperHandler'
+  App\Service\BulkActionDefinitionProviderInterface: '@App\Service\BulkActionDefinitionProvider'
+  App\Service\FieldDefinitionsProviderInterface: '@App\Legacy\FieldDefinitionsHandler'
+  App\Service\FilterDefinitionProviderInterface: '@App\Service\FilterDefinitionProvider'
+  App\Service\LineActionDefinitionProviderInterface: '@App\Service\LineActionDefinitionProvider'
+  App\Service\ListViewSidebarWidgetDefinitionProviderInterface: '@App\Service\ListViewSidebarWidgetDefinitionProvider'
+  App\Service\ModuleNameMapperInterface: '@App\Legacy\ModuleNameMapperHandler'
+  App\Service\ModuleRegistryInterface: '@App\Legacy\ModuleRegistryHandler'
+  App\Service\NavigationProviderInterface: '@App\Legacy\NavbarHandler'
+  App\Service\ProcessHandlerInterface: '@App\Legacy\ResetPasswordHandler'
+  App\Service\RecordActionDefinitionProviderInterface: '@App\Service\RecordActionDefinitionProvider'
+  App\Service\RecordDeletionServiceInterface: '@App\Legacy\RecordDeletionHandler'
+  App\Service\RecordListProviderInterface: '@App\Legacy\RecordListHandler'
+  App\Service\RecordProviderInterface: '@App\Legacy\RecordHandler'
+  App\Service\RouteConverterInterface: '@App\Legacy\RouteConverterHandler'
+  App\Service\StatisticsProviderInterface: '@App\Legacy\Statistics\SubpanelDefault'
+  App\Service\SubPanelDefinitionProviderInterface: '@App\Legacy\ViewDefinitions\SubPanelDefinitionHandler'
+  App\Service\SystemConfigProviderInterface: '@App\Legacy\SystemConfigHandler'
+  App\Service\UserPreferencesProviderInterface: '@App\Legacy\UserPreferenceHandler'
+  App\Service\ViewDefinitionsProviderInterface: '@App\Legacy\ViewDefinitionsHandler'
diff --git a/config/extension_services.yaml b/config/extension_services.yaml
deleted file mode 100644
index 85ce99f7a..000000000
--- a/config/extension_services.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
-  # makes classes in extensions/ available to be used as services
-  # this creates a service per class whose id is the fully-qualified class name
-  App\Extension\:
-    resource: '../extensions/*'
-    exclude: '../extensions/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
diff --git a/config/services.yaml b/config/services.yaml
index c3914e5ed..10179eae2 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -13,7 +13,6 @@ imports:
   - { resource: modules/**/*.yaml }
   - { resource: modules/**/*.php }
   - { resource: core_services.yaml }
-  - { resource: extension_services.yaml }
   - { resource: ../extensions/*/config/*.yaml }
   - { resource: ../extensions/*/config/*.php }
   - { resource: ../extensions/**/services.yaml }