Skip to content

Commit 75b396e

Browse files
Merge branch '3.4' into 4.4
* 3.4: Disable the PhpUnit bridge when testing it [PropertyInfo] Support for the mixed type. [Form] Add Bosnian (bs) validators translation [Form] Add missing Serbian (latn & cyrl) validators translation [Form] [Validator] added pt_BR translations Estonian update [PhpUnitBridge] fix running parallel tests with phpunit 9 [VarDumper] fix truncating big arrays
2 parents 7748ea6 + 4fed288 commit 75b396e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Cloner/VarCloner.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ protected function doClone($var)
240240
$stub->position = $len++;
241241
} elseif ($pos < $maxItems) {
242242
if ($maxItems < $pos += \count($a)) {
243-
$a = \array_slice($a, 0, $maxItems - $pos);
243+
$a = \array_slice($a, 0, $maxItems - $pos, true);
244244
if ($stub->cut >= 0) {
245245
$stub->cut += $pos - $maxItems;
246246
}

Tests/Cloner/VarClonerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public function testLimits()
170170
'Level 3 Item 3',
171171
],
172172
[
173-
'Level 3 Item 4',
173+
999 => 'Level 3 Item 4',
174174
'Level 3 Item 5',
175175
'Level 3 Item 6',
176176
],
@@ -250,7 +250,7 @@ public function testLimits()
250250
[1] => Array
251251
(
252252
[0] => 2
253-
[2] => 7
253+
[1] => 7
254254
)
255255
256256
[2] => Array
@@ -307,7 +307,7 @@ public function testLimits()
307307
308308
[7] => Array
309309
(
310-
[0] => Level 3 Item 4
310+
[999] => Level 3 Item 4
311311
)
312312
313313
)

0 commit comments

Comments
 (0)