Skip to content

Commit 99eeea5

Browse files
committed
Merge branch 'release/1.5.5'
2 parents 273c5d9 + 92c7cb9 commit 99eeea5

14 files changed

Lines changed: 525 additions & 486 deletions

File tree

Blueprints/src/BlueprintForm.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,8 @@ protected function doExtend($filename, array $parents, array $extends, $override
583583
// Let's check if user really meant extends@: parent@.
584584
$index = \array_search($filename, $files, true);
585585
if ($index !== false) {
586+
$index = (int)$index;
587+
586588
// We want to grab only the parents of the file which is currently being loaded.
587589
$files = \array_slice($files, $index + 1);
588590
}

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# v1.5.5
2+
## 12/01/2020
3+
4+
1. [](#bugfix)
5+
* Fixed a PHP8 issue in YAML library
6+
17
# v1.5.4
28
## 11/27/2020
39

Compat/src/Yaml/Parser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ private function parseValue($value, $exceptionOnInvalidType, $objectSupport, $ob
529529
if (self::preg_match('/^'.self::BLOCK_SCALAR_HEADER_PATTERN.'$/', $value, $matches)) {
530530
$modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
531531

532-
return $this->parseBlockScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs($modifiers));
532+
return $this->parseBlockScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), abs((int) $modifiers));
533533
}
534534

535535
try {

0 commit comments

Comments
 (0)