From e3acf43dbc94fb1fd2ee24da833a59168e9b2a08 Mon Sep 17 00:00:00 2001 From: "Fabio B. Silva" Date: Sat, 24 Dec 2011 12:01:25 -0200 Subject: [PATCH] move naming classes to Doctrine\ORM\Mapping --- lib/Doctrine/ORM/Configuration.php | 4 +++- lib/Doctrine/ORM/Mapping/ClassMetadata.php | 2 -- lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php | 2 -- .../ORM/{ => Mapping}/DefaultNamingStrategy.php | 2 +- lib/Doctrine/ORM/{ => Mapping}/NamingStrategy.php | 2 +- .../ORM/{ => Mapping}/UnderscoreNamingStrategy.php | 2 +- .../Tests/ORM/Mapping/AbstractMappingDriverTest.php | 6 +++--- tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php | 2 +- .../Tests/ORM/{ => Mapping}/NamingStrategyTest.php | 10 +++++----- 9 files changed, 15 insertions(+), 17 deletions(-) rename lib/Doctrine/ORM/{ => Mapping}/DefaultNamingStrategy.php (98%) rename lib/Doctrine/ORM/{ => Mapping}/NamingStrategy.php (98%) rename lib/Doctrine/ORM/{ => Mapping}/UnderscoreNamingStrategy.php (99%) rename tests/Doctrine/Tests/ORM/{ => Mapping}/NamingStrategyTest.php (97%) diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php index 2b9fb5f7c..7a3f7fdec 100644 --- a/lib/Doctrine/ORM/Configuration.php +++ b/lib/Doctrine/ORM/Configuration.php @@ -24,7 +24,9 @@ use Doctrine\Common\Cache\Cache, Doctrine\Common\Annotations\AnnotationRegistry, Doctrine\Common\Annotations\AnnotationReader, 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. diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php index 916b94511..a5410c748 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php @@ -21,8 +21,6 @@ namespace Doctrine\ORM\Mapping; use ReflectionClass, ReflectionProperty; use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata; -use Doctrine\ORM\DefaultNamingStrategy; -use Doctrine\ORM\NamingStrategy; /** * A ClassMetadata instance holds all the object-relational mapping metadata diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index 7a845e754..50b2fdb4b 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -21,8 +21,6 @@ namespace Doctrine\ORM\Mapping; use Doctrine\DBAL\Types\Type; use ReflectionClass; -use Doctrine\ORM\DefaultNamingStrategy; -use Doctrine\ORM\NamingStrategy; /** * A ClassMetadata instance holds all the object-relational mapping metadata diff --git a/lib/Doctrine/ORM/DefaultNamingStrategy.php b/lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php similarity index 98% rename from lib/Doctrine/ORM/DefaultNamingStrategy.php rename to lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php index 4d5a5b943..5bfe31577 100644 --- a/lib/Doctrine/ORM/DefaultNamingStrategy.php +++ b/lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php @@ -18,7 +18,7 @@ * . */ -namespace Doctrine\ORM; +namespace Doctrine\ORM\Mapping; /** * The default NamingStrategy diff --git a/lib/Doctrine/ORM/NamingStrategy.php b/lib/Doctrine/ORM/Mapping/NamingStrategy.php similarity index 98% rename from lib/Doctrine/ORM/NamingStrategy.php rename to lib/Doctrine/ORM/Mapping/NamingStrategy.php index a0147e76a..36dd1234a 100644 --- a/lib/Doctrine/ORM/NamingStrategy.php +++ b/lib/Doctrine/ORM/Mapping/NamingStrategy.php @@ -18,7 +18,7 @@ * . */ -namespace Doctrine\ORM; +namespace Doctrine\ORM\Mapping; /** * A set of rules for determining the physical column and table names diff --git a/lib/Doctrine/ORM/UnderscoreNamingStrategy.php b/lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php similarity index 99% rename from lib/Doctrine/ORM/UnderscoreNamingStrategy.php rename to lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php index e9d60842a..4b2a9a9da 100644 --- a/lib/Doctrine/ORM/UnderscoreNamingStrategy.php +++ b/lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php @@ -18,7 +18,7 @@ * . */ -namespace Doctrine\ORM; +namespace Doctrine\ORM\Mapping; /** * The default NamingStrategy diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php index 491bee220..5ad1b65d2 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php @@ -405,9 +405,9 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase $factory->setEntityManager($em); - $this->assertInstanceOf('Doctrine\ORM\DefaultNamingStrategy', $em->getConfiguration()->getNamingStrategy()); - $em->getConfiguration()->setNamingStrategy(new \Doctrine\ORM\UnderscoreNamingStrategy(CASE_UPPER)); - $this->assertInstanceOf('Doctrine\ORM\UnderscoreNamingStrategy', $em->getConfiguration()->getNamingStrategy()); + $this->assertInstanceOf('Doctrine\ORM\Mapping\DefaultNamingStrategy', $em->getConfiguration()->getNamingStrategy()); + $em->getConfiguration()->setNamingStrategy(new \Doctrine\ORM\Mapping\UnderscoreNamingStrategy(CASE_UPPER)); + $this->assertInstanceOf('Doctrine\ORM\Mapping\UnderscoreNamingStrategy', $em->getConfiguration()->getNamingStrategy()); $class = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1476\DDC1476EntityWithDefaultFieldType'); diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php index a77b73508..8b8392efb 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php @@ -298,7 +298,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase */ 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); $manyToManyMetadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy); diff --git a/tests/Doctrine/Tests/ORM/NamingStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php similarity index 97% rename from tests/Doctrine/Tests/ORM/NamingStrategyTest.php rename to tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php index ecaeeb845..0c56aa810 100644 --- a/tests/Doctrine/Tests/ORM/NamingStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php @@ -1,12 +1,12 @@