Skip to content

Commit 21dea96

Browse files
authored
Upgrade Valinor to v2.1.1 (#6398)
* Upgrade Valinor to v2.1.1 * Implement the changes from Valinor v1.17 * Clean up the deleted files
1 parent 3240741 commit 21dea96

140 files changed

Lines changed: 2261 additions & 1875 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

com.woltlab.wcf/fileDelete.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,29 @@
99
<file>js/WoltLabSuite/Core/Ui/User/CoverPhoto/Upload.js</file>
1010
<file>lib/form/AvatarEditForm.class.php</file>
1111
<file>lib/system/api/cuyz/valinor/qa/PHPStan/Stubs/Psr/SimpleCache/CacheInterface.stub</file>
12+
<file>lib/system/api/cuyz/valinor/src/Cache/ChainCache.php</file>
13+
<file>lib/system/api/cuyz/valinor/src/Cache/WarmupCache.php</file>
14+
<file>lib/system/api/cuyz/valinor/src/Definition/Repository/Cache/CacheClassDefinitionRepository.php</file>
15+
<file>lib/system/api/cuyz/valinor/src/Mapper/Object/Factory/CacheObjectBuilderFactory.php</file>
16+
<file>lib/system/api/cuyz/valinor/src/Mapper/Source/IdentifiableSource.php</file>
1217
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Builder/CasterNodeBuilder.php</file>
1318
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Builder/CasterProxyNodeBuilder.php</file>
1419
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Builder/ErrorCatcherNodeBuilder.php</file>
1520
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Builder/IterableNodeBuilder.php</file>
1621
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Builder/StrictNodeBuilder.php</file>
22+
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Builder/TreeNode.php</file>
23+
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Builder/ValueAlteringNodeBuilder.php</file>
24+
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Exception/InvalidNodeHasNoMappedValue.php</file>
1725
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Exception/NoCasterForType.php</file>
26+
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Exception/SourceValueWasNotFilled.php</file>
27+
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Node.php</file>
28+
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/NodeTraverser.php</file>
1829
<file>lib/system/api/cuyz/valinor/src/Normalizer/Formatter/StreamFormatter.php</file>
30+
<file>lib/system/api/cuyz/valinor/src/Normalizer/Transformer/EvaluatedTransformer.php</file>
1931
<file>lib/system/api/cuyz/valinor/src/Normalizer/Transformer/KeyTransformersHandler.php</file>
2032
<file>lib/system/api/cuyz/valinor/src/Normalizer/Transformer/ValueTransformersHandler.php</file>
33+
<file>lib/system/api/cuyz/valinor/src/Utility/Priority/HasPriority.php</file>
34+
<file>lib/system/api/cuyz/valinor/src/Utility/Priority/PrioritizedList.php</file>
2135
<file>lib/system/api/cuyz/valinor/src/Utility/PermissiveTypeFound.php</file>
2236
<file>lib/system/api/bin/pscss</file>
2337
<file>lib/system/api/scssphp/scssphp/bin/pscss</file>

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/api/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
},
1212
"require": {
13-
"cuyz/valinor": "^1.17.0",
13+
"cuyz/valinor": "^2.1.1",
1414
"dragonmantank/cron-expression": "^3.4.0",
1515
"erusev/parsedown": "^1.7.4",
1616
"ezyang/htmlpurifier": "^4.18",

wcfsetup/install/files/lib/system/api/composer.lock

Lines changed: 8 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)