RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-07 07:49:27 +03:00
Code Issues Projects Releases Wiki Activity

move naming classes to Doctrine\ORM\Mapping

Browse Source
This commit is contained in:
Fabio B. Silva 2011-12-24 12:01:25 -02:00
parent 1eddb53d6c
commit e3acf43dbc
9 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/ORM/Configuration.php
View File

@ -24,7 +24,9 @@ use Doctrine\Common\Cache\Cache,
Doctrine\Common\Annotations\AnnotationRegistry, Doctrine\Common\Annotations\AnnotationRegistry,
Doctrine\Common\Annotations\AnnotationReader, Doctrine\Common\Annotations\AnnotationReader,
Doctrine\ORM\Mapping\Driver\Driver, Doctrine\ORM\Mapping\Driver\Driver,
Doctrine\ORM\Mapping\Driver\AnnotationDriver; Doctrine\ORM\Mapping\Driver\AnnotationDriver,
Doctrine\ORM\Mapping\NamingStrategy,
Doctrine\ORM\Mapping\DefaultNamingStrategy;
/** /**
* Configuration container for all configuration options of Doctrine. * Configuration container for all configuration options of Doctrine.

2
lib/Doctrine/ORM/Mapping/ClassMetadata.php
View File

@ -21,8 +21,6 @@ namespace Doctrine\ORM\Mapping;
use ReflectionClass, ReflectionProperty; use ReflectionClass, ReflectionProperty;
use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata; use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata;
use Doctrine\ORM\DefaultNamingStrategy;
use Doctrine\ORM\NamingStrategy;
/** /**
* A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata * A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata

2
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View File

@ -21,8 +21,6 @@ namespace Doctrine\ORM\Mapping;
use Doctrine\DBAL\Types\Type; use Doctrine\DBAL\Types\Type;
use ReflectionClass; use ReflectionClass;
use Doctrine\ORM\DefaultNamingStrategy;
use Doctrine\ORM\NamingStrategy;
/** /**
* A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata * A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata

2
lib/Doctrine/ORM/DefaultNamingStrategy.php → lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php
View File

@ -18,7 +18,7 @@
* <http://www.doctrine-project.org>. * <http://www.doctrine-project.org>.
*/ */
namespace Doctrine\ORM; namespace Doctrine\ORM\Mapping;
/** /**
* The default NamingStrategy * The default NamingStrategy

2
lib/Doctrine/ORM/NamingStrategy.php → lib/Doctrine/ORM/Mapping/NamingStrategy.php
View File

@ -18,7 +18,7 @@
* <http://www.doctrine-project.org>. * <http://www.doctrine-project.org>.
*/ */
namespace Doctrine\ORM; namespace Doctrine\ORM\Mapping;
/** /**
* A set of rules for determining the physical column and table names * A set of rules for determining the physical column and table names

2
lib/Doctrine/ORM/UnderscoreNamingStrategy.php → lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php
View File

@ -18,7 +18,7 @@
* <http://www.doctrine-project.org>. * <http://www.doctrine-project.org>.
*/ */
namespace Doctrine\ORM; namespace Doctrine\ORM\Mapping;
/** /**
* The default NamingStrategy * The default NamingStrategy

6
tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
View File

@ -405,9 +405,9 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
$factory->setEntityManager($em); $factory->setEntityManager($em);
$this->assertInstanceOf('Doctrine\ORM\DefaultNamingStrategy', $em->getConfiguration()->getNamingStrategy()); $this->assertInstanceOf('Doctrine\ORM\Mapping\DefaultNamingStrategy', $em->getConfiguration()->getNamingStrategy());
$em->getConfiguration()->setNamingStrategy(new \Doctrine\ORM\UnderscoreNamingStrategy(CASE_UPPER)); $em->getConfiguration()->setNamingStrategy(new \Doctrine\ORM\Mapping\UnderscoreNamingStrategy(CASE_UPPER));
$this->assertInstanceOf('Doctrine\ORM\UnderscoreNamingStrategy', $em->getConfiguration()->getNamingStrategy()); $this->assertInstanceOf('Doctrine\ORM\Mapping\UnderscoreNamingStrategy', $em->getConfiguration()->getNamingStrategy());
$class = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1476\DDC1476EntityWithDefaultFieldType'); $class = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1476\DDC1476EntityWithDefaultFieldType');

2
tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
View File

@ -298,7 +298,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
*/ */
public function testUnderscoreNamingStrategyDefaults() public function testUnderscoreNamingStrategyDefaults()
{ {
$namingStrategy = new \Doctrine\ORM\UnderscoreNamingStrategy(CASE_UPPER); $namingStrategy = new \Doctrine\ORM\Mapping\UnderscoreNamingStrategy(CASE_UPPER);
$oneToOneMetadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy); $oneToOneMetadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy);
$manyToManyMetadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy); $manyToManyMetadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy);

10
tests/Doctrine/Tests/ORM/NamingStrategyTest.php → tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php
View File

@ -1,12 +1,12 @@
<?php <?php
namespace Doctrine\Tests\ORM; namespace Doctrine\Tests\ORM\Mapping;
use Doctrine\ORM\UnderscoreNamingStrategy; use Doctrine\ORM\Mapping\UnderscoreNamingStrategy;
use Doctrine\ORM\DefaultNamingStrategy; use Doctrine\ORM\Mapping\DefaultNamingStrategy;
use Doctrine\ORM\NamingStrategy; use Doctrine\ORM\Mapping\NamingStrategy;
require_once __DIR__ . '/../TestInit.php'; require_once __DIR__ . '/../../TestInit.php';
/** /**
* @group DDC-559 * @group DDC-559