Skip to content

Commit b28bac2

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: [DotEnv] Remove `usePutEnv` property default value Set up typo fix [Validator] Allow underscore character "_" in URL username and password [SecurityBundle] Passwords are not encoded when algorithm set to \"true\" do not validate passwords when the hash is null [DI] fix resolving bindings for named TypedReference [DI] Fix making the container path-independent when the app is in /app Allow copy instead of symlink for ./link script [FrameworkBundle] resolve service locators in `debug:*` commands bumped Symfony version to 4.3.10 updated VERSION for 4.3.9 updated CHANGELOG for 4.3.9 bumped Symfony version to 3.4.37 updated VERSION for 3.4.36 update CONTRIBUTORS for 3.4.36 updated CHANGELOG for 3.4.36 Add test on ServerLogHandler
2 parents 73f845f + 30795b2 commit b28bac2

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

DependencyInjection/MainConfiguration.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,13 @@ private function addEncodersSection(ArrayNodeDefinition $rootNode)
393393
->performNoDeepMerging()
394394
->beforeNormalization()->ifString()->then(function ($v) { return ['algorithm' => $v]; })->end()
395395
->children()
396-
->scalarNode('algorithm')->cannotBeEmpty()->end()
396+
->scalarNode('algorithm')
397+
->cannotBeEmpty()
398+
->validate()
399+
->ifTrue(function ($v) { return !\is_string($v); })
400+
->thenInvalid('You must provide a string value.')
401+
->end()
402+
->end()
397403
->arrayNode('migrate_from')
398404
->prototype('scalar')->end()
399405
->beforeNormalization()->castToArray()->end()

0 commit comments

Comments
 (0)