diff --git a/src/Symfony/XmlServiceMapFactory.php b/src/Symfony/XmlServiceMapFactory.php index 47aa1bc9..409ef847 100644 --- a/src/Symfony/XmlServiceMapFactory.php +++ b/src/Symfony/XmlServiceMapFactory.php @@ -48,7 +48,7 @@ public function create(): ServiceMap $service = new Service( strpos((string) $attrs->id, '.') === 0 ? substr((string) $attrs->id, 1) : (string) $attrs->id, isset($attrs->class) ? (string) $attrs->class : null, - !isset($attrs->public) || (string) $attrs->public !== 'false', + isset($attrs->public) && (string) $attrs->public === 'true', isset($attrs->synthetic) && (string) $attrs->synthetic === 'true', isset($attrs->alias) ? (string) $attrs->alias : null ); diff --git a/tests/Symfony/DefaultServiceMapTest.php b/tests/Symfony/DefaultServiceMapTest.php index 35d6b35d..8616ffaf 100644 --- a/tests/Symfony/DefaultServiceMapTest.php +++ b/tests/Symfony/DefaultServiceMapTest.php @@ -42,7 +42,7 @@ function (?Service $service): void { self::assertNotNull($service); self::assertSame('withoutClass', $service->getId()); self::assertNull($service->getClass()); - self::assertTrue($service->isPublic()); + self::assertFalse($service->isPublic()); self::assertFalse($service->isSynthetic()); self::assertNull($service->getAlias()); }, @@ -53,7 +53,7 @@ function (?Service $service): void { self::assertNotNull($service); self::assertSame('withClass', $service->getId()); self::assertSame('Foo', $service->getClass()); - self::assertTrue($service->isPublic()); + self::assertFalse($service->isPublic()); self::assertFalse($service->isSynthetic()); self::assertNull($service->getAlias()); }, @@ -64,29 +64,29 @@ function (?Service $service): void { self::assertNotNull($service); self::assertSame('withoutPublic', $service->getId()); self::assertSame('Foo', $service->getClass()); - self::assertTrue($service->isPublic()); + self::assertFalse($service->isPublic()); self::assertFalse($service->isSynthetic()); self::assertNull($service->getAlias()); }, ]; yield [ - 'publicNotFalse', + 'publicNotTrue', function (?Service $service): void { self::assertNotNull($service); - self::assertSame('publicNotFalse', $service->getId()); + self::assertSame('publicNotTrue', $service->getId()); self::assertSame('Foo', $service->getClass()); - self::assertTrue($service->isPublic()); + self::assertFalse($service->isPublic()); self::assertFalse($service->isSynthetic()); self::assertNull($service->getAlias()); }, ]; yield [ - 'private', + 'public', function (?Service $service): void { self::assertNotNull($service); - self::assertSame('private', $service->getId()); + self::assertSame('public', $service->getId()); self::assertSame('Foo', $service->getClass()); - self::assertFalse($service->isPublic()); + self::assertTrue($service->isPublic()); self::assertFalse($service->isSynthetic()); self::assertNull($service->getAlias()); }, @@ -97,7 +97,7 @@ function (?Service $service): void { self::assertNotNull($service); self::assertSame('synthetic', $service->getId()); self::assertSame('Foo', $service->getClass()); - self::assertTrue($service->isPublic()); + self::assertFalse($service->isPublic()); self::assertTrue($service->isSynthetic()); self::assertNull($service->getAlias()); }, @@ -108,7 +108,7 @@ function (?Service $service): void { self::assertNotNull($service); self::assertSame('alias', $service->getId()); self::assertSame('Foo', $service->getClass()); - self::assertTrue($service->isPublic()); + self::assertFalse($service->isPublic()); self::assertFalse($service->isSynthetic()); self::assertSame('withClass', $service->getAlias()); }, diff --git a/tests/Symfony/container.xml b/tests/Symfony/container.xml index 5bed7715..4be3bd98 100644 --- a/tests/Symfony/container.xml +++ b/tests/Symfony/container.xml @@ -37,8 +37,8 @@ - - + + diff --git a/tests/Type/Symfony/container.xml b/tests/Type/Symfony/container.xml index 5bedede2..f4240c3b 100644 --- a/tests/Type/Symfony/container.xml +++ b/tests/Type/Symfony/container.xml @@ -37,7 +37,7 @@ - - + +