8000 moved some Doctrine classes from the bundle to the bridge · renegare/symfony@879242c · GitHub
[go: up one dir, main page]
Skip to content

Commit 879242c

Browse files
fabpotfabpot
committed
moved some Doctrine classes from the bundle to the bridge
1 parent fbf3695 commit 879242c

File tree

14 files changed

+34
-38
lines changed

14 files changed

+34
-38
lines changed

‎src/Symfony/Bundle/DoctrineBundle/Annotations/IndexedReader.php renamed to ‎src/Symfony/Bridge/Doctrine/Annotations/IndexedReader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* with this source code in the file LICENSE.
1010
*/
1111

12-
namespace Symfony\Bundle\DoctrineBundle\Annotations;
12+
namespace Symfony\Bridge\Doctrine\Annotations;
1313

1414
use Doctrine\Common\Annotations\Reader;
1515

‎src/Symfony/Bundle/DoctrineBundle/CacheWarmer/ProxyCacheWarmer.php renamed to ‎src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Bundle\DoctrineBundle\CacheWarmer;
12+
namespace Symfony\Bridge\Doctrine\CacheWarmer;
1313

1414
use Symfony\Bridge\Doctrine\RegistryInterface;
1515
use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;

‎src/Symfony/Bundle/DoctrineBundle/DataCollector/DoctrineDataCollector.php renamed to ‎src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Bundle\DoctrineBundle\DataCollector;
12+
namespace Symfony\Bridge\Doctrine\DataCollector;
1313

1414
use Symfony\Component\HttpKernel\DataCollector\DataCollector;
1515
use Symfony\Component\HttpFoundation\Request;
1616
use Symfony\Component\HttpFoundation\Response;
17-
use Symfony\Bundle\DoctrineBundle\Logger\DbalLogger;
17+
use Symfony\Bridge\Doctrine\Logger\DbalLogger;
1818
use Symfony\Bridge\Doctrine\RegistryInterface;< 2D08 /div>
1919

2020
/**

‎src/Symfony/Bundle/DoctrineBundle/Logger/DbalLogger.php renamed to ‎src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Bundle\DoctrineBundle\Logger;
12+
namespace Symfony\Bridge\Doctrine\Logger;
1313

1414
use Symfony\Component\HttpKernel\Log\LoggerInterface;
1515
use Doctrine\DBAL\Logging\DebugStack;

‎src/Symfony/Bundle/DoctrineBundle/Mapping/Driver/XmlDriver.php renamed to ‎src/Symfony/Bridge/Doctrine/Mapping/Driver/XmlDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Bundle\DoctrineBundle\Mapping\Driver;
12+
namespace Symfony\Bridge\Doctrine\Mapping\Driver;
1313

1414
use Doctrine\ORM\Mapping\MappingException;
1515
use Doctrine\ORM\Mapping\Driver\XmlDriver as BaseXmlDriver;

‎src/Symfony/Bundle/DoctrineBundle/Mapping/Driver/YamlDriver.php renamed to ‎src/Symfony/Bridge/Doctrine/Mapping/Driver/YamlDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Bundle\DoctrineBundle\Mapping\Driver;
12+
namespace Symfony\Bridge\Doctrine\Mapping\Driver;
1313

1414
use Doctrine\ORM\Mapping\MappingException;
1515
use Doctrine\ORM\Mapping\Driver\YamlDriver as BaseYamlDriver;

‎src/Symfony/Bundle/DoctrineBundle/Resources/config/dbal.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<parameters>
88
<parameter key="doctrine.dbal.connection.class">Doctrine\DBAL\Connection</parameter>
99
<parameter key="doctrine.dbal.logger.debug.class">Doctrine\DBAL\Logging\DebugStack</parameter>
10-
<parameter key="doctrine.dbal.logger.class">Symfony\Bundle\DoctrineBundle\Logger\DbalLogger</parameter>
10+
<parameter key="doctrine.dbal.logger.class">Symfony\Bridge\Doctrine\Logger\DbalLogger</parameter>
1111
<parameter key="doctrine.dbal.configuration.class">Doctrine\DBAL\Configuration</parameter>
12-
<parameter key="doctrine.data_collector.class">Symfony\Bundle\DoctrineBundle\DataCollector\DoctrineDataCollector</parameter>
12+
<parameter key="doctrine.data_collector.class">Symfony\Bridge\Doctrine\DataCollector\DoctrineDataCollector</parameter>
1313
<parameter key="doctrine.dbal.connection.event_manager.class">Doctrine\Common\EventManager</parameter>
1414
<parameter key="doctrine.dbal.connection_factory.class">Symfony\Bundle\DoctrineBundle\ConnectionFactory</parameter>
1515
<parameter key="doctrine.dbal.events.mysql_session_init.class">Doctrine\DBAL\Event\Listeners\MysqlSessionInit</parameter>

‎src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
<!-- metadata -->
2121
<parameter key="doctrine.orm.metadata.driver_chain.class">Doctrine\ORM\Mapping\Driver\DriverChain</parameter>
2222
<parameter key="doctrine.orm.metadata.annotation.class">Doctrine\ORM\Mapping\Driver\AnnotationDriver</parameter>
23-
<parameter key="doctrine.orm.metadata.annotation_reader.class">Symfony\Bundle\DoctrineBundle\Annotations\IndexedReader</parameter>
24-
<parameter key="doctrine.orm.metadata.xml.class">Symfony\Bundle\DoctrineBundle\Mapping\Driver\XmlDriver</parameter>
25-
<parameter key="doctrine.orm.metadata.yml.class">Symfony\Bundle\DoctrineBundle\Mapping\Driver\YamlDriver</parameter>
23+
<parameter key="doctrine.orm.metadata.annotation_reader.class">Symfony\Bridge\Doctrine\Annotations\IndexedReader</parameter>
24+
<parameter key="doctrine.orm.metadata.xml.class">Symfony\Bridge\Doctrine\Mapping\Driver\XmlDriver</parameter>
25+
<parameter key="doctrine.orm.metadata.yml.class">Symfony\Bridge\Doctrine\Mapping\Driver\YamlDriver</parameter>
2626
<parameter key="doctrine.orm.metadata.php.class">Doctrine\ORM\Mapping\Driver\PHPDriver</parameter>
2727
<parameter key="doctrine.orm.metadata.staticphp.class">Doctrine\ORM\Mapping\Driver\StaticPHPDriver</parameter>
2828

2929
<!-- cache warmer -->
30-
<parameter key="doctrine.orm.proxy_cache_warmer.class">Symfony\Bundle\DoctrineBundle\CacheWarmer\ProxyCacheWarmer</parameter>
30+
<parameter key="doctrine.orm.proxy_cache_warmer.class">Symfony\Bridge\Doctrine\CacheWarmer\ProxyCacheWarmer</parameter>
3131

3232
<!-- form field factory guesser -->
3333
<parameter key="form.type_guesser.doctrine.class">Symfony\Bridge\Doctrine\Form\DoctrineOrmTypeGuesser</parameter>

‎src/Symfony/Bundle/DoctrineBundle/Tests/ContainerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function testContainer()
2020
$container = $this->createYamlBundleTestContainer();
2121
$this->assertInstanceOf('Doctrine\DBAL\Logging\DebugStack', $container->get('doctrine.dbal.logger.debug'));
2222
$this->assertInstanceOf('Doctrine\DBAL\Logging\DebugStack', $container->get('doctrine.dbal.logger'));
23-
$this->assertInstanceOf('Symfony\Bundle\DoctrineBundle\DataCollector\DoctrineDataCollector', $container->get('data_collector.doctrine'));
23+
$this->assertInstanceOf('Symfony\Bridge\Doctrine\DataCollector\DoctrineDataCollector', $container->get('data_collector.doctrine'));
2424
$this->assertInstanceOf('Doctrine\DBAL\Configuration', $container->get('doctrine.dbal.default_connection.configuration'));
2525
$this->assertInstanceOf('Doctrine\Common\EventManager', $container->get('doctrine.dbal.default_connection.event_manager'));
2626
$this->assertInstanceOf('Doctrine\DBAL\Connection', $container->get('doctrine.dbal.default_connection'));
@@ -36,7 +36,7 @@ public function testContainer()
3636
$this->assertInstanceOf('Doctrine\Common\EventManager', $container->get('doctrine.orm.default_entity_manager.event_manager'));
3737
$this->assertInstanceOf('Doctrine\Common\EventManager', $container->get('doctrine.dbal.event_manager'));
3838
$this->assertInstanceOf('Doctrine\DBAL\Event\Listeners\MysqlSessionInit', $container->get('doctrine.dbal.default_connection.events.mysqlsessioninit'));
39-
$this->assertInstanceOf('Symfony\Bundle\DoctrineBundle\CacheWarmer\ProxyCacheWarmer', $container->get('doctrine.orm.proxy_cache_warmer'));
39+
$this->assertInstanceOf('Symfony\Bridge\Doctrine\CacheWarmer\ProxyCacheWarmer', $container->get('doctrine.orm.proxy_cache_warmer'));
4040
$this->assertInstanceOf('Symfony\Bundle\DoctrineBundle\Registry', $container->get('doctrine'));
4141
$this->assertInstanceOf('Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntityValidator', $container->get('doctrine.orm.validator.unique'));
4242

‎src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ public function testDependencyInjectionConfigurationDefaults()
121121
$this->assertEquals('Doctrine\Common\Cache\XcacheCache', $container->getParameter('doctrine.orm.cache.xcache.class'));
122122
$this->assertEquals('Doctrine\ORM\Mapping\Driver\DriverChain', $container->getParameter('doctrine.orm.metadata.driver_chain.class'));
123123
$this->assertEquals('Doctrine\ORM\Mapping\Driver\AnnotationDriver', $container->getParameter('doctrine.orm.metadata.annotation.class'));
124-
$this->assertEquals('Symfony\Bundle\DoctrineBundle\Mapping\Driver\XmlDriver', $container->getParameter('doctrine.orm.metadata.xml.class'));
125-
$this->assertEquals('Symfony\Bundle\DoctrineBundle\Mapping\Driver\YamlDriver', $container->getParameter('doctrine.orm.metadata.yml.class'));
124+
$this->assertEquals('Symfony\Bridge\Doctrine\Mapping\Driver\XmlDriver', $container->getParameter('doctrine.orm.metadata.xml.class'));
125+
$this->assertEquals('Symfony\Bridge\Doctrine\Mapping\Driver\YamlDriver', $container->getParameter('doctrine.orm.metadata.yml.class'));
126126

127127
$config = array(
128128
'proxy_namespace' => 'MyProxies',

0 commit comments

Comments
 (0)
0