Class renamer visitor should put original class in newly instantiated…

… namespaces
Ocramius · Jul 19, 2013 · 5d841cd · 5d841cd
1 parent ee153ca
commit 5d841cd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/CodeGenerationUtils/Visitor/ClassRenamerVisitor.php b/src/CodeGenerationUtils/Visitor/ClassRenamerVisitor.php
@@ -93,6 +93,7 @@ public function leaveNode(PHPParser_Node $node)
             // @todo too simplistic (assumes single class per namespace right now)
             if ($this->currentNamespace) {
                 $this->replacedInNamespace = $node;
+                $this->currentNamespace->stmts = array($node);
             } elseif ($this->newNamespace) {
                 // wrap in namespace if no previous namespace exists
                 return new PHPParser_Node_Stmt_Namespace(new PHPParser_Node_Name($this->newNamespace), array($node));
@@ -105,7 +106,7 @@ public function leaveNode(PHPParser_Node $node)
     private function namespaceMatches()
     {
         $currentNamespace = ($this->currentNamespace && is_array($this->currentNamespace->name->parts))
-            ? implode('\\', $this->currentNamespace->name->parts)
+            ? $this->currentNamespace->name->toString()
             : '';
 
         return $currentNamespace === $this->reflectedClass->getNamespaceName();

diff --git a/tests/CodeGenerationUtilsTest/Visitor/ClassRenamerVisitorTest.php b/tests/CodeGenerationUtilsTest/Visitor/ClassRenamerVisitorTest.php
@@ -30,6 +30,7 @@ public function testRenamesNodesOnMatchingClass()
 
         $this->assertSame('Baz', $class->name);
         $this->assertSame(array('Foo', 'Bar'), $namespace->name->parts);
+        $this->assertSame(array($class), $namespace->stmts);
     }
 
     public function testIgnoresNodesOnNonMatchingClass()

diff --git a/tests/GeneratedHydratorTest/Functional/HydratorFunctionalTest.php b/tests/GeneratedHydratorTest/Functional/HydratorFunctionalTest.php
@@ -123,7 +123,8 @@ private function generateProxy($instance)
         $config             = new Configuration();
         $inflector          = $this->getMock('CodeGenerationUtils\\Inflector\\ClassNameInflectorInterface');
 
-        $inflector->expects($this->any())->method('getProxyClassName')->will($this->returnValue($generatedClassName));
+        $inflector->expects($this->any())->method('getProxyClassName')->with($parentClassName)->will($this->returnValue($generatedClassName));
+        $inflector->expects($this->any())->method('getUserClassName')->with($parentClassName)->will($this->returnValue($parentClassName));
         $config->setClassNameInflector($inflector);
         $config->setGeneratorStrategy(new EvaluatingGeneratorStrategy());