From 369a9934a563bb53b77d36e0e061e76015a7bfde Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Sun, 18 Jan 2015 00:07:54 +0100
Subject: [PATCH] #1252 DDC-3496 - moving stub naming strategy to tests
 directory

---
 .../JoinColumnClassNamingStrategy.php             | 15 +++++++--------
 .../Tests/ORM/Mapping/NamingStrategyTest.php      |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)
 rename {lib/Doctrine/ORM/Mapping => tests/Doctrine/Tests/ORM/Mapping/NamingStrategy}/JoinColumnClassNamingStrategy.php (78%)

diff --git a/lib/Doctrine/ORM/Mapping/JoinColumnClassNamingStrategy.php b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategy/JoinColumnClassNamingStrategy.php
similarity index 78%
rename from lib/Doctrine/ORM/Mapping/JoinColumnClassNamingStrategy.php
rename to tests/Doctrine/Tests/ORM/Mapping/NamingStrategy/JoinColumnClassNamingStrategy.php
index 299ff62be..8de8fa940 100644
--- a/lib/Doctrine/ORM/Mapping/JoinColumnClassNamingStrategy.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategy/JoinColumnClassNamingStrategy.php
@@ -18,15 +18,12 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Mapping;
+namespace Doctrine\Tests\ORM\Mapping\NamingStrategy;
+
+use Doctrine\ORM\Mapping\DefaultNamingStrategy;
 
 /**
- * The default NamingStrategy
- *
- * 
- * @link    www.doctrine-project.org
- * @since   2.3
- * @author  Fabio B. Silva <fabio.bat.silva@gmail.com>
+ * Stub naming strategy to verify `joinColumnName` proper behavior
  */
 class JoinColumnClassNamingStrategy extends DefaultNamingStrategy
 {
@@ -35,6 +32,8 @@ class JoinColumnClassNamingStrategy extends DefaultNamingStrategy
      */
     public function joinColumnName($propertyName, $className = null)
     {
-        return strtolower($this->classToTableName($className)) . '_' . $propertyName . '_' . $this->referenceColumnName();
+        return strtolower($this->classToTableName($className))
+            . '_' . $propertyName
+            . '_' . $this->referenceColumnName();
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php
index b6b87f626..16f0fe576 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php
@@ -4,8 +4,8 @@ namespace Doctrine\Tests\ORM\Mapping;
 
 use Doctrine\ORM\Mapping\UnderscoreNamingStrategy;
 use Doctrine\ORM\Mapping\DefaultNamingStrategy;
-use Doctrine\ORM\Mapping\JoinColumnClassNamingStrategy;
 use Doctrine\ORM\Mapping\NamingStrategy;
+use Doctrine\Tests\ORM\Mapping\NamingStrategy\JoinColumnClassNamingStrategy;
 
 /**
  * @group DDC-559