Skip to content

Commit a5e7368

Browse files
eliecharranorberttech
authored andcommitted
[3.0] Fix bad encoding in Repeat expander (#114)
* Fix encoding * Fix tests
1 parent 22f9c49 commit a5e7368

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/Matcher/Pattern/Expander/Repeat.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ private function matchScalar(array $values, Matcher $matcher) : bool
102102
$match = $matcher->match($value, $this->pattern);
103103

104104
if (!$match) {
105-
$this->error = sprintf("Repeat expander, entry n°%d, find error : %s", $index, $matcher->getError());
105+
$this->error = sprintf("Repeat expander, entry n°%d, find error : %s", $index, $matcher->getError());
106106
return false;
107107
}
108108
}
@@ -131,14 +131,14 @@ private function matchJson(array $values, Matcher $matcher) : bool
131131

132132
foreach ($patternKeys as $key) {
133133
if (!array_key_exists($key, $value)) {
134-
$this->error = sprintf("Repeat expander, entry n°%d, require \"array\" to have key \"%s\".", $index, $key);
134+
$this->error = sprintf("Repeat expander, entry n°%d, require \"array\" to have key \"%s\".", $index, $key);
135135
return false;
136136
}
137137

138138
$match = $matcher->match($value[$key], $this->pattern[$key]);
139139

140140
if (!$match) {
141-
$this->error = sprintf("Repeat expander, entry n°%d, key \"%s\", find error : %s", $index, $key, $matcher->getError());
141+
$this->error = sprintf("Repeat expander, entry n°%d, key \"%s\", find error : %s", $index, $key, $matcher->getError());
142142
return false;
143143
}
144144
}

tests/Matcher/Pattern/Expander/RepeatTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ public static function invalidCasesProvider()
7373
];
7474

7575
return [
76-
[$pattern, $valueTest, 'Repeat expander, entry n°0, key "name", find error : integer "1" is not a valid string.'],
77-
[$pattern, $keyTest, 'Repeat expander, entry n°0, require "array" to have key "name".'],
76+
[$pattern, $valueTest, 'Repeat expander, entry n°0, key "name", find error : integer "1" is not a valid string.'],
77+
[$pattern, $keyTest, 'Repeat expander, entry n°0, require "array" to have key "name".'],
7878
[$pattern, $strictTest, 'Repeat expander expect to have 2 keys in array but get : 3'],
7979
[$pattern, "", 'Repeat expander require "array", got "".']
8080
];

0 commit comments

Comments
 (0)