diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[2.7] [FrameworkBundle] bugfix in configuration for assets

Browse Source 
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

If both of configurations are defined, the exception is break because it isn't
defined properly (missing backslash in FQCN for ```\LogicException```).
Also, the message was wrong (it's referred to "templating.templating" instead of
"framework.templating").
This commit is contained in:
Javier Spagnoletti 2015-02-15 18:07:53 -03:00
parent 6d52112743
commit 3b4c23fa16
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
View File

@ -65,7 +65,7 @@ class Configuration implements ConfigurationInterface
// convert the old configuration to the new one
if (isset($v['assets'])) {
throw new LogicException('You cannot use assets settings under "templating.templating" and "assets" configurations in the same project.');
throw new \LogicException('You cannot use assets settings under "framework.templating" and "assets" configurations in the same project.');
}
$v['assets'] = array(

19
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
View File

@ -86,6 +86,25 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
));
}
/**
* @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 testInvalidValueAssets()
{
$processor = new Processor();
$configuration = new Configuration(true);
$processor->processConfiguration($configuration, array(
array(
'templating' => array(
'engines' => null,
'assets_base_urls' => '//example.com',
),
'assets' => null,
),
));
}
protected static function getBundleDefaultConfig()
{
return array(