Merge pull request #3 from cawolf/fix-1-reveal

Fixes #1: added ->reveal()

Author: cawolf

README.md

@@ -84,7 +84,7 @@ Place your cursor in the empty constructor argument list of a subject under test
         {
             $this->logger = $this->prophesize(LoggerInterface::class);
             $this->router = $this->prophesize(RouterInterface::class);
-            $this->subject = new Subject($this->logger, $this->router);
+            $this->subject = new Subject($this->logger->reveal(), $this->router->reveal());
         }
         
         public function testBusinessLogic()

build.gradle

@@ -10,7 +10,7 @@ apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'
 
 group 'de.cawolf'
-version '1.0.1'
+version '1.0.2'
 
 sourceCompatibility = 1.8
 

src/main/kotlin/de/cawolf/quickmock/intention/service/AddArguments.kt

@@ -2,15 +2,37 @@ package de.cawolf.quickmock.intention.service
 
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiFile
+import com.intellij.psi.PsiFileFactory
 import com.intellij.psi.tree.IElementType
-import com.jetbrains.php.lang.psi.PhpPsiElementFactory
+import com.jetbrains.php.lang.PhpFileType
 import com.jetbrains.php.lang.psi.elements.Parameter
+import com.jetbrains.php.lang.psi.visitors.PhpElementVisitor
 
 class AddArguments {
     fun invoke(psiElementAtCursor: PsiElement, parameter: MutableList<Parameter>, project: Project) {
         val parameterListType = IElementType.enumerate { it -> it.toString() == "Parameter list" }.first()
-        val joinedParameterNames = parameter.joinToString { it -> "\$this->" + it.name }
-        val newParameterList = PhpPsiElementFactory.createFromText(project, parameterListType, "f($joinedParameterNames);")
+        val joinedParameterNames = parameter.joinToString { it -> "\$this->" + it.name + "->reveal()" }
+        val newParameterList = createFirstFromText(project, parameterListType, "f($joinedParameterNames);")
         psiElementAtCursor.prevSibling.replace(newParameterList)
     }
+
+    private fun createFirstFromText(p: Project, elementType: IElementType, text: String): PsiElement {
+        var ret = arrayOf<PsiElement>()
+        createDummyFile(p, text).accept(object : PhpElementVisitor() {
+            override fun visitElement(element: PsiElement?) {
+                val node = element!!.node
+                if (node != null && node.elementType === elementType) {
+                    ret += element
+                }
+
+                element.acceptChildren(this)
+            }
+        })
+        return ret[0]
+    }
+
+    private fun createDummyFile(p: Project, fileText: String): PsiFile =
+            PsiFileFactory.getInstance(p).createFileFromText("DUMMY__." + PhpFileType.INSTANCE.defaultExtension, PhpFileType.INSTANCE, "<?php\n$fileText", System.currentTimeMillis(), false)
+
 }

src/main/resources/META-INF/plugin.xml

@@ -9,6 +9,8 @@
 
     <change-notes><![CDATA[
         <dl>
+            <dt>1.0.2</dt>
+            <dd>added "->reveal()" to constructor arguments (issue #1)</dd>
             <dt>1.0.1</dt>
             <dd>added gradle publishing support</dd>
             <dt>1.0</dt>