fileinfo: tests: Sync more upstream tests and fix phpt

weltling · weltling · commit a4280d23dddb · 2022-10-02T03:02:47.000+02:00
Signed-off-by: Anatol Belski &lt;ab@php.net&gt;
diff --git a/ext/fileinfo/tests/bug71434.phpt b/ext/fileinfo/tests/bug71434.phpt
@@ -10,8 +10,13 @@ $a='#!env python
 from serial import Serial
 from sys import exit
 ';
+// As of libmagic >= 5.41 libmagic delivers text/plain for this buffer,
+// to be observed further
 $finfo = new finfo(FILEINFO_MIME_TYPE);
 echo $finfo->buffer($a) . "\n";
+$finfo = new finfo();
+echo $finfo->buffer($a) . "\n";
 ?>
 --EXPECT--
-text/x-script.python
+text/plain
+a env python script, ASCII text executable
diff --git a/ext/fileinfo/tests/bug77961.phpt b/ext/fileinfo/tests/bug77961.phpt
@@ -8,5 +8,5 @@ finfo_open(FILEINFO_NONE, __DIR__ . '/bug77961.magic');
 ?>
 --EXPECTF--
 Warning: finfo_open(): Expected numeric type got `indirect' in %s on line %d
-
+Bad width %d
 Fatal error: fatal libmagic error in %s on line %d
diff --git a/ext/fileinfo/tests/finfo_file_002.phpt b/ext/fileinfo/tests/finfo_file_002.phpt
@@ -24,7 +24,7 @@ array(%d) {
   ["%s/resources/test.awk"]=>
   string(10) "text/plain"
   ["%s/resources/test.bmp"]=>
-  string(14) "image/x-ms-bmp"
+  string(9) "image/bmp"
   ["%s/resources/test.gif"]=>
   string(9) "image/gif"
   ["%s/resources/test.jpg"]=>
diff --git a/ext/fileinfo/tests/finfo_upstream.phpt b/ext/fileinfo/tests/finfo_upstream.phpt
@@ -14,7 +14,7 @@ foreach($lst as $p) {
 	$tp = dirname($p) . DIRECTORY_SEPARATOR . basename($p, ".testfile") . ".result";
 	$finfo = finfo_open(FILEINFO_NONE, file_exists($mp) ? $mp : NULL);
 	$i = finfo_file( $finfo, $p);
-	$exp = file_get_contents($tp);
+	$exp = trim(file_get_contents($tp));
 	if ($i !== $exp) {
 		echo "'$p' failed\nexp: '$exp'\ngot: '$i'\n";
 	} 
diff --git a/ext/fileinfo/tests/upstream/JW07022A.mp3.result b/ext/fileinfo/tests/upstream/JW07022A.mp3.result
@@ -1 +1 @@
-Audio file with ID3 version 2.2.0, contains:MPEG ADTS, layer III, v1, 96 kbps, 44.1 kHz, Monaural
+Audio file with ID3 version 2.2.0, contains: MPEG ADTS, layer III, v1, 96 kbps, 44.1 kHz, Monaural
diff --git a/ext/fileinfo/tests/upstream/android-vdex-1.result b/ext/fileinfo/tests/upstream/android-vdex-1.result
@@ -0,0 +1 @@
+Android vdex file, verifier deps version: 021, dex section version: 002, number of dex files: 4, verifier deps size: 106328
diff --git a/ext/fileinfo/tests/upstream/android-vdex-1.testfile b/ext/fileinfo/tests/upstream/android-vdex-1.testfile
diff --git a/ext/fileinfo/tests/upstream/android-vdex-2.result b/ext/fileinfo/tests/upstream/android-vdex-2.result
@@ -0,0 +1 @@
+Android vdex file, being processed by dex2oat, verifier deps version: 019, dex section version: 002, number of dex files: 1, verifier deps size: 1016
diff --git a/ext/fileinfo/tests/upstream/android-vdex-2.testfile b/ext/fileinfo/tests/upstream/android-vdex-2.testfile
diff --git a/ext/fileinfo/tests/upstream/arj.result b/ext/fileinfo/tests/upstream/arj.result
@@ -0,0 +1 @@
+ARJ archive data, v11, slash-switched, created 5 1980+48, original name: example_m0.arj, os: Unix
diff --git a/ext/fileinfo/tests/upstream/arj.testfile b/ext/fileinfo/tests/upstream/arj.testfile
diff --git a/ext/fileinfo/tests/upstream/bcachefs.result b/ext/fileinfo/tests/upstream/bcachefs.result
@@ -0,0 +1 @@
+bcachefs, UUID=46bd306f-80ad-4cd0-af4f-147e7d85f393, label "Label", version 13, min version 13, device 0/UUID=72a60ede-4cb6-4374-aa70-cb38a50af5ef, 1 devices
diff --git a/ext/fileinfo/tests/upstream/bcachefs.testfile b/ext/fileinfo/tests/upstream/bcachefs.testfile
diff --git a/ext/fileinfo/tests/upstream/cl8m8ocofedso.result b/ext/fileinfo/tests/upstream/cl8m8ocofedso.result
@@ -0,0 +1 @@
+Audio file with ID3 version 2.4.0, contains: MPEG ADTS, layer III, v1, 192 kbps, 44.1 kHz, JntStereo
diff --git a/ext/fileinfo/tests/upstream/cl8m8ocofedso.testfile b/ext/fileinfo/tests/upstream/cl8m8ocofedso.testfile
diff --git a/ext/fileinfo/tests/upstream/dsd64-dff.result b/ext/fileinfo/tests/upstream/dsd64-dff.result
@@ -0,0 +1 @@
+DSDIFF audio bitstream data, 1 bit, mono, "DSD 64" 2822400 Hz, no compression, ID3 version 2.0.0
diff --git a/ext/fileinfo/tests/upstream/dsd64-dff.testfile b/ext/fileinfo/tests/upstream/dsd64-dff.testfile
diff --git a/ext/fileinfo/tests/upstream/dsd64-dsf.result b/ext/fileinfo/tests/upstream/dsd64-dsf.result
@@ -0,0 +1 @@
+DSF audio bitstream data, 1 bit, mono, "DSD 64" 2822400 Hz, no compression, ID3 version 2.3.0
diff --git a/ext/fileinfo/tests/upstream/dsd64-dsf.testfile b/ext/fileinfo/tests/upstream/dsd64-dsf.testfile
diff --git a/ext/fileinfo/tests/upstream/ext4.result b/ext/fileinfo/tests/upstream/ext4.result
@@ -0,0 +1 @@
+Linux rev 1.0 ext4 filesystem data, UUID=d32bbb08-3a76-4510-a064-3045f887dbdf (extents) (64bit) (large files) (huge files)
diff --git a/ext/fileinfo/tests/upstream/ext4.testfile b/ext/fileinfo/tests/upstream/ext4.testfile
diff --git a/ext/fileinfo/tests/upstream/gpkg-1-zst.result b/ext/fileinfo/tests/upstream/gpkg-1-zst.result
@@ -0,0 +1 @@
+Gentoo GLEP 78 (GPKG) binary package for "inkscape-1.2.1-r2-1" using zstd compression
diff --git a/ext/fileinfo/tests/upstream/gpkg-1-zst.testfile b/ext/fileinfo/tests/upstream/gpkg-1-zst.testfile
diff --git a/ext/fileinfo/tests/upstream/json1.result b/ext/fileinfo/tests/upstream/json1.result
@@ -1 +1 @@
-JSON data
+JSON text data
diff --git a/ext/fileinfo/tests/upstream/json2.result b/ext/fileinfo/tests/upstream/json2.result
@@ -1 +1 @@
-JSON data
+JSON text data
diff --git a/ext/fileinfo/tests/upstream/json3.result b/ext/fileinfo/tests/upstream/json3.result
@@ -1 +1 @@
-JSON data
+JSON text data
diff --git a/ext/fileinfo/tests/upstream/json4.result b/ext/fileinfo/tests/upstream/json4.result
@@ -0,0 +1 @@
+JSON text data
diff --git a/ext/fileinfo/tests/upstream/json4.testfile b/ext/fileinfo/tests/upstream/json4.testfile
@@ -0,0 +1 @@
+[1]
diff --git a/ext/fileinfo/tests/upstream/json5.result b/ext/fileinfo/tests/upstream/json5.result
@@ -0,0 +1 @@
+ASCII text
diff --git a/ext/fileinfo/tests/upstream/json5.testfile b/ext/fileinfo/tests/upstream/json5.testfile
@@ -0,0 +1 @@
+[1] 2
diff --git a/ext/fileinfo/tests/upstream/json6.result b/ext/fileinfo/tests/upstream/json6.result
@@ -0,0 +1 @@
+JSON text data
diff --git a/ext/fileinfo/tests/upstream/json6.testfile b/ext/fileinfo/tests/upstream/json6.testfile
@@ -0,0 +1 @@
+{"a":[ ]}
diff --git a/ext/fileinfo/tests/upstream/json7.result b/ext/fileinfo/tests/upstream/json7.result
@@ -0,0 +1 @@
+ASCII text
diff --git a/ext/fileinfo/tests/upstream/json7.testfile b/ext/fileinfo/tests/upstream/json7.testfile
@@ -0,0 +1 @@
+{"tag": tLue}
diff --git a/ext/fileinfo/tests/upstream/json8.result b/ext/fileinfo/tests/upstream/json8.result
@@ -0,0 +1 @@
+JSON text data
diff --git a/ext/fileinfo/tests/upstream/json8.testfile b/ext/fileinfo/tests/upstream/json8.testfile
@@ -0,0 +1 @@
+{"tag": true}
diff --git a/ext/fileinfo/tests/upstream/jsonlines1.result b/ext/fileinfo/tests/upstream/jsonlines1.result
@@ -0,0 +1 @@
+New Line Delimited JSON text data
diff --git a/ext/fileinfo/tests/upstream/jsonlines1.testfile b/ext/fileinfo/tests/upstream/jsonlines1.testfile
@@ -0,0 +1,2 @@
+{}
+{}
diff --git a/ext/fileinfo/tests/upstream/matilde.arm.result b/ext/fileinfo/tests/upstream/matilde.arm.result
@@ -0,0 +1 @@
+Adaptive Multi-Rate Codec (GSM telephony)
diff --git a/ext/fileinfo/tests/upstream/matilde.arm.testfile b/ext/fileinfo/tests/upstream/matilde.arm.testfile
diff --git a/ext/fileinfo/tests/upstream/pcjr.result b/ext/fileinfo/tests/upstream/pcjr.result
@@ -0,0 +1 @@
+PCjr Cartridge image
diff --git a/ext/fileinfo/tests/upstream/pcjr.testfile b/ext/fileinfo/tests/upstream/pcjr.testfile
diff --git a/ext/fileinfo/tests/upstream/uf2.result b/ext/fileinfo/tests/upstream/uf2.result
@@ -0,0 +1 @@
+UF2 firmware image, family ESP32-S2, address 00000000, 4829 total blocks
diff --git a/ext/fileinfo/tests/upstream/uf2.testfile b/ext/fileinfo/tests/upstream/uf2.testfile

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ foreach($lst as $p) {`
`14`	`14`	`$tp = dirname($p) . DIRECTORY_SEPARATOR . basename($p, ".testfile") . ".result";`
`15`	`15`	`$finfo = finfo_open(FILEINFO_NONE, file_exists($mp) ? $mp : NULL);`
`16`	`16`	`$i = finfo_file( $finfo, $p);`
`17`		`- $exp = file_get_contents($tp);`
	`17`	`+ $exp = trim(file_get_contents($tp));`
`18`	`18`	`if ($i !== $exp) {`
`19`	`19`	`echo "'$p' failed\nexp: '$exp'\ngot: '$i'\n";`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Audio file with ID3 version 2.2.0, contains:MPEG ADTS, layer III, v1, 96 kbps, 44.1 kHz, Monaural`
	`1`	`+Audio file with ID3 version 2.2.0, contains: MPEG ADTS, layer III, v1, 96 kbps, 44.1 kHz, Monaural`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Android vdex file, verifier deps version: 021, dex section version: 002, number of dex files: 4, verifier deps size: 106328`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Android vdex file, being processed by dex2oat, verifier deps version: 019, dex section version: 002, number of dex files: 1, verifier deps size: 1016`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ARJ archive data, v11, slash-switched, created 5 1980+48, original name: example_m0.arj, os: Unix`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+bcachefs, UUID=46bd306f-80ad-4cd0-af4f-147e7d85f393, label "Label", version 13, min version 13, device 0/UUID=72a60ede-4cb6-4374-aa70-cb38a50af5ef, 1 devices`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Audio file with ID3 version 2.4.0, contains: MPEG ADTS, layer III, v1, 192 kbps, 44.1 kHz, JntStereo`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+DSDIFF audio bitstream data, 1 bit, mono, "DSD 64" 2822400 Hz, no compression, ID3 version 2.0.0`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+DSF audio bitstream data, 1 bit, mono, "DSD 64" 2822400 Hz, no compression, ID3 version 2.3.0`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Linux rev 1.0 ext4 filesystem data, UUID=d32bbb08-3a76-4510-a064-3045f887dbdf (extents) (64bit) (large files) (huge files)`