Skip to content

Commit

Permalink
Merge branch '5.4' into 6.0
Browse files Browse the repository at this point in the history
* 5.4:
  CS fixes
  Bump Symfony version to 5.4.11
  Update VERSION for 5.4.10
  Update CHANGELOG for 5.4.10
  Bump Symfony version to 4.4.44
  Update VERSION for 4.4.43
  Update CONTRIBUTORS for 4.4.43
  Update CHANGELOG for 4.4.43
  • Loading branch information
nicolas-grekas committed Jun 27, 2022
2 parents 9ba0113 + 97e6dd6 commit 9aa5fe2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dumper/IcuResFileDumper.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function formatCatalogue(MessageCatalogue $messages, string $domain, arra
$data .= pack('V', \strlen($target))
.mb_convert_encoding($target."\0", 'UTF-16LE', 'UTF-8')
.$this->writePadding($data)
;
;
}

$resOffset = $this->getPosition($data);
Expand All @@ -56,7 +56,7 @@ public function formatCatalogue(MessageCatalogue $messages, string $domain, arra
.$indexes
.$this->writePadding($data)
.$resources
;
;

$bundleTop = $this->getPosition($data);

Expand Down
2 changes: 1 addition & 1 deletion Dumper/MoFileDumper.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public function formatCatalogue(MessageCatalogue $messages, string $domain, arra
.$targetOffsets
.$sources
.$targets
;
;

return $output;
}
Expand Down
2 changes: 1 addition & 1 deletion Loader/PhpFileLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class PhpFileLoader extends FileLoader
*/
protected function loadResource(string $resource): array
{
if ([] === self::$cache && \function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN) && (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) || filter_var(ini_get('opcache.enable_cli'), \FILTER_VALIDATE_BOOLEAN))) {
if ([] === self::$cache && \function_exists('opcache_invalidate') && filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN) && (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) || filter_var(\ini_get('opcache.enable_cli'), \FILTER_VALIDATE_BOOLEAN))) {
self::$cache = null;
}

Expand Down

0 comments on commit 9aa5fe2

Please sign in to comment.