Correct more details in bin tools

Author: LC43

bin/PackageBuilder.php

@@ -64,7 +64,7 @@ private function readPluginVersion(): string {
 			throw new RuntimeException( "Could not read {$plugin_file}." );
 		}
 
-		if ( 1 === preg_match( "/PLUGIN_VERSION', '([^']+)'/", $contents, $matches ) ) {
+		if ( 1 === preg_match( "/PLUGIN_VERSION'\\s*,\\s*'([^']+)'/", $contents, $matches ) ) {
 			return $matches[1];
 		}
 

bin/bump.php

@@ -19,7 +19,7 @@ function read_version( string $file ): string {
 		throw new RuntimeException( "Could not read file: {$file}" );
 	}
 
-	if ( 1 === preg_match( "/PLUGIN_VERSION', '([^']+)'/", $contents, $matches ) ) {
+	if ( 1 === preg_match( "/PLUGIN_VERSION'\\s*,\\s*'([^']+)'/", $contents, $matches ) ) {
 		return $matches[1];
 	}
 

bin/check-textdomains.php

@@ -145,8 +145,7 @@
 
 				// Skip heredoc/nowdoc body entirely.
 				if ( $type === T_START_HEREDOC ) {
-					while ( $k < $t_count ) {
-						$k++;
+					while ( ++$k < $t_count ) {
 						if ( is_array( $tokens[ $k ] ) && $tokens[ $k ][0] === T_END_HEREDOC ) {
 							break;
 						}