Calculate hash properly also taking services' tags into consideration

phpstan · Jan 8, 2025 · 5f8002d · 5f8002d
1 parent a561077
commit 5f8002d
Show file tree

Hide file tree

Showing 2 changed files with 104 additions and 8 deletions.
diff --git a/src/Symfony/SymfonyContainerResultCacheMetaExtension.php b/src/Symfony/SymfonyContainerResultCacheMetaExtension.php
@@ -6,6 +6,7 @@
 use function array_map;
 use function hash;
 use function serialize;
+use function sort;
 
 final class SymfonyContainerResultCacheMetaExtension implements ResultCacheMetaExtension
 {
@@ -29,20 +30,32 @@ public function getHash(): string
 	{
 		return hash('sha256', serialize([
 			'parameters' => array_map(
-				static fn (ParameterDefinition $parameter) => [
+				static fn (ParameterDefinition $parameter): array => [
 					'name' => $parameter->getKey(),
 					'value' => $parameter->getValue(),
 				],
 				$this->parameterMap->getParameters(),
 			),
 			'services' => array_map(
-				static fn (ServiceDefinition $service) => [
-					'id' => $service->getId(),
-					'class' => $service->getClass(),
-					'public' => $service->isPublic() ? 'yes' : 'no',
-					'synthetic' => $service->isSynthetic() ? 'yes' : 'no',
-					'alias' => $service->getAlias(),
-				],
+				static function (ServiceDefinition $service): array {
+					$serviceTags = array_map(
+						static fn (ServiceTag $tag) => [
+							'name' => $tag->getName(),
+							'attributes' => $tag->getAttributes(),
+						],
+						$service->getTags(),
+					);
+					sort($serviceTags);
+
+					return [
+						'id' => $service->getId(),
+						'class' => $service->getClass(),
+						'public' => $service->isPublic() ? 'yes' : 'no',
+						'synthetic' => $service->isSynthetic() ? 'yes' : 'no',
+						'alias' => $service->getAlias(),
+						'tags' => $serviceTags,
+					];
+				},
 				$this->serviceMap->getServices(),
 			),
 		]));

diff --git a/tests/Symfony/SymfonyContainerResultCacheMetaExtensionTest.php b/tests/Symfony/SymfonyContainerResultCacheMetaExtensionTest.php
@@ -167,6 +167,89 @@ public static function provideContainerHashIsCalculatedCorrectlyCases(): iterabl
 				XML,
 		];
 
+		yield 'service tag attributes changes' => [
+			[
+				<<<'XML'
+					<container>
+						<services>
+							<service id="Foo" class="Foo">
+								<tag name="foo.bar" baz="bar"/>
+								<tag name="foo.baz" baz="baz"/>
+							</service>
+						</services>
+					</container>
+					XML,
+				<<<'XML'
+					<container>
+						<services>
+							<service id="Foo" class="Foo">
+								<tag name="foo.baz" baz="baz"/>
+								<tag name="foo.bar" baz="bar"/>
+							</service>
+						</services>
+					</container>
+					XML,
+			],
+			<<<'XML'
+				<container>
+					<services>
+						<service id="Foo" class="Foo">
+							<tag name="foo.bar" baz="bar"/>
+							<tag name="foo.baz" baz="buzz"/>
+						</service>
+					</services>
+				</container>
+				XML,
+		];
+
+		yield 'service tag added' => [
+			[
+				<<<'XML'
+					<container>
+						<services>
+							<service id="Foo" class="Foo">
+								<tag name="foo.bar" baz="bar"/>
+							</service>
+						</services>
+					</container>
+					XML,
+			],
+			<<<'XML'
+				<container>
+					<services>
+						<service id="Foo" class="Foo">
+							<tag name="foo.bar" baz="bar"/>
+							<tag name="foo.baz" baz="baz"/>
+						</service>
+					</services>
+				</container>
+				XML,
+		];
+
+		yield 'service tag removed' => [
+			[
+				<<<'XML'
+					<container>
+						<services>
+							<service id="Foo" class="Foo">
+								<tag name="foo.bar" baz="bar"/>
+								<tag name="foo.baz" baz="baz"/>
+							</service>
+						</services>
+					</container>
+					XML,
+			],
+			<<<'XML'
+				<container>
+					<services>
+						<service id="Foo" class="Foo">
+							<tag name="foo.bar" baz="bar"/>
+						</service>
+					</services>
+				</container>
+				XML,
+		];
+
 		yield 'new service added' => [
 			[
 				<<<'XML'