upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-07 16:01:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 32

Merge pull request #32657 from nextcloud/backport/32655/stable24

Browse source 
[stable24] Handle non existing settings again
This commit is contained in:
Vincent Petry 2022-06-10 15:31:58 +02:00 committed by GitHub
commit ddac16b6ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/private/Settings/Manager.php
View file

@ -126,8 +126,13 @@ class Manager implements IManager {
}
foreach (array_unique($this->sectionClasses[$type]) as $index => $class) {
/** @var IIconSection $section */
$section = \OC::$server->get($class);
try {
/** @var IIconSection $section */
$section = $this->container->get($class);
} catch (QueryException $e) {
$this->log->info($e->getMessage(), ['exception' => $e]);
continue;
}
$sectionID = $section->getID();

42
tests/lib/Settings/ManagerTest.php
View file

@ -21,7 +21,7 @@
*
*/
namespace OCA\Settings\Tests\AppInfo;
namespace OC\Settings\Tests\AppInfo;
use OC\Settings\AuthorizedGroupMapper;
use OC\Settings\Manager;
@ -82,16 +82,26 @@ class ManagerTest extends TestCase {
public function testGetAdminSections() {
$this->manager->registerSection('admin', \OCA\WorkflowEngine\Settings\Section::class);
$section = \OC::$server->query(\OCA\WorkflowEngine\Settings\Section::class);
$this->container->method('get')
->with(\OCA\WorkflowEngine\Settings\Section::class)
->willReturn($section);
$this->assertEquals([
55 => [\OC::$server->query(\OCA\WorkflowEngine\Settings\Section::class)],
55 => [$section],
], $this->manager->getAdminSections());
}
public function testGetPersonalSections() {
$this->manager->registerSection('personal', \OCA\WorkflowEngine\Settings\Section::class);
$section = \OC::$server->query(\OCA\WorkflowEngine\Settings\Section::class);
$this->container->method('get')
->with(\OCA\WorkflowEngine\Settings\Section::class)
->willReturn($section);
$this->assertEquals([
55 => [\OC::$server->query(\OCA\WorkflowEngine\Settings\Section::class)],
55 => [$section],
], $this->manager->getPersonalSections());
}
@ -181,14 +191,16 @@ class ManagerTest extends TestCase {
$this->manager->registerSetting('personal', 'section1');
$this->manager->registerSetting('personal', 'section2');
$this->container->expects($this->at(0))
$this->container->expects($this->exactly(2))
->method('get')
->with('section1')
->willReturn($section);
$this->container->expects($this->at(1))
->method('get')
->with('section2')
->willReturn($section2);
->withConsecutive(
['section1'],
['section2']
)
->willReturnMap([
['section1', $section],
['section2', $section2],
]);
$settings = $this->manager->getPersonalSettings('security');
@ -212,12 +224,18 @@ class ManagerTest extends TestCase {
$this->manager->registerSection('personal', \OCA\WorkflowEngine\Settings\Section::class);
$this->manager->registerSection('admin', \OCA\WorkflowEngine\Settings\Section::class);
$section = \OC::$server->query(\OCA\WorkflowEngine\Settings\Section::class);
$this->container->method('get')
->with(\OCA\WorkflowEngine\Settings\Section::class)
->willReturn($section);
$this->assertEquals([
55 => [\OC::$server->query(\OCA\WorkflowEngine\Settings\Section::class)],
55 => [$section],
], $this->manager->getPersonalSections());
$this->assertEquals([
55 => [\OC::$server->query(\OCA\WorkflowEngine\Settings\Section::class)],
55 => [$section],
], $this->manager->getAdminSections());
}
}