Skip to content

Commit be24257

Browse files
jeroennotenondrejmirtes
authored andcommitted
Services are private by default
1 parent 197c4cf commit be24257

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

src/Symfony/XmlServiceMapFactory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function create(): ServiceMap
4848
$service = new Service(
4949
strpos((string) $attrs->id, '.') === 0 ? substr((string) $attrs->id, 1) : (string) $attrs->id,
5050
isset($attrs->class) ? (string) $attrs->class : null,
51-
!isset($attrs->public) || (string) $attrs->public !== 'false',
51+
isset($attrs->public) && (string) $attrs->public === 'true',
5252
isset($attrs->synthetic) && (string) $attrs->synthetic === 'true',
5353
isset($attrs->alias) ? (string) $attrs->alias : null
5454
);

tests/Symfony/DefaultServiceMapTest.php

+11-11
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function (?Service $service): void {
4242
self::assertNotNull($service);
4343
self::assertSame('withoutClass', $service->getId());
4444
self::assertNull($service->getClass());
45-
self::assertTrue($service->isPublic());
45+
self::assertFalse($service->isPublic());
4646
self::assertFalse($service->isSynthetic());
4747
self::assertNull($service->getAlias());
4848
},
@@ -53,7 +53,7 @@ function (?Service $service): void {
5353
self::assertNotNull($service);
5454
self::assertSame('withClass', $service->getId());
5555
self::assertSame('Foo', $service->getClass());
56-
self::assertTrue($service->isPublic());
56+
self::assertFalse($service->isPublic());
5757
self::assertFalse($service->isSynthetic());
5858
self::assertNull($service->getAlias());
5959
},
@@ -64,29 +64,29 @@ function (?Service $service): void {
6464
self::assertNotNull($service);
6565
self::assertSame('withoutPublic', $service->getId());
6666
self::assertSame('Foo', $service->getClass());
67-
self::assertTrue($service->isPublic());
67+
self::assertFalse($service->isPublic());
6868
self::assertFalse($service->isSynthetic());
6969
self::assertNull($service->getAlias());
7070
},
7171
];
7272
yield [
73-
'publicNotFalse',
73+
'publicNotTrue',
7474
function (?Service $service): void {
7575
self::assertNotNull($service);
76-
self::assertSame('publicNotFalse', $service->getId());
76+
self::assertSame('publicNotTrue', $service->getId());
7777
self::assertSame('Foo', $service->getClass());
78-
self::assertTrue($service->isPublic());
78+
self::assertFalse($service->isPublic());
7979
self::assertFalse($service->isSynthetic());
8080
self::assertNull($service->getAlias());
8181
},
8282
];
8383
yield [
84-
'private',
84+
'public',
8585
function (?Service $service): void {
8686
self::assertNotNull($service);
87-
self::assertSame('private', $service->getId());
87+
self::assertSame('public', $service->getId());
8888
self::assertSame('Foo', $service->getClass());
89-
self::assertFalse($service->isPublic());
89+
self::assertTrue($service->isPublic());
9090
self::assertFalse($service->isSynthetic());
9191
self::assertNull($service->getAlias());
9292
},
@@ -97,7 +97,7 @@ function (?Service $service): void {
9797
self::assertNotNull($service);
9898
self::assertSame('synthetic', $service->getId());
9999
self::assertSame('Foo', $service->getClass());
100-
self::assertTrue($service->isPublic());
100+
self::assertFalse($service->isPublic());
101101
self::assertTrue($service->isSynthetic());
102102
self::assertNull($service->getAlias());
103103
},
@@ -108,7 +108,7 @@ function (?Service $service): void {
108108
self::assertNotNull($service);
109109
self::assertSame('alias', $service->getId());
110110
self::assertSame('Foo', $service->getClass());
111-
self::assertTrue($service->isPublic());
111+
self::assertFalse($service->isPublic());
112112
self::assertFalse($service->isSynthetic());
113113
self::assertSame('withClass', $service->getAlias());
114114
},

tests/Symfony/container.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<service id="withoutClass"></service>
3838
<service id="withClass" class="Foo"></service>
3939
<service id="withoutPublic" class="Foo"></service>
40-
<service id="publicNotFalse" class="Foo" public="true"></service>
41-
<service id="private" class="Foo" public="false"></service>
40+
<service id="publicNotTrue" class="Foo" public="false"></service>
41+
<service id="public" class="Foo" public="true"></service>
4242
<service id="synthetic" class="Foo" synthetic="true"></service>
4343
<service id="alias" class="Bar" alias="withClass"></service>
4444
</services>

tests/Type/Symfony/container.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</parameters>
3838

3939
<services>
40-
<service id="foo" class="Foo"></service>
41-
<service id="synthetic" class="Synthetic" synthetic="true" />
40+
<service id="foo" class="Foo" public="true"></service>
41+
<service id="synthetic" class="Synthetic" public="true" synthetic="true" />
4242
</services>
4343
</container>

0 commit comments

Comments
 (0)