Merge branch '4.4' into 5.3

fabpot · fabpot · commit 31b284c8cf1d · 2021-10-30T12:15:34.000+02:00
* 4.4:
  Add missing validators translation
  [Inflector] Fix inflector for "zombies"
  fix ErrorExcception in CacheWarmerAggregate
  [Translation] correctly handle intl domains with TargetOperation
diff --git a/CacheWarmer/CacheWarmerAggregate.php b/CacheWarmer/CacheWarmerAggregate.php
@@ -103,7 +103,9 @@ public function warmUp(string $cacheDir)
 
                 if (is_file($this->deprecationLogsFilepath)) {
                     $previousLogs = unserialize(file_get_contents($this->deprecationLogsFilepath));
-                    $collectedLogs = array_merge($previousLogs, $collectedLogs);
+                    if (\is_array($previousLogs)) {
+                        $collectedLogs = array_merge($previousLogs, $collectedLogs);
+                    }
                 }
 
                 file_put_contents($this->deprecationLogsFilepath, serialize(array_values($collectedLogs)));

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,9 @@ public function warmUp(string $cacheDir)`
`103`	`103`
`104`	`104`	`if (is_file($this->deprecationLogsFilepath)) {`
`105`	`105`	`$previousLogs = unserialize(file_get_contents($this->deprecationLogsFilepath));`
`106`		`- $collectedLogs = array_merge($previousLogs, $collectedLogs);`
	`106`	`+ if (\is_array($previousLogs)) {`
	`107`	`+ $collectedLogs = array_merge($previousLogs, $collectedLogs);`
	`108`	`+ }`
`107`	`109`	`}`
`108`	`110`
`109`	`111`	`file_put_contents($this->deprecationLogsFilepath, serialize(array_values($collectedLogs)));`