Fix up method replacement.

Author: dereuromark

src/Annotation/AbstractAnnotation.php

@@ -46,18 +46,24 @@ public function replaceClassName($type) {
 	abstract public function build();
 
 	/**
-	 * @return string
+	 * @param \IdeHelper\Annotation\AbstractAnnotation $annotation
+	 *
+	 * @return bool
 	 */
-	public function __toString() {
-		return static::TAG . ' ' . $this->build();
-	}
+	abstract public function matches(self $annotation);
 
 	/**
-	 * @param string $type
+	 * @param \IdeHelper\Annotation\AbstractAnnotation $annotation
+	 *
 	 * @return void
 	 */
-	public function setType($type) {
-		$this->type = $type;
+	abstract public function replaceWith(self $annotation);
+
+	/**
+	 * @return string
+	 */
+	public function __toString() {
+		return static::TAG . ' ' . $this->build();
 	}
 
 	/**
@@ -66,7 +72,6 @@ public function setType($type) {
 	public function getType() {
 		return $this->type;
 	}
-
 	/**
 	 * @return int|null
 	 */
@@ -78,6 +83,4 @@ public function getIndex() {
 		return $this->index;
 	}
 
-	abstract public function matches(self $annotation);
-
 }

src/Annotation/MethodAnnotation.php

@@ -44,11 +44,21 @@ public function matches(AbstractAnnotation $annotation) {
 		if ($annotation::TAG !== static::TAG) {
 			return false;
 		}
-		if ($annotation->getMethod() !== $this->method) {
+		$methodName = substr($annotation->getMethod(), 0, strpos($annotation->getMethod(), '('));
+		if ($methodName !== substr($this->method, 0, strpos($this->method, '('))) {
 			return false;
 		}
 
 		return true;
 	}
 
+	/**
+	 * @param \IdeHelper\Annotation\AbstractAnnotation|\IdeHelper\Annotation\MethodAnnotation $annotation
+	 * @return void
+	 */
+	public function replaceWith(AbstractAnnotation $annotation) {
+		$this->type = $annotation->getType();
+		$this->method = $annotation->getMethod();
+	}
+
 }

src/Annotation/PropertyAnnotation.php

@@ -51,4 +51,13 @@ public function matches(AbstractAnnotation $annotation) {
 		return true;
 	}
 
+	/**
+	 * @param \IdeHelper\Annotation\AbstractAnnotation|\IdeHelper\Annotation\PropertyAnnotation $annotation
+	 * @return void
+	 */
+	public function replaceWith(AbstractAnnotation $annotation) {
+		$this->type = $annotation->getType();
+		$this->property = $annotation->getProperty();
+	}
+
 }

src/Annotator/AbstractAnnotator.php

@@ -246,7 +246,7 @@ protected function _appendToExistingDocBlock(PHP_CodeSniffer_File $file, $closeT
 	protected function _needsReplacing(AbstractAnnotation $annotation, array $existingAnnotations) {
 		foreach ($existingAnnotations as $existingAnnotation) {
 			if ($existingAnnotation->matches($annotation)) {
-				$existingAnnotation->setType($annotation->getType());
+				$existingAnnotation->replaceWith($annotation);
 				return $existingAnnotation;
 			}
 		}

tests/TestCase/Annotation/AnnotationFactoryTest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace IdeHelper\Test\TestCase\Annotation;
+
+use IdeHelper\Annotation\AnnotationFactory;
+use IdeHelper\Annotation\MethodAnnotation;
+use IdeHelper\Annotation\PropertyAnnotation;
+use Tools\TestSuite\TestCase;
+
+/**
+ */
+class AnnotationFactoryTest extends TestCase {
+
+	/**
+	 * @return void
+	 */
+	public function setUp() {
+		parent::setUp();
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testCreate() {
+		$annotation = AnnotationFactory::create('@method', '\\Foo\\Model\\Entity\\Bar', 'doSth()', 1);
+		$this->assertInstanceOf(MethodAnnotation::class, $annotation);
+
+		$annotation = AnnotationFactory::create('@property', '\\Foo\\Model\\Entity\\Bar', '$baz', 1);
+		$this->assertInstanceOf(PropertyAnnotation::class, $annotation);
+	}
+
+}

tests/TestCase/Annotation/MethodAnnotationTest.php

@@ -30,23 +30,14 @@ public function testBuild() {
 	/**
 	 * @return void
 	 */
-	public function testSetType() {
-		$annotation = new MethodAnnotation('\\Foo\\Model\\Entity\\Bar', 'doSth()');
-		$annotation->setType('\\Something\\Model\\Entity\\Else');
-
-		$result = (string)$annotation;
-		$this->assertSame('@method \\Something\\Model\\Entity\\Else doSth()', $result);
-	}
+	public function testReplaceWith() {
+		$replacementAnnotation = new MethodAnnotation('\\Something\\Model\\Entity\\Else', 'doSth(array $options = [])');
 
-	/**
-	 * @return void
-	 */
-	public function testSetTypeComplex() {
-		$annotation = new MethodAnnotation('\\Foo\\Model\\Entity\\Bar[]|bool', 'doSth()');
-		$annotation->setType('\\Something\\Model\\Entity\\Else[]|bool');
+		$annotation = new MethodAnnotation('\\Foo\\Model\\Entity\\Bar', 'doSth()');
+		$annotation->replaceWith($replacementAnnotation);
 
 		$result = (string)$annotation;
-		$this->assertSame('@method \\Something\\Model\\Entity\\Else[]|bool doSth()', $result);
+		$this->assertSame('@method \\Something\\Model\\Entity\\Else doSth(array $options = [])', $result);
 	}
 
 	/**

tests/TestCase/Annotation/PropertyAnnotationTest.php

@@ -30,9 +30,11 @@ public function testBuild() {
 	/**
 	 * @return void
 	 */
-	public function testSetType() {
+	public function testReplaceWith() {
+		$replacementAnnotation = new PropertyAnnotation('\\Something\\Model\\Table\\Else', '$baz');
+
 		$annotation = new PropertyAnnotation('\\Foo\\Model\\Table\\Bar', '$baz');
-		$annotation->setType('\\Something\\Model\\Table\\Else');
+		$annotation->replaceWith($replacementAnnotation);
 
 		$result = (string)$annotation;
 		$this->assertSame('@property \\Something\\Model\\Table\\Else $baz', $result);