At least allow replacing if identical in inline doc block.

Author: dereuromark

src/Annotator/AbstractAnnotator.php

@@ -614,7 +614,7 @@ protected function _report() {
 			return;
 		}
 
-		$this->_io->success('   -> ' . implode(', ', $out));
+		$this->_io->success('   -> ' . implode(', ', $out) . '.');
 	}
 
 	/**

src/Annotator/TemplateAnnotator.php

@@ -137,19 +137,20 @@ protected function _addNewTemplateDocBlock(File $file, array $annotations, $phpO
 			$fixer->addContent($phpOpenTagIndex, $docBlock);
 		}
 
+		$this->_counter[static::COUNT_ADDED] = count($annotations);
+
 		if ($docBlockCloseIndex && $this->_isInlineDocBlockRedundant($file, $annotations, $docBlockCloseIndex)) {
 			$tokens = $file->getTokens();
 			$docBlockOpenIndex = $tokens[$docBlockCloseIndex]['comment_opener'];
 			for ($i = $docBlockCloseIndex + 1; $i >= $docBlockOpenIndex; $i--) {
 				$fixer->replaceToken($i, '');
 			}
-			$this->_counter[static::COUNT_REMOVED]++;
+
+			$this->_counter[static::COUNT_ADDED]--;
 		}
 
 		$newContent = $fixer->getContents();
 
-		$this->_counter[static::COUNT_ADDED] = count($annotations);
-
 		return $newContent;
 	}
 

tests/TestCase/Annotator/TemplateAnnotatorTest.php

@@ -121,7 +121,7 @@ public function testAnnotate() {
 
 		$output = (string)$this->out->output();
 
-		$this->assertTextContains('   -> 2 annotations added', $output);
+		$this->assertTextContains('   -> 2 annotations added.', $output);
 	}
 
 	/**
@@ -147,7 +147,7 @@ public function testAnnotateLoop() {
 
 		$output = (string)$this->out->output();
 
-		$this->assertTextContains('   -> 3 annotations added', $output);
+		$this->assertTextContains('   -> 3 annotations added.', $output);
 	}
 
 	/**
@@ -173,7 +173,7 @@ public function testAnnotatePhpLine() {
 
 		$output = (string)$this->out->output();
 
-		$this->assertTextContains('   -> 3 annotations added', $output);
+		$this->assertTextContains('   -> 3 annotations added.', $output);
 	}
 
 	/**
@@ -199,7 +199,7 @@ public function testAnnotateExisting() {
 
 		$output = (string)$this->out->output();
 
-		$this->assertTextContains('   -> 2 annotations added', $output);
+		$this->assertTextContains('   -> 2 annotations added.', $output);
 	}
 
 	/**
@@ -225,7 +225,7 @@ public function testAnnotateExistingOutdated() {
 
 		$output = (string)$this->out->output();
 
-		$this->assertTextContains('   -> 2 annotations updated', $output);
+		$this->assertTextContains('   -> 2 annotations updated, 1 annotation removed, 1 annotation skipped.', $output);
 	}
 
 	/**
@@ -251,7 +251,7 @@ public function testAnnotateEmptyPreemptive() {
 
 		$output = (string)$this->out->output();
 
-		$this->assertTextContains('   -> 1 annotation added', $output);
+		$this->assertTextContains('   -> 1 annotation added.', $output);
 	}
 
 	/**
@@ -299,7 +299,7 @@ public function testAnnotateInline() {
 
 		$output = (string)$this->out->output();
 
-		$this->assertTextContains('   -> 2 annotations added', $output);
+		$this->assertTextContains('   -> 1 annotation added.', $output);
 	}
 
 	/**

tests/test_app/src/Template/Foos/inline.ctp

@@ -1,5 +1,5 @@
 <?php
-/** @var \App\Lib\DocumentManager\DataFactory $DataFactory */
+/** @var \App\Model\Entity\Wheel $wheel */
 ?>
 <div>
 	<?php echo h($wheel->id); ?>

tests/test_files/Template/inline.ctp

@@ -3,7 +3,6 @@
  * @var \App\View\AppView $this
  * @var \App\Model\Entity\Wheel $wheel
  */
-/** @var \App\Lib\DocumentManager\DataFactory $DataFactory */
 ?>
 <div>
 	<?php echo h($wheel->id); ?>