diff --git a/lib/Alchemy/Phrasea/Command/Setup/CheckEnvironment.php b/lib/Alchemy/Phrasea/Command/Setup/CheckEnvironment.php index b64e605603..288ec54d47 100644 --- a/lib/Alchemy/Phrasea/Command/Setup/CheckEnvironment.php +++ b/lib/Alchemy/Phrasea/Command/Setup/CheckEnvironment.php @@ -42,7 +42,7 @@ protected function provideRequirements() return [ new BinariesRequirements(), new CacheServerRequirement(), - new FilesystemRequirements(), + new FilesystemRequirements($this->container['conf']), new LocalesRequirements(), new PhpRequirements(), new SystemRequirements(), diff --git a/lib/Alchemy/Phrasea/Controller/SetupController.php b/lib/Alchemy/Phrasea/Controller/SetupController.php index af6cff5029..f68640a9e4 100644 --- a/lib/Alchemy/Phrasea/Controller/SetupController.php +++ b/lib/Alchemy/Phrasea/Controller/SetupController.php @@ -44,7 +44,7 @@ private function getRequirementsCollection() { return [ new BinariesRequirements(), - new FilesystemRequirements(), + new FilesystemRequirements($this->getConf()), new LocalesRequirements(), new PhpRequirements(), new SystemRequirements(), diff --git a/lib/Alchemy/Phrasea/Setup/Probe/FilesystemProbe.php b/lib/Alchemy/Phrasea/Setup/Probe/FilesystemProbe.php index 745d17b0ab..ef1141b024 100644 --- a/lib/Alchemy/Phrasea/Setup/Probe/FilesystemProbe.php +++ b/lib/Alchemy/Phrasea/Setup/Probe/FilesystemProbe.php @@ -19,7 +19,7 @@ class FilesystemProbe extends FilesystemRequirements implements ProbeInterface { public function __construct(PropertyAccess $conf) { - parent::__construct(); + parent::__construct($conf); $baseDir = realpath(__DIR__ . '/../../../../../'); diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php index d93412b286..0f11603216 100644 --- a/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php +++ b/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php @@ -11,11 +11,12 @@ namespace Alchemy\Phrasea\Setup\Requirements; +use Alchemy\Phrasea\Core\Configuration\PropertyAccess; use Alchemy\Phrasea\Setup\RequirementCollection; class FilesystemRequirements extends RequirementCollection implements RequirementInterface { - public function __construct() + public function __construct(PropertyAccess $conf) { $baseDir = realpath(__DIR__ . '/../../../../../'); @@ -27,13 +28,13 @@ public function __construct() $baseDir . '/config/status', $baseDir . '/config/minilogos', $baseDir . '/config/wm', - $baseDir . '/logs', + $conf->get(['main', 'storage', 'log']), $baseDir . '/tmp', $baseDir . '/tmp/locks', - $baseDir . '/tmp/caption', - $baseDir . '/tmp/lazaret', - $baseDir . '/tmp/download', - $baseDir . '/cache', + $conf->get(['main', 'storage', 'caption']), + $conf->get(['main', 'storage', 'lazaret']), + $conf->get(['main', 'storage', 'download']), + $conf->get(['main', 'storage', 'cache']), $baseDir . '/www/custom', ]; diff --git a/templates/web/admin/worker-manager/worker_queue_monitor.html.twig b/templates/web/admin/worker-manager/worker_queue_monitor.html.twig index 011080abca..98467e52fe 100644 --- a/templates/web/admin/worker-manager/worker_queue_monitor.html.twig +++ b/templates/web/admin/worker-manager/worker_queue_monitor.html.twig @@ -7,11 +7,11 @@ diff --git a/tests/Alchemy/Tests/Phrasea/Setup/Requirements/FilesystemRequirementsTest.php b/tests/Alchemy/Tests/Phrasea/Setup/Requirements/FilesystemRequirementsTest.php index 1b4d2d9666..6264935ef5 100644 --- a/tests/Alchemy/Tests/Phrasea/Setup/Requirements/FilesystemRequirementsTest.php +++ b/tests/Alchemy/Tests/Phrasea/Setup/Requirements/FilesystemRequirementsTest.php @@ -12,6 +12,6 @@ class FilesystemRequirementsTest extends RequirementsTestCase { protected function provideRequirements() { - return new FilesystemRequirements; + return new FilesystemRequirements(self::$DI['app']['conf']); } }