Revert "merged branch stloyd/feature/kernel_secret_change (PR #6598)"
This reverts commitdbca0403b8
, reversing changes made to1e6258846a
.
This commit is contained in:
parent
c223eca2ad
commit
b378964dbd
@ -51,12 +51,7 @@ class Configuration implements ConfigurationInterface
|
||||
})
|
||||
->end()
|
||||
->end()
|
||||
->scalarNode('secret')
|
||||
->validate()
|
||||
->ifTrue(function($v) { return 'ThisTokenIsNotSoSecretChangeIt' === $v; })
|
||||
->thenInvalid('The "secret" parameter is currently set to the default. It is really important that you change it to something unique.')
|
||||
->end()
|
||||
->end()
|
||||
->scalarNode('secret')->end()
|
||||
->scalarNode('trust_proxy_headers')->defaultFalse()->end() // @deprecated, to be removed in 2.3
|
||||
->arrayNode('trusted_proxies')
|
||||
->beforeNormalization()
|
||||
|
@ -66,7 +66,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
$processor = new Processor();
|
||||
$configuration = new Configuration(array());
|
||||
$processor->processConfiguration($configuration, array(array('secret' => 's3cr3t', 'trusted_proxies' => 'Not an IP address')));
|
||||
$config = $processor->processConfiguration($configuration, array(array('secret' => 's3cr3t', 'trusted_proxies' => 'Not an IP address')));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -76,16 +76,6 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
$processor = new Processor();
|
||||
$configuration = new Configuration(array());
|
||||
$processor->processConfiguration($configuration, array(array('secret' => 's3cr3t', 'trusted_proxies' => array('Not an IP address'))));
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
|
||||
*/
|
||||
public function testDefaultSecretIsUsed()
|
||||
{
|
||||
$processor = new Processor();
|
||||
$configuration = new Configuration(array());
|
||||
$processor->processConfiguration($configuration, array(array('secret' => 'ThisTokenIsNotSoSecretChangeIt')));
|
||||
$config = $processor->processConfiguration($configuration, array(array('secret' => 's3cr3t', 'trusted_proxies' => array('Not an IP address'))));
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user