Merge pull request #8329 from ifunk/feature-assoc-classname

Add getter for protected $_className value for Association.
cakephp · Feb 25, 2016 · bca53dc · bca53dc
2 parents 262ec6e + f804099
commit bca53dc
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 0 deletions.
diff --git a/src/ORM/Association.php b/src/ORM/Association.php
@@ -260,6 +260,16 @@ public function cascadeCallbacks($cascadeCallbacks = null)
         return $this->_cascadeCallbacks;
     }
 
+    /**
+     * The class name of the target table object
+     *
+     * @return string
+     */
+    public function className()
+    {
+        return $this->_className;
+    }
+
     /**
      * Sets the table instance for the source side of the association. If no arguments
      * are passed, the current configured table instance is returned

diff --git a/tests/TestCase/ORM/AssociationTest.php b/tests/TestCase/ORM/AssociationTest.php
@@ -108,6 +108,38 @@ public function testName()
         $this->assertEquals('Bar', $this->association->name());
     }
 
+    /**
+     * Tests that className() returns the correct association className
+     *
+     * @return void
+     */
+    public function testClassName()
+    {
+        $this->assertEquals('\Cake\Test\TestCase\ORM\TestTable', $this->association->className());
+    }
+
+    /**
+     * Tests that className() returns the correct (unnormalized) className
+     *
+     * @return void
+     */
+    public function testClassNameUnnormalized()
+    {
+        $config = [
+            'className' => 'Test',
+        ];
+        $this->association = $this->getMock(
+            '\Cake\ORM\Association',
+            [
+                '_options', 'attachTo', '_joinCondition', 'cascadeDelete', 'isOwningSide',
+                'saveAssociated', 'eagerLoader', 'type'
+            ],
+            ['Foo', $config]
+        );
+
+        $this->assertEquals('Test', $this->association->className());
+    }
+
     /**
      * Tests that cascadeCallbacks() returns the correct configured value
      *