diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index d9a6cf3f83..60caf1d00c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -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() diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php index 5de7ddc449..77670cc005 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php @@ -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')))); } }