Fixed Table::setInterface(), Table::getInterface() usages

sanemat · May 2, 2012 · f747823 · f747823
1 parent 1fd5b18
commit f747823
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 11 deletions.
diff --git a/generator/lib/builder/om/ClassTools.php b/generator/lib/builder/om/ClassTools.php
@@ -25,11 +25,12 @@ class ClassTools
 	 */
 	public static function classname($qualifiedName)
 	{
-		$pos = strrpos($qualifiedName, '.');
-		if ($pos === false) {
-			return $qualifiedName;  // there is no '.' in the qualifed name
-		} else {
+		if (false !== $pos = strrpos($qualifiedName, '.')) {
 			return substr($qualifiedName, $pos + 1); // start just after '.'
+		} elseif (false !== $pos = strrpos($qualifiedName, '\\')) {
+			return substr($qualifiedName, $pos + 1);
+		} else {
+			return $qualifiedName;  // there is no '.' in the qualifed name
 		}
 	}
 

diff --git a/generator/lib/builder/om/PHP5ObjectBuilder.php b/generator/lib/builder/om/PHP5ObjectBuilder.php
@@ -198,12 +198,14 @@ protected function addClassOpen(&$script)
  */
 abstract class ".$this->getClassname()." extends ".$parentClass." ";
 
-		$interface = ClassTools::getInterface($table);
-		if ($interface) {
-			$script .= " implements " . ClassTools::classname($interface);
-		}
-		if ($this->getTable()->getInterface()) {
-			$this->declareClassFromBuilder($this->getInterfaceBuilder());
+		if ($interface = $this->getTable()->getInterface()) {
+			$script .= "implements " . ClassTools::classname($interface);
+
+			if ($interface !== ClassTools::classname($interface)) {
+				$this->declareClass($interface);
+			} else {
+				$this->declareClassFromBuilder($this->getInterfaceBuilder());
+			}
 		}
 
 		$script .= "

diff --git a/generator/lib/util/PropelQuickBuilder.php b/generator/lib/util/PropelQuickBuilder.php
@@ -184,7 +184,7 @@ public function getClassesForTable(Table $table, array $classTargets = null)
 		}
 
 		if ($table->getInterface()) {
-			$script .= $this->getConfig()->getConfiguredBuilder('interface', $target)->build();
+			$script .= $this->getConfig()->getConfiguredBuilder($table, 'interface')->build();
 		}
 
 		if ($table->treeMode()) {

diff --git a/test/testsuite/generator/builder/om/GeneratedObjectWithInterfaceTest.php b/test/testsuite/generator/builder/om/GeneratedObjectWithInterfaceTest.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
+require_once dirname(__FILE__) . '/../../../../../generator/lib/util/PropelQuickBuilder.php';
+
+class GeneratedObjectWithInterfaceTest extends PHPUnit_Framework_TestCase
+{
+	public function setUp()
+	{
+		if (!class_exists('Foo\MyClassWithInterface')) {
+			$schema = <<<EOF
+<database name="a-database" namespace="Foo">
+	<table name="my_class_with_interface" interface="MyInterface">
+		<column name="id" required="true" primaryKey="true" autoIncrement="true" type="INTEGER" />
+		<column name="name" type="VARCHAR" />
+	</table>
+</database>
+EOF;
+			$builder = new PropelQuickBuilder();
+			$builder->setSchema($schema);
+			$builder->buildClasses();
+		}
+	}
+
+	public function testClassHasInterface()
+	{
+		$this->assertInstanceOf('Foo\MyInterface', new \Foo\MyClassWithInterface());
+	}
+}