Merge branch 'trunk' into fix/add_cover_annotation_test

bin/plugin/commands/since.js

@@ -77,21 +77,29 @@ exports.handler = async ( opt ) => {
 			ignore,
 		} );
 
-		const regexp = /(@since\s+)n\.e\.x\.t/g;
+		const regexps = [
+			/(@since\s+)n\.e\.x\.t/g,
+			/('[^']*?)n\.e\.x\.t(?=')/g,
+		];
 
 		let replacementCount = 0;
-		files.forEach( ( file ) => {
-			const content = fs.readFileSync( file, 'utf-8' );
-			if ( regexp.test( content ) ) {
-				fs.writeFileSync(
-					file,
-					content.replace( regexp, function ( matches, sinceTag ) {
-						replacementCount++;
-						return sinceTag + version;
-					} )
-				);
+		for ( const file of files ) {
+			for ( const regexp of regexps ) {
+				const content = fs.readFileSync( file, 'utf-8' );
+				if ( regexp.test( content ) ) {
+					fs.writeFileSync(
+						file,
+						content.replace(
+							regexp,
+							function ( matches, sinceTag ) {
+								replacementCount++;
+								return sinceTag + version;
+							}
+						)
+					);
+				}
 			}
-		} );
+		}
 
 		const commonMessage = `Using version ${ version } for ${ pluginSlug }: `;
 		if ( replacementCount > 0 ) {

bin/test-php-watch.sh

@@ -6,7 +6,7 @@ fi
 
 while true; do
 	echo "Waiting for a change in the plugins directory..."
-	output=$(inotifywait -e modify,create,delete -r ./plugins 2> /dev/null)
+	output=$(inotifywait -e modify,create,delete -r ./plugins  --include '.*(\.php$|/tests/.*)' 2> /dev/null)
 	plugin_slug=$(echo "$output" | awk -F/ '{print $3}')
 	sleep 1 # Give the user a chance to copy text from terminal before IDE auto-saves.
 	clear