Fix plugin detection.

dereuromark · Nov 21, 2021 · a6459de · a6459de
1 parent 66a7852
commit a6459de
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Annotator/ClassAnnotatorTask/MailerClassAnnotatorTask.php b/src/Annotator/ClassAnnotatorTask/MailerClassAnnotatorTask.php
@@ -24,7 +24,7 @@ public function shouldRun(string $path, string $content): bool {
 		}
 
 		preg_match('#\buse (\w+)\\\\Mailer\\\\(\w+)Mailer\b#', $content, $useMatches);
-		preg_match('#\$\w+\s*=\s*\$this-\>getMailer\(\'(\w+)\'\)#', $content, $callMatches);
+		preg_match('#\$\w+\s*=\s*\$this-\>getMailer\(\'([\w\.]+)\'\)#', $content, $callMatches);
 		if (!$useMatches && !$callMatches) {
 			return false;
 		}
@@ -50,7 +50,7 @@ public function shouldRun(string $path, string $content): bool {
 	public function annotate(string $path): bool {
 		preg_match('#\buse (\w+)\\\\Mailer\\\\(\w+)Mailer\b#', $this->content, $useMatches);
 		if (!$useMatches) {
-			preg_match('#\$\w+\s*=\s*\$this->getMailer\(\'(\w+)\'\)#', $this->content, $callMatches);
+			preg_match('#\$\w+\s*=\s*\$this->getMailer\(\'([\w\.]+)\'\)#', $this->content, $callMatches);
 			if (!$callMatches) {
 				return false;
 			}

diff --git a/tests/TestCase/Annotator/ClassAnnotatorTask/MailerClassAnnotatorTaskTest.php b/tests/TestCase/Annotator/ClassAnnotatorTask/MailerClassAnnotatorTaskTest.php
@@ -66,6 +66,20 @@ public function testShouldRunViaCall() {
 		$this->assertFalse($result);
 	}
 
+	/**
+	 * @return void
+	 */
+	public function testShouldRunViaCallPlugin() {
+		$task = $this->getTask('');
+
+		$content = 'namespace TestApp\\Foo' . PHP_EOL . '$notificationMailer = $this->getMailer(\'FooBar.Notification\')' . PHP_EOL . '$notificationMailer->send(\'notify\')';
+		$result = $task->shouldRun('/src/Foo.php', $content);
+		$this->assertTrue($result);
+
+		$result = $task->shouldRun('/tests/Foo.php', $content);
+		$this->assertFalse($result);
+	}
+
 	/**
 	 * @return void
 	 */