Skip to content

Commit fb8d6da

Browse files
committed
Implement the changes from Valinor v1.17
1 parent b1ff09c commit fb8d6da

File tree

5 files changed

+5
-8
lines changed

5 files changed

+5
-8
lines changed

wcfsetup/install/files/lib/action/AbstractOauth2AuthAction.class.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ protected function mapParameters(ServerRequestInterface $request): OAuth2Success
111111
try {
112112
$mapper = (new MapperBuilder())
113113
->allowSuperfluousKeys()
114-
->enableFlexibleCasting()
115114
->mapper();
116115

117116
return $mapper->map(

wcfsetup/install/files/lib/action/TwitterAuthAction.class.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ protected function mapParameters(ServerRequestInterface $request): OAuth2Success
8686
try {
8787
$mapper = (new MapperBuilder())
8888
->allowSuperfluousKeys()
89-
->enableFlexibleCasting()
9089
->mapper();
9190

9291
return $mapper->map(

wcfsetup/install/files/lib/http/Helper.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static function mapQueryParameters(array $queryParameters, string $schema
115115
{
116116
$mapper = (new MapperBuilder())
117117
->allowSuperfluousKeys()
118-
->enableFlexibleCasting()
118+
->allowScalarValueCasting()
119119
->mapper();
120120

121121
return $mapper->map(

wcfsetup/install/files/lib/http/middleware/HandleValinorMappingErrors.class.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace wcf\http\middleware;
44

55
use CuyZ\Valinor\Mapper\MappingError;
6-
use CuyZ\Valinor\Mapper\Tree\Message\Messages;
76
use CuyZ\Valinor\Mapper\Tree\Message\NodeMessage;
87
use Laminas\Diactoros\Response\HtmlResponse;
98
use Laminas\Diactoros\Response\JsonResponse;
@@ -34,8 +33,8 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
3433
try {
3534
return $handler->handle($request);
3635
} catch (MappingError $e) {
37-
$message = "Could not map type '{$e->node()->type()}'.";
38-
$errors = Messages::flattenFromNode($e->node())
36+
$message = "Could not map type '{$e->type()}'.";
37+
$errors = $e->messages()
3938
->formatWith(new PrependPath());
4039

4140
$preferredType = Helper::getPreferredContentType($request, [
@@ -49,7 +48,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
4948
'message' => $message,
5049
'exception' => \ENABLE_DEBUG_MODE ? $e->__toString() : null,
5150
'errors' => \array_map(
52-
static fn (NodeMessage $m) => $m->toString(),
51+
static fn(NodeMessage $m) => $m->toString(),
5352
\iterator_to_array($errors, false)
5453
),
5554
],

wcfsetup/install/files/lib/system/valinor/formatter/PrependPath.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ final class PrependPath implements MessageFormatter
2020
*/
2121
public function format(NodeMessage $m): NodeMessage
2222
{
23-
return $m->withBody("{$m->node()->path()}: {$m->body()}");
23+
return $m->withBody("{$m->path()}: {$m->body()}");
2424
}
2525
}

0 commit comments

Comments
 (0)