Merge branch 'master' into jit-dynasm

* master:
  Use system libzip by default
  Not sure why these lines are removed :<
  Update NEWS
  Fixed bug #75152 (signed integer overflow in parse_iv)
  Fixed bug #73730 (textdomain(null) throws in strict mode)
  They should always be equal (zend_call_graph.c:php#109)
  Optimize truncation to zero scale in bc_raisemod()
  Fix bug75178.phpt on Windows
  Fixed signature
  Fixed bug #75178 (bcpowmod() misbehaves for non-integer base or modulus)
  Added gd func infos
  Added fileinfo func infos
  Remove unused member

Author: dstogov

ext/bcmath/libbcmath/src/bcmath.h

@@ -42,7 +42,6 @@ typedef struct bc_struct
       int   n_len;	/* The number of digits before the decimal point. */
       int   n_scale;	/* The number of digits after the decimal point. */
       int   n_refs;     /* The number of pointers to this number. */
-      bc_num n_next;	/* Linked list for available list. */
       char *n_ptr;	/* The pointer to the actual storage.
 			   If NULL, n_value points to the inside of
 			   another number (bc_multiply...) and should

ext/bcmath/libbcmath/src/init.c

@@ -51,14 +51,6 @@ _bc_new_num_ex (length, scale, persistent)
   }
   /* PHP Change:  malloc() -> pemalloc(), removed free_list code */
   temp = (bc_num) safe_pemalloc (1, sizeof(bc_struct)+length, scale, persistent);
-#if 0
-  if (_bc_Free_list != NULL) {
-    temp = _bc_Free_list;
-    _bc_Free_list = temp->n_next;
-  } else {
-    temp = (bc_num) pemalloc (sizeof(bc_struct), persistent);
-  }
-#endif
   temp->n_sign = PLUS;
   temp->n_len = length;
   temp->n_scale = scale;
@@ -86,10 +78,6 @@ _bc_free_num_ex (num, persistent)
 		/* PHP Change:  free() -> pefree(), removed free_list code */
       pefree ((*num)->n_ptr, persistent);
 	pefree(*num, persistent);
-#if 0
-    (*num)->n_next = _bc_Free_list;
-    _bc_Free_list = *num;
-#endif
   }
   *num = NULL;
 }

ext/bcmath/libbcmath/src/raisemod.c

@@ -38,14 +38,32 @@
 #include "bcmath.h"
 #include "private.h"
 
+
+/* Truncate a number to zero scale.  To avoid sharing issues (refcount and
+   shared n_value) the number is copied, this copy is truncated, and the
+   original number is "freed". */
+
+static void
+_bc_truncate (bc_num *num)
+{
+  bc_num temp;
+
+  temp = bc_new_num ((*num)->n_len, 0);
+  temp->n_sign = (*num)->n_sign;
+  memcpy (temp->n_value, (*num)->n_value, (*num)->n_len);
+  bc_free_num (num);
+  *num = temp;
+}
+
+
 /* Raise BASE to the EXPO power, reduced modulo MOD.  The result is
    placed in RESULT.  If a EXPO is not an integer,
    only the integer part is used.  */
 
 int
 bc_raisemod (bc_num base, bc_num expo, bc_num mod, bc_num *result, int scale)
 {
-  bc_num power, exponent, parity, temp;
+  bc_num power, exponent, modulus, parity, temp;
   int rscale;
 
   /* Check for correct numbers. */
@@ -55,27 +73,34 @@ bc_raisemod (bc_num base, bc_num expo, bc_num mod, bc_num *result, int scale)
   /* Set initial values.  */
   power = bc_copy_num (base);
   exponent = bc_copy_num (expo);
+  modulus = bc_copy_num (mod);
   temp = bc_copy_num (BCG(_one_));
   bc_init_num(&parity);
 
   /* Check the base for scale digits. */
-  if (base->n_scale != 0)
+  if (power->n_scale != 0)
+    {
       bc_rt_warn ("non-zero scale in base");
+      _bc_truncate (&power);
+    }
 
   /* Check the exponent for scale digits. */
   if (exponent->n_scale != 0)
     {
       bc_rt_warn ("non-zero scale in exponent");
-      bc_divide (exponent, BCG(_one_), &exponent, 0); /*truncate */
+      _bc_truncate (&exponent);
     }
 
   /* Check the modulus for scale digits. */
-  if (mod->n_scale != 0)
+  if (modulus->n_scale != 0)
+    {
       bc_rt_warn ("non-zero scale in modulus");
+      _bc_truncate (&modulus);
+    }
 
   /* Do the calculation. */
-  rscale = MAX(scale, base->n_scale);
-  if ( !bc_compare(mod, BCG(_one_)) )
+  rscale = MAX(scale, power->n_scale);
+  if ( !bc_compare(modulus, BCG(_one_)) )
     {
       temp = bc_new_num (1, scale);
     }
@@ -87,17 +112,18 @@ bc_raisemod (bc_num base, bc_num expo, bc_num mod, bc_num *result, int scale)
 	  if ( !bc_is_zero(parity) )
 	    {
 	      bc_multiply (temp, power, &temp, rscale);
-	      (void) bc_modulo (temp, mod, &temp, scale);
+	      (void) bc_modulo (temp, modulus, &temp, scale);
 	    }
 
 	  bc_multiply (power, power, &power, rscale);
-	  (void) bc_modulo (power, mod, &power, scale);
+	  (void) bc_modulo (power, modulus, &power, scale);
 	}
     }
 
   /* Assign the value. */
   bc_free_num (&power);
   bc_free_num (&exponent);
+  bc_free_num (&modulus);
   bc_free_num (result);
   bc_free_num (&parity);
   *result = temp;

ext/bcmath/tests/bug75178-win32.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Bug #75178 (bcpowmod() misbehaves for non-integer base or modulus)
+--SKIPIF--
+<?php
+if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+    die('skip valid only for windows');
+}
+?>
+--FILE--
+<?php
+var_dump(bcpowmod('4.1', '4', '3', 3));
+var_dump(bcpowmod('4', '4', '3.1', 3));
+?>
+===DONE===
+--EXPECT--
+string(5) "1.000"
+string(5) "1.000"
+===DONE===
+bc math warning: non-zero scale in base
+bc math warning: non-zero scale in modulus

ext/bcmath/tests/bug75178.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Bug #75178 (bcpowmod() misbehaves for non-integer base or modulus)
+--SKIPIF--
+<?php
+if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip Not valid for windows');
+}
+?>
+--FILE--
+<?php
+var_dump(bcpowmod('4.1', '4', '3', 3));
+var_dump(bcpowmod('4', '4', '3.1', 3));
+?>
+===DONE===
+--EXPECT--
+bc math warning: non-zero scale in base
+string(5) "1.000"
+bc math warning: non-zero scale in modulus
+string(5) "1.000"
+===DONE===

ext/gd/gd.c

@@ -3036,7 +3036,7 @@ PHP_FUNCTION(imagecolorexact)
 }
 /* }}} */
 
-/* {{{ proto void imagecolorset(resource im, int col, int red, int green, int blue)
+/* {{{ proto bool imagecolorset(resource im, int col, int red, int green, int blue)
    Set the color for the specified palette index */
 PHP_FUNCTION(imagecolorset)
 {
@@ -4634,7 +4634,7 @@ PHP_FUNCTION(imageconvolution)
 /* }}} */
 /* End section: Filters */
 
-/* {{{ proto void imageflip(resource im, int mode)
+/* {{{ proto bool imageflip(resource im, int mode)
    Flip an image (in place) horizontally, vertically or both directions. */
 PHP_FUNCTION(imageflip)
 {
@@ -4692,7 +4692,7 @@ PHP_FUNCTION(imageantialias)
 }
 /* }}} */
 
-/* {{{ proto void imagecrop(resource im, array rect)
+/* {{{ proto resource imagecrop(resource im, array rect)
    Crop an image using the given coordinates and size, x, y, width and height. */
 PHP_FUNCTION(imagecrop)
 {
@@ -4749,7 +4749,7 @@ PHP_FUNCTION(imagecrop)
 }
 /* }}} */
 
-/* {{{ proto void imagecropauto(resource im [, int mode [, float threshold [, int color]]])
+/* {{{ proto resource imagecropauto(resource im [, int mode [, float threshold [, int color]]])
    Crop an image automatically using one of the available modes. */
 PHP_FUNCTION(imagecropauto)
 {

ext/gettext/gettext.c

@@ -161,16 +161,16 @@ PHP_MINFO_FUNCTION(php_gettext)
    Set the textdomain to "domain". Returns the current domain */
 PHP_NAMED_FUNCTION(zif_textdomain)
 {
-	char *domain, *domain_name, *retval;
-	size_t domain_len;
+	char *domain = NULL, *domain_name, *retval;
+	size_t domain_len = 0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &domain, &domain_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!", &domain, &domain_len) == FAILURE) {
 		return;
 	}
 
 	PHP_GETTEXT_DOMAIN_LENGTH_CHECK
 
-	if (strcmp(domain, "") && strcmp(domain, "0")) {
+	if (domain != NULL && strcmp(domain, "") && strcmp(domain, "0")) {
 		domain_name = domain;
 	} else {
 		domain_name = NULL;

ext/gettext/tests/bug73730.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Bug #73730 (textdomain(null) throws in strict mode)
+--SKIPIF--
+<?php
+if (!extension_loaded('gettext')) die('skip gettext extension is not available');
+?>
+--FILE--
+<?php
+declare(strict_types=1);
+
+var_dump(textdomain(null));
+?>
+===DONE===
+--EXPECT--
+string(8) "messages"
+===DONE===