From 0d3e48475e34ffbbc9955d037dc5772d00ca0f08 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Fri, 28 Jun 2019 17:23:07 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B02060=20[WIP]=20Initialisation=20of=20the?= =?UTF-8?q?=20portal=20application:=20Code=20cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portal/config/legacy_silex_compat_layer.php | 1 - datamodels/2.x/itop-portal-base/portal/config/services.yaml | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php b/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php index 6ba1a194d..f0f1aaf3b 100644 --- a/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php +++ b/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php @@ -27,7 +27,6 @@ use Combodo\iTop\Portal\DependencyInjection\SilexCompatBootstrap\PortalXmlConfig // Note: ModuleDesign service is not available yet as this script is processed before service generation, // that's why we have to instantiate it manually. -require_once APPROOT . 'core/moduledesign.class.inc.php'; $moduleDesign = new \ModuleDesign(PORTAL_ID); // TODO: The following code needs to be refactored to more independent and atomic services. diff --git a/datamodels/2.x/itop-portal-base/portal/config/services.yaml b/datamodels/2.x/itop-portal-base/portal/config/services.yaml index 0b3735e3f..08e1bfe07 100644 --- a/datamodels/2.x/itop-portal-base/portal/config/services.yaml +++ b/datamodels/2.x/itop-portal-base/portal/config/services.yaml @@ -88,7 +88,8 @@ services: # Legacy code as a service: since it is not in the auto-wiring path, it needs to be explicitly declared ModuleDesign: - class: 'ModuleDesign' + public: true + class: ModuleDesign arguments: - '%combodo.portal.instance.id%'