|
@@ -170,7 +170,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
|
|
|
|
|
$definition = $container->getDefinition('doctrine.orm.default_configuration');
|
|
$definition = $container->getDefinition('doctrine.orm.default_configuration');
|
|
$calls = array_values($definition->getMethodCalls());
|
|
$calls = array_values($definition->getMethodCalls());
|
|
- $this->assertEquals(array('YamlBundle' => 'DoctrineBundle\Tests\DependencyInjection\Fixtures\Bundles\YamlBundle\Entity'), $calls[0][1][0]);
|
|
|
|
|
|
+ $this->assertEquals(array('YamlBundle' => 'Fixtures\Bundles\YamlBundle\Entity'), $calls[0][1][0]);
|
|
$this->assertEquals('doctrine.orm.default_metadata_cache', (string) $calls[1][1][0]);
|
|
$this->assertEquals('doctrine.orm.default_metadata_cache', (string) $calls[1][1][0]);
|
|
$this->assertEquals('doctrine.orm.default_query_cache', (string) $calls[2][1][0]);
|
|
$this->assertEquals('doctrine.orm.default_query_cache', (string) $calls[2][1][0]);
|
|
$this->assertEquals('doctrine.orm.default_result_cache', (string) $calls[3][1][0]);
|
|
$this->assertEquals('doctrine.orm.default_result_cache', (string) $calls[3][1][0]);
|
|
@@ -363,7 +363,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
|
|
|
|
|
$definition = $container->getDefinition('doctrine.orm.default_configuration');
|
|
$definition = $container->getDefinition('doctrine.orm.default_configuration');
|
|
$this->assertDICDefinitionMethodCallOnce($definition, 'setEntityNamespaces',
|
|
$this->assertDICDefinitionMethodCallOnce($definition, 'setEntityNamespaces',
|
|
- array(array('YamlBundle' => 'DoctrineBundle\Tests\DependencyInjection\Fixtures\Bundles\YamlBundle\Entity'))
|
|
|
|
|
|
+ array(array('YamlBundle' => 'Fixtures\Bundles\YamlBundle\Entity'))
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -377,7 +377,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
|
|
|
|
|
$definition = $container->getDefinition('doctrine.orm.default_configuration');
|
|
$definition = $container->getDefinition('doctrine.orm.default_configuration');
|
|
$this->assertDICDefinitionMethodCallOnce($definition, 'setEntityNamespaces',
|
|
$this->assertDICDefinitionMethodCallOnce($definition, 'setEntityNamespaces',
|
|
- array(array('yml' => 'DoctrineBundle\Tests\DependencyInjection\Fixtures\Bundles\YamlBundle\Entity'))
|
|
|
|
|
|
+ array(array('yml' => 'Fixtures\Bundles\YamlBundle\Entity'))
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -392,7 +392,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
|
$definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
|
|
$definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
|
|
$this->assertDICDefinitionMethodCallOnce($definition, 'addDriver', array(
|
|
$this->assertDICDefinitionMethodCallOnce($definition, 'addDriver', array(
|
|
new Reference('doctrine.orm.default_yml_metadata_driver'),
|
|
new Reference('doctrine.orm.default_yml_metadata_driver'),
|
|
- 'DoctrineBundle\Tests\DependencyInjection\Fixtures\Bundles\YamlBundle\Entity'
|
|
|
|
|
|
+ 'Fixtures\Bundles\YamlBundle\Entity'
|
|
));
|
|
));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -407,7 +407,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
|
$definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
|
|
$definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
|
|
$this->assertDICDefinitionMethodCallOnce($definition, 'addDriver', array(
|
|
$this->assertDICDefinitionMethodCallOnce($definition, 'addDriver', array(
|
|
new Reference('doctrine.orm.default_xml_metadata_driver'),
|
|
new Reference('doctrine.orm.default_xml_metadata_driver'),
|
|
- 'DoctrineBundle\Tests\DependencyInjection\Fixtures\Bundles\XmlBundle\Entity'
|
|
|
|
|
|
+ 'Fixtures\Bundles\XmlBundle\Entity'
|
|
));
|
|
));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -422,7 +422,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
|
$definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
|
|
$definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
|
|
$this->assertDICDefinitionMethodCallOnce($definition, 'addDriver', array(
|
|
$this->assertDICDefinitionMethodCallOnce($definition, 'addDriver', array(
|
|
new Reference('doctrine.orm.default_annotation_metadata_driver'),
|
|
new Reference('doctrine.orm.default_annotation_metadata_driver'),
|
|
- 'DoctrineBundle\Tests\DependencyInjection\Fixtures\Bundles\AnnotationsBundle\Entity'
|
|
|
|
|
|
+ 'Fixtures\Bundles\AnnotationsBundle\Entity'
|
|
));
|
|
));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -444,11 +444,11 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
|
$definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
|
|
$definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
|
|
$this->assertDICDefinitionMethodCallAt(0, $definition, 'addDriver', array(
|
|
$this->assertDICDefinitionMethodCallAt(0, $definition, 'addDriver', array(
|
|
new Reference('doctrine.orm.default_annotation_metadata_driver'),
|
|
new Reference('doctrine.orm.default_annotation_metadata_driver'),
|
|
- 'DoctrineBundle\Tests\DependencyInjection\Fixtures\Bundles\AnnotationsBundle\Entity'
|
|
|
|
|
|
+ 'Fixtures\Bundles\AnnotationsBundle\Entity'
|
|
));
|
|
));
|
|
$this->assertDICDefinitionMethodCallAt(1, $definition, 'addDriver', array(
|
|
$this->assertDICDefinitionMethodCallAt(1, $definition, 'addDriver', array(
|
|
new Reference('doctrine.orm.default_xml_metadata_driver'),
|
|
new Reference('doctrine.orm.default_xml_metadata_driver'),
|
|
- 'DoctrineBundle\Tests\DependencyInjection\Fixtures\Bundles\XmlBundle\Entity'
|
|
|
|
|
|
+ 'Fixtures\Bundles\XmlBundle\Entity'
|
|
));
|
|
));
|
|
|
|
|
|
$configDef = $container->getDefinition('doctrine.orm.default_configuration');
|
|
$configDef = $container->getDefinition('doctrine.orm.default_configuration');
|
|
@@ -534,17 +534,17 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
|
|
|
|
|
$this->assertDICDefinitionMethodCallAt(0, $definition, 'addDriver', array(
|
|
$this->assertDICDefinitionMethodCallAt(0, $definition, 'addDriver', array(
|
|
new Reference('doctrine.orm.default_annotation_metadata_driver'),
|
|
new Reference('doctrine.orm.default_annotation_metadata_driver'),
|
|
- 'DoctrineBundle\Tests\DependencyInjection\Fixtures\Bundles\AnnotationsBundle\Entity'
|
|
|
|
|
|
+ 'Fixtures\Bundles\AnnotationsBundle\Entity'
|
|
));
|
|
));
|
|
|
|
|
|
$this->assertDICDefinitionMethodCallAt(1, $definition, 'addDriver', array(
|
|
$this->assertDICDefinitionMethodCallAt(1, $definition, 'addDriver', array(
|
|
new Reference('doctrine.orm.default_yml_metadata_driver'),
|
|
new Reference('doctrine.orm.default_yml_metadata_driver'),
|
|
- 'DoctrineBundle\Tests\DependencyInjection\Fixtures\Bundles\YamlBundle\Entity'
|
|
|
|
|
|
+ 'Fixtures\Bundles\YamlBundle\Entity'
|
|
));
|
|
));
|
|
|
|
|
|
$this->assertDICDefinitionMethodCallAt(2, $definition, 'addDriver', array(
|
|
$this->assertDICDefinitionMethodCallAt(2, $definition, 'addDriver', array(
|
|
new Reference('doctrine.orm.default_xml_metadata_driver'),
|
|
new Reference('doctrine.orm.default_xml_metadata_driver'),
|
|
- 'DoctrineBundle\Tests\DependencyInjection\Fixtures\Bundles\XmlBundle'
|
|
|
|
|
|
+ 'Fixtures\Bundles\XmlBundle'
|
|
));
|
|
));
|
|
|
|
|
|
$annDef = $container->getDefinition('doctrine.orm.default_annotation_metadata_driver');
|
|
$annDef = $container->getDefinition('doctrine.orm.default_annotation_metadata_driver');
|
|
@@ -583,17 +583,17 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
|
|
|
|
|
$this->assertDICDefinitionMethodCallAt(0, $def1, 'addDriver', array(
|
|
$this->assertDICDefinitionMethodCallAt(0, $def1, 'addDriver', array(
|
|
new Reference('doctrine.orm.em1_annotation_metadata_driver'),
|
|
new Reference('doctrine.orm.em1_annotation_metadata_driver'),
|
|
- 'DoctrineBundle\Tests\DependencyInjection\Fixtures\Bundles\AnnotationsBundle\Entity'
|
|
|
|
|
|
+ 'Fixtures\Bundles\AnnotationsBundle\Entity'
|
|
));
|
|
));
|
|
|
|
|
|
$this->assertDICDefinitionMethodCallAt(0, $def2, 'addDriver', array(
|
|
$this->assertDICDefinitionMethodCallAt(0, $def2, 'addDriver', array(
|
|
new Reference('doctrine.orm.em2_yml_metadata_driver'),
|
|
new Reference('doctrine.orm.em2_yml_metadata_driver'),
|
|
- 'DoctrineBundle\Tests\DependencyInjection\Fixtures\Bundles\YamlBundle\Entity'
|
|
|
|
|
|
+ 'Fixtures\Bundles\YamlBundle\Entity'
|
|
));
|
|
));
|
|
|
|
|
|
$this->assertDICDefinitionMethodCallAt(1, $def2, 'addDriver', array(
|
|
$this->assertDICDefinitionMethodCallAt(1, $def2, 'addDriver', array(
|
|
new Reference('doctrine.orm.em2_xml_metadata_driver'),
|
|
new Reference('doctrine.orm.em2_xml_metadata_driver'),
|
|
- 'DoctrineBundle\Tests\DependencyInjection\Fixtures\Bundles\XmlBundle'
|
|
|
|
|
|
+ 'Fixtures\Bundles\XmlBundle'
|
|
));
|
|
));
|
|
|
|
|
|
$annDef = $container->getDefinition('doctrine.orm.em1_annotation_metadata_driver');
|
|
$annDef = $container->getDefinition('doctrine.orm.em1_annotation_metadata_driver');
|
|
@@ -623,7 +623,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
|
|
|
|
|
$calls = $container->getDefinition('doctrine.orm.default_metadata_driver')->getMethodCalls();
|
|
$calls = $container->getDefinition('doctrine.orm.default_metadata_driver')->getMethodCalls();
|
|
$this->assertEquals('doctrine.orm.default_annotation_metadata_driver', (string) $calls[0][1][0]);
|
|
$this->assertEquals('doctrine.orm.default_annotation_metadata_driver', (string) $calls[0][1][0]);
|
|
- $this->assertEquals('DoctrineBundle\Tests\DependencyInjection\Fixtures\Bundles\Vendor\AnnotationsBundle\Entity', $calls[0][1][1]);
|
|
|
|
|
|
+ $this->assertEquals('Fixtures\Bundles\Vendor\AnnotationsBundle\Entity', $calls[0][1][1]);
|
|
}
|
|
}
|
|
|
|
|
|
public function testSetTypes()
|
|
public function testSetTypes()
|
|
@@ -653,7 +653,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
|
foreach ($bundles as $bundle) {
|
|
foreach ($bundles as $bundle) {
|
|
require_once __DIR__.'/Fixtures/Bundles/'.($vendor ? $vendor.'/' : '').$bundle.'/'.$bundle.'.php';
|
|
require_once __DIR__.'/Fixtures/Bundles/'.($vendor ? $vendor.'/' : '').$bundle.'/'.$bundle.'.php';
|
|
|
|
|
|
- $map[$bundle] = 'DoctrineBundle\\Tests\DependencyInjection\\Fixtures\\Bundles\\'.($vendor ? $vendor.'\\' : '').$bundle.'\\'.$bundle;
|
|
|
|
|
|
+ $map[$bundle] = 'Fixtures\\Bundles\\'.($vendor ? $vendor.'\\' : '').$bundle.'\\'.$bundle;
|
|
}
|
|
}
|
|
|
|
|
|
return new ContainerBuilder(new ParameterBag(array(
|
|
return new ContainerBuilder(new ParameterBag(array(
|