From 743729d5bf4637ef6f9f6008213ac675d216abf6 Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Thu, 22 Aug 2019 12:03:22 +0200
Subject: [PATCH] Promote warnings to errors in str_pad()

---
 ext/standard/string.c                         |   4 +-
 ext/standard/tests/strings/str_pad.phpt       | Bin 9340 -> 8557 bytes
 .../tests/strings/str_pad_variation2.phpt     |  70 ++++++++++++++++++
 3 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 ext/standard/tests/strings/str_pad_variation2.phpt

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 0ddc1f6956..823d1ab4c1 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -5683,12 +5683,12 @@ PHP_FUNCTION(str_pad)
 	}
 
 	if (pad_str_len == 0) {
-		php_error_docref(NULL, E_WARNING, "Padding string cannot be empty");
+		zend_throw_error(NULL, "Padding string cannot be empty");
 		return;
 	}
 
 	if (pad_type_val < STR_PAD_LEFT || pad_type_val > STR_PAD_BOTH) {
-		php_error_docref(NULL, E_WARNING, "Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH");
+		zend_throw_error(NULL, "Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH");
 		return;
 	}
 
diff --git a/ext/standard/tests/strings/str_pad.phpt b/ext/standard/tests/strings/str_pad.phpt
index be4c9ed9428695dd25d532e0eabca37dddc1580f..a4f60bfa6ae277ebee476fe74613024d5dc0029d 100644
GIT binary patch
delta 504
zcmez4@z!a>M<zyv$)A~2MU|9v6gc(u6;g8xN-7nKONuh{(zz!0GK){%%q*sEXsV;2
z0F=!u%}p)JOy*Jm0z*?hQ#9epvMh4Un$}#C{aB2dfl4Mfv#5jVH7qidud?V)=4aKL
z>;=TFtXg1o2Ux{`_FrQ)n#{!(F*$)vfAT{%gUP$uw19Nf<d2;0lk3=d!Sp$HJ|G>y
z4zjtHt9Ei8lf>j_@}irgICz+tV)7=ZacS|#<SAKmag`KRDpZ49IN6a=V)803ZkJkx
z<iwKX3<ZrC*P^2QA_bLHO^6DG)Z~nOAXnEeJ+;I)wYWGjJyk<fK~F&mY*a0}VQ08F
zEy*@)@)a%vR0CC=m9&AuZfFV&GV+bJ<(AnT#eIf(@+rZUlMO_qHWv%M6_^~atT6e8
UvK%89l$2F*X5(_n&r9V30Q~uoh5!Hn

delta 1127
zcmaFs^v7evM<ymt&dHycRO=N`L2^cshJmIYh%z!Yg)j__ETAIBCQuO*V@(|ePJMj^
zJ9FKn%n}91U}sNHE>2FMVM<C6nbh2Zl1hc*lA_GKbS_j&z&yWDA0HhB2?d}bASSw!
z$@a`r0%+O{Cl@jcb0Y~(&SaKG;WseL2_wlvn3~p;7cv`zJbay59Yis*$bei50h1+J
z43T(lEJjGY5*8zVm_jgZXg0ZuMMoJ)Ow*c6r64gS9^z94TLmRsC2KByt;w%gjF`9-
zCd;r!OfF;9ovgv3Gx;*B*5o=4%gI)3vOxMRtAau;SMB6HCW+1Y?21g2Cvj>q1NBbc
z$STflXru!U7ohPVJ_m@eqy+Rz50}AYMm9ZeC2e3p8=7h=0LApUWf<KydvTv(t_KPz
zG5l|M)vv?_aghdHMd}CEdQE+F-&?{Q1d1|vn7~CRZxj&~M-4AzIbkWVoUJWfr=bDN
zz{!CE!mMEF$&CUM5~zkCDQgrEm4=#vWQ-Zy7+Wbxs4*ACRnUz=D7z>w#|<;a*4B2i
zBma!a2K*+QZ}Pttm^_bDPLwM=u_zCi*{ndBE*_X9H8iahCO=b<Q&-5$Q&25d$j?*A
c$;?YtP)*^YT&;?tvka!W;GFD|pO?x70P#*s-2eap

diff --git a/ext/standard/tests/strings/str_pad_variation2.phpt b/ext/standard/tests/strings/str_pad_variation2.phpt
new file mode 100644
index 0000000000..1ebf1b2825
--- /dev/null
+++ b/ext/standard/tests/strings/str_pad_variation2.phpt
@@ -0,0 +1,70 @@
+--TEST--
+str_pad() function: usage variations - Non printable chars
+--INI--
+precision=14
+--FILE--
+<?php
+// Split from str_pad for NUL Bytes
+// 7-bit ASCII
+$string = chr(0).chr(255).chr(128).chr(234).chr(143);
+
+/* different pad_lengths */
+$pad_lengths = [
+    -PHP_INT_MAX,  // huge negative value
+	-1,  // negative value
+    0,  // pad_length < sizeof(input_string)
+    9,  // pad_length <= sizeof(input_string)
+    10,  // pad_length > sizeof(input_string)
+    16,  // pad_length > sizeof(input_string)
+];
+
+$pad_string = "=";
+
+/*loop through to use each variant of $pad_length on
+  each element of $input_strings array */
+foreach ($pad_lengths as $pad_length ) {
+    // default pad_string & pad_type
+    var_dump( bin2hex( str_pad($string, $pad_length) ) );
+    // default pad_type
+    var_dump( bin2hex( str_pad($string, $pad_length, $pad_string) ) );
+    var_dump( bin2hex( str_pad($string, $pad_length, $pad_string, STR_PAD_LEFT) ) );
+    var_dump( bin2hex( str_pad($string, $pad_length, $pad_string, STR_PAD_RIGHT) ) );
+    var_dump( bin2hex( str_pad($string, $pad_length, $pad_string, STR_PAD_BOTH) ) );
+}
+
+?>
+
+DONE
+--EXPECT--
+string(10) "00ff80ea8f"
+string(10) "00ff80ea8f"
+string(10) "00ff80ea8f"
+string(10) "00ff80ea8f"
+string(10) "00ff80ea8f"
+string(10) "00ff80ea8f"
+string(10) "00ff80ea8f"
+string(10) "00ff80ea8f"
+string(10) "00ff80ea8f"
+string(10) "00ff80ea8f"
+string(10) "00ff80ea8f"
+string(10) "00ff80ea8f"
+string(10) "00ff80ea8f"
+string(10) "00ff80ea8f"
+string(10) "00ff80ea8f"
+string(18) "00ff80ea8f20202020"
+string(18) "00ff80ea8f3d3d3d3d"
+string(18) "3d3d3d3d00ff80ea8f"
+string(18) "00ff80ea8f3d3d3d3d"
+string(18) "3d3d00ff80ea8f3d3d"
+string(20) "00ff80ea8f2020202020"
+string(20) "00ff80ea8f3d3d3d3d3d"
+string(20) "3d3d3d3d3d00ff80ea8f"
+string(20) "00ff80ea8f3d3d3d3d3d"
+string(20) "3d3d00ff80ea8f3d3d3d"
+string(32) "00ff80ea8f2020202020202020202020"
+string(32) "00ff80ea8f3d3d3d3d3d3d3d3d3d3d3d"
+string(32) "3d3d3d3d3d3d3d3d3d3d3d00ff80ea8f"
+string(32) "00ff80ea8f3d3d3d3d3d3d3d3d3d3d3d"
+string(32) "3d3d3d3d3d00ff80ea8f3d3d3d3d3d3d"
+
+DONE
-- 
2.40.0