Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  ftp: Fix weird typo (php#20295)

Author: ndossche

ext/ftp/php_ftp.c

@@ -809,7 +809,7 @@ PHP_FUNCTION(ftp_nb_get)
 }
 /* }}} */
 
-/* {{{ Continues retrieving/sending a file nbronously */
+/* {{{ Continues to retrieve or send a file in non-blocking mode */
 PHP_FUNCTION(ftp_nb_continue)
 {
 	zval		*z_ftp;
@@ -822,7 +822,7 @@ PHP_FUNCTION(ftp_nb_continue)
 	GET_FTPBUF(ftp, z_ftp);
 
 	if (!ftp->nb) {
-		php_error_docref(NULL, E_WARNING, "No nbronous transfer to continue");
+		php_error_docref(NULL, E_WARNING, "No non-blocking transfer to continue");
 		RETURN_LONG(PHP_FTP_FAILED);
 	}
 

ext/ftp/tests/005.phpt

@@ -85,7 +85,7 @@ int(-1)
 Warning: ftp_mkdir(): Command not implemented (7). in %s005.php on line %d
 bool(false)
 
-Warning: ftp_nb_continue(): No nbronous transfer to continue in %s005.php on line %d
+Warning: ftp_nb_continue(): No non-blocking transfer to continue in %s on line %d
 int(0)
 ftp_nb_fget(): Argument #4 ($mode) must be either FTP_ASCII or FTP_BINARY
 ftp_nb_fput(): Argument #4 ($mode) must be either FTP_ASCII or FTP_BINARY