mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
Fix latest merge
This commit is contained in:
@@ -13,7 +13,7 @@ class PhraseaRegisterFormTest extends FormTestCase
|
|||||||
$available = [
|
$available = [
|
||||||
'parameter' => [
|
'parameter' => [
|
||||||
'type' => 'text',
|
'type' => 'text',
|
||||||
'label' => 'Yollah !',
|
'label' => '',
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
$params = [
|
$params = [
|
||||||
@@ -47,7 +47,7 @@ class PhraseaRegisterFormTest extends FormTestCase
|
|||||||
'name' => 'extra-parameter2',
|
'name' => 'extra-parameter2',
|
||||||
'required' => true
|
'required' => true
|
||||||
)
|
)
|
||||||
];
|
);
|
||||||
|
|
||||||
$expected = array('email', 'password', 'provider-id', '_token', 'extraParameter','extraParameter2');
|
$expected = array('email', 'password', 'provider-id', '_token', 'extraParameter','extraParameter2');
|
||||||
|
|
||||||
@@ -55,7 +55,7 @@ class PhraseaRegisterFormTest extends FormTestCase
|
|||||||
$expected[] = 'accept-tou';
|
$expected[] = 'accept-tou';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!self::$DI['app']['phraseanet.registry']->get('GV_autoselectDB')) {
|
if (!self::$DI['app']['conf']->get(['registry', 'registration', 'auto-select-collections'])) {
|
||||||
$expected[] = 'collections';
|
$expected[] = 'collections';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -91,7 +91,7 @@ class PhraseaRegisterFormTest extends FormTestCase
|
|||||||
$expected[] = 'accept-tou';
|
$expected[] = 'accept-tou';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!self::$DI['app']['phraseanet.registry']->get('GV_autoselectDB')) {
|
if (!self::$DI['app']['conf']->get(['registry', 'registration', 'auto-select-collections'])) {
|
||||||
$expected[] = 'collections';
|
$expected[] = 'collections';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user