Fix up routes for new approach.

Author: dereuromark

src/Annotator/RoutesAnnotator.php

@@ -20,7 +20,7 @@ public function annotate(string $path): bool {
 			throw new RuntimeException('Cannot read file');
 		}
 
-		if ($this->hasAnnotation($content)) {
+		if ($this->hasAnnotation($content) || !$this->needsAnnotation($content)) {
 			return false;
 		}
 
@@ -56,4 +56,13 @@ protected function hasAnnotation(string $content): bool {
 		return (bool)preg_match('/\* @var .+\\\\RouteBuilder \\$routes/', $content);
 	}
 
+	/**
+	 * @param string $content
+	 *
+	 * @return bool
+	 */
+	protected function needsAnnotation(string $content): bool {
+		return !(bool)preg_match('/return\s*(static)?\s*function \(RouteBuilder \$\w+\)/', $content);
+	}
+
 }

tests/TestCase/Annotator/RoutesAnnotatorTest.php

@@ -136,6 +136,44 @@ public function testHasAnnotation() {
 		$this->assertTrue($result);
 	}
 
+	/**
+	 * @return void
+	 */
+	public function testNeedsAnnotationTrue() {
+		$annotator = $this->_getAnnotatorMock([]);
+
+		$content = <<<'PHP'
+/**
+ */
+$routes->scope()
+PHP;
+		$result = $this->invokeMethod($annotator, 'needsAnnotation', [$content]);
+		$this->assertTrue($result);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testNeedsAnnotationFalse() {
+		$annotator = $this->_getAnnotatorMock([]);
+
+		$content = <<<'PHP'
+/**
+ */
+return static function (RouteBuilder $x) {
+PHP;
+		$result = $this->invokeMethod($annotator, 'needsAnnotation', [$content]);
+		$this->assertFalse($result);
+
+		$content = <<<'PHP'
+/**
+ */
+return function (RouteBuilder $y) {
+PHP;
+		$result = $this->invokeMethod($annotator, 'needsAnnotation', [$content]);
+		$this->assertFalse($result);
+	}
+
 	/**
 	 * @param array $params
 	 * @return \IdeHelper\Annotator\RoutesAnnotator|\PHPUnit\Framework\MockObject\MockObject