Skip to content

Commit 53205be

Browse files
committed
Merge branch '7.2' into 7.3
* 7.2: Use unique identifier for RequestContextProvider [Validator] Add Japanese translation for Twig template validator [FrameworkBundle] Fix `lint:container --resolve-env-vars`
2 parents 5744290 + 67ad2a1 commit 53205be

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Dumper/ContextProvider/CliContextProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function getContext(): ?array
2626

2727
return [
2828
'command_line' => $commandLine = implode(' ', $_SERVER['argv'] ?? []),
29-
'identifier' => hash('crc32b', $commandLine.$_SERVER['REQUEST_TIME_FLOAT']),
29+
'identifier' => hash('xxh128', $commandLine.'@'.$_SERVER['REQUEST_TIME_FLOAT']),
3030
];
3131
}
3232
}

Dumper/ContextProvider/RequestContextProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function getContext(): ?array
4444
'uri' => $request->getUri(),
4545
'method' => $request->getMethod(),
4646
'controller' => $controller ? $this->cloner->cloneVar($controller) : $controller,
47-
'identifier' => spl_object_hash($request),
47+
'identifier' => hash('xxh128', spl_object_id($request).'@'.$_SERVER['REQUEST_TIME_FLOAT']),
4848
];
4949
}
5050
}

0 commit comments

Comments
 (0)