Replace fakemail with minimal PHP script

cmb69 · cmb69 · commit 10c420f84a5f · 2020-01-09T12:04:28.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -213,8 +213,6 @@ php
 /main/config.w32.h
 /win32/build/deplister.exe
 /win32/build/deplister.obj
-/win32/build/fakemail.exe
-/win32/build/fakemail.obj
 /win32/*.aps
 /win32/*.positions
 /win32/*.suo
diff --git a/run-tests.php b/run-tests.php
@@ -2110,7 +2110,7 @@ function run_test($php, $file, $env)
 		$section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']);
 		$section_text['INI'] = str_replace('{TMP}', sys_get_temp_dir(), $section_text['INI']);
 		if (PHP_OS_FAMILY === 'Windows') {
-			$replacement = 'fakemail $1';
+			$replacement = '"' . PHP_BINARY . ' -r \"while ($in = fgets(STDIN)) echo $in;\" > $1"';
 		} else {
 			$replacement = 'tee $1 >/dev/null';
 		}
diff --git a/win32/build/Makefile b/win32/build/Makefile
@@ -203,7 +203,7 @@ build-snap: set-tmp-env generated_files
 	-for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T"
 	-for %T in ($(PECL_TARGETS)) do $(MAKE) /I /nologo "%T"
 
-build-dist: $(BUILD_DIR)\deplister.exe $(BUILD_DIR)\fakemail.exe
+build-dist: $(BUILD_DIR)\deplister.exe
 	-rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
 	-rd /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
 	-del /f /q $(BUILD_DIR)\$(DIST_ZIP_SNAP)
@@ -227,9 +227,6 @@ snap: build-snap build-devel build-dist
 $(BUILD_DIR)\deplister.exe:	win32\build\deplister.c
 	$(CC) /nologo /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c imagehlp.lib
 
-$(BUILD_DIR)\fakemail.exe:	win32\build\fakemail.c
-	$(CC) /nologo /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR) /Fe$(BUILD_DIR)\fakemail.exe win32\build\fakemail.c
-
 install: really-install install-sdk
 
 build-lib: build-ext-libs
diff --git a/win32/build/fakemail.c b/win32/build/fakemail.c
diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
@@ -497,7 +497,6 @@ function make_phar_dot_phar($dist_dir)
 	copy_test_dir($dir, $test_dir);
 }
 copy('run-tests.php', $test_dir . '/run-test.php');
-copy($build_dir . '/fakemail.exe', $test_dir . '/fakemail.exe');
 
 /* change this next line to true to use good-old
  * hand-assembled go-pear-bundle from the snapshot template */

Original file line number	Diff line number	Diff line change
`@@ -2110,7 +2110,7 @@ function run_test($php, $file, $env)`
`2110`	`2110`	`$section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']);`
`2111`	`2111`	`$section_text['INI'] = str_replace('{TMP}', sys_get_temp_dir(), $section_text['INI']);`
`2112`	`2112`	`if (PHP_OS_FAMILY === 'Windows') {`
`2113`		`- $replacement = 'fakemail $1';`
	`2113`	`+ $replacement = '"' . PHP_BINARY . ' -r \"while ($in = fgets(STDIN)) echo $in;\" > $1"';`
`2114`	`2114`	`} else {`
`2115`	`2115`	`$replacement = 'tee $1 >/dev/null';`
`2116`	`2116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,6 @@ function make_phar_dot_phar($dist_dir)`
`497`	`497`	`copy_test_dir($dir, $test_dir);`
`498`	`498`	`}`
`499`	`499`	`copy('run-tests.php', $test_dir . '/run-test.php');`
`500`		`-copy($build_dir . '/fakemail.exe', $test_dir . '/fakemail.exe');`
`501`	`500`
`502`	`501`	`/* change this next line to true to use good-old`
`503`	`502`	`* hand-assembled go-pear-bundle from the snapshot template */`