Skip to content

Commit 30795b2

Browse files
committed
Merge branch '3.4' into 4.3
* 3.4: [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 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 3.4.37 updated VERSION for 3.4.36 update CONTRIBUTORS for 3.4.36 updated CHANGELOG for 3.4.36
2 parents 8d157b5 + 9e3e44f commit 30795b2

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
@@ -399,7 +399,13 @@ private function addEncodersSection(ArrayNodeDefinition $rootNode)
399399
->performNoDeepMerging()
400400
->beforeNormalization()->ifString()->then(function ($v) { return ['algorithm' => $v]; })->end()
401401
->children()
402-
->scalarNode('algorithm')->cannotBeEmpty()->end()
402+
->scalarNode('algorithm')
403+
->cannotBeEmpty()
404+
->validate()
405+
->ifTrue(function ($v) { return !\is_string($v); })
406+
->thenInvalid('You must provide a string value.')
407+
->end()
408+
->end()
403409
->scalarNode('hash_algorithm')->info('Name of hashing algorithm for PBKDF2 (i.e. sha256, sha512, etc..) See hash_algos() for a list of supported algorithms.')->defaultValue('sha512')->end()
404410
->scalarNode('key_length')->defaultValue(40)->end()
405411
->booleanNode('ignore_case')->defaultFalse()->end()

0 commit comments

Comments
 (0)