Skip to content

Upgrade Valinor to v2.1.1 #6398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dtdesign merged 3 commits into from
Jul 25, 2025
Merged

Upgrade Valinor to v2.1.1 #6398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1ff09c
Upgrade Valinor to v2.1.1
dtdesign Jul 24, 2025
fb8d6da
Implement the changes from Valinor v1.17
dtdesign Jul 24, 2025
8469e0e
Clean up the deleted files
dtdesign Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions com.woltlab.wcf/fileDelete.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,29 @@
<file>js/WoltLabSuite/Core/Ui/User/CoverPhoto/Upload.js</file>
<file>lib/form/AvatarEditForm.class.php</file>
<file>lib/system/api/cuyz/valinor/qa/PHPStan/Stubs/Psr/SimpleCache/CacheInterface.stub</file>
<file>lib/system/api/cuyz/valinor/src/Cache/ChainCache.php</file>
<file>lib/system/api/cuyz/valinor/src/Cache/WarmupCache.php</file>
<file>lib/system/api/cuyz/valinor/src/Definition/Repository/Cache/CacheClassDefinitionRepository.php</file>
<file>lib/system/api/cuyz/valinor/src/Mapper/Object/Factory/CacheObjectBuilderFactory.php</file>
<file>lib/system/api/cuyz/valinor/src/Mapper/Source/IdentifiableSource.php</file>
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Builder/CasterNodeBuilder.php</file>
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Builder/CasterProxyNodeBuilder.php</file>
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Builder/ErrorCatcherNodeBuilder.php</file>
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Builder/IterableNodeBuilder.php</file>
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Builder/StrictNodeBuilder.php</file>
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Builder/TreeNode.php</file>
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Builder/ValueAlteringNodeBuilder.php</file>
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Exception/InvalidNodeHasNoMappedValue.php</file>
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Exception/NoCasterForType.php</file>
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Exception/SourceValueWasNotFilled.php</file>
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/Node.php</file>
<file>lib/system/api/cuyz/valinor/src/Mapper/Tree/NodeTraverser.php</file>
<file>lib/system/api/cuyz/valinor/src/Normalizer/Formatter/StreamFormatter.php</file>
<file>lib/system/api/cuyz/valinor/src/Normalizer/Transformer/EvaluatedTransformer.php</file>
<file>lib/system/api/cuyz/valinor/src/Normalizer/Transformer/KeyTransformersHandler.php</file>
<file>lib/system/api/cuyz/valinor/src/Normalizer/Transformer/ValueTransformersHandler.php</file>
<file>lib/system/api/cuyz/valinor/src/Utility/Priority/HasPriority.php</file>
<file>lib/system/api/cuyz/valinor/src/Utility/Priority/PrioritizedList.php</file>
<file>lib/system/api/cuyz/valinor/src/Utility/PermissiveTypeFound.php</file>
<file>lib/system/api/bin/pscss</file>
<file>lib/system/api/scssphp/scssphp/bin/pscss</file>
Expand Down
1 change: 0 additions & 1 deletion wcfsetup/install/files/lib/action/AbstractOauth2AuthAction.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ protected function mapParameters(ServerRequestInterface $request): OAuth2Success
try {
$mapper = (new MapperBuilder())
->allowSuperfluousKeys()
->enableFlexibleCasting()
->mapper();

return $mapper->map(
Expand Down
1 change: 0 additions & 1 deletion wcfsetup/install/files/lib/action/TwitterAuthAction.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ protected function mapParameters(ServerRequestInterface $request): OAuth2Success
try {
$mapper = (new MapperBuilder())
->allowSuperfluousKeys()
->enableFlexibleCasting()
->mapper();

return $mapper->map(
Expand Down
2 changes: 1 addition & 1 deletion wcfsetup/install/files/lib/http/Helper.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public static function mapQueryParameters(array $queryParameters, string $schema
{
$mapper = (new MapperBuilder())
->allowSuperfluousKeys()
->enableFlexibleCasting()
->allowScalarValueCasting()
->mapper();

return $mapper->map(
Expand Down
7 changes: 3 additions & 4 deletions wcfsetup/install/files/lib/http/middleware/HandleValinorMappingErrors.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace wcf\http\middleware;

use CuyZ\Valinor\Mapper\MappingError;
use CuyZ\Valinor\Mapper\Tree\Message\Messages;
use CuyZ\Valinor\Mapper\Tree\Message\NodeMessage;
use Laminas\Diactoros\Response\HtmlResponse;
use Laminas\Diactoros\Response\JsonResponse;
Expand Down Expand Up @@ -34,8 +33,8 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
try {
return $handler->handle($request);
} catch (MappingError $e) {
$message = "Could not map type '{$e->node()->type()}'.";
$errors = Messages::flattenFromNode($e->node())
$message = "Could not map type '{$e->type()}'.";
$errors = $e->messages()
->formatWith(new PrependPath());

$preferredType = Helper::getPreferredContentType($request, [
Expand All @@ -49,7 +48,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
'message' => $message,
'exception' => \ENABLE_DEBUG_MODE ? $e->__toString() : null,
'errors' => \array_map(
static fn (NodeMessage $m) => $m->toString(),
static fn(NodeMessage $m) => $m->toString(),
\iterator_to_array($errors, false)
),
],
Expand Down
2 changes: 1 addition & 1 deletion wcfsetup/install/files/lib/system/api/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
},
"require": {
"cuyz/valinor": "^1.17.0",
"cuyz/valinor": "^2.1.1",
"dragonmantank/cron-expression": "^3.4.0",
"erusev/parsedown": "^1.7.4",
"ezyang/htmlpurifier": "^4.18",
Expand Down
17 changes: 8 additions & 9 deletions wcfsetup/install/files/lib/system/api/composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading