Skip to content

Commit 2f13db4

Browse files
GirgiasGirgias
committed
ext/standard: Remove invalid specifier tests for fscanf
These are not parsing related
1 parent e0378f6 commit 2f13db4

25 files changed

+172
-3447
lines changed

‎ext/standard/tests/file/fscanf_variation12.phpt‎

Lines changed: 9 additions & 422 deletions
Large diffs are not rendered by default.

‎ext/standard/tests/file/fscanf_variation14.phpt‎

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ $valid_strings = array(
6262
// various string formats
6363
$string_formats = array( "%s",
6464
"%hs", "%ls", "%Ls",
65-
" %s", "%s ", "% s",
65+
" %s", "%s ",
6666
"\t%s", "\n%s", "%4s",
6767
"%30s", "%[a-zA-Z0-9]", "%*s"
6868
);
@@ -565,33 +565,6 @@ array(1) {
565565
bool(false)
566566

567567
-- iteration 7 --
568-
Bad scan conversion character " "
569-
Bad scan conversion character " "
570-
Bad scan conversion character " "
571-
Bad scan conversion character " "
572-
Bad scan conversion character " "
573-
Bad scan conversion character " "
574-
Bad scan conversion character " "
575-
Bad scan conversion character " "
576-
Bad scan conversion character " "
577-
Bad scan conversion character " "
578-
Bad scan conversion character " "
579-
Bad scan conversion character " "
580-
Bad scan conversion character " "
581-
Bad scan conversion character " "
582-
Bad scan conversion character " "
583-
Bad scan conversion character " "
584-
Bad scan conversion character " "
585-
Bad scan conversion character " "
586-
Bad scan conversion character " "
587-
Bad scan conversion character " "
588-
Bad scan conversion character " "
589-
Bad scan conversion character " "
590-
Bad scan conversion character " "
591-
Bad scan conversion character " "
592-
bool(false)
593-
594-
-- iteration 8 --
595568
NULL
596569
NULL
597570
NULL
@@ -666,7 +639,7 @@ array(1) {
666639
}
667640
bool(false)
668641

669-
-- iteration 9 --
642+
-- iteration 8 --
670643
NULL
671644
NULL
672645
NULL
@@ -741,7 +714,7 @@ array(1) {
741714
}
742715
bool(false)
743716

744-
-- iteration 10 --
717+
-- iteration 9 --
745718
NULL
746719
NULL
747720
NULL
@@ -816,7 +789,7 @@ array(1) {
816789
}
817790
bool(false)
818791

819-
-- iteration 11 --
792+
-- iteration 10 --
820793
NULL
821794
NULL
822795
NULL
@@ -891,7 +864,7 @@ array(1) {
891864
}
892865
bool(false)
893866

894-
-- iteration 12 --
867+
-- iteration 11 --
895868
array(1) {
896869
[0]=>
897870
NULL
@@ -987,7 +960,7 @@ array(1) {
987960
}
988961
bool(false)
989962

990-
-- iteration 13 --
963+
-- iteration 12 --
991964
NULL
992965
NULL
993966
NULL

‎ext/standard/tests/file/fscanf_variation15.phpt‎

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $float_values = array (
3737

3838
$string_formats = array( "%s",
3939
"%hs", "%ls", "%Ls",
40-
" %s", "%s ", "% s",
40+
" %s", "%s ",
4141
"\t%s", "\n%s", "%4s",
4242
"%30s", "%[a-zA-Z0-9]", "%*s");
4343

@@ -463,24 +463,6 @@ array(1) {
463463
bool(false)
464464

465465
-- iteration 7 --
466-
Bad scan conversion character " "
467-
Bad scan conversion character " "
468-
Bad scan conversion character " "
469-
Bad scan conversion character " "
470-
Bad scan conversion character " "
471-
Bad scan conversion character " "
472-
Bad scan conversion character " "
473-
Bad scan conversion character " "
474-
Bad scan conversion character " "
475-
Bad scan conversion character " "
476-
Bad scan conversion character " "
477-
Bad scan conversion character " "
478-
Bad scan conversion character " "
479-
Bad scan conversion character " "
480-
Bad scan conversion character " "
481-
bool(false)
482-
483-
-- iteration 8 --
484466
array(1) {
485467
[0]=>
486468
string(11) "-2147483649"
@@ -543,7 +525,7 @@ array(1) {
543525
}
544526
bool(false)
545527

546-
-- iteration 9 --
528+
-- iteration 8 --
547529
array(1) {
548530
[0]=>
549531
string(11) "-2147483649"
@@ -606,7 +588,7 @@ array(1) {
606588
}
607589
bool(false)
608590

609-
-- iteration 10 --
591+
-- iteration 9 --
610592
array(1) {
611593
[0]=>
612594
string(4) "-214"
@@ -669,7 +651,7 @@ array(1) {
669651
}
670652
bool(false)
671653

672-
-- iteration 11 --
654+
-- iteration 10 --
673655
array(1) {
674656
[0]=>
675657
string(11) "-2147483649"
@@ -732,7 +714,7 @@ array(1) {
732714
}
733715
bool(false)
734716

735-
-- iteration 12 --
717+
-- iteration 11 --
736718
array(1) {
737719
[0]=>
738720
NULL
@@ -795,7 +777,7 @@ array(1) {
795777
}
796778
bool(false)
797779

798-
-- iteration 13 --
780+
-- iteration 12 --
799781
array(0) {
800782
}
801783
array(0) {

‎ext/standard/tests/file/fscanf_variation18.phpt‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ $integer_values = array (
4040

4141
$string_formats = array( "%s",
4242
"%hs", "%ls", "%Ls",
43-
" %s", "%s ", "% s",
43+
" %s", "%s ",
4444
"\t%s", "\n%s", "%4s",
4545
"%30s", "%[a-zA-Z0-9]", "%*s"
4646
);
@@ -539,27 +539,6 @@ array(1) {
539539
bool(false)
540540

541541
-- iteration 7 --
542-
Bad scan conversion character " "
543-
Bad scan conversion character " "
544-
Bad scan conversion character " "
545-
Bad scan conversion character " "
546-
Bad scan conversion character " "
547-
Bad scan conversion character " "
548-
Bad scan conversion character " "
549-
Bad scan conversion character " "
550-
Bad scan conversion character " "
551-
Bad scan conversion character " "
552-
Bad scan conversion character " "
553-
Bad scan conversion character " "
554-
Bad scan conversion character " "
555-
Bad scan conversion character " "
556-
Bad scan conversion character " "
557-
Bad scan conversion character " "
558-
Bad scan conversion character " "
559-
Bad scan conversion character " "
560-
bool(false)
561-
562-
-- iteration 8 --
563542
array(1) {
564543
[0]=>
565544
string(1) "0"
@@ -634,7 +613,7 @@ array(1) {
634613
}
635614
bool(false)
636615

637-
-- iteration 9 --
616+
-- iteration 8 --
638617
array(1) {
639618
[0]=>
640619
string(1) "0"
@@ -709,7 +688,7 @@ array(1) {
709688
}
710689
bool(false)
711690

712-
-- iteration 10 --
691+
-- iteration 9 --
713692
array(1) {
714693
[0]=>
715694
string(1) "0"
@@ -784,7 +763,7 @@ array(1) {
784763
}
785764
bool(false)
786765

787-
-- iteration 11 --
766+
-- iteration 10 --
788767
array(1) {
789768
[0]=>
790769
string(1) "0"
@@ -859,7 +838,7 @@ array(1) {
859838
}
860839
bool(false)
861840

862-
-- iteration 12 --
841+
-- iteration 11 --
863842
array(1) {
864843
[0]=>
865844
string(1) "0"
@@ -934,7 +913,7 @@ array(1) {
934913
}
935914
bool(false)
936915

937-
-- iteration 13 --
916+
-- iteration 12 --
938917
array(0) {
939918
}
940919
array(0) {

‎ext/standard/tests/file/fscanf_variation2.phpt‎

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ $valid_ints = array(
3232
0x7fffffff, // max positive integer as hexadecimal
3333
0x7FFFFFFF, // max positive integer as hexadecimal
3434
0123, // integer as octal
35-
01, // should be quivalent to octal 1
35+
01, // should be equivalent to octal 1
3636
-020000000000, // max negative integer as octal
3737
017777777777 // max positive integer as octal
3838
);
3939
// various integer formats
40-
$int_formats = array( "%d", "%hd", "%ld", "%Ld", " %d", "%d ", "% d", "\t%d", "\n%d", "%4d", "%30d", "%[0-9]", "%*d");
40+
$int_formats = array( "%d", "%hd", "%ld", "%Ld", " %d", "%d ", "\t%d", "\n%d", "%4d", "%30d", "%[0-9]", "%*d");
4141

4242
$counter = 1;
4343

@@ -533,27 +533,6 @@ array(1) {
533533
bool(false)
534534

535535
-- iteration 7 --
536-
Bad scan conversion character " "
537-
Bad scan conversion character " "
538-
Bad scan conversion character " "
539-
Bad scan conversion character " "
540-
Bad scan conversion character " "
541-
Bad scan conversion character " "
542-
Bad scan conversion character " "
543-
Bad scan conversion character " "
544-
Bad scan conversion character " "
545-
Bad scan conversion character " "
546-
Bad scan conversion character " "
547-
Bad scan conversion character " "
548-
Bad scan conversion character " "
549-
Bad scan conversion character " "
550-
Bad scan conversion character " "
551-
Bad scan conversion character " "
552-
Bad scan conversion character " "
553-
Bad scan conversion character " "
554-
bool(false)
555-
556-
-- iteration 8 --
557536
array(1) {
558537
[0]=>
559538
int(0)
@@ -628,7 +607,7 @@ array(1) {
628607
}
629608
bool(false)
630609

631-
-- iteration 9 --
610+
-- iteration 8 --
632611
array(1) {
633612
[0]=>
634613
int(0)
@@ -703,7 +682,7 @@ array(1) {
703682
}
704683
bool(false)
705684

706-
-- iteration 10 --
685+
-- iteration 9 --
707686
array(1) {
708687
[0]=>
709688
int(0)
@@ -778,7 +757,7 @@ array(1) {
778757
}
779758
bool(false)
780759

781-
-- iteration 11 --
760+
-- iteration 10 --
782761
array(1) {
783762
[0]=>
784763
int(0)
@@ -853,7 +832,7 @@ array(1) {
853832
}
854833
bool(false)
855834

856-
-- iteration 12 --
835+
-- iteration 11 --
857836
array(1) {
858837
[0]=>
859838
string(1) "0"
@@ -928,7 +907,7 @@ array(1) {
928907
}
929908
bool(false)
930909

931-
-- iteration 13 --
910+
-- iteration 12 --
932911
array(0) {
933912
}
934913
array(0) {

0 commit comments

Comments
 (0)