Skip to content

Commit 13bdb16

Browse files
Merge branch '6.4' into 7.0
* 6.4: [FrameworkBundle] Add TemplateController to the list of allowed controllers for fragments [Cache][Lock] Fix PDO store not creating table + add tests Closes #51936-Added Missing translations for Czech (cs) in validators.cs.xlf file Added missing translations in turkish and updated validators.tr.xlf [Serializer] Fix denormalizing date intervals having both weeks and days [Validator] updated Turkish translation [Serializer] Remove wrong final tags [Serializer] Fix denormalize constructor arguments Add some more non-countable English nouns Add hint that changing input arguments has no effect register the virtual request stack together with common profiling services Don't lose checkpoint state when lock is acquired from another [DomCrawler] Revert "bug #52579 UriResolver support path with colons" [VarExporter] Fix handling mangled property names returned by __sleep() Update Github template for 7.1 Fix memory limit in PhpSubprocess unit test
2 parents 5610dee + 191703b commit 13bdb16

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Tests/PhpSubprocessTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static function subprocessProvider(): \Generator
4747
yield 'Process does ignore dynamic memory_limit' => [
4848
'Process',
4949
self::getRandomMemoryLimit(),
50-
self::getCurrentMemoryLimit(),
50+
self::getDefaultMemoryLimit(),
5151
];
5252

5353
yield 'PhpSubprocess does not ignore dynamic memory_limit' => [
@@ -57,16 +57,16 @@ public static function subprocessProvider(): \Generator
5757
];
5858
}
5959

60-
private static function getCurrentMemoryLimit(): string
60+
private static function getDefaultMemoryLimit(): string
6161
{
62-
return trim(\ini_get('memory_limit'));
62+
return trim(ini_get_all()['memory_limit']['global_value']);
6363
}
6464

6565
private static function getRandomMemoryLimit(): string
6666
{
6767
$memoryLimit = 123; // Take something that's really unlikely to be configured on a user system.
6868

69-
while (($formatted = $memoryLimit.'M') === self::getCurrentMemoryLimit()) {
69+
while (($formatted = $memoryLimit.'M') === self::getDefaultMemoryLimit()) {
7070
++$memoryLimit;
7171
}
7272

0 commit comments

Comments
 (0)