Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PHRAS-3796 bin/setup check:system - download , lazaret, wrong repo is checked #4349

Merged
merged 5 commits into from
Jul 26, 2023
Merged

PHRAS-3796 bin/setup check:system - download , lazaret, wrong repo is checked #4349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
793aa69
fix directory check
aynsix Jul 26, 2023
d8a53bb
fix test
aynsix Jul 26, 2023
cea0988
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet int…
aynsix Jul 26, 2023
0176aa9
PHRAS-3882
aynsix Jul 26, 2023
8e6aac4
Merge branch 'master' into PHRAS-3796-check-system-directory
nmaillat Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Alchemy/Phrasea/Command/Setup/CheckEnvironment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion lib/Alchemy/Phrasea/Controller/SetupController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ private function getRequirementsCollection()
{
return [
new BinariesRequirements(),
new FilesystemRequirements(),
new FilesystemRequirements($this->getConf()),
new LocalesRequirements(),
new PhpRequirements(),
new SystemRequirements(),
Expand Down
2 changes: 1 addition & 1 deletion lib/Alchemy/Phrasea/Setup/Probe/FilesystemProbe.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class FilesystemProbe extends FilesystemRequirements implements ProbeInterface
{
public function __construct(PropertyAccess $conf)
{
parent::__construct();
parent::__construct($conf);

$baseDir = realpath(__DIR__ . '/../../../../../');

Expand Down
13 changes: 7 additions & 6 deletions lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__ . '/../../../../../');

Expand All @@ -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',
];

Expand Down
4 changes: 2 additions & 2 deletions templates/web/admin/worker-manager/worker_queue_monitor.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
</button>

<label class="checkbox inline" style="margin-left: 20px;padding-top: 0px;">
<input class="hide-empty-queue" type="checkbox" value="1" checked> {{ 'admin::workermanager:tab:queueMonitor: Hide empty queues' |trans }}
<input class="consumed-queue" type="checkbox" value="1" checked> {{ 'admin::workermanager:tab:queueMonitor: consumed queues' |trans }}
</label>

<label class="checkbox inline" style="margin-left: 20px;padding-top: 0px;">
<input class="consumed-queue" type="checkbox" value="1" checked> {{ 'admin::workermanager:tab:queueMonitor: consumed queues' |trans }}
<input class="hide-empty-queue" type="checkbox" value="1" checked> {{ 'admin::workermanager:tab:queueMonitor: Hide empty queues' |trans }}
</label>
</div>

Expand Down
2 changes: 1 addition & 1 deletion tests/Alchemy/Tests/Phrasea/Setup/Requirements/FilesystemRequirementsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ class FilesystemRequirementsTest extends RequirementsTestCase
{
protected function provideRequirements()
{
return new FilesystemRequirements;
return new FilesystemRequirements(self::$DI['app']['conf']);
}
}