Commit 416a116d authored by Tino Goratsch's avatar Tino Goratsch

fixed the module installer of the system module

parent 13525c28
...@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface ...@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface
/** /**
* Contains the current ACP3 version string * Contains the current ACP3 version string
*/ */
const VERSION = '4.0.0-rc.10.2'; const VERSION = '4.0.0-rc.10.3';
/** /**
* Performs some startup checks * Performs some startup checks
......
...@@ -99,7 +99,7 @@ class Modules extends Core\Controller\AbstractAdminAction ...@@ -99,7 +99,7 @@ class Modules extends Core\Controller\AbstractAdminAction
} }
$serviceId = strtolower($moduleDirectory . '.installer.schema'); $serviceId = strtolower($moduleDirectory . '.installer.schema');
$container = $this->installerHelper->updateServiceContainer(true); $container = $this->installerHelper->updateServiceContainer($this->request, true);
$this->moduleInstallerExists($container, $serviceId); $this->moduleInstallerExists($container, $serviceId);
/** @var Core\Modules\Installer\SchemaInterface $moduleSchema */ /** @var Core\Modules\Installer\SchemaInterface $moduleSchema */
...@@ -238,7 +238,7 @@ class Modules extends Core\Controller\AbstractAdminAction ...@@ -238,7 +238,7 @@ class Modules extends Core\Controller\AbstractAdminAction
} }
$serviceId = strtolower($moduleDirectory . '.installer.schema'); $serviceId = strtolower($moduleDirectory . '.installer.schema');
$container = $this->installerHelper->updateServiceContainer(true); $container = $this->installerHelper->updateServiceContainer($this->request, true);
$this->moduleInstallerExists($container, $serviceId); $this->moduleInstallerExists($container, $serviceId);
/** @var Core\Modules\Installer\SchemaInterface $moduleSchema */ /** @var Core\Modules\Installer\SchemaInterface $moduleSchema */
...@@ -282,7 +282,7 @@ class Modules extends Core\Controller\AbstractAdminAction ...@@ -282,7 +282,7 @@ class Modules extends Core\Controller\AbstractAdminAction
} }
$serviceId = strtolower($moduleDirectory . '.installer.schema'); $serviceId = strtolower($moduleDirectory . '.installer.schema');
$container = $this->installerHelper->updateServiceContainer(); $container = $this->installerHelper->updateServiceContainer($this->request);
$this->moduleInstallerExists($container, $serviceId); $this->moduleInstallerExists($container, $serviceId);
/** @var Core\Modules\Installer\SchemaInterface $moduleSchema */ /** @var Core\Modules\Installer\SchemaInterface $moduleSchema */
......
...@@ -137,12 +137,17 @@ class Installer ...@@ -137,12 +137,17 @@ class Installer
} }
/** /**
* @param Core\Http\RequestInterface $request
* @param bool $allModules * @param bool $allModules
*
* @return \Symfony\Component\DependencyInjection\ContainerBuilder * @return \Symfony\Component\DependencyInjection\ContainerBuilder
*/ */
public function updateServiceContainer($allModules = false) public function updateServiceContainer(Core\Http\RequestInterface $request, $allModules = false)
{ {
return Core\DependencyInjection\ServiceContainerBuilder::create($this->appPath, $this->environment, $allModules); return Core\DependencyInjection\ServiceContainerBuilder::create(
$this->appPath,
$request->getSymfonyRequest(),
$this->environment,
$allModules
);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment