Merge branch 'trunk' of https://github.com/WordPress/performance into add/authenticated-speculative-loading

Author: westonruter

bin/test-php-watch.sh

@@ -1,13 +1,29 @@
 #!/bin/bash
-if ! which inotifywait >/dev/null 2>&1; then
-  echo "Error: the inotifywait command is not available. Make sure you have inotify-tools installed."
-  exit 1
+
+# Check for the fswatch command
+if ! command -v fswatch >/dev/null 2>&1; then
+	echo "Error: The fswatch command is not available."
+	echo "On macOS, you can install it with Homebrew: brew install fswatch"
+	exit 1
 fi
 
+cd "$(git rev-parse --show-toplevel)"
+
 while true; do
 	echo "Waiting for a change in the plugins directory..."
-	output=$(inotifywait -e modify,create,delete -r ./plugins  --include '.*(\.php$|/tests/.*)' 2> /dev/null)
-	plugin_slug=$(echo "$output" | awk -F/ '{print $3}')
+
+	file=$(fswatch -1 -r \
+		--event Created \
+		--event Updated \
+		--event Removed \
+		--include '\.php$' \
+		--include '/tests/' \
+		./plugins 2>/dev/null | head -n 1)
+
+	# Make the file path relative.
+	file="${file#"$PWD/"}"
+
+	plugin_slug=$(echo "$file" | awk -F/ '{print $2}')
 	sleep 1 # Give the user a chance to copy text from terminal before IDE auto-saves.
 	clear
 	echo "Running phpunit tests for $(tput bold)$plugin_slug$(tput sgr0):"

bin/update-test-case-snapshots.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+# Updates snapshots used for testing Optimization Detective
+# Move actual.html files on top of an expected.html file in directories that also contain buffer.html files.
+
+set -e
+
+cd "$(git rev-parse --show-toplevel)"
+
+count=0
+
+while IFS= read -r -d '' actual_file; do
+	dir_path=$(dirname "$actual_file")
+	buffer_file="$dir_path/buffer.html"
+	if [ ! -e "$buffer_file" ]; then
+		continue
+	fi
+	expected_file="$dir_path/expected.html"
+
+	count=$((count + 1))
+
+	mv "$actual_file" "$expected_file"
+	echo "Updated $expected_file"
+done < <(find plugins -name 'actual.html' -path '*/test-cases/*' -print0)
+
+echo "Performed $count snapshot update(s)"

composer.json

@@ -51,7 +51,7 @@
     "yoast/phpunit-polyfills": "^4.0",
     "phpstan/php-8-stubs": "^0.4.0",
     "phpstan/phpstan-strict-rules": "^1.6",
-    "wpackagist-plugin/plugin-check": "^1.5"
+    "wpackagist-plugin/plugin-check": "^1.6"
   },
   "config": {
     "allow-plugins": {