#10862 loadClassMetadata vs loadValidatorMetadata: revert default config
This commit is contained in:
parent
4086ab57c5
commit
3bde718411
@ -445,7 +445,7 @@ class Configuration implements ConfigurationInterface
|
|||||||
->scalarNode('cache')->end()
|
->scalarNode('cache')->end()
|
||||||
->booleanNode('enable_annotations')->defaultFalse()->end()
|
->booleanNode('enable_annotations')->defaultFalse()->end()
|
||||||
->arrayNode('static_method')
|
->arrayNode('static_method')
|
||||||
->defaultValue(array('loadClassMetadata'))
|
->defaultValue(array('loadValidatorMetadata'))
|
||||||
->prototype('scalar')->end()
|
->prototype('scalar')->end()
|
||||||
->treatFalseLike(array())
|
->treatFalseLike(array())
|
||||||
->validate()
|
->validate()
|
||||||
|
@ -126,7 +126,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
|
|||||||
'validation' => array(
|
'validation' => array(
|
||||||
'enabled' => false,
|
'enabled' => false,
|
||||||
'enable_annotations' => false,
|
'enable_annotations' => false,
|
||||||
'static_method' => array('loadClassMetadata'),
|
'static_method' => array('loadValidatorMetadata'),
|
||||||
'translation_domain' => 'validators',
|
'translation_domain' => 'validators',
|
||||||
'strict_email' => false,
|
'strict_email' => false,
|
||||||
'api' => 'auto',
|
'api' => 'auto',
|
||||||
|
@ -274,7 +274,7 @@ abstract class FrameworkExtensionTest extends TestCase
|
|||||||
$this->assertSame('addXmlMappings', $calls[3][0]);
|
$this->assertSame('addXmlMappings', $calls[3][0]);
|
||||||
$this->assertSame(array($xmlMappings), $calls[3][1]);
|
$this->assertSame(array($xmlMappings), $calls[3][1]);
|
||||||
$this->assertSame('addMethodMapping', $calls[4][0]);
|
$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->assertSame('setMetadataCache', $calls[5][0]);
|
||||||
$this->assertEquals(array(new Reference('validator.mapping.cache.apc')), $calls[5][1]);
|
$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->assertSame('enableAnnotationMapping', $calls[4][0]);
|
||||||
$this->assertEquals(array(new Reference('annotation_reader')), $calls[4][1]);
|
$this->assertEquals(array(new Reference('annotation_reader')), $calls[4][1]);
|
||||||
$this->assertSame('addMethodMapping', $calls[5][0]);
|
$this->assertSame('addMethodMapping', $calls[5][0]);
|
||||||
$this->assertSame(array('loadClassMetadata'), $calls[5][1]);
|
$this->assertSame(array('loadValidatorMetadata'), $calls[5][1]);
|
||||||
// no cache this time
|
// no cache this time
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -341,7 +341,7 @@ abstract class FrameworkExtensionTest extends TestCase
|
|||||||
$this->assertSame('addYamlMappings', $calls[4][0]);
|
$this->assertSame('addYamlMappings', $calls[4][0]);
|
||||||
$this->assertSame('enableAnnotationMapping', $calls[5][0]);
|
$this->assertSame('enableAnnotationMapping', $calls[5][0]);
|
||||||
$this->assertSame('addMethodMapping', $calls[6][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];
|
$xmlMappings = $calls[3][1][0];
|
||||||
$this->assertCount(2, $xmlMappings);
|
$this->assertCount(2, $xmlMappings);
|
||||||
@ -373,7 +373,7 @@ abstract class FrameworkExtensionTest extends TestCase
|
|||||||
$this->assertCount(6, $calls);
|
$this->assertCount(6, $calls);
|
||||||
$this->assertSame('addXmlMappings', $calls[3][0]);
|
$this->assertSame('addXmlMappings', $calls[3][0]);
|
||||||
$this->assertSame('addMethodMapping', $calls[4][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('setApiVersion', $calls[5][0]);
|
||||||
$this->assertSame(array(Validation::API_VERSION_2_4), $calls[5][1]);
|
$this->assertSame(array(Validation::API_VERSION_2_4), $calls[5][1]);
|
||||||
// no cache, no annotations
|
// no cache, no annotations
|
||||||
|
Reference in New Issue
Block a user