From 6a1f8fb3be9e8924dd62bc52c701074f06b44b71 Mon Sep 17 00:00:00 2001 From: Robin Windey Date: Mon, 12 Oct 2020 14:19:41 +0200 Subject: [PATCH 1/2] Fix typo 'shared' --- .../Bootstrap/RegistrationContext.php | 2 +- .../Bootstrap/RegistrationContextTest.php | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/private/AppFramework/Bootstrap/RegistrationContext.php b/lib/private/AppFramework/Bootstrap/RegistrationContext.php index 0f408380e8..023590596e 100644 --- a/lib/private/AppFramework/Bootstrap/RegistrationContext.php +++ b/lib/private/AppFramework/Bootstrap/RegistrationContext.php @@ -203,7 +203,7 @@ class RegistrationContext { "appId" => $appId, "name" => $name, "factory" => $factory, - "sharred" => $shared, + "shared" => $shared, ]; } diff --git a/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php b/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php index 8441b6e983..8e88db6f19 100644 --- a/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php +++ b/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php @@ -83,7 +83,10 @@ class RegistrationContextTest extends TestCase { $this->context->delegateEventListenerRegistrations($dispatcher); } - public function testRegisterService(): void { + /** + * @dataProvider dataProvider_TrueFalse + */ + public function testRegisterService(bool $shared): void { $app = $this->createMock(App::class); $service = 'abc'; $factory = function () { @@ -94,11 +97,11 @@ class RegistrationContextTest extends TestCase { ->willReturn($container); $container->expects($this->once()) ->method('registerService') - ->with($service, $factory, true); + ->with($service, $factory, $shared); $this->logger->expects($this->never()) ->method('logException'); - $this->context->for('myapp')->registerService($service, $factory); + $this->context->for('myapp')->registerService($service, $factory, $shared); $this->context->delegateContainerRegistrations([ 'myapp' => $app, ]); @@ -159,4 +162,11 @@ class RegistrationContextTest extends TestCase { 'myapp' => $app, ]); } + + public function dataProvider_TrueFalse(){ + return[ + [true], + [false] + ]; + } } From 91d445909ac4fea3e57b07dbfa0fb8dc6ad5223c Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 12 Oct 2020 14:54:51 +0200 Subject: [PATCH 2/2] Fix code style Signed-off-by: Morris Jobke --- tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php b/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php index 8e88db6f19..e304a63cfc 100644 --- a/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php +++ b/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php @@ -163,7 +163,7 @@ class RegistrationContextTest extends TestCase { ]); } - public function dataProvider_TrueFalse(){ + public function dataProvider_TrueFalse() { return[ [true], [false]