Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix openssl_csr_export() stub

Author: cmb69

ext/openssl/openssl.stub.php

@@ -66,7 +66,7 @@ function openssl_pkcs12_read(string $pkcs12, &$certificates, string $passphrase)
 
 function openssl_csr_export_to_file(OpenSSLCertificateSigningRequest|string $csr, string $output_filename, bool $no_text = true): bool {}
 
-/** @param OpenSSLAsymmetricKey $output */
+/** @param string $output */
 function openssl_csr_export(OpenSSLCertificateSigningRequest|string $csr, &$output, bool $no_text = true): bool {}
 
 /** @param OpenSSLAsymmetricKey|OpenSSLCertificate|array|string $private_key */

ext/openssl/openssl_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 320aca9647019329a42dc3e7937420610a8a4419 */
+ * Stub hash: b820bb89ed3a0612473de268b057663ee237f876 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_x509_export_to_file, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_TYPE_MASK(0, certificate, OpenSSLCertificate, MAY_BE_STRING, NULL)