Skip to content

Commit 3878abe

Browse files
filiskofilisko
authored
Merge pull request #324 from philsbury/master
Pass null values to prevent PHP8 warnings
2 parents e8416a3 + ff6fa1c commit 3878abe

1 file changed

Lines changed: 43 additions & 43 deletions

File tree

‎gump.class.php‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public function __construct(string $lang = 'en')
152152
$lang_file_location = __DIR__.DIRECTORY_SEPARATOR.'lang'.DIRECTORY_SEPARATOR.$lang.'.php';
153153

154154
if (!EnvHelpers::file_exists($lang_file_location)) {
155-
throw new Exception(sprintf("'%s' language is not supported.", $lang));
155+
throw new Exception(sprintf("'%s' language is not supported.", $lang));
156156
}
157157

158158
$this->lang = $lang;
@@ -480,7 +480,7 @@ private function parse_rules($rules)
480480
$rules_names[] = is_numeric($key) ? $value : $key;
481481
}
482482

483-
return array_map(function($value, $key) use($rules) {
483+
return array_map(function ($value, $key) use ($rules) {
484484
if ($value === $key) {
485485
return [ $key ];
486486
}
@@ -554,7 +554,7 @@ private function field_has_required_rules(array $rules)
554554

555555
// v2
556556
if (is_array($rules) && is_array($rules[0])) {
557-
$found = array_filter($rules, function($item) use($require_type_of_rules) {
557+
$found = array_filter($rules, function ($item) use ($require_type_of_rules) {
558558
return in_array($item[0], $require_type_of_rules);
559559
});
560560
return count($found) > 0;
@@ -849,18 +849,18 @@ public function get_readable_errors(bool $convert_to_string = false, string $fie
849849
$messages = $this->get_messages();
850850
$result = [];
851851

852-
$transformer = static function($replace) use($field_class) {
852+
$transformer = static function ($replace) use ($field_class) {
853853
$replace['{field}'] = sprintf('<span class="%s">%s</span>', $field_class, $replace['{field}']);
854854
return $replace;
855855
};
856856

857857
foreach ($this->errors as $error) {
858858
$message = $this->get_error_message($messages, $error['field'], $error['rule']);
859-
$result[] = $this->process_error_message($error['field'], $error['params'], $message, $transformer);
859+
$result[] = $this->process_error_message($error['field'], $error['params'], $message, $transformer);
860860
}
861861

862862
if ($convert_to_string) {
863-
return array_reduce($result, static function($prev, $next) use($error_class) {
863+
return array_reduce($result, static function ($prev, $next) use ($error_class) {
864864
return sprintf('%s<span class="%s">%s</span>', $prev, $error_class, $next);
865865
});
866866
}
@@ -1158,7 +1158,7 @@ protected function filter_slug($value, array $params = [])
11581158
*
11591159
* @return bool
11601160
*/
1161-
protected function validate_required($field, array $input, array $params = [], $value)
1161+
protected function validate_required($field, array $input, array $params = [], $value = null)
11621162
{
11631163
return isset($value) && !self::is_empty($value);
11641164
}
@@ -1178,7 +1178,7 @@ protected function validate_contains($field, array $input, array $params)
11781178
{
11791179
$value = mb_strtolower(trim($input[$field]));
11801180

1181-
$params = array_map(static function($value) {
1181+
$params = array_map(static function ($value) {
11821182
return mb_strtolower(trim($value));
11831183
}, $params);
11841184

@@ -1231,7 +1231,7 @@ protected function validate_doesnt_contain_list($field, $input, array $params)
12311231
*
12321232
* @return bool
12331233
*/
1234-
protected function validate_boolean($field, array $input, array $params = [], $value)
1234+
protected function validate_boolean($field, array $input, array $params = [], $value = null)
12351235
{
12361236
if (isset($params[0]) && $params[0] === 'strict') {
12371237
return in_array($input[$field], [true, false], true);
@@ -1258,7 +1258,7 @@ protected function validate_boolean($field, array $input, array $params = [], $v
12581258
*
12591259
* @return bool
12601260
*/
1261-
protected function validate_valid_email($field, array $input, array $params = [], $value)
1261+
protected function validate_valid_email($field, array $input, array $params = [], $value = null)
12621262
{
12631263
return filter_var($value, FILTER_VALIDATE_EMAIL) !== false;
12641264
}
@@ -1275,7 +1275,7 @@ protected function validate_valid_email($field, array $input, array $params = []
12751275
*
12761276
* @return bool
12771277
*/
1278-
protected function validate_max_len($field, array $input, array $params = [], $value)
1278+
protected function validate_max_len($field, array $input, array $params = [], $value = null)
12791279
{
12801280
return mb_strlen($value) <= (int)$params[0];
12811281
}
@@ -1292,7 +1292,7 @@ protected function validate_max_len($field, array $input, array $params = [], $v
12921292
*
12931293
* @return bool
12941294
*/
1295-
protected function validate_min_len($field, array $input, array $params = [], $value)
1295+
protected function validate_min_len($field, array $input, array $params = [], $value = null)
12961296
{
12971297
return mb_strlen($value) >= (int)$params[0];
12981298
}
@@ -1308,7 +1308,7 @@ protected function validate_min_len($field, array $input, array $params = [], $v
13081308
*
13091309
* @return bool
13101310
*/
1311-
protected function validate_exact_len($field, array $input, array $params = [], $value)
1311+
protected function validate_exact_len($field, array $input, array $params = [], $value = null)
13121312
{
13131313
return mb_strlen($value) == (int)$params[0];
13141314
}
@@ -1353,7 +1353,7 @@ protected function validate_alpha($field, array $input, array $params = [], $val
13531353
*
13541354
* @return bool
13551355
*/
1356-
protected function validate_alpha_numeric($field, array $input, array $params = [], $value)
1356+
protected function validate_alpha_numeric($field, array $input, array $params = [], $value = null)
13571357
{
13581358
return preg_match('/^(['.self::$alpha_regex.'0-9])+$/i', $value) > 0;
13591359
}
@@ -1367,7 +1367,7 @@ protected function validate_alpha_numeric($field, array $input, array $params =
13671367
*
13681368
* @return bool
13691369
*/
1370-
protected function validate_alpha_dash($field, array $input, array $params = [], $value)
1370+
protected function validate_alpha_dash($field, array $input, array $params = [], $value = null)
13711371
{
13721372
return preg_match('/^(['.self::$alpha_regex.'_-])+$/i', $value) > 0;
13731373
}
@@ -1381,7 +1381,7 @@ protected function validate_alpha_dash($field, array $input, array $params = [],
13811381
*
13821382
* @return bool
13831383
*/
1384-
protected function validate_alpha_numeric_dash($field, array $input, array $params = [], $value)
1384+
protected function validate_alpha_numeric_dash($field, array $input, array $params = [], $value = null)
13851385
{
13861386
return preg_match('/^(['.self::$alpha_regex.'0-9_-])+$/i', $value) > 0;
13871387
}
@@ -1395,7 +1395,7 @@ protected function validate_alpha_numeric_dash($field, array $input, array $para
13951395
*
13961396
* @return bool
13971397
*/
1398-
protected function validate_alpha_numeric_space($field, array $input, array $params = [], $value)
1398+
protected function validate_alpha_numeric_space($field, array $input, array $params = [], $value = null)
13991399
{
14001400
return preg_match('/^(['.self::$alpha_regex.'\s0-9])+$/i', $value) > 0;
14011401
}
@@ -1409,7 +1409,7 @@ protected function validate_alpha_numeric_space($field, array $input, array $par
14091409
*
14101410
* @return bool
14111411
*/
1412-
protected function validate_alpha_space($field, array $input, array $params = [], $value)
1412+
protected function validate_alpha_space($field, array $input, array $params = [], $value = null)
14131413
{
14141414
return preg_match('/^(['.self::$alpha_regex.'\s])+$/i', $value) > 0;
14151415
}
@@ -1423,7 +1423,7 @@ protected function validate_alpha_space($field, array $input, array $params = []
14231423
*
14241424
* @return bool
14251425
*/
1426-
protected function validate_numeric($field, array $input, array $params = [], $value)
1426+
protected function validate_numeric($field, array $input, array $params = [], $value = null)
14271427
{
14281428
return is_numeric($value);
14291429
}
@@ -1437,7 +1437,7 @@ protected function validate_numeric($field, array $input, array $params = [], $v
14371437
*
14381438
* @return bool
14391439
*/
1440-
protected function validate_integer($field, array $input, array $params = [], $value)
1440+
protected function validate_integer($field, array $input, array $params = [], $value = null)
14411441
{
14421442
return !(filter_var($value, FILTER_VALIDATE_INT) === false || is_bool($value) || is_null($value));
14431443
}
@@ -1451,7 +1451,7 @@ protected function validate_integer($field, array $input, array $params = [], $v
14511451
*
14521452
* @return bool
14531453
*/
1454-
protected function validate_float($field, array $input, array $params = [], $value)
1454+
protected function validate_float($field, array $input, array $params = [], $value = null)
14551455
{
14561456
return filter_var($value, FILTER_VALIDATE_FLOAT) !== false;
14571457
}
@@ -1465,7 +1465,7 @@ protected function validate_float($field, array $input, array $params = [], $val
14651465
*
14661466
* @return bool
14671467
*/
1468-
protected function validate_valid_url($field, array $input, array $params = [], $value)
1468+
protected function validate_valid_url($field, array $input, array $params = [], $value = null)
14691469
{
14701470
return filter_var($value, FILTER_VALIDATE_URL) !== false;
14711471
}
@@ -1479,7 +1479,7 @@ protected function validate_valid_url($field, array $input, array $params = [],
14791479
*
14801480
* @return bool
14811481
*/
1482-
protected function validate_url_exists($field, array $input, array $params = [], $value)
1482+
protected function validate_url_exists($field, array $input, array $params = [], $value = null)
14831483
{
14841484
$url = parse_url(mb_strtolower($value));
14851485

@@ -1500,7 +1500,7 @@ protected function validate_url_exists($field, array $input, array $params = [],
15001500
*
15011501
* @return bool
15021502
*/
1503-
protected function validate_valid_ip($field, array $input, array $params = [], $value)
1503+
protected function validate_valid_ip($field, array $input, array $params = [], $value = null)
15041504
{
15051505
return filter_var($value, FILTER_VALIDATE_IP) !== false;
15061506
}
@@ -1517,7 +1517,7 @@ protected function validate_valid_ip($field, array $input, array $params = [], $
15171517
*
15181518
* @return bool
15191519
*/
1520-
protected function validate_valid_ipv4($field, array $input, array $params = [], $value)
1520+
protected function validate_valid_ipv4($field, array $input, array $params = [], $value = null)
15211521
{
15221522
return filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
15231523
}
@@ -1532,7 +1532,7 @@ protected function validate_valid_ipv4($field, array $input, array $params = [],
15321532
*
15331533
* @return bool
15341534
*/
1535-
protected function validate_valid_ipv6($field, array $input, array $params = [], $value)
1535+
protected function validate_valid_ipv6($field, array $input, array $params = [], $value = null)
15361536
{
15371537
return filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== false;
15381538
}
@@ -1549,7 +1549,7 @@ protected function validate_valid_ipv6($field, array $input, array $params = [],
15491549
*
15501550
* @return bool
15511551
*/
1552-
protected function validate_valid_cc($field, array $input, array $params = [], $value)
1552+
protected function validate_valid_cc($field, array $input, array $params = [], $value = null)
15531553
{
15541554
$number = preg_replace('/\D/', '', $value);
15551555

@@ -1561,7 +1561,7 @@ protected function validate_valid_cc($field, array $input, array $params = [], $
15611561
*
15621562
* @since 1.5
15631563
*/
1564-
if ($number_length == 0 ) {
1564+
if ($number_length == 0) {
15651565
return false;
15661566
}
15671567

@@ -1598,7 +1598,7 @@ protected function validate_valid_cc($field, array $input, array $params = [], $
15981598
*
15991599
* @return bool
16001600
*/
1601-
protected function validate_valid_name($field, array $input, array $params = [], $value)
1601+
protected function validate_valid_name($field, array $input, array $params = [], $value = null)
16021602
{
16031603
return preg_match("/^([a-z \p{L} '-])+$/i", $value) > 0;
16041604
}
@@ -1613,7 +1613,7 @@ protected function validate_valid_name($field, array $input, array $params = [],
16131613
*
16141614
* @return bool
16151615
*/
1616-
protected function validate_street_address($field, array $input, array $params = [], $value)
1616+
protected function validate_street_address($field, array $input, array $params = [], $value = null)
16171617
{
16181618
// Theory: 1 number, 1 or more spaces, 1 or more words
16191619
$has_letter = preg_match('/[a-zA-Z]/', $value);
@@ -1633,7 +1633,7 @@ protected function validate_street_address($field, array $input, array $params =
16331633
*
16341634
* @return bool
16351635
*/
1636-
protected function validate_iban($field, array $input, array $params = [], $value)
1636+
protected function validate_iban($field, array $input, array $params = [], $value = null)
16371637
{
16381638
$character = [
16391639
'A' => 10, 'C' => 12, 'D' => 13, 'E' => 14, 'F' => 15, 'G' => 16,
@@ -1666,7 +1666,7 @@ protected function validate_iban($field, array $input, array $params = [], $valu
16661666
*
16671667
* @return bool
16681668
*/
1669-
protected function validate_date($field, array $input, array $params = [], $value)
1669+
protected function validate_date($field, array $input, array $params = [], $value = null)
16701670
{
16711671
// Default
16721672
if (count($params) === 0) {
@@ -1715,7 +1715,7 @@ protected function validate_min_age($field, array $input, array $params, $value)
17151715
* @param array $params
17161716
* @return bool
17171717
*/
1718-
protected function validate_max_numeric($field, array $input, array $params = [], $value)
1718+
protected function validate_max_numeric($field, array $input, array $params = [], $value = null)
17191719
{
17201720
return is_numeric($value) && is_numeric($params[0]) && ($value <= $params[0]);
17211721
}
@@ -1730,7 +1730,7 @@ protected function validate_max_numeric($field, array $input, array $params = []
17301730
* @param array $params
17311731
* @return bool
17321732
*/
1733-
protected function validate_min_numeric($field, array $input, array $params = [], $value)
1733+
protected function validate_min_numeric($field, array $input, array $params = [], $value = null)
17341734
{
17351735
return is_numeric($value) && is_numeric($params[0]) && ($value >= $params[0]);
17361736
}
@@ -1761,7 +1761,7 @@ protected function validate_starts($field, array $input, array $params, $value)
17611761
*
17621762
* @return bool
17631763
*/
1764-
protected function validate_required_file($field, array $input, array $params = [], $value)
1764+
protected function validate_required_file($field, array $input, array $params = [], $value = null)
17651765
{
17661766
return isset($input[$field]) && is_array($input[$field]) && $input[$field]['error'] === 0;
17671767
}
@@ -1781,7 +1781,7 @@ protected function validate_required_file($field, array $input, array $params =
17811781
protected function validate_extension($field, $input, array $params, $value)
17821782
{
17831783
if (is_array($input[$field]) && $input[$field]['error'] === 0) {
1784-
$params = array_map(function($v) {
1784+
$params = array_map(function ($v) {
17851785
return trim(mb_strtolower($v));
17861786
}, $params);
17871787

@@ -1821,7 +1821,7 @@ protected function validate_equalsfield($field, array $input, array $params, $va
18211821
*
18221822
* @return bool
18231823
*/
1824-
protected function validate_guidv4($field, array $input, array $params = [], $value)
1824+
protected function validate_guidv4($field, array $input, array $params = [], $value = null)
18251825
{
18261826
return preg_match("/\{?[a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12}\}?$/", $value) > 0;
18271827
}
@@ -1842,7 +1842,7 @@ protected function validate_guidv4($field, array $input, array $params = [], $va
18421842
*
18431843
* @return bool
18441844
*/
1845-
protected function validate_phone_number($field, array $input, array $params = [], $value)
1845+
protected function validate_phone_number($field, array $input, array $params = [], $value = null)
18461846
{
18471847
$regex = '/^(\d[\s-]?)?[\(\[\s-]{0,2}?\d{3}[\)\]\s-]{0,2}?\d{3}[\s-]?\d{4}$/i';
18481848

@@ -1862,7 +1862,7 @@ protected function validate_phone_number($field, array $input, array $params = [
18621862
*
18631863
* @return bool
18641864
*/
1865-
protected function validate_regex($field, array $input, array $params = [], $value)
1865+
protected function validate_regex($field, array $input, array $params = [], $value = null)
18661866
{
18671867
return preg_match($params[0], $value) > 0;
18681868
}
@@ -1879,7 +1879,7 @@ protected function validate_regex($field, array $input, array $params = [], $val
18791879
*
18801880
* @return bool
18811881
*/
1882-
protected function validate_valid_json_string($field, array $input, array $params = [], $value)
1882+
protected function validate_valid_json_string($field, array $input, array $params = [], $value = null)
18831883
{
18841884
if (!is_string($input[$field]) || !is_object(json_decode($value))) {
18851885
return false;
@@ -1921,7 +1921,7 @@ protected function validate_valid_array_size_greater($field, array $input, array
19211921
*
19221922
* @return bool
19231923
*/
1924-
protected function validate_valid_array_size_lesser($field, array $input, array $params = [], $value)
1924+
protected function validate_valid_array_size_lesser($field, array $input, array $params = [], $value = null)
19251925
{
19261926
if (!is_array($input[$field]) || count($input[$field]) > $params[0]) {
19271927
return false;
@@ -1942,7 +1942,7 @@ protected function validate_valid_array_size_lesser($field, array $input, array
19421942
*
19431943
* @return bool
19441944
*/
1945-
protected function validate_valid_array_size_equal($field, array $input, array $params = [], $value)
1945+
protected function validate_valid_array_size_equal($field, array $input, array $params = [], $value = null)
19461946
{
19471947
return !(!is_array($input[$field]) || count($input[$field]) != $params[0]);
19481948
}
@@ -1958,7 +1958,7 @@ protected function validate_valid_array_size_equal($field, array $input, array $
19581958
* @return bool
19591959
* @throws Exception if Twitter API has changed, in such case report on GitHub please.
19601960
*/
1961-
protected function validate_valid_twitter($field, array $input, array $params = [], $value)
1961+
protected function validate_valid_twitter($field, array $input, array $params = [], $value = null)
19621962
{
19631963
$json = EnvHelpers::file_get_contents("http://twitter.com/users/username_available?username=".$input[$field]);
19641964

0 commit comments

Comments
 (0)