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

bug #11047 #10862 loadClassMetadata vs loadValidatorMetadata: revert default config (phramz)

Browse Source 
This PR was squashed before being merged into the 2.5 branch (closes #11047).

Discussion
----------

#10862 loadClassMetadata vs loadValidatorMetadata: revert default config

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #10862
| License       | MIT
| Doc PR        |

Commits
-------

3bde718 #10862 loadClassMetadata vs loadValidatorMetadata: revert default config
This commit is contained in:
Fabien Potencier 2014-06-03 23:45:50 +02:00
commit 0a177805bc
3 changed files with 6 additions and 6 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

@ -445,7 +445,7 @@ class Configuration implements ConfigurationInterface
->scalarNode('cache')->end()
->booleanNode('enable_annotations')->defaultFalse()->end()
->arrayNode('static_method')
->defaultValue(array('loadClassMetadata'))
->defaultValue(array('loadValidatorMetadata'))
->prototype('scalar')->end()
->treatFalseLike(array())
->validate()

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

@ -126,7 +126,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
'validation' => array(
'enabled' => false,
'enable_annotations' => false,
'static_method' => array('loadClassMetadata'),
'static_method' => array('loadValidatorMetadata'),
'translation_domain' => 'validators',
'strict_email' => false,
'api' => 'auto',

8
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View File

@ -274,7 +274,7 @@ abstract class FrameworkExtensionTest extends TestCase
$this->assertSame('addXmlMappings', $calls[3][0]);
$this->assertSame(array($xmlMappings), $calls[3][1]);
$this->assertSame('addMethodMapping', $calls[4][0]);
$this->assertSame(array('loadClassMetadata'), $calls[4][1]);
$this->assertSame(array('loadValidatorMetadata'), $calls[4][1]);
$this->assertSame('setMetadataCache', $calls[5][0]);
$this->assertEquals(array(new Reference('validator.mapping.cache.apc')), $calls[5][1]);
}
@ -322,7 +322,7 @@ abstract class FrameworkExtensionTest extends TestCase
$this->assertSame('enableAnnotationMapping', $calls[4][0]);
$this->assertEquals(array(new Reference('annotation_reader')), $calls[4][1]);
$this->assertSame('addMethodMapping', $calls[5][0]);
$this->assertSame(array('loadClassMetadata'), $calls[5][1]);
$this->assertSame(array('loadValidatorMetadata'), $calls[5][1]);
// no cache this time
}
@ -341,7 +341,7 @@ abstract class FrameworkExtensionTest extends TestCase
$this->assertSame('addYamlMappings', $calls[4][0]);
$this->assertSame('enableAnnotationMapping', $calls[5][0]);
$this->assertSame('addMethodMapping', $calls[6][0]);
$this->assertSame(array('loadClassMetadata'), $calls[6][1]);
$this->assertSame(array('loadValidatorMetadata'), $calls[6][1]);
$xmlMappings = $calls[3][1][0];
$this->assertCount(2, $xmlMappings);
@ -373,7 +373,7 @@ abstract class FrameworkExtensionTest extends TestCase
$this->assertCount(6, $calls);
$this->assertSame('addXmlMappings', $calls[3][0]);
$this->assertSame('addMethodMapping', $calls[4][0]);
$this->assertSame(array('loadClassMetadata'), $calls[4][1]);
$this->assertSame(array('loadValidatorMetadata'), $calls[4][1]);
$this->assertSame('setApiVersion', $calls[5][0]);
$this->assertSame(array(Validation::API_VERSION_2_4), $calls[5][1]);
// no cache, no annotations