diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php index 1cef379eeb5e7..c680afd887581 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php @@ -86,25 +86,21 @@ public function testInvalidValueTrustedProxies() )); } - /** - * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException - * @expectedExceptionMessage You cannot use assets settings under "framework.templating" and "assets" configurations in the same project. - */ - public function testLegacyInvalidValueAssets() + public function testAssetsCanBeEnabled() { - $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED); - $processor = new Processor(); $configuration = new Configuration(true); - $processor->processConfiguration($configuration, array( - array( - 'templating' => array( - 'engines' => null, - 'assets_base_urls' => '//example.com', - ), - 'assets' => null, - ), - )); + $config = $processor->processConfiguration($configuration, array(array('assets' => null))); + + $defaultConfig = array( + 'version' => null, + 'version_format' => '%%s?%%s', + 'base_path' => '', + 'base_urls' => array(), + 'packages' => array(), + ); + + $this->assertEquals($defaultConfig, $config['assets']); } protected static function getBundleDefaultConfig() @@ -166,13 +162,6 @@ protected static function getBundleDefaultConfig() 'magic_call' => false, 'throw_exception_on_invalid_index' => false, ), - 'assets' => array( - 'version' => null, - 'version_format' => '%%s?%%s', - 'base_path' => '', - 'base_urls' => array(), - 'packages' => array(), - ), ); } } diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/config/framework.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/config/framework.yml index c6a50bdac96d5..43961a1aeb322 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/config/framework.yml +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/config/framework.yml @@ -4,6 +4,7 @@ framework: enabled: true router: { resource: "%kernel.root_dir%/%kernel.test_case%/routing.yml" } validation: { enabled: true, enable_annotations: true } + assets: ~ form: ~ test: ~ default_locale: en diff --git a/src/Symfony/Component/Form/Tests/SimpleFormTest.php b/src/Symfony/Component/Form/Tests/SimpleFormTest.php index 4d5fb22808ada..7b4892a69ae4f 100644 --- a/src/Symfony/Component/Form/Tests/SimpleFormTest.php +++ b/src/Symfony/Component/Form/Tests/SimpleFormTest.php @@ -134,7 +134,7 @@ public function testFalseIsConvertedToNull() $config->addEventListener(FormEvents::PRE_SUBMIT, array($mock, 'preSubmit')); $form = new Form($config); - $form->bind(false); + $form->submit(false); $this->assertTrue($form->isValid()); $this->assertNull($form->getData());