From 208e50175b678b4836a1b619abdf9945cadcd06a Mon Sep 17 00:00:00 2001
From: dbrekelmans <dbrekelmans@users.noreply.github.com>
Date: Mon, 19 Jul 2021 20:28:19 +0200
Subject: [PATCH 01/10] Add changes from safe8 library

---
 .github/workflows/auto-regenerate.yml         |    2 +-
 .github/workflows/continuous-integration.yml  |    4 +-
 .../rector-continuous-integration.yml         |    4 +-
 README.md                                     |   13 -
 composer.json                                 |    3 +-
 generated/Exceptions/GettextException.php     |   11 +
 generated/apache.php                          |   22 -
 generated/curl.php                            |    8 +-
 generated/functionsList.php                   |   12 +-
 generated/gettext.php                         |   26 +
 generated/image.php                           |    6 +-
 generated/imap.php                            |    2 +-
 generated/mbstring.php                        |   47 +-
 generated/misc.php                            |   15 +
 generated/oci8.php                            |    6 +-
 generated/openssl.php                         |  694 ++++--
 generated/simplexml.php                       |    2 +-
 generated/sockets.php                         |    3 +-
 generated/ssh2.php                            |   61 +
 generated/stream.php                          |    1 +
 generated/uodbc.php                           |    4 +-
 generator/composer.json                       |    4 +-
 generator/composer.lock                       | 1934 ++++++++++++-----
 .../CustomPhpStanFunctionMap.php              |    1 +
 generator/tests/DocPageTest.php               |    2 -
 generator/tests/GeneratedFilesTest.php        |    3 +-
 generator/tests/rector/0.7/composer.json      |    2 +-
 lib/DateTimeImmutable.php                     |    4 +-
 lib/Exceptions/CurlException.php              |    4 +-
 lib/special_cases.php                         |    4 +-
 rector-migrate-0.7.php                        |   12 +-
 31 files changed, 2095 insertions(+), 821 deletions(-)
 create mode 100644 generated/Exceptions/GettextException.php
 create mode 100644 generated/gettext.php

diff --git a/.github/workflows/auto-regenerate.yml b/.github/workflows/auto-regenerate.yml
index 7e22bb39..c4d4f8c0 100644
--- a/.github/workflows/auto-regenerate.yml
+++ b/.github/workflows/auto-regenerate.yml
@@ -18,7 +18,7 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "pcov"
-          php-version: "7.4"
+          php-version: "8.0"
   
       - name: "Check out salathe/phpdoc-base"
         uses: "actions/checkout@v2"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 505768b6..36c31b75 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -16,9 +16,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.2"
-          - "7.3"
-          - "7.4"
+          - "8.0"
 
         dependencies:
           - "highest"
diff --git a/.github/workflows/rector-continuous-integration.yml b/.github/workflows/rector-continuous-integration.yml
index 46c1e0be..b7046899 100644
--- a/.github/workflows/rector-continuous-integration.yml
+++ b/.github/workflows/rector-continuous-integration.yml
@@ -16,9 +16,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.2"
-          - "7.3"
-          - "7.4"
+          - "8.0"
 
         dependencies:
           - "highest"
diff --git a/README.md b/README.md
index f6369de8..3c2ee624 100644
--- a/README.md
+++ b/README.md
@@ -9,19 +9,6 @@
 Safe PHP
 ========
 
-# This project is deprecated 
-
-
-
-Because of how this project needs to be in sync with the official PHP documentation, maintaining a set of functions for PHP 7 is simply too difficult, which means we have to drop support for versions below PHP 8.
-
-On the other hand, because this project is used in other libraries, I cannot actually change the PHP dependency in composer.json to ^8.0 without risking some huge versions conflicts.
-
-So the only solution I see is to create a new project: [Safe8](https://github.com/thecodingmachine/safe8/).
-
-The old safe library will stay on Packagist, but it won't be updated anymore.
-
-
 **Work in progress**
 
 A set of core PHP functions rewritten to throw exceptions instead of returning `false` when an error is encountered.
diff --git a/composer.json b/composer.json
index c0890a7f..6bf17a81 100644
--- a/composer.json
+++ b/composer.json
@@ -36,6 +36,7 @@
             "generated/fpm.php",
             "generated/ftp.php",
             "generated/funchand.php",
+            "generated/gettext.php",
             "generated/gmp.php",
             "generated/gnupg.php",
             "generated/hash.php",
@@ -100,7 +101,7 @@
         ]
     },
     "require": {
-        "php": ">=7.2"
+        "php": "^8.0"
     },
     "require-dev": {
         "phpstan/phpstan": "^0.12",
diff --git a/generated/Exceptions/GettextException.php b/generated/Exceptions/GettextException.php
new file mode 100644
index 00000000..0228ce23
--- /dev/null
+++ b/generated/Exceptions/GettextException.php
@@ -0,0 +1,11 @@
+<?php
+namespace Safe\Exceptions;
+
+class GettextException extends \ErrorException implements SafeExceptionInterface
+{
+    public static function createFromPhpError(): self
+    {
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
+    }
+}
diff --git a/generated/apache.php b/generated/apache.php
index 6ffb983c..2bb3632a 100644
--- a/generated/apache.php
+++ b/generated/apache.php
@@ -110,28 +110,6 @@ function apache_request_headers(): array
 }
 
 
-/**
- * apache_reset_timeout resets the Apache write timer,
- * which defaults to 300 seconds. With set_time_limit(0);
- * ignore_user_abort(true) and periodic
- * apache_reset_timeout calls, Apache can theoretically
- * run forever.
- *
- * This function requires Apache 1.
- *
- * @throws ApacheException
- *
- */
-function apache_reset_timeout(): void
-{
-    error_clear_last();
-    $result = \apache_reset_timeout();
-    if ($result === false) {
-        throw ApacheException::createFromPhpError();
-    }
-}
-
-
 /**
  * Fetch all HTTP response headers.  Works in the
  * Apache, FastCGI, CLI, and FPM webservers.
diff --git a/generated/curl.php b/generated/curl.php
index 05e659e8..f89e6624 100644
--- a/generated/curl.php
+++ b/generated/curl.php
@@ -843,9 +843,8 @@ function curl_multi_init()
  *
  * TRUE to follow any
  * "Location: " header that the server sends as
- * part of the HTTP header (note this is recursive, PHP will follow as
- * many "Location: " headers that it is sent,
- * unless CURLOPT_MAXREDIRS is set).
+ * part of the HTTP header.
+ * See also CURLOPT_MAXREDIRS.
  *
  *
  *
@@ -1481,6 +1480,9 @@ function curl_multi_init()
  *
  * The maximum amount of HTTP redirections to follow. Use this option
  * alongside CURLOPT_FOLLOWLOCATION.
+ * Default value of 20 is set to prevent infinite redirects.
+ * Setting to -1 allows inifinite redirects, and 0
+ * refuses all redirects.
  *
  *
  *
diff --git a/generated/functionsList.php b/generated/functionsList.php
index d2a2090f..c4016050 100644
--- a/generated/functionsList.php
+++ b/generated/functionsList.php
@@ -5,7 +5,6 @@
     'apache_get_version',
     'apache_lookup_uri',
     'apache_request_headers',
-    'apache_reset_timeout',
     'apache_response_headers',
     'apache_setenv',
     'apcu_cache_info',
@@ -23,6 +22,7 @@
     'arsort',
     'asort',
     'base64_decode',
+    'bindtextdomain',
     'bzclose',
     'bzflush',
     'bzread',
@@ -633,6 +633,7 @@
     'openssl_cms_verify',
     'openssl_csr_export',
     'openssl_csr_export_to_file',
+    'openssl_csr_get_public_key',
     'openssl_csr_get_subject',
     'openssl_csr_new',
     'openssl_csr_sign',
@@ -640,6 +641,7 @@
     'openssl_dh_compute_key',
     'openssl_digest',
     'openssl_encrypt',
+    'openssl_get_curve_names',
     'openssl_open',
     'openssl_pbkdf2',
     'openssl_pkcs7_decrypt',
@@ -649,6 +651,7 @@
     'openssl_pkcs12_export',
     'openssl_pkcs12_export_to_file',
     'openssl_pkcs12_read',
+    'openssl_pkey_derive',
     'openssl_pkey_export',
     'openssl_pkey_export_to_file',
     'openssl_pkey_get_private',
@@ -661,6 +664,11 @@
     'openssl_random_pseudo_bytes',
     'openssl_seal',
     'openssl_sign',
+    'openssl_spki_export',
+    'openssl_spki_export_challenge',
+    'openssl_spki_new',
+    'openssl_spki_verify',
+    'openssl_verify',
     'openssl_x509_export',
     'openssl_x509_export_to_file',
     'openssl_x509_fingerprint',
@@ -965,6 +973,7 @@
     'ssh2_publickey_remove',
     'ssh2_scp_recv',
     'ssh2_scp_send',
+    'ssh2_send_eof',
     'ssh2_sftp',
     'ssh2_sftp_chmod',
     'ssh2_sftp_mkdir',
@@ -972,6 +981,7 @@
     'ssh2_sftp_rmdir',
     'ssh2_sftp_symlink',
     'ssh2_sftp_unlink',
+    'ssh2_shell',
     'stream_context_set_params',
     'stream_copy_to_stream',
     'stream_filter_append',
diff --git a/generated/gettext.php b/generated/gettext.php
new file mode 100644
index 00000000..e1269035
--- /dev/null
+++ b/generated/gettext.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Safe;
+
+use Safe\Exceptions\GettextException;
+
+/**
+ * The bindtextdomain function sets or gets the path
+ * for a domain.
+ *
+ * @param string $domain The domain.
+ * @param string $directory The directory path.
+ * If NULL, the currently set directory is returned.
+ * @return string The full pathname for the domain currently being set.
+ * @throws GettextException
+ *
+ */
+function bindtextdomain(string $domain, string $directory): string
+{
+    error_clear_last();
+    $result = \bindtextdomain($domain, $directory);
+    if ($result === false) {
+        throw GettextException::createFromPhpError();
+    }
+    return $result;
+}
diff --git a/generated/image.php b/generated/image.php
index cdaeeba8..2999a978 100644
--- a/generated/image.php
+++ b/generated/image.php
@@ -1837,15 +1837,15 @@ function imagerectangle($image, int $x1, int $y1, int $x2, int $y2, int $color):
  * @param float $angle Rotation angle, in degrees. The rotation angle is interpreted as the
  * number of degrees to rotate the image anticlockwise.
  * @param int $bgd_color Specifies the color of the uncovered zone after the rotation
- * @param int $dummy This parameter is unused.
+ * @param bool $ignore_transparent This parameter is unused.
  * @return resource Returns an image resource for the rotated image.
  * @throws ImageException
  *
  */
-function imagerotate($image, float $angle, int $bgd_color, int $dummy = 0)
+function imagerotate($image, float $angle, int $bgd_color, bool $ignore_transparent = false)
 {
     error_clear_last();
-    $result = \imagerotate($image, $angle, $bgd_color, $dummy);
+    $result = \imagerotate($image, $angle, $bgd_color, $ignore_transparent);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
diff --git a/generated/imap.php b/generated/imap.php
index 35898be1..bff3bb21 100644
--- a/generated/imap.php
+++ b/generated/imap.php
@@ -492,7 +492,7 @@ function imap_fetchbody($imap, int $message_num, string $section, int $flags = 0
  *
  *
  *
- * FT_UID - The msgno
+ * FT_UID - The message_num
  * argument is a UID
  *
  *
diff --git a/generated/mbstring.php b/generated/mbstring.php
index 113e2260..60ead94a 100644
--- a/generated/mbstring.php
+++ b/generated/mbstring.php
@@ -5,11 +5,17 @@
 use Safe\Exceptions\MbstringException;
 
 /**
+ * Returns a string containing the character specified by the Unicode code point value,
+ * encoded in the specified encoding.
  *
+ * This function complements mb_ord.
  *
- * @param int $codepoint
- * @param string $encoding
- * @return string Returns a specific character.
+ * @param int $codepoint A Unicode codepoint value, e.g. 128024 for U+1F418 ELEPHANT
+ * @param string $encoding The encoding
+ * parameter is the character encoding. If it is omitted or NULL, the internal character
+ * encoding value will be used.
+ * @return string A string containing the requested character, if it can be represented in the specified
+ * encoding.
  * @throws MbstringException
  *
  */
@@ -328,13 +334,24 @@ function mb_eregi_replace(string $pattern, string $replacement, string $string,
 /**
  *
  *
- * @param string $type If type isn't specified or is specified to
- * "all", an array having the elements "internal_encoding",
- * "http_output", "http_input", "func_overload", "mail_charset",
- * "mail_header_encoding", "mail_body_encoding" will be returned.
- *
- * If type is specified as "http_output",
- * "http_input", "internal_encoding", "func_overload",
+ * @param string $type If type is not specified or is specified as "all",
+ * "internal_encoding", "http_input",
+ * "http_output", "http_output_conv_mimetypes",
+ * "mail_charset", "mail_header_encoding",
+ * "mail_body_encoding", "illegal_chars",
+ * "encoding_translation", "language",
+ * "detect_order", "substitute_character"
+ * and "strict_detection"
+ * will be returned.
+ *
+ * If type is specified as
+ * "internal_encoding", "http_input",
+ * "http_output", "http_output_conv_mimetypes",
+ * "mail_charset", "mail_header_encoding",
+ * "mail_body_encoding", "illegal_chars",
+ * "encoding_translation", "language",
+ * "detect_order", "substitute_character"
+ * or "strict_detection"
  * the specified setting parameter will be returned.
  * @return mixed An array of type information if type
  * is not specified, otherwise a specific type.
@@ -417,11 +434,15 @@ function mb_internal_encoding(string $encoding = null)
 
 
 /**
+ * Returns the Unicode code point value of the given character.
  *
+ * This function complements mb_chr.
  *
- * @param string $string
- * @param string $encoding
- * @return int Returns a code point of character.
+ * @param string $string A string
+ * @param string $encoding The encoding
+ * parameter is the character encoding. If it is omitted or NULL, the internal character
+ * encoding value will be used.
+ * @return int The Unicode code point for the first character of string.
  * @throws MbstringException
  *
  */
diff --git a/generated/misc.php b/generated/misc.php
index de4dfc47..95bfa6a6 100644
--- a/generated/misc.php
+++ b/generated/misc.php
@@ -490,6 +490,21 @@ function time_sleep_until(float $timestamp): void
  * then each of the array keys will have a sequence number behind
  * the given name.
  *
+ * Changes were made to bring this function into line with Perl:
+ *
+ *
+ * The "a" code now retains trailing NULL bytes.
+ *
+ *
+ * The "A" code now strips all trailing ASCII whitespace (spaces, tabs,
+ * newlines, carriage returns, and NULL bytes).
+ *
+ *
+ * The "Z" code was added for NULL-padded strings, and removes trailing
+ * NULL bytes.
+ *
+ *
+ *
  * @param string $format See pack for an explanation of the format codes.
  * @param string $string The packed data.
  * @param int $offset The offset to begin unpacking from.
diff --git a/generated/oci8.php b/generated/oci8.php
index b5dad79a..2966fbb4 100644
--- a/generated/oci8.php
+++ b/generated/oci8.php
@@ -434,7 +434,7 @@ function oci_commit($connection): void
  * [//]host_name[:port][/service_name]. From Oracle
  * 11g, the syntax is:
  * [//]host_name[:port][/service_name][:server_type][/instance_name].
- * Futher options were introduced with Oracle 19c, including timeout and keep-alive
+ * Further options were introduced with Oracle 19c, including timeout and keep-alive
  * settings.  Refer to Oracle documentation.  Service names can be found by running
  * the Oracle utility lsnrctl status on the database server
  * machine.
@@ -960,7 +960,7 @@ function oci_new_collection($connection, string $tdo, string $schema = null)
  * [//]host_name[:port][/service_name]. From Oracle
  * 11g, the syntax is:
  * [//]host_name[:port][/service_name][:server_type][/instance_name].
- * Futher options were introduced with Oracle 19c, including timeout and keep-alive
+ * Further options were introduced with Oracle 19c, including timeout and keep-alive
  * settings.  Refer to Oracle documentation.  Service names can be found by running
  * the Oracle utility lsnrctl status on the database server
  * machine.
@@ -1182,7 +1182,7 @@ function oci_parse($connection, string $sql_text)
  * [//]host_name[:port][/service_name]. From Oracle
  * 11g, the syntax is:
  * [//]host_name[:port][/service_name][:server_type][/instance_name].
- * Futher options were introduced with Oracle 19c, including timeout and keep-alive
+ * Further options were introduced with Oracle 19c, including timeout and keep-alive
  * settings.  Refer to Oracle documentation.  Service names can be found by running
  * the Oracle utility lsnrctl status on the database server
  * machine.
diff --git a/generated/openssl.php b/generated/openssl.php
index 985b8ade..5d6664e6 100644
--- a/generated/openssl.php
+++ b/generated/openssl.php
@@ -7,15 +7,15 @@
 /**
  * Gets the cipher initialization vector (iv) length.
  *
- * @param string $method The cipher method, see openssl_get_cipher_methods for a list of potential values.
+ * @param string $cipher_algo The cipher method, see openssl_get_cipher_methods for a list of potential values.
  * @return int Returns the cipher length on success.
  * @throws OpensslException
  *
  */
-function openssl_cipher_iv_length(string $method): int
+function openssl_cipher_iv_length(string $cipher_algo): int
 {
     error_clear_last();
-    $result = \openssl_cipher_iv_length($method);
+    $result = \openssl_cipher_iv_length($cipher_algo);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -168,11 +168,11 @@ function openssl_cms_verify(string $input_filename, int $flags = 0, $certificate
 /**
  * openssl_csr_export_to_file takes the Certificate
  * Signing Request represented by csr and saves it
- * in PEM format into the file named by outfilename.
+ * in PEM format into the file named by output_filename.
  *
  * @param string|resource $csr See CSR parameters for a list of valid values.
- * @param string $outfilename Path to the output file.
- * @param bool $notext
+ * @param string $output_filename Path to the output file.
+ * @param bool $no_text
  * The optional parameter notext affects
  * the verbosity of the output; if it is FALSE, then additional human-readable
  * information is included in the output. The default value of
@@ -180,10 +180,10 @@ function openssl_cms_verify(string $input_filename, int $flags = 0, $certificate
  * @throws OpensslException
  *
  */
-function openssl_csr_export_to_file($csr, string $outfilename, bool $notext = true): void
+function openssl_csr_export_to_file($csr, string $output_filename, bool $no_text = true): void
 {
     error_clear_last();
-    $result = \openssl_csr_export_to_file($csr, $outfilename, $notext);
+    $result = \openssl_csr_export_to_file($csr, $output_filename, $no_text);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -193,12 +193,12 @@ function openssl_csr_export_to_file($csr, string $outfilename, bool $notext = tr
 /**
  * openssl_csr_export takes the Certificate Signing
  * Request represented by csr and stores it in
- * PEM format in out, which is passed by
+ * PEM format in output, which is passed by
  * reference.
  *
  * @param string|resource $csr See CSR parameters for a list of valid values.
- * @param string|null $out on success, this string will contain the PEM encoded CSR
- * @param bool $notext
+ * @param string|null $output on success, this string will contain the PEM encoded CSR
+ * @param bool $no_text
  * The optional parameter notext affects
  * the verbosity of the output; if it is FALSE, then additional human-readable
  * information is included in the output. The default value of
@@ -206,23 +206,44 @@ function openssl_csr_export_to_file($csr, string $outfilename, bool $notext = tr
  * @throws OpensslException
  *
  */
-function openssl_csr_export($csr, ?string &$out, bool $notext = true): void
+function openssl_csr_export($csr, ?string &$output, bool $no_text = true): void
 {
     error_clear_last();
-    $result = \openssl_csr_export($csr, $out, $notext);
+    $result = \openssl_csr_export($csr, $output, $no_text);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
 }
 
 
+/**
+ * openssl_csr_get_public_key extracts the public key
+ * from csr and prepares it for use by other functions.
+ *
+ * @param string|resource $csr See CSR parameters for a list of valid values.
+ * @param bool $short_names This parameter is ignored
+ * @return resource Returns an OpenSSLAsymmetricKey on success.
+ * @throws OpensslException
+ *
+ */
+function openssl_csr_get_public_key($csr, bool $short_names = true)
+{
+    error_clear_last();
+    $result = \openssl_csr_get_public_key($csr, $short_names);
+    if ($result === false) {
+        throw OpensslException::createFromPhpError();
+    }
+    return $result;
+}
+
+
 /**
  * openssl_csr_get_subject returns subject
  * distinguished name information encoded in the csr
  * including fields commonName (CN), organizationName (O), countryName (C) etc.
  *
  * @param string|resource $csr See CSR parameters for a list of valid values.
- * @param bool $use_shortnames shortnames controls how the data is indexed in the
+ * @param bool $short_names shortnames controls how the data is indexed in the
  * array - if shortnames is TRUE (the default) then
  * fields will be indexed with the short name form, otherwise, the long name
  * form will be used - e.g.: CN is the shortname form of commonName.
@@ -230,10 +251,10 @@ function openssl_csr_export($csr, ?string &$out, bool $notext = true): void
  * @throws OpensslException
  *
  */
-function openssl_csr_get_subject($csr, bool $use_shortnames = true): array
+function openssl_csr_get_subject($csr, bool $short_names = true): array
 {
     error_clear_last();
-    $result = \openssl_csr_get_subject($csr, $use_shortnames);
+    $result = \openssl_csr_get_subject($csr, $short_names);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -243,21 +264,21 @@ function openssl_csr_get_subject($csr, bool $use_shortnames = true): array
 
 /**
  * openssl_csr_new generates a new CSR (Certificate Signing Request)
- * based on the information provided by dn.
+ * based on the information provided by distinguished_names.
  *
- * @param array $dn The Distinguished Name or subject fields to be used in the certificate.
- * @param resource $privkey privkey should be set to a private key that was
+ * @param array $distinguished_names The Distinguished Name or subject fields to be used in the certificate.
+ * @param resource $private_key private_key should be set to a private key that was
  * previously generated by openssl_pkey_new (or
  * otherwise obtained from the other openssl_pkey family of functions).
  * The corresponding public portion of the key will be used to sign the
  * CSR.
- * @param array $configargs By default, the information in your system openssl.conf
+ * @param array $options By default, the information in your system openssl.conf
  * is used to initialize the request; you can specify a configuration file
  * section by setting the config_section_section key of
- * configargs.  You can also specify an alternative
+ * options.  You can also specify an alternative
  * openssl configuration file by setting the value of the
  * config key to the path of the file you want to use.
- * The following keys, if present in configargs
+ * The following keys, if present in options
  * behave as their equivalents in the openssl.conf, as
  * listed in the table below.
  *
@@ -265,7 +286,7 @@ function openssl_csr_get_subject($csr, bool $use_shortnames = true): array
  *
  *
  *
- * configargs key
+ * options key
  * type
  * openssl.conf equivalent
  * description
@@ -343,23 +364,23 @@ function openssl_csr_get_subject($csr, bool $use_shortnames = true): array
  *
  *
  *
- * @param array $extraattribs extraattribs is used to specify additional
- * configuration options for the CSR.  Both dn and
- * extraattribs are associative arrays whose keys are
+ * @param array $extra_attributes extra_attributes is used to specify additional
+ * configuration options for the CSR.  Both distinguished_names and
+ * extra_attributes are associative arrays whose keys are
  * converted to OIDs and applied to the relevant part of the request.
  * @return resource Returns the CSR.
  * @throws OpensslException
  *
  */
-function openssl_csr_new(array $dn, &$privkey, array $configargs = null, array $extraattribs = null)
+function openssl_csr_new(array $distinguished_names, &$private_key, array $options = null, array $extra_attributes = null)
 {
     error_clear_last();
-    if ($extraattribs !== null) {
-        $result = \openssl_csr_new($dn, $privkey, $configargs, $extraattribs);
-    } elseif ($configargs !== null) {
-        $result = \openssl_csr_new($dn, $privkey, $configargs);
+    if ($extra_attributes !== null) {
+        $result = \openssl_csr_new($distinguished_names, $private_key, $options, $extra_attributes);
+    } elseif ($options !== null) {
+        $result = \openssl_csr_new($distinguished_names, $private_key, $options);
     } else {
-        $result = \openssl_csr_new($dn, $privkey);
+        $result = \openssl_csr_new($distinguished_names, $private_key);
     }
     if ($result === false) {
         throw OpensslException::createFromPhpError();
@@ -369,38 +390,37 @@ function openssl_csr_new(array $dn, &$privkey, array $configargs = null, array $
 
 
 /**
- * openssl_csr_sign generates an x509 certificate
- * resource from the given CSR.
+ * openssl_csr_sign generates an x509 certificate from the given CSR.
  *
  * @param string|resource $csr A CSR previously generated by openssl_csr_new.
  * It can also be the path to a PEM encoded CSR when specified as
  * file://path/to/csr or an exported string generated
  * by openssl_csr_export.
- * @param string|resource|null $cacert The generated certificate will be signed by cacert.
- * If cacert is NULL, the generated certificate
+ * @param string|resource|null $ca_certificate The generated certificate will be signed by ca_certificate.
+ * If ca_certificate is NULL, the generated certificate
  * will be a self-signed certificate.
- * @param string|resource|array $priv_key priv_key is the private key that corresponds to
- * cacert.
+ * @param string|resource|array $private_key private_key is the private key that corresponds to
+ * ca_certificate.
  * @param int $days days specifies the length of time for which the
  * generated certificate will be valid, in days.
- * @param array $configargs You can finetune the CSR signing by configargs.
+ * @param array $options You can finetune the CSR signing by options.
  * See openssl_csr_new for more information about
- * configargs.
+ * options.
  * @param int $serial An optional the serial number of issued certificate. If not specified
  * it will default to 0.
- * @return resource Returns an x509 certificate resource on success, FALSE on failure.
+ * @return resource Returns an OpenSSLCertificate on success, FALSE on failure.
  * @throws OpensslException
  *
  */
-function openssl_csr_sign($csr, $cacert, $priv_key, int $days, array $configargs = null, int $serial = 0)
+function openssl_csr_sign($csr, $ca_certificate, $private_key, int $days, array $options = null, int $serial = 0)
 {
     error_clear_last();
     if ($serial !== 0) {
-        $result = \openssl_csr_sign($csr, $cacert, $priv_key, $days, $configargs, $serial);
-    } elseif ($configargs !== null) {
-        $result = \openssl_csr_sign($csr, $cacert, $priv_key, $days, $configargs);
+        $result = \openssl_csr_sign($csr, $ca_certificate, $private_key, $days, $options, $serial);
+    } elseif ($options !== null) {
+        $result = \openssl_csr_sign($csr, $ca_certificate, $private_key, $days, $options);
     } else {
-        $result = \openssl_csr_sign($csr, $cacert, $priv_key, $days);
+        $result = \openssl_csr_sign($csr, $ca_certificate, $private_key, $days);
     }
     if ($result === false) {
         throw OpensslException::createFromPhpError();
@@ -413,9 +433,9 @@ function openssl_csr_sign($csr, $cacert, $priv_key, int $days, array $configargs
  * Takes a raw or base64 encoded string and decrypts it using a given method and key.
  *
  * @param string $data The encrypted message to be decrypted.
- * @param string $method The cipher method. For a list of available cipher methods, use
+ * @param string $cipher_algo The cipher method. For a list of available cipher methods, use
  * openssl_get_cipher_methods.
- * @param string $key The key.
+ * @param string $passphrase The key.
  * @param int $options options can be one of
  * OPENSSL_RAW_DATA,
  * OPENSSL_ZERO_PADDING.
@@ -426,10 +446,10 @@ function openssl_csr_sign($csr, $cacert, $priv_key, int $days, array $configargs
  * @throws OpensslException
  *
  */
-function openssl_decrypt(string $data, string $method, string $key, int $options = 0, string $iv = "", string $tag = "", string $aad = ""): string
+function openssl_decrypt(string $data, string $cipher_algo, string $passphrase, int $options = 0, string $iv = "", string $tag = "", string $aad = ""): string
 {
     error_clear_last();
-    $result = \openssl_decrypt($data, $method, $key, $options, $iv, $tag, $aad);
+    $result = \openssl_decrypt($data, $cipher_algo, $passphrase, $options, $iv, $tag, $aad);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -442,16 +462,16 @@ function openssl_decrypt(string $data, string $method, string $key, int $options
  * often used as an encryption key to secretly communicate with a remote party.
  * This is known as the Diffie-Hellman key exchange.
  *
- * @param string $pub_key DH Public key of the remote party.
- * @param resource $dh_key A local DH private key, corresponding to the public key to be shared with the remote party.
+ * @param string $public_key DH Public key of the remote party.
+ * @param resource $private_key A local DH private key, corresponding to the public key to be shared with the remote party.
  * @return string Returns shared secret on success.
  * @throws OpensslException
  *
  */
-function openssl_dh_compute_key(string $pub_key, $dh_key): string
+function openssl_dh_compute_key(string $public_key, $private_key): string
 {
     error_clear_last();
-    $result = \openssl_dh_compute_key($pub_key, $dh_key);
+    $result = \openssl_dh_compute_key($public_key, $private_key);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -464,17 +484,79 @@ function openssl_dh_compute_key(string $pub_key, $dh_key): string
  * and returns a raw or binhex encoded string.
  *
  * @param string $data The data.
- * @param string $method The digest method to use, e.g. "sha256", see openssl_get_md_methods for a list of available digest methods.
- * @param bool $raw_output Setting to TRUE will return as raw output data, otherwise the return
+ * @param string $digest_algo The digest method to use, e.g. "sha256", see openssl_get_md_methods for a list of available digest methods.
+ * @param bool $binary Setting to TRUE will return as raw output data, otherwise the return
  * value is binhex encoded.
  * @return string Returns the digested hash value on success.
  * @throws OpensslException
  *
  */
-function openssl_digest(string $data, string $method, bool $raw_output = false): string
+function openssl_digest(string $data, string $digest_algo, bool $binary = false): string
 {
     error_clear_last();
-    $result = \openssl_digest($data, $method, $raw_output);
+    $result = \openssl_digest($data, $digest_algo, $binary);
+    if ($result === false) {
+        throw OpensslException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Gets the list of available curve names for use in Elliptic curve
+ * cryptography (ECC) for public/private key operations. The two most widely
+ * standardized/supported curves are prime256v1
+ * (NIST P-256) and secp384r1 (NIST P-384).
+ *
+ * Approximate Equivalancies of AES, RSA, DSA and ECC Keysizes
+ *
+ *
+ *
+ * AES Symmetric Keysize (Bits)
+ * RSA and DSA Keysize (Bits)
+ * ECC Keysize (Bits)
+ *
+ *
+ *
+ *
+ * 80
+ * 1024
+ * 160
+ *
+ *
+ * 112
+ * 2048
+ * 224
+ *
+ *
+ * 128
+ * 3072
+ * 256
+ *
+ *
+ * 192
+ * 7680
+ * 384
+ *
+ *
+ * 256
+ * 15360
+ * 512
+ *
+ *
+ *
+ *
+ * NIST
+ * recommends using ECC curves with at least 256 bits.
+ *
+ * @return array An array of available curve names.
+ * @throws OpensslException
+ *
+ */
+function openssl_get_curve_names(): array
+{
+    error_clear_last();
+    $result = \openssl_get_curve_names();
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -484,20 +566,20 @@ function openssl_digest(string $data, string $method, bool $raw_output = false):
 
 /**
  * openssl_open opens (decrypts)
- * sealed_data using the private key associated with
- * the key identifier priv_key_id and the envelope key
- * env_key, and fills
- * open_data with the decrypted data.
+ * data using the private key associated with
+ * the key identifier private_key and the envelope key
+ * encrypted_key, and fills
+ * output with the decrypted data.
  * The envelope key is generated when the
  * data are sealed and can only be used by one specific private key. See
  * openssl_seal for more information.
  *
- * @param string $sealed_data
- * @param string|null $open_data If the call is successful the opened data is returned in this
+ * @param string $data
+ * @param string|null $output If the call is successful the opened data is returned in this
  * parameter.
- * @param string $env_key
- * @param string|array|resource $priv_key_id
- * @param string $method The cipher method.
+ * @param string $encrypted_key
+ * @param string|array|resource $private_key
+ * @param string $cipher_algo The cipher method.
  *
  *
  * The default value ('RC4') is considered insecure.
@@ -508,13 +590,13 @@ function openssl_digest(string $data, string $method, bool $raw_output = false):
  * @throws OpensslException
  *
  */
-function openssl_open(string $sealed_data, ?string &$open_data, string $env_key, $priv_key_id, string $method = "RC4", string $iv = null): void
+function openssl_open(string $data, ?string &$output, string $encrypted_key, $private_key, string $cipher_algo, string $iv = null): void
 {
     error_clear_last();
     if ($iv !== null) {
-        $result = \openssl_open($sealed_data, $open_data, $env_key, $priv_key_id, $method, $iv);
+        $result = \openssl_open($data, $output, $encrypted_key, $private_key, $cipher_algo, $iv);
     } else {
-        $result = \openssl_open($sealed_data, $open_data, $env_key, $priv_key_id, $method);
+        $result = \openssl_open($data, $output, $encrypted_key, $private_key, $cipher_algo);
     }
     if ($result === false) {
         throw OpensslException::createFromPhpError();
@@ -531,15 +613,15 @@ function openssl_open(string $sealed_data, ?string &$open_data, string $env_key,
  * @param int $key_length Length of desired output key.
  * @param int $iterations The number of iterations desired. NIST
  * recommends at least 10,000.
- * @param string $digest_algorithm Optional hash or digest algorithm from openssl_get_md_methods.  Defaults to SHA-1.
+ * @param string $digest_algo Optional hash or digest algorithm from openssl_get_md_methods.  Defaults to SHA-1.
  * @return string Returns raw binary string.
  * @throws OpensslException
  *
  */
-function openssl_pbkdf2(string $password, string $salt, int $key_length, int $iterations, string $digest_algorithm = "sha1"): string
+function openssl_pbkdf2(string $password, string $salt, int $key_length, int $iterations, string $digest_algo = "sha1"): string
 {
     error_clear_last();
-    $result = \openssl_pbkdf2($password, $salt, $key_length, $iterations, $digest_algorithm);
+    $result = \openssl_pbkdf2($password, $salt, $key_length, $iterations, $digest_algo);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -549,15 +631,15 @@ function openssl_pbkdf2(string $password, string $salt, int $key_length, int $it
 
 /**
  * openssl_pkcs12_export_to_file stores
- * x509 into a file named by
- * filename in a PKCS#12 file format.
+ * certificate into a file named by
+ * output_filename in a PKCS#12 file format.
  *
- * @param string|resource $x509 See Key/Certificate parameters for a list of valid values.
- * @param string $filename Path to the output file.
- * @param string|array|resource $priv_key Private key component of PKCS#12 file.
+ * @param string|resource $certificate See Key/Certificate parameters for a list of valid values.
+ * @param string $output_filename Path to the output file.
+ * @param string|array|resource $private_key Private key component of PKCS#12 file.
  * See Public/Private Key parameters for a list of valid values.
- * @param string $pass Encryption password for unlocking the PKCS#12 file.
- * @param array $args Optional array, other keys will be ignored.
+ * @param string $passphrase Encryption password for unlocking the PKCS#12 file.
+ * @param array $options Optional array, other keys will be ignored.
  *
  *
  *
@@ -581,14 +663,10 @@ function openssl_pbkdf2(string $password, string $salt, int $key_length, int $it
  * @throws OpensslException
  *
  */
-function openssl_pkcs12_export_to_file($x509, string $filename, $priv_key, string $pass, array $args = null): void
+function openssl_pkcs12_export_to_file($certificate, string $output_filename, $private_key, string $passphrase, array $options = []): void
 {
     error_clear_last();
-    if ($args !== null) {
-        $result = \openssl_pkcs12_export_to_file($x509, $filename, $priv_key, $pass, $args);
-    } else {
-        $result = \openssl_pkcs12_export_to_file($x509, $filename, $priv_key, $pass);
-    }
+    $result = \openssl_pkcs12_export_to_file($certificate, $output_filename, $private_key, $passphrase, $options);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -597,15 +675,15 @@ function openssl_pkcs12_export_to_file($x509, string $filename, $priv_key, strin
 
 /**
  * openssl_pkcs12_export stores
- * x509 into a string named by
- * out in a PKCS#12 file format.
+ * certificate into a string named by
+ * output in a PKCS#12 file format.
  *
- * @param string|resource $x509 See Key/Certificate parameters for a list of valid values.
- * @param string|null $out On success, this will hold the PKCS#12.
- * @param string|array|resource $priv_key Private key component of PKCS#12 file.
+ * @param string|resource $certificate See Key/Certificate parameters for a list of valid values.
+ * @param string|null $output On success, this will hold the PKCS#12.
+ * @param string|array|resource $private_key Private key component of PKCS#12 file.
  * See Public/Private Key parameters for a list of valid values.
- * @param string $pass Encryption password for unlocking the PKCS#12 file.
- * @param array $args Optional array, other keys will be ignored.
+ * @param string $passphrase Encryption password for unlocking the PKCS#12 file.
+ * @param array $options Optional array, other keys will be ignored.
  *
  *
  *
@@ -629,14 +707,10 @@ function openssl_pkcs12_export_to_file($x509, string $filename, $priv_key, strin
  * @throws OpensslException
  *
  */
-function openssl_pkcs12_export($x509, ?string &$out, $priv_key, string $pass, array $args = null): void
+function openssl_pkcs12_export($certificate, ?string &$output, $private_key, string $passphrase, array $options = []): void
 {
     error_clear_last();
-    if ($args !== null) {
-        $result = \openssl_pkcs12_export($x509, $out, $priv_key, $pass, $args);
-    } else {
-        $result = \openssl_pkcs12_export($x509, $out, $priv_key, $pass);
-    }
+    $result = \openssl_pkcs12_export($certificate, $output, $private_key, $passphrase, $options);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -646,18 +720,18 @@ function openssl_pkcs12_export($x509, ?string &$out, $priv_key, string $pass, ar
 /**
  * openssl_pkcs12_read parses the PKCS#12 certificate store supplied by
  * pkcs12 into a array named
- * certs.
+ * certificates.
  *
  * @param string $pkcs12 The certificate store contents, not its file name.
- * @param array|null $certs On success, this will hold the Certificate Store Data.
- * @param string $pass Encryption password for unlocking the PKCS#12 file.
+ * @param array|null $certificates On success, this will hold the Certificate Store Data.
+ * @param string $passphrase Encryption password for unlocking the PKCS#12 file.
  * @throws OpensslException
  *
  */
-function openssl_pkcs12_read(string $pkcs12, ?array &$certs, string $pass): void
+function openssl_pkcs12_read(string $pkcs12, ?array &$certificates, string $passphrase): void
 {
     error_clear_last();
-    $result = \openssl_pkcs12_read($pkcs12, $certs, $pass);
+    $result = \openssl_pkcs12_read($pkcs12, $certificates, $passphrase);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -666,25 +740,25 @@ function openssl_pkcs12_read(string $pkcs12, ?array &$certs, string $pass): void
 
 /**
  * Decrypts the S/MIME encrypted message contained in the file specified by
- * infilename using the certificate and its
- * associated private key specified by recipcert and
- * recipkey.
- *
- * @param string $infilename
- * @param string $outfilename The decrypted message is written to the file specified by
- * outfilename.
- * @param string|resource $recipcert
- * @param string|resource|array $recipkey
+ * input_filename using the certificate and its
+ * associated private key specified by certificate and
+ * private_key.
+ *
+ * @param string $input_filename
+ * @param string $output_filename The decrypted message is written to the file specified by
+ * output_filename.
+ * @param string|resource $certificate
+ * @param string|resource|array $private_key
  * @throws OpensslException
  *
  */
-function openssl_pkcs7_decrypt(string $infilename, string $outfilename, $recipcert, $recipkey = null): void
+function openssl_pkcs7_decrypt(string $input_filename, string $output_filename, $certificate, $private_key = null): void
 {
     error_clear_last();
-    if ($recipkey !== null) {
-        $result = \openssl_pkcs7_decrypt($infilename, $outfilename, $recipcert, $recipkey);
+    if ($private_key !== null) {
+        $result = \openssl_pkcs7_decrypt($input_filename, $output_filename, $certificate, $private_key);
     } else {
-        $result = \openssl_pkcs7_decrypt($infilename, $outfilename, $recipcert);
+        $result = \openssl_pkcs7_decrypt($input_filename, $output_filename, $certificate);
     }
     if ($result === false) {
         throw OpensslException::createFromPhpError();
@@ -694,13 +768,13 @@ function openssl_pkcs7_decrypt(string $infilename, string $outfilename, $recipce
 
 /**
  * openssl_pkcs7_encrypt takes the contents of the
- * file named infile and encrypts them using an RC2
+ * file named input_filename and encrypts them using an RC2
  * 40-bit cipher so that they can only be read by the intended recipients
- * specified by recipcerts.
+ * specified by certificate.
  *
- * @param string $infile
- * @param string $outfile
- * @param string|resource|array $recipcerts Either a lone X.509 certificate, or an array of X.509 certificates.
+ * @param string $input_filename
+ * @param string $output_filename
+ * @param string|resource|array $certificate Either a lone X.509 certificate, or an array of X.509 certificates.
  * @param array $headers headers is an array of headers that
  * will be prepended to the data after it has been encrypted.
  *
@@ -710,14 +784,14 @@ function openssl_pkcs7_decrypt(string $infilename, string $outfilename, $recipce
  * @param int $flags flags can be used to specify options that affect
  * the encoding process - see PKCS7
  * constants.
- * @param int $cipherid One of cipher constants.
+ * @param int $cipher_algo One of cipher constants.
  * @throws OpensslException
  *
  */
-function openssl_pkcs7_encrypt(string $infile, string $outfile, $recipcerts, array $headers, int $flags = 0, int $cipherid = OPENSSL_CIPHER_RC2_40): void
+function openssl_pkcs7_encrypt(string $input_filename, string $output_filename, $certificate, array $headers, int $flags = 0, int $cipher_algo = OPENSSL_CIPHER_RC2_40): void
 {
     error_clear_last();
-    $result = \openssl_pkcs7_encrypt($infile, $outfile, $recipcerts, $headers, $flags, $cipherid);
+    $result = \openssl_pkcs7_encrypt($input_filename, $output_filename, $certificate, $headers, $flags, $cipher_algo);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -727,15 +801,15 @@ function openssl_pkcs7_encrypt(string $infile, string $outfile, $recipcerts, arr
 /**
  *
  *
- * @param string $infilename
- * @param array|null $certs
+ * @param string $input_filename
+ * @param array|null $certificates
  * @throws OpensslException
  *
  */
-function openssl_pkcs7_read(string $infilename, ?array &$certs): void
+function openssl_pkcs7_read(string $input_filename, ?array &$certificates): void
 {
     error_clear_last();
-    $result = \openssl_pkcs7_read($infilename, $certs);
+    $result = \openssl_pkcs7_read($input_filename, $certificates);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -744,67 +818,91 @@ function openssl_pkcs7_read(string $infilename, ?array &$certs): void
 
 /**
  * openssl_pkcs7_sign takes the contents of the file
- * named infilename and signs them using the
+ * named input_filename and signs them using the
  * certificate and its matching private key specified by
- * signcert and privkey
+ * certificate and private_key
  * parameters.
  *
- * @param string $infilename The input file you are intending to digitally sign.
- * @param string $outfilename The file which the digital signature will be written to.
- * @param string|resource $signcert The X.509 certificate used to digitally sign infilename.
+ * @param string $input_filename The input file you are intending to digitally sign.
+ * @param string $output_filename The file which the digital signature will be written to.
+ * @param string|resource $certificate The X.509 certificate used to digitally sign input_filename.
  * See Key/Certificate parameters for a list of valid values.
- * @param string|resource|array $privkey privkey is the private key corresponding to signcert.
+ * @param string|resource|array $private_key private_key is the private key corresponding to certificate.
  * See Public/Private Key parameters for a list of valid values.
  * @param array $headers headers is an array of headers that
  * will be prepended to the data after it has been signed (see
  * openssl_pkcs7_encrypt for more information about
  * the format of this parameter).
  * @param int $flags flags can be used to alter the output - see PKCS7 constants.
- * @param string $extracerts extracerts specifies the name of a file containing
+ * @param string $untrusted_certificates_filename untrusted_certificates_filename specifies the name of a file containing
  * a bunch of extra certificates to include in the signature which can for
  * example be used to help the recipient to verify the certificate that you used.
  * @throws OpensslException
  *
  */
-function openssl_pkcs7_sign(string $infilename, string $outfilename, $signcert, $privkey, array $headers, int $flags = PKCS7_DETACHED, string $extracerts = null): void
+function openssl_pkcs7_sign(string $input_filename, string $output_filename, $certificate, $private_key, array $headers, int $flags = PKCS7_DETACHED, string $untrusted_certificates_filename = null): void
 {
     error_clear_last();
-    if ($extracerts !== null) {
-        $result = \openssl_pkcs7_sign($infilename, $outfilename, $signcert, $privkey, $headers, $flags, $extracerts);
+    if ($untrusted_certificates_filename !== null) {
+        $result = \openssl_pkcs7_sign($input_filename, $output_filename, $certificate, $private_key, $headers, $flags, $untrusted_certificates_filename);
     } else {
-        $result = \openssl_pkcs7_sign($infilename, $outfilename, $signcert, $privkey, $headers, $flags);
+        $result = \openssl_pkcs7_sign($input_filename, $output_filename, $certificate, $private_key, $headers, $flags);
+    }
+    if ($result === false) {
+        throw OpensslException::createFromPhpError();
     }
+}
+
+
+/**
+ * openssl_pkey_derive takes a set of a public_key
+ * and private_key and derives a shared secret, for either DH or EC keys.
+ *
+ * @param resource $public_key public_key is the public key for the derivation.
+ * See Public/Private Key parameters for a list of valid values.
+ * @param resource $private_key private_key is the private key for the derivation.
+ * See Public/Private Key parameters for a list of valid values.
+ * @param int $key_length If not zero, will set the desired length of the derived secret.
+ * @return string The derived secret on success.
+ * @throws OpensslException
+ *
+ */
+function openssl_pkey_derive($public_key, $private_key, int $key_length = 0): string
+{
+    error_clear_last();
+    $result = \openssl_pkey_derive($public_key, $private_key, $key_length);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
+    return $result;
 }
 
 
 /**
  * openssl_pkey_export_to_file saves an ascii-armoured
  * (PEM encoded) rendition of key into the file named
- * by outfilename.
+ * by output_filename.
  *
  * @param resource|string|array $key
- * @param string $outfilename Path to the output file.
+ * @param string $output_filename Path to the output file.
  * @param string|null $passphrase The key can be optionally protected by a
  * passphrase.
- * @param array $configargs configargs can be used to fine-tune the export
+ * @param array $options options can be used to fine-tune the export
  * process by specifying and/or overriding options for the openssl
  * configuration file. See openssl_csr_new for more
- * information about configargs.
+ * information about options.
  * @throws OpensslException
  *
  */
-function openssl_pkey_export_to_file($key, string $outfilename, ?string $passphrase = null, array $configargs = null): void
+function openssl_pkey_export_to_file($key, string $output_filename, ?string $passphrase = null, array $options = null): void
 {
     error_clear_last();
-    if ($configargs !== null) {
-        $result = \openssl_pkey_export_to_file($key, $outfilename, $passphrase, $configargs);
+    if ($options !== null) {
+        $result = \openssl_pkey_export_to_file($key, $output_filename, $passphrase, $options);
     } elseif ($passphrase !== null) {
-        $result = \openssl_pkey_export_to_file($key, $outfilename, $passphrase);
+        $result = \openssl_pkey_export_to_file($key, $output_filename, $passphrase);
     } else {
-        $result = \openssl_pkey_export_to_file($key, $outfilename);
+        $result = \openssl_pkey_export_to_file($key, $output_filename);
     }
     if ($result === false) {
         throw OpensslException::createFromPhpError();
@@ -815,27 +913,27 @@ function openssl_pkey_export_to_file($key, string $outfilename, ?string $passphr
 /**
  * openssl_pkey_export exports
  * key as a PEM encoded string and stores it into
- * out (which is passed by reference).
+ * output (which is passed by reference).
  *
  * @param resource $key
- * @param string|null $out
+ * @param string|null $output
  * @param string|null $passphrase The key is optionally protected by passphrase.
- * @param array $configargs configargs can be used to fine-tune the export
+ * @param array $options options can be used to fine-tune the export
  * process by specifying and/or overriding options for the openssl
  * configuration file.  See openssl_csr_new for more
- * information about configargs.
+ * information about options.
  * @throws OpensslException
  *
  */
-function openssl_pkey_export($key, ?string &$out, ?string $passphrase = null, array $configargs = null): void
+function openssl_pkey_export($key, ?string &$output, ?string $passphrase = null, array $options = null): void
 {
     error_clear_last();
-    if ($configargs !== null) {
-        $result = \openssl_pkey_export($key, $out, $passphrase, $configargs);
+    if ($options !== null) {
+        $result = \openssl_pkey_export($key, $output, $passphrase, $options);
     } elseif ($passphrase !== null) {
-        $result = \openssl_pkey_export($key, $out, $passphrase);
+        $result = \openssl_pkey_export($key, $output, $passphrase);
     } else {
-        $result = \openssl_pkey_export($key, $out);
+        $result = \openssl_pkey_export($key, $output);
     }
     if ($result === false) {
         throw OpensslException::createFromPhpError();
@@ -845,9 +943,9 @@ function openssl_pkey_export($key, ?string &$out, ?string $passphrase = null, ar
 
 /**
  * openssl_pkey_get_private parses
- * key and prepares it for use by other functions.
+ * private_key and prepares it for use by other functions.
  *
- * @param string $key key can be one of the following:
+ * @param string $private_key private_key can be one of the following:
  *
  * a string having the format
  * file://path/to/file.pem. The named file must
@@ -858,14 +956,18 @@ function openssl_pkey_export($key, ?string &$out, ?string $passphrase = null, ar
  *
  * @param string $passphrase The optional parameter passphrase must be used
  * if the specified key is encrypted (protected by a passphrase).
- * @return resource Returns a positive key resource identifier on success.
+ * @return resource Returns an OpenSSLAsymmetricKey instance on success.
  * @throws OpensslException
  *
  */
-function openssl_pkey_get_private(string $key, string $passphrase = "")
+function openssl_pkey_get_private(string $private_key, string $passphrase = null)
 {
     error_clear_last();
-    $result = \openssl_pkey_get_private($key, $passphrase);
+    if ($passphrase !== null) {
+        $result = \openssl_pkey_get_private($private_key, $passphrase);
+    } else {
+        $result = \openssl_pkey_get_private($private_key);
+    }
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -875,12 +977,12 @@ function openssl_pkey_get_private(string $key, string $passphrase = "")
 
 /**
  * openssl_pkey_get_public extracts the public key from
- * certificate and prepares it for use by other
+ * public_key and prepares it for use by other
  * functions.
  *
- * @param resource|string $certificate certificate can be one of the following:
+ * @param resource|string $public_key public_key can be one of the following:
  *
- * an X.509 certificate resource
+ * an OpenSSLAsymmetricKey instance
  * a string having the format
  * file://path/to/file.pem. The named file must
  * contain a PEM encoded certificate/public key (it may contain both).
@@ -888,14 +990,14 @@ function openssl_pkey_get_private(string $key, string $passphrase = "")
  *
  * A PEM formatted public key.
  *
- * @return resource Returns a positive key resource identifier on success.
+ * @return resource Returns an OpenSSLAsymmetricKey instance on success.
  * @throws OpensslException
  *
  */
-function openssl_pkey_get_public($certificate)
+function openssl_pkey_get_public($public_key)
 {
     error_clear_last();
-    $result = \openssl_pkey_get_public($certificate);
+    $result = \openssl_pkey_get_public($public_key);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -908,19 +1010,19 @@ function openssl_pkey_get_public($certificate)
  * key.
  * How to obtain the public component of the key is shown in an example below.
  *
- * @param array $configargs You can finetune the key generation (such as specifying the number of
- * bits) using configargs.  See
+ * @param array $options You can finetune the key generation (such as specifying the number of
+ * bits) using options.  See
  * openssl_csr_new for more information about
- * configargs.
- * @return resource Returns a resource identifier for the pkey on success.
+ * options.
+ * @return resource Returns an OpenSSLAsymmetricKey instance for the pkey on success.
  * @throws OpensslException
  *
  */
-function openssl_pkey_new(array $configargs = null)
+function openssl_pkey_new(array $options = null)
 {
     error_clear_last();
-    if ($configargs !== null) {
-        $result = \openssl_pkey_new($configargs);
+    if ($options !== null) {
+        $result = \openssl_pkey_new($options);
     } else {
         $result = \openssl_pkey_new();
     }
@@ -935,13 +1037,13 @@ function openssl_pkey_new(array $configargs = null)
  * openssl_private_decrypt decrypts
  * data that was previously encrypted via
  * openssl_public_encrypt and stores the result into
- * decrypted.
+ * decrypted_data.
  *
  * You can use this function e.g. to decrypt data which is supposed to only be available to you.
  *
  * @param string $data
- * @param string|null $decrypted
- * @param string|resource|array $key key must be the private key corresponding that
+ * @param string|null $decrypted_data
+ * @param string|resource|array $private_key private_key must be the private key corresponding that
  * was used to encrypt the data.
  * @param int $padding padding can be one of
  * OPENSSL_PKCS1_PADDING,
@@ -951,10 +1053,10 @@ function openssl_pkey_new(array $configargs = null)
  * @throws OpensslException
  *
  */
-function openssl_private_decrypt(string $data, ?string &$decrypted, $key, int $padding = OPENSSL_PKCS1_PADDING): void
+function openssl_private_decrypt(string $data, ?string &$decrypted_data, $private_key, int $padding = OPENSSL_PKCS1_PADDING): void
 {
     error_clear_last();
-    $result = \openssl_private_decrypt($data, $decrypted, $key, $padding);
+    $result = \openssl_private_decrypt($data, $decrypted_data, $private_key, $padding);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -963,26 +1065,26 @@ function openssl_private_decrypt(string $data, ?string &$decrypted, $key, int $p
 
 /**
  * openssl_private_encrypt encrypts data
- * with private key and stores the result into
- * crypted. Encrypted data can be decrypted via
+ * with private private_key and stores the result into
+ * encrypted_data. Encrypted data can be decrypted via
  * openssl_public_decrypt.
  *
  * This function can be used e.g. to sign data (or its hash) to prove that it
  * is not written by someone else.
  *
  * @param string $data
- * @param string|null $crypted
- * @param string|resource|array $key
+ * @param string|null $encrypted_data
+ * @param string|resource|array $private_key
  * @param int $padding padding can be one of
  * OPENSSL_PKCS1_PADDING,
  * OPENSSL_NO_PADDING.
  * @throws OpensslException
  *
  */
-function openssl_private_encrypt(string $data, ?string &$crypted, $key, int $padding = OPENSSL_PKCS1_PADDING): void
+function openssl_private_encrypt(string $data, ?string &$encrypted_data, $private_key, int $padding = OPENSSL_PKCS1_PADDING): void
 {
     error_clear_last();
-    $result = \openssl_private_encrypt($data, $crypted, $key, $padding);
+    $result = \openssl_private_encrypt($data, $encrypted_data, $private_key, $padding);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -993,14 +1095,14 @@ function openssl_private_encrypt(string $data, ?string &$crypted, $key, int $pad
  * openssl_public_decrypt decrypts
  * data that was previous encrypted via
  * openssl_private_encrypt and stores the result into
- * decrypted.
+ * decrypted_data.
  *
  * You can use this function e.g. to check if the message was written by the
  * owner of the private key.
  *
  * @param string $data
- * @param string|null $decrypted
- * @param string|resource $key key must be the public key corresponding that
+ * @param string|null $decrypted_data
+ * @param string|resource $public_key public_key must be the public key corresponding that
  * was used to encrypt the data.
  * @param int $padding padding can be one of
  * OPENSSL_PKCS1_PADDING,
@@ -1008,10 +1110,10 @@ function openssl_private_encrypt(string $data, ?string &$crypted, $key, int $pad
  * @throws OpensslException
  *
  */
-function openssl_public_decrypt(string $data, ?string &$decrypted, $key, int $padding = OPENSSL_PKCS1_PADDING): void
+function openssl_public_decrypt(string $data, ?string &$decrypted_data, $public_key, int $padding = OPENSSL_PKCS1_PADDING): void
 {
     error_clear_last();
-    $result = \openssl_public_decrypt($data, $decrypted, $key, $padding);
+    $result = \openssl_public_decrypt($data, $decrypted_data, $public_key, $padding);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -1020,8 +1122,8 @@ function openssl_public_decrypt(string $data, ?string &$decrypted, $key, int $pa
 
 /**
  * openssl_public_encrypt encrypts data
- * with public key and stores the result into
- * crypted. Encrypted data can be decrypted via
+ * with public public_key and stores the result into
+ * encrypted_data. Encrypted data can be decrypted via
  * openssl_private_decrypt.
  *
  * This function can be used e.g. to encrypt message which can be then read
@@ -1029,8 +1131,8 @@ function openssl_public_decrypt(string $data, ?string &$decrypted, $key, int $pa
  * in database.
  *
  * @param string $data
- * @param string|null $crypted This will hold the result of the encryption.
- * @param string|resource $key The public key.
+ * @param string|null $encrypted_data This will hold the result of the encryption.
+ * @param string|resource $public_key The public key.
  * @param int $padding padding can be one of
  * OPENSSL_PKCS1_PADDING,
  * OPENSSL_SSLV23_PADDING,
@@ -1039,10 +1141,10 @@ function openssl_public_decrypt(string $data, ?string &$decrypted, $key, int $pa
  * @throws OpensslException
  *
  */
-function openssl_public_encrypt(string $data, ?string &$crypted, $key, int $padding = OPENSSL_PKCS1_PADDING): void
+function openssl_public_encrypt(string $data, ?string &$encrypted_data, $public_key, int $padding = OPENSSL_PKCS1_PADDING): void
 {
     error_clear_last();
-    $result = \openssl_public_encrypt($data, $crypted, $key, $padding);
+    $result = \openssl_public_encrypt($data, $encrypted_data, $public_key, $padding);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -1054,22 +1156,22 @@ function openssl_public_encrypt(string $data, ?string &$crypted, $key, int $padd
  * determined by the length parameter.
  *
  * It also indicates if a cryptographically strong algorithm was used to produce the
- * pseudo-random bytes, and does this via the optional crypto_strong
+ * pseudo-random bytes, and does this via the optional strong_result
  * parameter. It's rare for this to be FALSE, but some systems may be broken or old.
  *
  * @param int $length The length of the desired string of bytes. Must be a positive integer. PHP will
  * try to cast this parameter to a non-null integer to use it.
- * @param bool|null $crypto_strong If passed into the function, this will hold a bool value that determines
+ * @param bool|null $strong_result If passed into the function, this will hold a bool value that determines
  * if the algorithm used was "cryptographically strong", e.g., safe for usage with GPG,
  * passwords, etc. TRUE if it did, otherwise FALSE
  * @return string Returns the generated string of bytes on success.
  * @throws OpensslException
  *
  */
-function openssl_random_pseudo_bytes(int $length, ?bool &$crypto_strong = null): string
+function openssl_random_pseudo_bytes(int $length, ?bool &$strong_result = null): string
 {
     error_clear_last();
-    $result = \openssl_random_pseudo_bytes($length, $crypto_strong);
+    $result = \openssl_random_pseudo_bytes($length, $strong_result);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -1079,20 +1181,20 @@ function openssl_random_pseudo_bytes(int $length, ?bool &$crypto_strong = null):
 
 /**
  * openssl_seal seals (encrypts)
- * data by using the given method with a randomly generated
+ * data by using the given cipher_algo with a randomly generated
  * secret key. The key is encrypted with each of the public keys
- * associated with the identifiers in pub_key_ids
+ * associated with the identifiers in public_key
  * and each encrypted key is returned
- * in env_keys. This means that one can send
+ * in encrypted_keys. This means that one can send
  * sealed data to multiple recipients (provided one has obtained their
  * public keys). Each recipient must receive both the sealed data and
  * the envelope key that was encrypted with the recipient's public key.
  *
  * @param string $data The data to seal.
  * @param string|null $sealed_data The sealed data.
- * @param array|null $env_keys Array of encrypted keys.
- * @param array $pub_key_ids Array of public key resource identifiers.
- * @param string $method The cipher method.
+ * @param array|null $encrypted_keys Array of encrypted keys.
+ * @param array $public_key Array of OpenSSLAsymmetricKey instances containing public keys.
+ * @param string $cipher_algo The cipher method.
  *
  *
  * The default value ('RC4') is considered insecure.
@@ -1103,14 +1205,14 @@ function openssl_random_pseudo_bytes(int $length, ?bool &$crypto_strong = null):
  * @return int Returns the length of the sealed data on success.
  * If successful the sealed data is returned in
  * sealed_data, and the envelope keys in
- * env_keys.
+ * encrypted_keys.
  * @throws OpensslException
  *
  */
-function openssl_seal(string $data, ?string &$sealed_data, ?array &$env_keys, array $pub_key_ids, string $method = "RC4", string &$iv = null): int
+function openssl_seal(string $data, ?string &$sealed_data, ?array &$encrypted_keys, array $public_key, string $cipher_algo, string &$iv = null): int
 {
     error_clear_last();
-    $result = \openssl_seal($data, $sealed_data, $env_keys, $pub_key_ids, $method, $iv);
+    $result = \openssl_seal($data, $sealed_data, $encrypted_keys, $public_key, $cipher_algo, $iv);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -1122,39 +1224,151 @@ function openssl_seal(string $data, ?string &$sealed_data, ?array &$env_keys, ar
  * openssl_sign computes a signature for the
  * specified data by generating a cryptographic
  * digital signature using the private key associated with
- * priv_key_id. Note that the data itself is
+ * private_key. Note that the data itself is
  * not encrypted.
  *
  * @param string $data The string of data you wish to sign
  * @param string|null $signature If the call was successful the signature is returned in
  * signature.
- * @param resource|string $priv_key_id resource - a key, returned by openssl_get_privatekey
+ * @param resource|string $private_key OpenSSLAsymmetricKey - a key, returned by openssl_get_privatekey
  *
  * string - a PEM formatted key
- * @param int|string $signature_alg int - one of these Signature Algorithms.
+ * @param int|string $algorithm int - one of these Signature Algorithms.
  *
  * string - a valid string returned by openssl_get_md_methods example, "sha256WithRSAEncryption" or "sha384".
  * @throws OpensslException
  *
  */
-function openssl_sign(string $data, ?string &$signature, $priv_key_id, $signature_alg = OPENSSL_ALGO_SHA1): void
+function openssl_sign(string $data, ?string &$signature, $private_key, $algorithm = OPENSSL_ALGO_SHA1): void
+{
+    error_clear_last();
+    $result = \openssl_sign($data, $signature, $private_key, $algorithm);
+    if ($result === false) {
+        throw OpensslException::createFromPhpError();
+    }
+}
+
+
+/**
+ * Exports challenge from encoded signed public key and challenge
+ *
+ * @param string $spki Expects a valid signed public key and challenge
+ * @return string|null Returns the associated challenge string.
+ * @throws OpensslException
+ *
+ */
+function openssl_spki_export_challenge(string $spki): ?string
+{
+    error_clear_last();
+    $result = \openssl_spki_export_challenge($spki);
+    if ($result === false) {
+        throw OpensslException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Exports PEM formatted public key from encoded signed public key and challenge
+ *
+ * @param string $spki Expects a valid signed public key and challenge
+ * @return string|null Returns the associated PEM formatted public key.
+ * @throws OpensslException
+ *
+ */
+function openssl_spki_export(string $spki): ?string
+{
+    error_clear_last();
+    $result = \openssl_spki_export($spki);
+    if ($result === false) {
+        throw OpensslException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Generates a signed public key and challenge using specified hashing algorithm
+ *
+ * @param resource $private_key private_key should be set to a private key that was
+ * previously generated by openssl_pkey_new (or
+ * otherwise obtained from the other openssl_pkey family of functions).
+ * The corresponding public portion of the key will be used to sign the
+ * CSR.
+ * @param string $challenge The challenge associated to associate with the SPKAC
+ * @param int $digest_algo The digest algorithm. See openssl_get_md_method().
+ * @return string|null Returns a signed public key and challenge string.
+ * @throws OpensslException
+ *
+ */
+function openssl_spki_new($private_key, string $challenge, int $digest_algo = OPENSSL_ALGO_MD5): ?string
 {
     error_clear_last();
-    $result = \openssl_sign($data, $signature, $priv_key_id, $signature_alg);
+    $result = \openssl_spki_new($private_key, $challenge, $digest_algo);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
+    return $result;
+}
+
+
+/**
+ * Validates the supplied signed public key and challenge
+ *
+ * @param string $spki Expects a valid signed public key and challenge
+ * @throws OpensslException
+ *
+ */
+function openssl_spki_verify(string $spki): void
+{
+    error_clear_last();
+    $result = \openssl_spki_verify($spki);
+    if ($result === false) {
+        throw OpensslException::createFromPhpError();
+    }
+}
+
+
+/**
+ * openssl_verify verifies that the
+ * signature is correct for the specified
+ * data using the public key associated with
+ * public_key. This must be the public key
+ * corresponding to the private key used for signing.
+ *
+ * @param string $data The string of data used to generate the signature previously
+ * @param string $signature A raw binary string, generated by openssl_sign or similar means
+ * @param resource|string $public_key OpenSSLAsymmetricKey - a key, returned by openssl_get_publickey
+ *
+ * string - a PEM formatted key, example, "-----BEGIN PUBLIC KEY-----
+ * MIIBCgK..."
+ * @param int|string $algorithm int - one of these Signature Algorithms.
+ *
+ * string - a valid string returned by openssl_get_md_methods example, "sha1WithRSAEncryption" or "sha512".
+ * @return \-1|\0|\1 Returns 1 if the signature is correct, 0 if it is incorrect, and
+ * -1.
+ * @throws OpensslException
+ *
+ */
+function openssl_verify(string $data, string $signature, $public_key, $algorithm = OPENSSL_ALGO_SHA1)
+{
+    error_clear_last();
+    $result = \openssl_verify($data, $signature, $public_key, $algorithm);
+    if ($result === false) {
+        throw OpensslException::createFromPhpError();
+    }
+    return $result;
 }
 
 
 /**
  * openssl_x509_export_to_file stores
- * x509 into a file named by
- * outfilename in a PEM encoded format.
+ * certificate into a file named by
+ * output_filename in a PEM encoded format.
  *
- * @param string|resource $x509 See Key/Certificate parameters for a list of valid values.
- * @param string $outfilename Path to the output file.
- * @param bool $notext
+ * @param string|resource $certificate See Key/Certificate parameters for a list of valid values.
+ * @param string $output_filename Path to the output file.
+ * @param bool $no_text
  * The optional parameter notext affects
  * the verbosity of the output; if it is FALSE, then additional human-readable
  * information is included in the output. The default value of
@@ -1162,10 +1376,10 @@ function openssl_sign(string $data, ?string &$signature, $priv_key_id, $signatur
  * @throws OpensslException
  *
  */
-function openssl_x509_export_to_file($x509, string $outfilename, bool $notext = true): void
+function openssl_x509_export_to_file($certificate, string $output_filename, bool $no_text = true): void
 {
     error_clear_last();
-    $result = \openssl_x509_export_to_file($x509, $outfilename, $notext);
+    $result = \openssl_x509_export_to_file($certificate, $output_filename, $no_text);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -1174,12 +1388,12 @@ function openssl_x509_export_to_file($x509, string $outfilename, bool $notext =
 
 /**
  * openssl_x509_export stores
- * x509 into a string named by
+ * certificate into a string named by
  * output in a PEM encoded format.
  *
- * @param string|resource $x509 See Key/Certificate parameters for a list of valid values.
+ * @param string|resource $certificate See Key/Certificate parameters for a list of valid values.
  * @param string|null $output On success, this will hold the PEM.
- * @param bool $notext
+ * @param bool $no_text
  * The optional parameter notext affects
  * the verbosity of the output; if it is FALSE, then additional human-readable
  * information is included in the output. The default value of
@@ -1187,10 +1401,10 @@ function openssl_x509_export_to_file($x509, string $outfilename, bool $notext =
  * @throws OpensslException
  *
  */
-function openssl_x509_export($x509, ?string &$output, bool $notext = true): void
+function openssl_x509_export($certificate, ?string &$output, bool $no_text = true): void
 {
     error_clear_last();
-    $result = \openssl_x509_export($x509, $output, $notext);
+    $result = \openssl_x509_export($certificate, $output, $no_text);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -1199,21 +1413,21 @@ function openssl_x509_export($x509, ?string &$output, bool $notext = true): void
 
 /**
  * openssl_x509_fingerprint returns the digest of
- * x509 as a string.
+ * certificate as a string.
  *
- * @param string|resource $x509 See Key/Certificate parameters for a list of valid values.
- * @param string $hash_algorithm The digest method or hash algorithm to use, e.g. "sha256", one of openssl_get_md_methods.
- * @param bool $raw_output When set to TRUE, outputs raw binary data. FALSE outputs lowercase hexits.
- * @return string Returns a string containing the calculated certificate fingerprint as lowercase hexits unless raw_output is set to TRUE in which case the raw binary representation of the message digest is returned.
+ * @param string|resource $certificate See Key/Certificate parameters for a list of valid values.
+ * @param string $digest_algo The digest method or hash algorithm to use, e.g. "sha256", one of openssl_get_md_methods.
+ * @param bool $binary When set to TRUE, outputs raw binary data. FALSE outputs lowercase hexits.
+ * @return string Returns a string containing the calculated certificate fingerprint as lowercase hexits unless binary is set to TRUE in which case the raw binary representation of the message digest is returned.
  *
  * Returns FALSE on failure.
  * @throws OpensslException
  *
  */
-function openssl_x509_fingerprint($x509, string $hash_algorithm = "sha1", bool $raw_output = false): string
+function openssl_x509_fingerprint($certificate, string $digest_algo = "sha1", bool $binary = false): string
 {
     error_clear_last();
-    $result = \openssl_x509_fingerprint($x509, $hash_algorithm, $raw_output);
+    $result = \openssl_x509_fingerprint($certificate, $digest_algo, $binary);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
@@ -1223,18 +1437,18 @@ function openssl_x509_fingerprint($x509, string $hash_algorithm = "sha1", bool $
 
 /**
  * openssl_x509_read parses the certificate supplied by
- * x509certdata and returns a resource identifier for
+ * certificate and returns an OpenSSLCertificate object for
  * it.
  *
- * @param string|resource $x509certdata X509 certificate. See Key/Certificate parameters for a list of valid values.
- * @return resource Returns a resource identifier on success.
+ * @param string|resource $certificate X509 certificate. See Key/Certificate parameters for a list of valid values.
+ * @return resource Returns an OpenSSLCertificate on success.
  * @throws OpensslException
  *
  */
-function openssl_x509_read($x509certdata)
+function openssl_x509_read($certificate)
 {
     error_clear_last();
-    $result = \openssl_x509_read($x509certdata);
+    $result = \openssl_x509_read($certificate);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
diff --git a/generated/simplexml.php b/generated/simplexml.php
index 118de443..9276ab76 100644
--- a/generated/simplexml.php
+++ b/generated/simplexml.php
@@ -22,7 +22,7 @@ function simplexml_import_dom(\DOMNode $node, string $class_name = "SimpleXMLEle
 {
     error_clear_last();
     $result = \simplexml_import_dom($node, $class_name);
-    if ($result === false) {
+    if ($result === null) {
         throw SimplexmlException::createFromPhpError();
     }
     return $result;
diff --git a/generated/sockets.php b/generated/sockets.php
index 63ceb10a..3e175371 100644
--- a/generated/sockets.php
+++ b/generated/sockets.php
@@ -151,7 +151,8 @@ function socket_bind($socket, string $address, int $port = 0): void
  * socket, which must be Socket
  * instance created with socket_create.
  *
- * @param resource $socket
+ * @param resource $socket A Socket instance created with
+ * socket_create.
  * @param string $address The address parameter is either an IPv4 address
  * in dotted-quad notation (e.g. 127.0.0.1) if
  * socket is AF_INET, a valid
diff --git a/generated/ssh2.php b/generated/ssh2.php
index 01f23600..fff3ceb6 100644
--- a/generated/ssh2.php
+++ b/generated/ssh2.php
@@ -543,6 +543,27 @@ function ssh2_scp_send($session, string $local_file, string $remote_file, int $c
 }
 
 
+/**
+ * Sends an EOF to the stream; this is typically used to close standard input,
+ * while keeping output and error alive. For example, one can send a remote
+ * process some data over standard input, close it to start processing, and
+ * still be able to read out the results without creating additional files.
+ *
+ * @param resource $channel An SSH stream; can be acquired through functions like ssh2_fetch_stream
+ * or ssh2_connect.
+ * @throws Ssh2Exception
+ *
+ */
+function ssh2_send_eof($channel): void
+{
+    error_clear_last();
+    $result = \ssh2_send_eof($channel);
+    if ($result === false) {
+        throw Ssh2Exception::createFromPhpError();
+    }
+}
+
+
 /**
  * Attempts to change the mode of the specified file to that given in
  * mode.
@@ -573,6 +594,7 @@ function ssh2_sftp_chmod($sftp, string $filename, int $mode): void
  * @param resource $sftp An SSH2 SFTP resource opened by ssh2_sftp.
  * @param string $dirname Path of the new directory.
  * @param int $mode Permissions on the new directory.
+ * The actual mode is affected by the current umask.
  * @param bool $recursive If recursive is TRUE any parent directories
  * required for dirname will be automatically created as well.
  * @throws Ssh2Exception
@@ -686,3 +708,42 @@ function ssh2_sftp($session)
     }
     return $result;
 }
+
+
+/**
+ * Open a shell at the remote end and allocate a stream for it.
+ *
+ * @param resource $session An SSH connection link identifier, obtained from a call to
+ * ssh2_connect.
+ * @param string $term_type term_type should correspond to one of the
+ * entries in the target system's /etc/termcap file.
+ * @param array $env env may be passed as an associative array of
+ * name/value pairs to set in the target environment.
+ * @param int $width Width of the virtual terminal.
+ * @param int $height Height of the virtual terminal.
+ * @param int $width_height_type width_height_type should be one of
+ * SSH2_TERM_UNIT_CHARS or
+ * SSH2_TERM_UNIT_PIXELS.
+ * @return resource Returns a stream resource on success.
+ * @throws Ssh2Exception
+ *
+ */
+function ssh2_shell($session, string $term_type = "vanilla", array $env = null, int $width = 80, int $height = 25, int $width_height_type = SSH2_TERM_UNIT_CHARS)
+{
+    error_clear_last();
+    if ($width_height_type !== SSH2_TERM_UNIT_CHARS) {
+        $result = \ssh2_shell($session, $term_type, $env, $width, $height, $width_height_type);
+    } elseif ($height !== 25) {
+        $result = \ssh2_shell($session, $term_type, $env, $width, $height);
+    } elseif ($width !== 80) {
+        $result = \ssh2_shell($session, $term_type, $env, $width);
+    } elseif ($env !== null) {
+        $result = \ssh2_shell($session, $term_type, $env);
+    } else {
+        $result = \ssh2_shell($session, $term_type);
+    }
+    if ($result === false) {
+        throw Ssh2Exception::createFromPhpError();
+    }
+    return $result;
+}
diff --git a/generated/stream.php b/generated/stream.php
index d203b92b..7497e300 100644
--- a/generated/stream.php
+++ b/generated/stream.php
@@ -554,6 +554,7 @@ function stream_supports_lock($stream): void
  * fread etc.).
  *
  * @param string $protocol The wrapper name to be registered.
+ * Valid protocol names must contain alphanumerics, dots (.), plusses (+), or hyphens (-) only.
  * @param string $class The classname which implements the protocol.
  * @param int $flags Should be set to STREAM_IS_URL if
  * protocol is a URL protocol. Default is 0, local
diff --git a/generated/uodbc.php b/generated/uodbc.php
index 97d67e1a..6ac914bd 100644
--- a/generated/uodbc.php
+++ b/generated/uodbc.php
@@ -390,12 +390,12 @@ function odbc_exec($odbc, string $query)
  * Executes a statement prepared with odbc_prepare.
  *
  * @param resource $statement The result id resource, from odbc_prepare.
- * @param array $params Parameters in parameter_array will be
+ * @param array $params Parameters in params will be
  * substituted for placeholders in the prepared statement in order.
  * Elements of this array will be converted to strings by calling this
  * function.
  *
- * Any parameters in parameter_array which
+ * Any parameters in params which
  * start and end with single quotes will be taken as the name of a
  * file to read and send to the database server as the data for the
  * appropriate placeholder.
diff --git a/generator/composer.json b/generator/composer.json
index 40ad548a..0306da79 100644
--- a/generator/composer.json
+++ b/generator/composer.json
@@ -7,7 +7,7 @@
     }
   },
   "require": {
-    "php": "^7.2",
+    "php": "^8.0",
     "ext-simplexml": "*",
     "ext-json": "*",
     "symfony/console": "^4.1.4",
@@ -15,7 +15,7 @@
     "symfony/finder": "^4.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "^8.5.2",
+    "phpunit/phpunit": "^9.0.0",
     "thecodingmachine/phpstan-strict-rules": "^0.12",
     "squizlabs/php_codesniffer": "^3.2",
     "php-coveralls/php-coveralls": "^2.1",
diff --git a/generator/composer.lock b/generator/composer.lock
index 914f222a..d277b039 100644
--- a/generator/composer.lock
+++ b/generator/composer.lock
@@ -4,31 +4,26 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "431ecbdfbe4c78368c53a8ca1f05d845",
+    "content-hash": "26e79295eef0b73b7a5e1916d6503004",
     "packages": [
         {
             "name": "psr/container",
-            "version": "1.0.0",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=7.2.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -41,7 +36,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common Container Interface (PHP FIG PSR-11)",
@@ -53,26 +48,31 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2017-02-14T16:28:37+00:00"
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/1.1.1"
+            },
+            "time": "2021-03-05T17:36:06+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v4.4.1",
+            "version": "v4.4.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "f0aea3df20d15635b3cb9730ca5eea1c65b7f201"
+                "reference": "c98349bda966c70d6c08b4cd8658377c94166492"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/f0aea3df20d15635b3cb9730ca5eea1c65b7f201",
-                "reference": "f0aea3df20d15635b3cb9730ca5eea1c65b7f201",
+                "url": "https://api.github.com/repos/symfony/console/zipball/c98349bda966c70d6c08b4cd8658377c94166492",
+                "reference": "c98349bda966c70d6c08b4cd8658377c94166492",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": ">=7.1.3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/polyfill-php73": "^1.8",
+                "symfony/polyfill-php80": "^1.15",
                 "symfony/service-contracts": "^1.1|^2"
             },
             "conflict": {
@@ -100,11 +100,6 @@
                 "symfony/process": ""
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.4-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Console\\": ""
@@ -127,33 +122,45 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Console Component",
+            "description": "Eases the creation of beautiful and testable command line interfaces",
             "homepage": "https://symfony.com",
-            "time": "2019-12-01T10:06:17+00:00"
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v4.4.20"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-02-22T18:44:15+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.4.1",
+            "version": "v4.4.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "ce8743441da64c41e2a667b8eb66070444ed911e"
+                "reference": "2543795ab1570df588b9bbd31e1a2bd7037b94f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/ce8743441da64c41e2a667b8eb66070444ed911e",
-                "reference": "ce8743441da64c41e2a667b8eb66070444ed911e",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/2543795ab1570df588b9bbd31e1a2bd7037b94f6",
+                "reference": "2543795ab1570df588b9bbd31e1a2bd7037b94f6",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3"
+                "php": ">=7.1.3"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.4-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Finder\\": ""
@@ -176,26 +183,43 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Finder Component",
+            "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
-            "time": "2019-11-17T21:56:56+00:00"
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v4.4.20"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-02-12T10:48:09+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.13.1",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f"
+                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f",
-                "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1",
+                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-mbstring": "For best performance"
@@ -203,7 +227,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.13-dev"
+                    "dev-main": "1.22-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -237,29 +265,50 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-11-27T14:18:11+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-22T09:19:47+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.13.1",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "4b0e2222c55a25b4541305a053013d5647d3a25f"
+                "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/4b0e2222c55a25b4541305a053013d5647d3a25f",
-                "reference": "4b0e2222c55a25b4541305a053013d5647d3a25f",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2",
+                "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.13-dev"
+                    "dev-main": "1.22-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -295,31 +344,126 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-11-27T16:25:15+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-07T16:49:33+00:00"
         },
         {
-            "name": "symfony/process",
-            "version": "v4.4.1",
+            "name": "symfony/polyfill-php80",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "51c0135ef3f44c5803b33dc60e96bf4f77752726"
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/51c0135ef3f44c5803b33dc60e96bf4f77752726",
-                "reference": "51c0135ef3f44c5803b33dc60e96bf4f77752726",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91",
+                "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.4-dev"
+                    "dev-main": "1.22-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
                 }
+            ],
+            "time": "2021-01-07T16:49:33+00:00"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v4.4.20",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "7e950b6366d4da90292c2e7fa820b3c1842b965a"
             },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/7e950b6366d4da90292c2e7fa820b3c1842b965a",
+                "reference": "7e950b6366d4da90292c2e7fa820b3c1842b965a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1.3"
+            },
+            "type": "library",
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Process\\": ""
@@ -342,26 +486,43 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Process Component",
+            "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
-            "time": "2019-11-28T13:33:56+00:00"
+            "support": {
+                "source": "https://github.com/symfony/process/tree/v4.4.20"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-27T09:09:26+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.0.1",
+            "version": "v2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "144c5e51266b281231e947b51223ba14acf1a749"
+                "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/144c5e51266b281231e947b51223ba14acf1a749",
-                "reference": "144c5e51266b281231e947b51223ba14acf1a749",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1",
+                "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "psr/container": "^1.0"
             },
             "suggest": {
@@ -370,7 +531,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.2-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -402,42 +567,54 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-11-18T17:27:11+00:00"
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/master"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-09-07T11:33:47+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.3.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
-                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^6.0",
+                "doctrine/coding-standard": "^8.0",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.13",
-                "phpstan/phpstan-phpunit": "^0.11",
-                "phpstan/phpstan-shim": "^0.11",
-                "phpunit/phpunit": "^7.0"
+                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
+                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan-phpunit": "^0.12",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
@@ -451,7 +628,7 @@
                 {
                     "name": "Marco Pivetta",
                     "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
+                    "homepage": "https://ocramius.github.io/"
                 }
             ],
             "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
@@ -460,41 +637,65 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2019-10-21T16:45:58+00:00"
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-11-10T18:47:58+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.5.0",
+            "version": "7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5"
+                "reference": "0aa74dfb41ae110835923ef10a9d803a22d50e79"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5",
-                "reference": "dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0aa74dfb41ae110835923ef10a9d803a22d50e79",
+                "reference": "0aa74dfb41ae110835923ef10a9d803a22d50e79",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.6.1",
-                "php": ">=5.5"
+                "guzzlehttp/promises": "^1.4",
+                "guzzlehttp/psr7": "^1.7",
+                "php": "^7.2.5 || ^8.0",
+                "psr/http-client": "^1.0"
+            },
+            "provide": {
+                "psr/http-client-implementation": "1.0"
             },
             "require-dev": {
                 "ext-curl": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
+                "php-http/client-integration-tests": "^3.0",
+                "phpunit/phpunit": "^8.5.5 || ^9.3.5",
                 "psr/log": "^1.1"
             },
             "suggest": {
+                "ext-curl": "Required for CURL handler support",
                 "ext-intl": "Required for Internationalized Domain Name (IDN) support",
                 "psr/log": "Required for using the Log middleware"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.5-dev"
+                    "dev-master": "7.1-dev"
                 }
             },
             "autoload": {
@@ -514,6 +715,11 @@
                     "name": "Michael Dowling",
                     "email": "mtdowling@gmail.com",
                     "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://sagikazarmark.hu"
                 }
             ],
             "description": "Guzzle is a PHP HTTP client library",
@@ -524,30 +730,54 @@
                 "framework",
                 "http",
                 "http client",
+                "psr-18",
+                "psr-7",
                 "rest",
                 "web service"
             ],
-            "time": "2019-12-07T18:20:45+00:00"
+            "support": {
+                "issues": "https://github.com/guzzle/guzzle/issues",
+                "source": "https://github.com/guzzle/guzzle/tree/7.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/alexeyshockov",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/gmponos",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-10T11:47:56+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "v1.3.1",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+                "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d",
+                "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.0"
+                "php": ">=5.5"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0"
+                "symfony/phpunit-bridge": "^4.4 || ^5.1"
             },
             "type": "library",
             "extra": {
@@ -578,20 +808,24 @@
             "keywords": [
                 "promise"
             ],
-            "time": "2016-12-20T10:07:11+00:00"
+            "support": {
+                "issues": "https://github.com/guzzle/promises/issues",
+                "source": "https://github.com/guzzle/promises/tree/1.4.1"
+            },
+            "time": "2021-03-07T09:25:29+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.6.1",
+            "version": "1.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
+                "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
-                "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1",
+                "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1",
                 "shasum": ""
             },
             "require": {
@@ -604,15 +838,15 @@
             },
             "require-dev": {
                 "ext-zlib": "*",
-                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10"
             },
             "suggest": {
-                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6-dev"
+                    "dev-master": "1.7-dev"
                 }
             },
             "autoload": {
@@ -649,24 +883,28 @@
                 "uri",
                 "url"
             ],
-            "time": "2019-07-01T23:21:34+00:00"
+            "support": {
+                "issues": "https://github.com/guzzle/psr7/issues",
+                "source": "https://github.com/guzzle/psr7/tree/1.8.1"
+            },
+            "time": "2021-03-21T16:25:00+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.9.5",
+            "version": "1.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef"
+                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef",
-                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
+                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "replace": {
                 "myclabs/deep-copy": "self.version"
@@ -697,20 +935,30 @@
                 "object",
                 "object graph"
             ],
-            "time": "2020-01-17T21:11:47+00:00"
+            "support": {
+                "issues": "https://github.com/myclabs/DeepCopy/issues",
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-11-13T09:40:50+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.3.0",
+            "version": "v4.10.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc"
+                "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc",
-                "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e",
+                "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e",
                 "shasum": ""
             },
             "require": {
@@ -718,8 +966,8 @@
                 "php": ">=7.0"
             },
             "require-dev": {
-                "ircmaxell/php-yacc": "0.0.5",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -727,7 +975,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3-dev"
+                    "dev-master": "4.9-dev"
                 }
             },
             "autoload": {
@@ -749,32 +997,37 @@
                 "parser",
                 "php"
             ],
-            "time": "2019-11-08T13:50:10+00:00"
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4"
+            },
+            "time": "2020-12-20T10:01:03+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "1.0.3",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
+                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
-                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
+                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-phar": "*",
-                "phar-io/version": "^2.0",
-                "php": "^5.6 || ^7.0"
+                "ext-xmlwriter": "*",
+                "phar-io/version": "^3.0.1",
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -804,24 +1057,28 @@
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "time": "2018-07-08T19:23:20+00:00"
+            "support": {
+                "issues": "https://github.com/phar-io/manifest/issues",
+                "source": "https://github.com/phar-io/manifest/tree/master"
+            },
+            "time": "2020-06-27T14:33:11+00:00"
         },
         {
             "name": "phar-io/version",
-            "version": "2.0.1",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
+                "reference": "bae7c545bef187884426f042434e561ab1ddb182"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
-                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182",
+                "reference": "bae7c545bef187884426f042434e561ab1ddb182",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "autoload": {
@@ -851,27 +1108,31 @@
                 }
             ],
             "description": "Library for handling version information and constraints",
-            "time": "2018-07-08T19:19:57+00:00"
+            "support": {
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/3.1.0"
+            },
+            "time": "2021-02-23T14:00:09+00:00"
         },
         {
             "name": "php-coveralls/php-coveralls",
-            "version": "v2.2.0",
+            "version": "v2.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-coveralls/php-coveralls.git",
-                "reference": "3e6420fa666ef7bae5e750ddeac903153e193bae"
+                "reference": "909381bd40a17ae6e9076051f0d73293c1c091af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/3e6420fa666ef7bae5e750ddeac903153e193bae",
-                "reference": "3e6420fa666ef7bae5e750ddeac903153e193bae",
+                "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/909381bd40a17ae6e9076051f0d73293c1c091af",
+                "reference": "909381bd40a17ae6e9076051f0d73293c1c091af",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-simplexml": "*",
-                "guzzlehttp/guzzle": "^6.0",
-                "php": "^5.5 || ^7.0",
+                "guzzlehttp/guzzle": "^6.0 || ^7.0",
+                "php": "^5.5 || ^7.0 || ^8.0",
                 "psr/log": "^1.0",
                 "symfony/config": "^2.1 || ^3.0 || ^4.0 || ^5.0",
                 "symfony/console": "^2.1 || ^3.0 || ^4.0 || ^5.0",
@@ -879,7 +1140,8 @@
                 "symfony/yaml": "^2.0.5 || ^3.0 || ^4.0 || ^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0"
+                "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+                "sanmai/phpunit-legacy-adapter": "^6.1 || ^8.0"
             },
             "suggest": {
                 "symfony/http-kernel": "Allows Symfony integration"
@@ -888,11 +1150,6 @@
                 "bin/php-coveralls"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.2-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "PhpCoveralls\\": "src/"
@@ -934,32 +1191,33 @@
                 "github",
                 "test"
             ],
-            "time": "2019-11-20T16:29:20+00:00"
+            "support": {
+                "issues": "https://github.com/php-coveralls/php-coveralls/issues",
+                "source": "https://github.com/php-coveralls/php-coveralls/tree/v2.4.3"
+            },
+            "time": "2020-12-24T09:17:03+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "2.0.0",
+            "version": "2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a"
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a",
-                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~6"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.x-dev"
+                    "dev-2.x": "2.x-dev"
                 }
             },
             "autoload": {
@@ -986,32 +1244,35 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2018-08-07T13:53:10+00:00"
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+            },
+            "time": "2020-06-27T09:03:43+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "5.0.0",
+            "version": "5.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "a48807183a4b819072f26e347bbd0b5199a9d15f"
+                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/a48807183a4b819072f26e347bbd0b5199a9d15f",
-                "reference": "a48807183a4b819072f26e347bbd0b5199a9d15f",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556",
+                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556",
                 "shasum": ""
             },
             "require": {
-                "ext-filter": "^7.1",
-                "php": "^7.2",
-                "phpdocumentor/reflection-common": "^2.0",
-                "phpdocumentor/type-resolver": "^1.0",
-                "webmozart/assert": "^1"
+                "ext-filter": "*",
+                "php": "^7.2 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.2",
+                "phpdocumentor/type-resolver": "^1.3",
+                "webmozart/assert": "^1.9.1"
             },
             "require-dev": {
-                "doctrine/instantiator": "^1",
-                "mockery/mockery": "^1"
+                "mockery/mockery": "~1.3.2"
             },
             "type": "library",
             "extra": {
@@ -1039,35 +1300,37 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2020-02-09T09:16:15+00:00"
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
+            },
+            "time": "2020-09-03T19:13:55+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.0.1",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9"
+                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
-                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
+                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1",
+                "php": "^7.2 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "ext-tokenizer": "^7.1",
-                "mockery/mockery": "~1",
-                "phpunit/phpunit": "^7.0"
+                "ext-tokenizer": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-1.x": "1.x-dev"
                 }
             },
             "autoload": {
@@ -1086,37 +1349,41 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2019-08-22T18:11:29+00:00"
+            "support": {
+                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
+            },
+            "time": "2020-09-17T18:55:26+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.10.2",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9"
+                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b4400efc9d206e83138e2bb97ed7f5b14b831cd9",
-                "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea",
+                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
-                "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
+                "doctrine/instantiator": "^1.2",
+                "php": "^7.2 || ~8.0, <8.1",
+                "phpdocumentor/reflection-docblock": "^5.2",
+                "sebastian/comparator": "^3.0 || ^4.0",
+                "sebastian/recursion-context": "^3.0 || ^4.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^2.5 || ^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+                "phpspec/phpspec": "^6.0",
+                "phpunit/phpunit": "^8.0 || ^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.10.x-dev"
+                    "dev-master": "1.11.x-dev"
                 }
             },
             "autoload": {
@@ -1149,20 +1416,24 @@
                 "spy",
                 "stub"
             ],
-            "time": "2020-01-20T15:57:02+00:00"
+            "support": {
+                "issues": "https://github.com/phpspec/prophecy/issues",
+                "source": "https://github.com/phpspec/prophecy/tree/1.13.0"
+            },
+            "time": "2021-03-17T13:42:18+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.68",
+            "version": "0.12.82",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "ddbe01af0706ee094c3f1ce9730b35aebb508d3d"
+                "reference": "3920f0fb0aff39263d3a4cb0bca120a67a1a6a11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ddbe01af0706ee094c3f1ce9730b35aebb508d3d",
-                "reference": "ddbe01af0706ee094c3f1ce9730b35aebb508d3d",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3920f0fb0aff39263d3a4cb0bca120a67a1a6a11",
+                "reference": "3920f0fb0aff39263d3a4cb0bca120a67a1a6a11",
                 "shasum": ""
             },
             "require": {
@@ -1191,6 +1462,10 @@
                 "MIT"
             ],
             "description": "PHPStan - PHP Static Analysis Tool",
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "source": "https://github.com/phpstan/phpstan/tree/0.12.82"
+            },
             "funding": [
                 {
                     "url": "https://github.com/ondrejmirtes",
@@ -1205,44 +1480,48 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-18T12:29:17+00:00"
+            "time": "2021-03-19T06:08:17+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "7.0.10",
+            "version": "9.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf"
+                "reference": "f3e026641cc91909d421802dd3ac7827ebfd97e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f1884187926fbb755a9aaf0b3836ad3165b478bf",
-                "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f3e026641cc91909d421802dd3ac7827ebfd97e1",
+                "reference": "f3e026641cc91909d421802dd3ac7827ebfd97e1",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "php": "^7.2",
-                "phpunit/php-file-iterator": "^2.0.2",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^3.1.1",
-                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^4.2.2",
-                "sebastian/version": "^2.0.1",
-                "theseer/tokenizer": "^1.1.3"
+                "nikic/php-parser": "^4.10.2",
+                "php": ">=7.3",
+                "phpunit/php-file-iterator": "^3.0.3",
+                "phpunit/php-text-template": "^2.0.2",
+                "sebastian/code-unit-reverse-lookup": "^2.0.2",
+                "sebastian/complexity": "^2.0",
+                "sebastian/environment": "^5.1.2",
+                "sebastian/lines-of-code": "^1.0.3",
+                "sebastian/version": "^3.0.1",
+                "theseer/tokenizer": "^1.2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.2.2"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
-                "ext-xdebug": "^2.7.2"
+                "ext-pcov": "*",
+                "ext-xdebug": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "7.0-dev"
+                    "dev-master": "9.2-dev"
                 }
             },
             "autoload": {
@@ -1268,32 +1547,42 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2019-11-20T13:55:58+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-28T06:44:49+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "2.0.2",
+            "version": "3.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "050bedf145a257b1ff02746c31894800e5122946"
+                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946",
-                "reference": "050bedf145a257b1ff02746c31894800e5122946",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8",
+                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.1"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -1318,26 +1607,48 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2018-09-13T20:33:42+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:57:25+00:00"
         },
         {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
+            "name": "phpunit/php-invoker",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-pcntl": "*"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -1354,37 +1665,47 @@
                     "role": "lead"
                 }
             ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
             "keywords": [
-                "template"
+                "process"
             ],
-            "time": "2015-06-21T13:50:34+00:00"
-        },
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:58:55+00:00"
+        },
         {
-            "name": "phpunit/php-timer",
-            "version": "2.1.2",
+            "name": "phpunit/php-text-template",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "1038454804406b0b5f5f520358e78c1c2f71501e"
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e",
-                "reference": "1038454804406b0b5f5f520358e78c1c2f71501e",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -1403,38 +1724,47 @@
                     "role": "lead"
                 }
             ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
             "keywords": [
-                "timer"
+                "template"
             ],
-            "time": "2019-06-07T04:22:29+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T05:33:50+00:00"
         },
         {
-            "name": "phpunit/php-token-stream",
-            "version": "3.1.1",
+            "name": "phpunit/php-timer",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff"
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/995192df77f63a59e47f025390d2d1fdf8f425ff",
-                "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
                 "shasum": ""
             },
             "require": {
-                "ext-tokenizer": "*",
-                "php": "^7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -1449,65 +1779,78 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
             "keywords": [
-                "tokenizer"
+                "timer"
             ],
-            "abandoned": true,
-            "time": "2019-09-17T06:23:10+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:16:10+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "8.5.2",
+            "version": "9.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "018b6ac3c8ab20916db85fa91bf6465acb64d1e0"
+                "reference": "27241ac75fc37ecf862b6e002bf713b6566cbe41"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/018b6ac3c8ab20916db85fa91bf6465acb64d1e0",
-                "reference": "018b6ac3c8ab20916db85fa91bf6465acb64d1e0",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/27241ac75fc37ecf862b6e002bf713b6566cbe41",
+                "reference": "27241ac75fc37ecf862b6e002bf713b6566cbe41",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.2.0",
+                "doctrine/instantiator": "^1.3.1",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.9.1",
-                "phar-io/manifest": "^1.0.3",
-                "phar-io/version": "^2.0.1",
-                "php": "^7.2",
-                "phpspec/prophecy": "^1.8.1",
-                "phpunit/php-code-coverage": "^7.0.7",
-                "phpunit/php-file-iterator": "^2.0.2",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^2.1.2",
-                "sebastian/comparator": "^3.0.2",
-                "sebastian/diff": "^3.0.2",
-                "sebastian/environment": "^4.2.2",
-                "sebastian/exporter": "^3.1.1",
-                "sebastian/global-state": "^3.0.0",
-                "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^2.0.1",
-                "sebastian/type": "^1.1.3",
-                "sebastian/version": "^2.0.1"
+                "myclabs/deep-copy": "^1.10.1",
+                "phar-io/manifest": "^2.0.1",
+                "phar-io/version": "^3.0.2",
+                "php": ">=7.3",
+                "phpspec/prophecy": "^1.12.1",
+                "phpunit/php-code-coverage": "^9.2.3",
+                "phpunit/php-file-iterator": "^3.0.5",
+                "phpunit/php-invoker": "^3.1.1",
+                "phpunit/php-text-template": "^2.0.3",
+                "phpunit/php-timer": "^5.0.2",
+                "sebastian/cli-parser": "^1.0.1",
+                "sebastian/code-unit": "^1.0.6",
+                "sebastian/comparator": "^4.0.5",
+                "sebastian/diff": "^4.0.3",
+                "sebastian/environment": "^5.1.3",
+                "sebastian/exporter": "^4.0.3",
+                "sebastian/global-state": "^5.0.1",
+                "sebastian/object-enumerator": "^4.0.3",
+                "sebastian/resource-operations": "^3.0.3",
+                "sebastian/type": "^2.3",
+                "sebastian/version": "^3.0.2"
             },
             "require-dev": {
-                "ext-pdo": "*"
+                "ext-pdo": "*",
+                "phpspec/prophecy-phpunit": "^2.0.1"
             },
             "suggest": {
                 "ext-soap": "*",
-                "ext-xdebug": "*",
-                "phpunit/php-invoker": "^2.0.0"
+                "ext-xdebug": "*"
             },
             "bin": [
                 "phpunit"
@@ -1515,12 +1858,15 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "8.5-dev"
+                    "dev-master": "9.5-dev"
                 }
             },
             "autoload": {
                 "classmap": [
                     "src/"
+                ],
+                "files": [
+                    "src/Framework/Assert/Functions.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1541,7 +1887,73 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2020-01-08T08:49:49+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.3"
+            },
+            "funding": [
+                {
+                    "url": "https://phpunit.de/donate.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-03-17T07:30:34+00:00"
+        },
+        {
+            "name": "psr/http-client",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-client.git",
+                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0 || ^8.0",
+                "psr/http-message": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP clients",
+            "homepage": "https://github.com/php-fig/http-client",
+            "keywords": [
+                "http",
+                "http-client",
+                "psr",
+                "psr-18"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-client/tree/master"
+            },
+            "time": "2020-06-29T06:28:15+00:00"
         },
         {
             "name": "psr/http-message",
@@ -1591,20 +2003,23 @@
                 "request",
                 "response"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/master"
+            },
             "time": "2016-08-06T14:39:51+00:00"
         },
         {
             "name": "psr/log",
-            "version": "1.1.2",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
-                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
                 "shasum": ""
             },
             "require": {
@@ -1638,7 +2053,10 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2019-11-01T11:05:21+00:00"
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.3"
+            },
+            "time": "2020-03-23T09:12:05+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -1678,32 +2096,148 @@
                 }
             ],
             "description": "A polyfill for getallheaders.",
+            "support": {
+                "issues": "https://github.com/ralouphie/getallheaders/issues",
+                "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+            },
             "time": "2019-03-08T08:55:37+00:00"
         },
         {
-            "name": "sebastian/code-unit-reverse-lookup",
+            "name": "sebastian/cli-parser",
             "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/cli-parser.git",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for parsing CLI options",
+            "homepage": "https://github.com/sebastianbergmann/cli-parser",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:08:49+00:00"
+        },
+        {
+            "name": "sebastian/code-unit",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit.git",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:08:54+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -1723,34 +2257,44 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2017-03-04T06:30:41+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:30:19+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "3.0.2",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
+                "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
-                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
+                "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1",
-                "sebastian/diff": "^3.0",
-                "sebastian/exporter": "^3.1"
+                "php": ">=7.3",
+                "sebastian/diff": "^4.0",
+                "sebastian/exporter": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.1"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1763,6 +2307,10 @@
                 "BSD-3-Clause"
             ],
             "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
                 {
                     "name": "Jeff Welch",
                     "email": "whatthejeff@gmail.com"
@@ -1774,10 +2322,6 @@
                 {
                     "name": "Bernhard Schussek",
                     "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Provides the functionality to compare PHP values for equality",
@@ -1787,33 +2331,100 @@
                 "compare",
                 "equality"
             ],
-            "time": "2018-07-12T15:12:46+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T15:49:45+00:00"
+        },
+        {
+            "name": "sebastian/complexity",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/complexity.git",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.7",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for calculating the complexity of PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/complexity",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T15:52:27+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "3.0.2",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29"
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
-                "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5 || ^8.0",
-                "symfony/process": "^2 || ^3.3 || ^4"
+                "phpunit/phpunit": "^9.3",
+                "symfony/process": "^4.2 || ^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1826,13 +2437,13 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
                 }
             ],
             "description": "Diff implementation",
@@ -1843,27 +2454,37 @@
                 "unidiff",
                 "unified diff"
             ],
-            "time": "2019-02-04T06:01:07+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:10:38+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "4.2.3",
+            "version": "5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368"
+                "reference": "388b6ced16caa751030f6a69e588299fa09200ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/464c90d7bdf5ad4e8a6aea15c091fec0603d4368",
-                "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
+                "reference": "388b6ced16caa751030f6a69e588299fa09200ac",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-posix": "*"
@@ -1871,7 +2492,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.2-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -1896,34 +2517,44 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2019-11-20T08:46:58+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:52:38+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "3.1.2",
+            "version": "4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e"
+                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e",
-                "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65",
+                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
                 "ext-mbstring": "*",
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1963,30 +2594,40 @@
                 "export",
                 "exporter"
             ],
-            "time": "2019-09-14T09:02:43+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:24:23+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "3.0.0",
+            "version": "5.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4"
+                "reference": "a90ccbddffa067b51f574dea6eb25d5680839455"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4",
-                "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/a90ccbddffa067b51f574dea6eb25d5680839455",
+                "reference": "a90ccbddffa067b51f574dea6eb25d5680839455",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
                 "ext-dom": "*",
-                "phpunit/phpunit": "^8.0"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-uopz": "*"
@@ -1994,7 +2635,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -2017,34 +2658,101 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2019-02-01T05:30:01+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T15:55:19+00:00"
+        },
+        {
+            "name": "sebastian/lines-of-code",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.6",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for counting the lines of code in PHP source code",
+            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-28T06:42:11+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "3.0.3",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -2064,32 +2772,42 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2017-08-03T12:35:26+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:12:34+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "1.1.1",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "773f97c67f28de00d397be301821b06708fca0be"
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
-                "reference": "773f97c67f28de00d397be301821b06708fca0be",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -2109,32 +2827,42 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "time": "2017-03-29T09:07:27+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:14:26+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "3.0.0",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -2147,14 +2875,14 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
                 },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
                 {
                     "name": "Adam Harvey",
                     "email": "aharvey@php.net"
@@ -2162,29 +2890,42 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2017-03-03T06:23:57+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:17:30+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "2.0.1",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9"
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
-                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2204,32 +2945,42 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2018-10-04T04:07:39+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:45:17+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "1.1.3",
+            "version": "2.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3"
+                "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/3aaaa15fa71d27650d62a948be022fe3b48541a3",
-                "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/81cd61ab7bbf2de744aba0ea61fae32f721df3d2",
+                "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.2"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "2.3-dev"
                 }
             },
             "autoload": {
@@ -2250,29 +3001,39 @@
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
             "homepage": "https://github.com/sebastianbergmann/type",
-            "time": "2019-07-02T08:10:15+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/type/issues",
+                "source": "https://github.com/sebastianbergmann/type/tree/2.3.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:18:59+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "2.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+                "reference": "c6c1022351a901512170118436c764e473f6de8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": ">=7.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2293,20 +3054,30 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-10-03T07:35:21+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:39:44+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.5.3",
+            "version": "3.5.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "557a1fc7ac702c66b0bbfe16ab3d55839ef724cb"
+                "reference": "9d583721a7157ee997f235f327de038e7ea6dac4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/557a1fc7ac702c66b0bbfe16ab3d55839ef724cb",
-                "reference": "557a1fc7ac702c66b0bbfe16ab3d55839ef724cb",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4",
+                "reference": "9d583721a7157ee997f235f327de038e7ea6dac4",
                 "shasum": ""
             },
             "require": {
@@ -2344,26 +3115,33 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2019-12-04T04:46:47+00:00"
+            "support": {
+                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+            },
+            "time": "2020-10-23T02:01:07+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v5.0.1",
+            "version": "v5.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "c0773efcc2c940ffbc4c34a0dba2836f2cf6dc9c"
+                "reference": "212d54675bf203ff8aef7d8cee8eecfb72f4a263"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/c0773efcc2c940ffbc4c34a0dba2836f2cf6dc9c",
-                "reference": "c0773efcc2c940ffbc4c34a0dba2836f2cf6dc9c",
+                "url": "https://api.github.com/repos/symfony/config/zipball/212d54675bf203ff8aef7d8cee8eecfb72f4a263",
+                "reference": "212d54675bf203ff8aef7d8cee8eecfb72f4a263",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
                 "symfony/filesystem": "^4.4|^5.0",
-                "symfony/polyfill-ctype": "~1.8"
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-php80": "^1.15"
             },
             "conflict": {
                 "symfony/finder": "<4.4"
@@ -2379,11 +3157,6 @@
                 "symfony/yaml": "To use the yaml reference dumper"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Config\\": ""
@@ -2406,34 +3179,113 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Config Component",
+            "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
-            "time": "2019-12-01T10:51:15+00:00"
+            "support": {
+                "source": "https://github.com/symfony/config/tree/v5.2.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-02-23T23:58:19+00:00"
         },
         {
-            "name": "symfony/filesystem",
-            "version": "v5.0.1",
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "1d71f670bc5a07b9ccc97dc44f932177a322d4e6"
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/1d71f670bc5a07b9ccc97dc44f932177a322d4e6",
-                "reference": "1d71f670bc5a07b9ccc97dc44f932177a322d4e6",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665",
+                "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
-                "symfony/polyfill-ctype": "~1.8"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "2.2-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/master"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
                 }
+            ],
+            "time": "2020-09-07T11:33:47+00:00"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v5.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "710d364200997a5afde34d9fe57bd52f3cc1e108"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/710d364200997a5afde34d9fe57bd52f3cc1e108",
+                "reference": "710d364200997a5afde34d9fe57bd52f3cc1e108",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-ctype": "~1.8"
             },
+            "type": "library",
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Filesystem\\": ""
@@ -2456,26 +3308,43 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Filesystem Component",
+            "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
-            "time": "2019-11-26T23:25:11+00:00"
+            "support": {
+                "source": "https://github.com/symfony/filesystem/tree/v5.2.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-02-12T10:38:38+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.14.0",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38"
+                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/fbdeaec0df06cf3d51c93de80c7eb76e271f5a38",
-                "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
+                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-ctype": "For best performance"
@@ -2483,7 +3352,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.14-dev"
+                    "dev-main": "1.22-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -2516,32 +3389,44 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2020-01-13T11:15:53+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-07T16:49:33+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.0.1",
+            "version": "v5.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "d410282956706e0b08681a5527447a8e6b6f421e"
+                "reference": "b12274acfab9d9850c52583d136a24398cdf1a0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/d410282956706e0b08681a5527447a8e6b6f421e",
-                "reference": "d410282956706e0b08681a5527447a8e6b6f421e",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b12274acfab9d9850c52583d136a24398cdf1a0c",
+                "reference": "b12274acfab9d9850c52583d136a24398cdf1a0c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "symfony/service-contracts": "^1.0|^2"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Stopwatch\\": ""
@@ -2564,26 +3449,44 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Stopwatch Component",
+            "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
-            "time": "2019-11-18T17:27:11+00:00"
+            "support": {
+                "source": "https://github.com/symfony/stopwatch/tree/v5.2.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-27T10:15:41+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.0.1",
+            "version": "v5.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "51b684480184fa767b97e28eaca67664e48dd3e9"
+                "reference": "298a08ddda623485208506fcee08817807a251dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/51b684480184fa767b97e28eaca67664e48dd3e9",
-                "reference": "51b684480184fa767b97e28eaca67664e48dd3e9",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/298a08ddda623485208506fcee08817807a251dd",
+                "reference": "298a08ddda623485208506fcee08817807a251dd",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
@@ -2595,12 +3498,10 @@
             "suggest": {
                 "symfony/console": "For validating YAML files using the lint command"
             },
+            "bin": [
+                "Resources/bin/yaml-lint"
+            ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Yaml\\": ""
@@ -2623,26 +3524,43 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Yaml Component",
+            "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
-            "time": "2019-11-18T17:27:11+00:00"
+            "support": {
+                "source": "https://github.com/symfony/yaml/tree/v5.2.5"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-03-06T07:59:01+00:00"
         },
         {
             "name": "thecodingmachine/phpstan-strict-rules",
-            "version": "v0.12.0",
+            "version": "v0.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thecodingmachine/phpstan-strict-rules.git",
-                "reference": "8c58cc87dc870382b228c95c4f1cc9fc871aaf28"
+                "reference": "4bb334f6f637ebfba83cfdc7392d549a8a3fbba7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thecodingmachine/phpstan-strict-rules/zipball/8c58cc87dc870382b228c95c4f1cc9fc871aaf28",
-                "reference": "8c58cc87dc870382b228c95c4f1cc9fc871aaf28",
+                "url": "https://api.github.com/repos/thecodingmachine/phpstan-strict-rules/zipball/4bb334f6f637ebfba83cfdc7392d549a8a3fbba7",
+                "reference": "4bb334f6f637ebfba83cfdc7392d549a8a3fbba7",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1",
+                "php": "^7.1|^8.0",
                 "phpstan/phpstan": "^0.12"
             },
             "require-dev": {
@@ -2676,27 +3594,31 @@
                 }
             ],
             "description": "A set of additional rules for PHPStan based on best practices followed at TheCodingMachine",
-            "time": "2019-12-04T11:25:22+00:00"
+            "support": {
+                "issues": "https://github.com/thecodingmachine/phpstan-strict-rules/issues",
+                "source": "https://github.com/thecodingmachine/phpstan-strict-rules/tree/master"
+            },
+            "time": "2020-09-08T09:14:10+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.1.3",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
+                "reference": "75a63c33a8577608444246075ea0af0d052e452a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
-                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
+                "reference": "75a63c33a8577608444246075ea0af0d052e452a",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-tokenizer": "*",
                 "ext-xmlwriter": "*",
-                "php": "^7.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "autoload": {
@@ -2716,33 +3638,49 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2019-06-13T22:48:21+00:00"
+            "support": {
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/master"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-07-12T23:59:07+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.7.0",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "aed98a490f9a8f78468232db345ab9cf606cf598"
+                "url": "https://github.com/webmozarts/assert.git",
+                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/aed98a490f9a8f78468232db345ab9cf606cf598",
-                "reference": "aed98a490f9a8f78468232db345ab9cf606cf598",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
+                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0",
+                "php": "^7.2 || ^8.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
-                "vimeo/psalm": "<3.6.0"
+                "phpstan/phpstan": "<0.12.20",
+                "vimeo/psalm": "<4.6.1 || 4.6.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
+                "phpunit/phpunit": "^8.5.13"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.10-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Webmozart\\Assert\\": "src/"
@@ -2764,7 +3702,11 @@
                 "check",
                 "validate"
             ],
-            "time": "2020-02-14T12:15:55+00:00"
+            "support": {
+                "issues": "https://github.com/webmozarts/assert/issues",
+                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
+            },
+            "time": "2021-03-09T10:59:23+00:00"
         }
     ],
     "aliases": [],
@@ -2773,10 +3715,10 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^7.2",
+        "php": ">=8.0",
         "ext-simplexml": "*",
         "ext-json": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.0.0"
 }
diff --git a/generator/src/PhpStanFunctions/CustomPhpStanFunctionMap.php b/generator/src/PhpStanFunctions/CustomPhpStanFunctionMap.php
index f87ec549..23eeac47 100644
--- a/generator/src/PhpStanFunctions/CustomPhpStanFunctionMap.php
+++ b/generator/src/PhpStanFunctions/CustomPhpStanFunctionMap.php
@@ -10,4 +10,5 @@
     'com_load_typelib' => ['bool', 'typelib_name'=>'string', 'case_insensitive='=>'bool'], // case_insensitive is a bool
     'sem_get' => ['resource|false', 'key'=>'int', 'max_acquire='=>'int', 'perm='=>'int', 'auto_release='=>'bool'], // auto_release is a bool
     'imap_open' => ['resource|false', 'mailbox'=>'string', 'user'=>'string', 'password'=>'string', 'flags='=>'int', 'retries='=>'int', 'options=' => 'array'], //the last 3 parameters were renamed
+    'imagerotate' => ['resource|false', 'src_im'=>'resource', 'angle'=>'float', 'bgdcolor'=>'int', 'ignoretransparent='=>'bool'], //ignoretransparent is a bool instead of a int
 ];
diff --git a/generator/tests/DocPageTest.php b/generator/tests/DocPageTest.php
index 5bd9ac0a..7183382b 100644
--- a/generator/tests/DocPageTest.php
+++ b/generator/tests/DocPageTest.php
@@ -13,7 +13,6 @@ public function testDetectFalsyFunction()
         $getCwd = new DocPage(__DIR__ . '/../doc/doc-en/en/reference/dir/functions/getcwd.xml');
         $setTime = new DocPage(__DIR__ . '/../doc/doc-en/en/reference/datetime/datetime/settime.xml');
         $filesize = new DocPage(__DIR__ . '/../doc/doc-en/en/reference/filesystem/functions/filesize.xml');
-        $sessionRegister = new DocPage(__DIR__ . '/../doc/doc-en/en/reference/session/functions/session-register.xml');
         $mcryptDecrypt = new DocPage(__DIR__ . '/../doc/doc-en/en/reference/mcrypt/functions/mcrypt-decrypt.xml');
         $fsockopen = new DocPage(__DIR__ . '/../doc/doc-en/en/reference/network/functions/fsockopen.xml');
         $arrayReplace = new DocPage(__DIR__ . '/../doc/doc-en/en/reference/array/functions/array-replace.xml');
@@ -25,7 +24,6 @@ public function testDetectFalsyFunction()
         $this->assertTrue($getCwd->detectFalsyFunction());
         $this->assertTrue($setTime->detectFalsyFunction());
         $this->assertTrue($filesize->detectFalsyFunction());
-        $this->assertFalse($sessionRegister->detectFalsyFunction());
         $this->assertTrue($mcryptDecrypt->detectFalsyFunction());
         $this->assertTrue($fsockopen->detectFalsyFunction());
         $this->assertFalse($arrayReplace->detectFalsyFunction());
diff --git a/generator/tests/GeneratedFilesTest.php b/generator/tests/GeneratedFilesTest.php
index 04f385d3..df03d9f3 100644
--- a/generator/tests/GeneratedFilesTest.php
+++ b/generator/tests/GeneratedFilesTest.php
@@ -5,7 +5,6 @@
 use PHPUnit\Framework\TestCase;
 use Safe\Exceptions\DatetimeException;
 use function restore_error_handler;
-use Safe\Exceptions\StringsException;
 use SimpleXMLElement;
 
 /**
@@ -26,7 +25,7 @@ public function testSprintf()
         set_error_handler(function () {
         });
         try {
-            $this->expectException(StringsException::class);
+            $this->expectException(\ArgumentCountError::class);
             sprintf('foo%s%s', 'bar');
         } finally {
             restore_error_handler();
diff --git a/generator/tests/rector/0.7/composer.json b/generator/tests/rector/0.7/composer.json
index 0b3171a0..8a0f1859 100644
--- a/generator/tests/rector/0.7/composer.json
+++ b/generator/tests/rector/0.7/composer.json
@@ -5,7 +5,7 @@
     }
   },
   "require": {
-    "php": "^7.2",
+    "php": "^8.0",
     "rector/rector": "^0.7.6"
   },
   "require-dev": {
diff --git a/lib/DateTimeImmutable.php b/lib/DateTimeImmutable.php
index 114ec3a3..2ce4933d 100644
--- a/lib/DateTimeImmutable.php
+++ b/lib/DateTimeImmutable.php
@@ -55,9 +55,9 @@ public function getInnerDateTime(): \DateTimeImmutable
      * @param DateTimeZone|null $timezone
      * @throws DatetimeException
      */
-    public static function createFromFormat($format, $time, $timezone = null): self
+    public static function createFromFormat($format, $time, $timezone = null)
     {
-        $datetime = parent::createFromFormat($format, $time, $timezone);
+        $datetime = \DateTimeImmutable::createFromFormat($format, $time, $timezone);
         if ($datetime === false) {
             throw DatetimeException::createFromPhpError();
         }
diff --git a/lib/Exceptions/CurlException.php b/lib/Exceptions/CurlException.php
index 2814066b..d0dbdb69 100644
--- a/lib/Exceptions/CurlException.php
+++ b/lib/Exceptions/CurlException.php
@@ -6,9 +6,9 @@
 class CurlException extends \Exception implements SafeExceptionInterface
 {
     /**
-     * @param resource $ch
+     * @param \CurlHandle $ch
      */
-    public static function createFromCurlResource($ch): self
+    public static function createFromPhpError($ch): self
     {
         return new self(\curl_error($ch), \curl_errno($ch));
     }
diff --git a/lib/special_cases.php b/lib/special_cases.php
index d18e2118..d2093b59 100644
--- a/lib/special_cases.php
+++ b/lib/special_cases.php
@@ -216,7 +216,7 @@ function openssl_encrypt(string $data, string $method, string $key, int $options
  * socket from the given
  * buffer.
  *
- * @param resource $socket
+ * @param \Socket $socket
  * @param string $buffer The buffer to be written.
  * @param int $length The optional parameter length can specify an
  * alternate length of bytes written to the socket. If this length is
@@ -230,7 +230,7 @@ function openssl_encrypt(string $data, string $method, string $key, int $options
  * @throws SocketsException
  *
  */
-function socket_write($socket, string $buffer, int $length = 0): int
+function socket_write(\Socket $socket, string $buffer, int $length = 0): int
 {
     error_clear_last();
     $result = $length === 0 ? \socket_write($socket, $buffer) : \socket_write($socket, $buffer, $length);
diff --git a/rector-migrate-0.7.php b/rector-migrate-0.7.php
index de1a89d9..2f901dc0 100644
--- a/rector-migrate-0.7.php
+++ b/rector-migrate-0.7.php
@@ -15,7 +15,6 @@
             'apache_get_version' => 'Safe\apache_get_version',
             'apache_lookup_uri' => 'Safe\apache_lookup_uri',
             'apache_request_headers' => 'Safe\apache_request_headers',
-            'apache_reset_timeout' => 'Safe\apache_reset_timeout',
             'apache_response_headers' => 'Safe\apache_response_headers',
             'apache_setenv' => 'Safe\apache_setenv',
             'apcu_cache_info' => 'Safe\apcu_cache_info',
@@ -33,6 +32,7 @@
             'arsort' => 'Safe\arsort',
             'asort' => 'Safe\asort',
             'base64_decode' => 'Safe\base64_decode',
+            'bindtextdomain' => 'Safe\bindtextdomain',
             'bzclose' => 'Safe\bzclose',
             'bzflush' => 'Safe\bzflush',
             'bzread' => 'Safe\bzread',
@@ -643,6 +643,7 @@
             'openssl_cms_verify' => 'Safe\openssl_cms_verify',
             'openssl_csr_export' => 'Safe\openssl_csr_export',
             'openssl_csr_export_to_file' => 'Safe\openssl_csr_export_to_file',
+            'openssl_csr_get_public_key' => 'Safe\openssl_csr_get_public_key',
             'openssl_csr_get_subject' => 'Safe\openssl_csr_get_subject',
             'openssl_csr_new' => 'Safe\openssl_csr_new',
             'openssl_csr_sign' => 'Safe\openssl_csr_sign',
@@ -650,6 +651,7 @@
             'openssl_dh_compute_key' => 'Safe\openssl_dh_compute_key',
             'openssl_digest' => 'Safe\openssl_digest',
             'openssl_encrypt' => 'Safe\openssl_encrypt',
+            'openssl_get_curve_names' => 'Safe\openssl_get_curve_names',
             'openssl_open' => 'Safe\openssl_open',
             'openssl_pbkdf2' => 'Safe\openssl_pbkdf2',
             'openssl_pkcs7_decrypt' => 'Safe\openssl_pkcs7_decrypt',
@@ -659,6 +661,7 @@
             'openssl_pkcs12_export' => 'Safe\openssl_pkcs12_export',
             'openssl_pkcs12_export_to_file' => 'Safe\openssl_pkcs12_export_to_file',
             'openssl_pkcs12_read' => 'Safe\openssl_pkcs12_read',
+            'openssl_pkey_derive' => 'Safe\openssl_pkey_derive',
             'openssl_pkey_export' => 'Safe\openssl_pkey_export',
             'openssl_pkey_export_to_file' => 'Safe\openssl_pkey_export_to_file',
             'openssl_pkey_get_private' => 'Safe\openssl_pkey_get_private',
@@ -671,6 +674,11 @@
             'openssl_random_pseudo_bytes' => 'Safe\openssl_random_pseudo_bytes',
             'openssl_seal' => 'Safe\openssl_seal',
             'openssl_sign' => 'Safe\openssl_sign',
+            'openssl_spki_export' => 'Safe\openssl_spki_export',
+            'openssl_spki_export_challenge' => 'Safe\openssl_spki_export_challenge',
+            'openssl_spki_new' => 'Safe\openssl_spki_new',
+            'openssl_spki_verify' => 'Safe\openssl_spki_verify',
+            'openssl_verify' => 'Safe\openssl_verify',
             'openssl_x509_export' => 'Safe\openssl_x509_export',
             'openssl_x509_export_to_file' => 'Safe\openssl_x509_export_to_file',
             'openssl_x509_fingerprint' => 'Safe\openssl_x509_fingerprint',
@@ -975,6 +983,7 @@
             'ssh2_publickey_remove' => 'Safe\ssh2_publickey_remove',
             'ssh2_scp_recv' => 'Safe\ssh2_scp_recv',
             'ssh2_scp_send' => 'Safe\ssh2_scp_send',
+            'ssh2_send_eof' => 'Safe\ssh2_send_eof',
             'ssh2_sftp' => 'Safe\ssh2_sftp',
             'ssh2_sftp_chmod' => 'Safe\ssh2_sftp_chmod',
             'ssh2_sftp_mkdir' => 'Safe\ssh2_sftp_mkdir',
@@ -982,6 +991,7 @@
             'ssh2_sftp_rmdir' => 'Safe\ssh2_sftp_rmdir',
             'ssh2_sftp_symlink' => 'Safe\ssh2_sftp_symlink',
             'ssh2_sftp_unlink' => 'Safe\ssh2_sftp_unlink',
+            'ssh2_shell' => 'Safe\ssh2_shell',
             'stream_context_set_params' => 'Safe\stream_context_set_params',
             'stream_copy_to_stream' => 'Safe\stream_copy_to_stream',
             'stream_filter_append' => 'Safe\stream_filter_append',

From b4a7964565aa8be89225c2f4e639abafcf90b406 Mon Sep 17 00:00:00 2001
From: dbrekelmans <dbrekelmans@users.noreply.github.com>
Date: Mon, 19 Jul 2021 21:05:47 +0200
Subject: [PATCH 02/10] Regenerate files

---
 .travis.yml.old                               |   68 -
 composer.json                                 |    4 +-
 generated/Exceptions/MysqlndMsException.php   |   11 -
 generated/Exceptions/MysqlndQcException.php   |   11 -
 ...resiiException.php => SodiumException.php} |    2 +-
 generated/array.php                           |   21 +-
 generated/classobj.php                        |    8 +-
 generated/cubrid.php                          | 1731 ++++++++++++++++-
 generated/curl.php                            |   82 +-
 generated/datetime.php                        |   35 +-
 generated/dir.php                             |    3 +
 generated/eio.php                             |   57 +-
 generated/fileinfo.php                        |    8 +-
 generated/filesystem.php                      |   58 +-
 generated/functionsList.php                   |   85 +-
 generated/gettext.php                         |    1 +
 generated/image.php                           |  895 +++++----
 generated/ingres-ii.php                       |  720 -------
 generated/ldap.php                            |   80 +-
 generated/misc.php                            |    8 +-
 generated/mysqli.php                          |    1 -
 generated/mysqlndMs.php                       |  119 --
 generated/mysqlndQc.php                       |  103 -
 generated/network.php                         |   40 +-
 generated/oci8.php                            |    4 +-
 generated/openssl.php                         |    8 +-
 generated/password.php                        |    5 +
 generated/pgsql.php                           |    2 +-
 generated/readline.php                        |   32 -
 generated/simplexml.php                       |   29 +-
 generated/sodium.php                          |  303 +++
 generated/spl.php                             |   55 +-
 generated/stream.php                          |    4 +-
 generated/strings.php                         |   38 +-
 generated/url.php                             |   31 +-
 generated/xml.php                             |   12 +-
 generated/zlib.php                            |   11 +-
 generator/config/ignoredFunctions.php         |    3 +-
 generator/doc/update.sh                       |   20 +-
 rector-migrate-0.7.php                        |   85 +-
 40 files changed, 2961 insertions(+), 1832 deletions(-)
 delete mode 100644 .travis.yml.old
 delete mode 100644 generated/Exceptions/MysqlndMsException.php
 delete mode 100644 generated/Exceptions/MysqlndQcException.php
 rename generated/Exceptions/{IngresiiException.php => SodiumException.php} (73%)
 delete mode 100644 generated/ingres-ii.php
 delete mode 100644 generated/mysqlndMs.php
 delete mode 100644 generated/mysqlndQc.php
 create mode 100644 generated/sodium.php

diff --git a/.travis.yml.old b/.travis.yml.old
deleted file mode 100644
index 8adae7af..00000000
--- a/.travis.yml.old
+++ /dev/null
@@ -1,68 +0,0 @@
-language: php
-matrix:
-  fast_finish: true # Don't wait for the allowed failures to build.
-  include:
-  - php: 7.3
-    env: PREFER_LOWEST=""
-  - php: 7.2
-    env: PREFER_LOWEST=""
-  allow_failures:
-    # PHP 7.4 testing is allowed to fail because the container isn't ready yet 
-    - php: 7.4
-      env: PREFER_LOWEST=""
-
-cache:
-  directories:
-  - generator/doc/doc-en
-  - vendor
-  - generator/vendor
-  - $HOME/.composer
-
-before_script:
-- cd generator && composer install --no-interaction && cd ..
-- |
-  if [ ! -d "generator/doc/doc-en/en" ]; then
-    cd generator/doc
-    svn co https://svn.php.net/repository/phpdoc/modules/doc-en doc-en
-    cd ../..
-  else
-    cd generator/doc/doc-en
-    svn update
-    if [ $? -ne 0 ];
-    then
-      cd ..
-      rm -rf doc-en
-      svn co https://svn.php.net/repository/phpdoc/modules/doc-en doc-en
-      cd doc-en
-    fi
-    cd ../../..
-  fi
-- composer update
-
-script:
-- cd generator && ./vendor/bin/phpunit && cd ..
-- cd generator && composer cs-check && cd ..
-- cd generator && composer phpstan && cd ..
-- composer dump-autoload
-- composer cs-check
-- composer phpstan
-# Now, let's regenerate all files and see if we obtain the same set of files as the ones commited:
-- cd generator && ./safe.php generate && cd ..
-- |
-  if output=$(git status --porcelain) && [ -z "$output" ]; then
-    # all is good
-    echo "Generated files are the same as committed file: OK"
-  else
-    # Uncommitted changes
-    echo "Generated files are different from commited files. Please run './safe.php generate' command and commit the results."
-    echo "Detected changes:"
-    git status
-    git diff
-    echo "Generated files are different from commited files. Please run './safe.php generate' command and commit the results."
-    exit 1;
-  fi
-- cd generator/tests/rector/0.5 && composer install && composer rector && composer test && cd ../../../..
-- cd generator/tests/rector/0.6 && composer install && composer rector && composer test && cd ../../../..
-
-after_script:
-- cd generator && travis_retry php vendor/bin/php-coveralls -v --root_dir="./generator"
diff --git a/composer.json b/composer.json
index 6bf17a81..c4522f3c 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,6 @@
             "generated/image.php",
             "generated/imap.php",
             "generated/info.php",
-            "generated/ingres-ii.php",
             "generated/inotify.php",
             "generated/json.php",
             "generated/ldap.php",
@@ -57,8 +56,6 @@
             "generated/misc.php",
             "generated/mysql.php",
             "generated/mysqli.php",
-            "generated/mysqlndMs.php",
-            "generated/mysqlndQc.php",
             "generated/network.php",
             "generated/oci8.php",
             "generated/opcache.php",
@@ -79,6 +76,7 @@
             "generated/shmop.php",
             "generated/simplexml.php",
             "generated/sockets.php",
+            "generated/sodium.php",
             "generated/solr.php",
             "generated/spl.php",
             "generated/sqlsrv.php",
diff --git a/generated/Exceptions/MysqlndMsException.php b/generated/Exceptions/MysqlndMsException.php
deleted file mode 100644
index 5e9b5594..00000000
--- a/generated/Exceptions/MysqlndMsException.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace Safe\Exceptions;
-
-class MysqlndMsException extends \ErrorException implements SafeExceptionInterface
-{
-    public static function createFromPhpError(): self
-    {
-        $error = error_get_last();
-        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
-    }
-}
diff --git a/generated/Exceptions/MysqlndQcException.php b/generated/Exceptions/MysqlndQcException.php
deleted file mode 100644
index 4db9f491..00000000
--- a/generated/Exceptions/MysqlndQcException.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace Safe\Exceptions;
-
-class MysqlndQcException extends \ErrorException implements SafeExceptionInterface
-{
-    public static function createFromPhpError(): self
-    {
-        $error = error_get_last();
-        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
-    }
-}
diff --git a/generated/Exceptions/IngresiiException.php b/generated/Exceptions/SodiumException.php
similarity index 73%
rename from generated/Exceptions/IngresiiException.php
rename to generated/Exceptions/SodiumException.php
index ca40822e..f33ec049 100644
--- a/generated/Exceptions/IngresiiException.php
+++ b/generated/Exceptions/SodiumException.php
@@ -1,7 +1,7 @@
 <?php
 namespace Safe\Exceptions;
 
-class IngresiiException extends \ErrorException implements SafeExceptionInterface
+class SodiumException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
diff --git a/generated/array.php b/generated/array.php
index dcc887f6..a31109f8 100644
--- a/generated/array.php
+++ b/generated/array.php
@@ -149,17 +149,17 @@ function array_replace(array $array, array  ...$replacements): array
  * reference. Then,
  * any changes made to those elements will be made in the
  * original array itself.
- * @param mixed $userdata If the optional userdata parameter is supplied,
+ * @param mixed $arg If the optional arg parameter is supplied,
  * it will be passed as the third parameter to the
  * callback.
  * @throws ArrayException
  *
  */
-function array_walk_recursive(array &$array, callable $callback, $userdata = null): void
+function array_walk_recursive(array &$array, callable $callback, $arg = null): void
 {
     error_clear_last();
-    if ($userdata !== null) {
-        $result = \array_walk_recursive($array, $callback, $userdata);
+    if ($arg !== null) {
+        $result = \array_walk_recursive($array, $callback, $arg);
     } else {
         $result = \array_walk_recursive($array, $callback);
     }
@@ -170,7 +170,7 @@ function array_walk_recursive(array &$array, callable $callback, $userdata = nul
 
 
 /**
- * This function sorts an array such that array indices maintain their
+ * This function sorts an array in descending order such that array indices maintain their
  * correlation with the array elements they are associated with.
  *
  * This is used mainly when sorting associative arrays where the actual
@@ -228,7 +228,7 @@ function arsort(array &$array, int $flags = SORT_REGULAR): void
 
 
 /**
- * This function sorts an array such that array indices maintain
+ * This function sorts an array in ascending order such that array indices maintain
  * their correlation with the array elements they are associated
  * with.  This is used mainly when sorting associative arrays where
  * the actual element order is significant.
@@ -285,7 +285,7 @@ function asort(array &$array, int $flags = SORT_REGULAR): void
 
 
 /**
- * Sorts an array by key in reverse order, maintaining key to data
+ * Sorts an array by key in descending order, maintaining key to data
  * correlations. This is useful mainly for associative arrays.
  *
  * @param array $array The input array.
@@ -340,7 +340,7 @@ function krsort(array &$array, int $flags = SORT_REGULAR): void
 
 
 /**
- * Sorts an array by key, maintaining key to data correlations. This is
+ * Sorts an array by key in ascending order, maintaining key to data correlations. This is
  * useful mainly for associative arrays.
  *
  * @param array $array The input array.
@@ -438,7 +438,7 @@ function natsort(array &$array): void
 
 
 /**
- * This function sorts an array in reverse order (highest to lowest).
+ * This function sorts an array by value in descending order.
  *
  * @param array $array The input array.
  * @param int $flags The optional second parameter flags
@@ -511,8 +511,7 @@ function shuffle(array &$array): void
 
 
 /**
- * This function sorts an array.  Elements will be arranged from
- * lowest to highest when this function has completed.
+ * This function sorts an array by value in ascending order.
  *
  * @param array $array The input array.
  * @param int $flags The optional second parameter flags
diff --git a/generated/classobj.php b/generated/classobj.php
index 98147ac2..dd2535ae 100644
--- a/generated/classobj.php
+++ b/generated/classobj.php
@@ -6,19 +6,19 @@
 
 /**
  * Creates an alias named alias
- * based on the user defined class original.
+ * based on the user defined class class.
  * The aliased class is exactly the same as the original class.
  *
- * @param string $original The original class.
+ * @param string $class The original class.
  * @param string $alias The alias name for the class.
  * @param bool $autoload Whether to autoload if the original class is not found.
  * @throws ClassobjException
  *
  */
-function class_alias(string $original, string $alias, bool $autoload = true): void
+function class_alias(string $class, string $alias, bool $autoload = true): void
 {
     error_clear_last();
-    $result = \class_alias($original, $alias, $autoload);
+    $result = \class_alias($class, $alias, $autoload);
     if ($result === false) {
         throw ClassobjException::createFromPhpError();
     }
diff --git a/generated/cubrid.php b/generated/cubrid.php
index f19f2d56..559bc973 100644
--- a/generated/cubrid.php
+++ b/generated/cubrid.php
@@ -4,6 +4,433 @@
 
 use Safe\Exceptions\CubridException;
 
+/**
+ * The cubrid_bind function is used to bind values to a
+ * corresponding named or question mark placeholder in the SQL statement that
+ * was passed to cubrid_prepare. If
+ * bind_value_type is not given, string will be the
+ * default.
+ *
+ * The following table shows the types of substitute values.
+ *
+ *
+ * CUBRID Bind Date Types
+ *
+ *
+ *
+ * Support
+ * Bind Type
+ * Corresponding SQL Type
+ *
+ *
+ *
+ *
+ * Supported
+ * STRING
+ * CHAR, VARCHAR
+ *
+ *
+ *
+ * NCHAR
+ * NCHAR, NVARCHAR
+ *
+ *
+ *
+ * BIT
+ * BIT, VARBIT
+ *
+ *
+ *
+ * NUMERIC or NUMBER
+ * SHORT, INT, NUMERIC
+ *
+ *
+ *
+ * FLOAT
+ * FLOAT
+ *
+ *
+ *
+ * DOUBLE
+ * DOUBLE
+ *
+ *
+ *
+ * TIME
+ * TIME
+ *
+ *
+ *
+ * DATE
+ * DATE
+ *
+ *
+ *
+ * TIMESTAMP
+ * TIMESTAMP
+ *
+ *
+ *
+ * OBJECT
+ * OBJECT
+ *
+ *
+ *
+ * ENUM
+ * ENUM
+ *
+ *
+ *
+ * BLOB
+ * BLOB
+ *
+ *
+ *
+ * CLOB
+ * CLOB
+ *
+ *
+ *
+ * NULL
+ * NULL
+ *
+ *
+ * Not supported
+ * SET
+ * SET
+ *
+ *
+ *
+ * MULTISET
+ * MULTISET
+ *
+ *
+ *
+ * SEQUENCE
+ * SEQUENCE
+ *
+ *
+ *
+ *
+ *
+ * @param resource $req_identifier Request identifier as a result of
+ * cubrid_prepare.
+ * @param int $bind_index Location of binding parameters. It starts with 1.
+ * @param mixed $bind_value Actual value for binding.
+ * @param string $bind_value_type A type of the value to bind. (It is omitted by default.
+ * Thus, the system internally uses string by default. However, you need to
+ * specify the exact type of the value as an argument when they are NCHAR,
+ * BIT, or BLOB/CLOB).
+ * @throws CubridException
+ *
+ */
+function cubrid_bind($req_identifier, int $bind_index, $bind_value, string $bind_value_type = null): void
+{
+    error_clear_last();
+    if ($bind_value_type !== null) {
+        $result = \cubrid_bind($req_identifier, $bind_index, $bind_value, $bind_value_type);
+    } else {
+        $result = \cubrid_bind($req_identifier, $bind_index, $bind_value);
+    }
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_col_size function is used to get the
+ * number of elements in a collection type (set, multiset, sequence)
+ * attribute.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @param string $oid OID the instance that you want to work with.
+ * @param string $attr_name Name of the attribute that you want to work with.
+ * @return int Number of elements, when process is successful.
+ * @throws CubridException
+ *
+ */
+function cubrid_col_size($conn_identifier, string $oid, string $attr_name): int
+{
+    error_clear_last();
+    $result = \cubrid_col_size($conn_identifier, $oid, $attr_name);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * The cubrid_column_names function is used to get the
+ * column names of the query result by using req_identifier.
+ *
+ * @param resource $req_identifier Request identifier.
+ * @return array Array of string values containing the column names, when process is successful.
+ * @throws CubridException
+ *
+ */
+function cubrid_column_names($req_identifier): array
+{
+    error_clear_last();
+    $result = \cubrid_column_names($req_identifier);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * The cubrid_column_types function gets column types of
+ * query results by using req_identifier.
+ *
+ * @param resource $req_identifier Request identifier.
+ * @return array Array of string values containing the column types, when process is successful.
+ * @throws CubridException
+ *
+ */
+function cubrid_column_types($req_identifier): array
+{
+    error_clear_last();
+    $result = \cubrid_column_types($req_identifier);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * The cubrid_commit function is used to execute commit
+ * on the transaction pointed by conn_identifier,
+ * currently in progress. Connection to the server is closed after the
+ * cubrid_commit function is called; However,
+ * the connection handle is still valid.
+ *
+ * In CUBRID PHP, auto-commit mode is disabled by default for transaction management.
+ * You can set it by using cubrid_set_autocommit.
+ * You can get its status by using cubrid_get_autocommit. Before you start a transaction,
+ * remember to disable the auto-commit mode.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @throws CubridException
+ *
+ */
+function cubrid_commit($conn_identifier): void
+{
+    error_clear_last();
+    $result = \cubrid_commit($conn_identifier);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_connect_with_url function is used to
+ * establish the environment for connecting to your server by using connection
+ * information passed with an url string argument. If the HA feature is
+ * enabled in CUBRID, you must specify the connection information of the
+ * standby server, which is used for failover when failure occurs, in the url
+ * string argument of this function. If the user name and password is not
+ * given, then the "PUBLIC" connection will be made by default.
+ *
+ * &lt;url&gt; ::= CUBRID:&lt;host&gt;:&lt;db_name&gt;:&lt;db_user&gt;:&lt;db_password&gt;:[?&lt;properties&gt;]
+ *
+ * &lt;properties&gt; ::= &lt;property&gt; [&amp;&lt;property&gt;]
+ *
+ * &lt;properties&gt; ::= alhosts=&lt;alternative_hosts&gt;[ &amp;rctime=&lt;time&gt;]
+ *
+ * &lt;properties&gt; ::= login_timeout=&lt;milli_sec&gt;
+ *
+ * &lt;properties&gt; ::= query_timeout=&lt;milli_sec&gt;
+ *
+ * &lt;properties&gt; ::= disconnect_on_query_timeout=true|false
+ *
+ * &lt;alternative_hosts&gt; ::= &lt;standby_broker1_host&gt;:&lt;port&gt; [,&lt;standby_broker2_host&gt;:&lt;port&gt;]
+ *
+ * &lt;host&gt; := HOSTNAME | IP_ADDR
+ *
+ * &lt;time&gt; := SECOND
+ *
+ * &lt;milli_sec&gt; := MILLI SECOND
+ *
+ *
+ * host : A host name or IP address of the master database
+ * db_name : A name of the database
+ * db_user : A name of the database user
+ * db_password : A database user password
+ *
+ * alhosts : Specifies the broker information of the standby server, which is
+ * used for failover when it is impossible to connect to the active server.
+ * You can specify multiple brokers for failover, and the connection to the brokers
+ * is attempted in the order listed in alhosts
+ *
+ * rctime : An interval between the attempts to connect to the active broker in
+ * which failure occurred. After a failure occurs, the system connects to the
+ * broker specified by althosts (failover), terminates the transaction, and then
+ * attempts to connect to the active broker of the master database at every rctime.
+ * The default value is 600 seconds.
+ *
+ * login_timeout : Timeout value (unit: msec.) for database login. The default
+ * value is 0, which means infinite postponement.
+ *
+ *
+ * query_timeout : Timeout value (unit: msec.) for query request. Upon timeout,
+ * a message to cancel requesting a query transferred to server is sent. The return
+ * value can depend on the disconnect_on_query_timeout configuration; even though the
+ * message to cancel a request is sent to server, that request may succeed.
+ *
+ *
+ * disconnect_on_query_timeout : Configures a value whether to immediately return
+ * an error of function being executed upon timeout. The default value is false.
+ *
+ *
+ *
+ * @param string $conn_url A character string that contains server connection information.
+ * @param string $userid User name for the database.
+ * @param string $passwd User password.
+ * @param bool $new_link If a second call is made to
+ * cubrid_connect_with_url with the same arguments,
+ * no new connection will be established, but instead, the connection
+ * identifier of the already opened connection will be returned. The
+ * new_link parameter modifies this behavior and
+ * makes cubrid_connect_with_url always open a new
+ * connection, even if cubrid_connect_with_url was
+ * called before with the same parameters.
+ * @return resource Connection identifier, when process is successful.
+ * @throws CubridException
+ *
+ */
+function cubrid_connect_with_url(string $conn_url, string $userid = null, string $passwd = null, bool $new_link = false)
+{
+    error_clear_last();
+    if ($new_link !== false) {
+        $result = \cubrid_connect_with_url($conn_url, $userid, $passwd, $new_link);
+    } elseif ($passwd !== null) {
+        $result = \cubrid_connect_with_url($conn_url, $userid, $passwd);
+    } elseif ($userid !== null) {
+        $result = \cubrid_connect_with_url($conn_url, $userid);
+    } else {
+        $result = \cubrid_connect_with_url($conn_url);
+    }
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * The cubrid_connect function is used to establish the
+ * environment for connecting to your server by using your server address,
+ * port number, database name, user name, and password. If the user name and
+ * password is not given, then the "PUBLIC" connection will be made by
+ * default.
+ *
+ * @param string $host Host name or IP address of CUBRID CAS server.
+ * @param int $port Port number of CUBRID CAS server (BROKER_PORT configured in $CUBRID/conf/cubrid_broker.conf).
+ * @param string $dbname Name of database.
+ * @param string $userid User name for the database. If not given, the default
+ * value is "public".
+ * @param string $passwd User password. If not given, the default value is "".
+ * @param bool $new_link If a second call is made to
+ * cubrid_connect with the same arguments, no new
+ * connection will be established, but instead, the connection identifier
+ * of the already opened connection will be returned. The
+ * new_link parameter modifies this behavior and
+ * makes cubrid_connect always open a new connection,
+ * even if cubrid_connect was called before with the
+ * same parameters.
+ * @return resource Connection identifier, when process is successful.
+ * @throws CubridException
+ *
+ */
+function cubrid_connect(string $host, int $port, string $dbname, string $userid = null, string $passwd = null, bool $new_link = false)
+{
+    error_clear_last();
+    if ($new_link !== false) {
+        $result = \cubrid_connect($host, $port, $dbname, $userid, $passwd, $new_link);
+    } elseif ($passwd !== null) {
+        $result = \cubrid_connect($host, $port, $dbname, $userid, $passwd);
+    } elseif ($userid !== null) {
+        $result = \cubrid_connect($host, $port, $dbname, $userid);
+    } else {
+        $result = \cubrid_connect($host, $port, $dbname);
+    }
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * The cubrid_current_oid function is used to get the
+ * oid of the current cursor location from the query result.  To use
+ * cubrid_current_oid, the query executed must be a
+ * updatable query, and the CUBRID_INCLUDE_OID option must be included during
+ * the query execution.
+ *
+ * @param resource $req_identifier Request identifier.
+ * @return string Oid of current cursor location, when process is successful.
+ * @throws CubridException
+ *
+ */
+function cubrid_current_oid($req_identifier): string
+{
+    error_clear_last();
+    $result = \cubrid_current_oid($req_identifier);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * The cubrid_disconnect function closes the connection
+ * handle and disconnects from server. If any request handle is not closed at this point,
+ * it will be closed. It is similar to the CUBRID MySQL compatible function cubrid_close.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @throws CubridException
+ *
+ */
+function cubrid_disconnect($conn_identifier = null): void
+{
+    error_clear_last();
+    if ($conn_identifier !== null) {
+        $result = \cubrid_disconnect($conn_identifier);
+    } else {
+        $result = \cubrid_disconnect();
+    }
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_drop function is used to delete an
+ * instance from database by using the oid of the instance.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @param string $oid Oid of the instance that you want to delete.
+ * @throws CubridException
+ *
+ */
+function cubrid_drop($conn_identifier, string $oid): void
+{
+    error_clear_last();
+    $result = \cubrid_drop($conn_identifier, $oid);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
 /**
  * This function frees the memory occupied by the result data. It returns
  * TRUE on success. Note that it can only frees the
@@ -30,9 +457,7 @@ function cubrid_free_result($req_identifier): void
  * cubrid_client_encoding.
  *
  * @param resource $conn_identifier The CUBRID connection.
- * @return string A string that represents the CUBRID connection charset; on success.
- *
- * FALSE on failure.
+ * @return string A string that represents the CUBRID connection charset on success.
  * @throws CubridException
  *
  */
@@ -48,11 +473,31 @@ function cubrid_get_charset($conn_identifier): string
 
 
 /**
- * This function returns a string that represents the client library version.
+ * The cubrid_get_class_name function is used to get the
+ * class name from oid. It doesn't work when selecting data from the system tables,
+ * for example db_class.
  *
- * @return string A string that represents the client library version; on success.
+ * @param resource $conn_identifier Connection identifier.
+ * @param string $oid OID of the instance that you want to check the existence.
+ * @return string Class name when process is successful.
+ * @throws CubridException
  *
- * FALSE on failure.
+ */
+function cubrid_get_class_name($conn_identifier, string $oid): string
+{
+    error_clear_last();
+    $result = \cubrid_get_class_name($conn_identifier, $oid);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * This function returns a string that represents the client library version.
+ *
+ * @return string A string that represents the client library version on success.
  * @throws CubridException
  *
  */
@@ -68,9 +513,8 @@ function cubrid_get_client_info(): string
 
 
 /**
- * This function returns the CUBRID database parameters or it returns FALSE on
- * failure. It returns an associative array with the values for the following
- * parameters:
+ * This function returns the CUBRID database parameters.
+ * It returns an associative array with the values for the following parameters:
  *
  *
  * PARAM_ISOLATION_LEVEL
@@ -178,8 +622,6 @@ function cubrid_get_client_info(): string
  * @param resource $conn_identifier The CUBRID connection. If the connection identifier is not specified,
  * the last link opened by cubrid_connect is assumed.
  * @return array An associative array with CUBRID database parameters; on success.
- *
- * FALSE on failure.
  * @throws CubridException
  *
  */
@@ -195,19 +637,18 @@ function cubrid_get_db_parameter($conn_identifier): array
 
 
 /**
- * This function returns a string that represents the CUBRID server version.
- *
- * @param resource $conn_identifier The CUBRID connection.
- * @return string A string that represents the CUBRID server version; on success.
+ * The cubrid_get_query_timeout function is used to get
+ * the query timeout of the request.
  *
- * FALSE on failure.
+ * @param resource $req_identifier Request identifier.
+ * @return int Returns the query timeout value in milliseconds of the current request on success.
  * @throws CubridException
  *
  */
-function cubrid_get_server_info($conn_identifier): string
+function cubrid_get_query_timeout($req_identifier): int
 {
     error_clear_last();
-    $result = \cubrid_get_server_info($conn_identifier);
+    $result = \cubrid_get_query_timeout($req_identifier);
     if ($result === false) {
         throw CubridException::createFromPhpError();
     }
@@ -216,12 +657,31 @@ function cubrid_get_server_info($conn_identifier): string
 
 
 /**
- * The cubrid_insert_id function retrieves the ID
- * generated for the AUTO_INCREMENT column which is updated by the previous
- * INSERT query. It returns 0 if the previous query does not generate new
- * rows.
+ * This function returns a string that represents the CUBRID server version.
  *
- * @param resource $conn_identifier The connection identifier previously obtained by a call to
+ * @param resource $conn_identifier The CUBRID connection.
+ * @return string A string that represents the CUBRID server version on success.
+ * @throws CubridException
+ *
+ */
+function cubrid_get_server_info($conn_identifier): string
+{
+    error_clear_last();
+    $result = \cubrid_get_server_info($conn_identifier);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * The cubrid_insert_id function retrieves the ID
+ * generated for the AUTO_INCREMENT column which is updated by the previous
+ * INSERT query. It returns 0 if the previous query does not generate new
+ * rows.
+ *
+ * @param resource $conn_identifier The connection identifier previously obtained by a call to
  * cubrid_connect.
  * @return string A string representing the ID generated for an AUTO_INCREMENT column by the
  * previous query, on success.
@@ -247,6 +707,199 @@ function cubrid_insert_id($conn_identifier = null): string
 }
 
 
+/**
+ * cubrid_lob_close is used to close all BLOB/CLOB
+ * returned from cubrid_lob_get.
+ *
+ * @param array $lob_identifier_array LOB identifier array returned from cubrid_lob_get.
+ * @throws CubridException
+ *
+ */
+function cubrid_lob_close(array $lob_identifier_array): void
+{
+    error_clear_last();
+    $result = \cubrid_lob_close($lob_identifier_array);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * cubrid_lob_export is used to get BLOB/CLOB data from CUBRID database, and saves its contents to a file.
+ * To use this function, you must use cubrid_lob_get first to get BLOB/CLOB info from CUBRID.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @param resource $lob_identifier LOB identifier.
+ * @param string $path_name Path name of the file.
+ * @throws CubridException
+ *
+ */
+function cubrid_lob_export($conn_identifier, $lob_identifier, string $path_name): void
+{
+    error_clear_last();
+    $result = \cubrid_lob_export($conn_identifier, $lob_identifier, $path_name);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * cubrid_lob_get is used to get BLOB/CLOB meta info from CUBRID database,
+ * CUBRID gets BLOB/CLOB by executing the SQL statement, and returns all LOBs as a resource array.
+ * Be sure that the SQL retrieves only one column and its data type is BLOB or CLOB.
+ *
+ * Remember to use cubrid_lob_close to release the LOBs if you don't need it any more.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @param string $sql SQL statement to be executed.
+ * @return array Return an array of LOB resources, when process is successful.
+ * @throws CubridException
+ *
+ */
+function cubrid_lob_get($conn_identifier, string $sql): array
+{
+    error_clear_last();
+    $result = \cubrid_lob_get($conn_identifier, $sql);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * cubrid_lob_send reads BLOB/CLOB data and passes it straight through to the browser.
+ * To use this function, you must use cubrid_lob_get first to get BLOB/CLOB info from CUBRID.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @param resource $lob_identifier LOB identifier.
+ * @throws CubridException
+ *
+ */
+function cubrid_lob_send($conn_identifier, $lob_identifier): void
+{
+    error_clear_last();
+    $result = \cubrid_lob_send($conn_identifier, $lob_identifier);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * cubrid_lob_size is used to get BLOB/CLOB data size.
+ *
+ * @param resource $lob_identifier LOB identifier.
+ * @return string A string representing LOB data size, when process is successful.
+ * @throws CubridException
+ *
+ */
+function cubrid_lob_size($lob_identifier): string
+{
+    error_clear_last();
+    $result = \cubrid_lob_size($lob_identifier);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * The cubrid_lob2_bind function is used to bind BLOB/CLOB datas
+ * to a corresponding question mark placeholder in the SQL statement that was passed
+ * to cubrid_prepare. If bind_value_type
+ * is not given, string will be "BLOB" as the default. But if you use
+ * cubrid_lob2_new before, bind_value_type
+ * will be consistent with type in cubrid_lob2_new as the default.
+ *
+ * @param resource $req_identifier Request identifier as a result of cubrid_prepare.
+ * @param int $bind_index Location of binding parameters. It starts with 1.
+ * @param mixed $bind_value Actual value for binding.
+ * @param string $bind_value_type It must be "BLOB" or "CLOB" and it won't be case-sensitive. If it not be given, the default value is "BLOB".
+ * @throws CubridException
+ *
+ */
+function cubrid_lob2_bind($req_identifier, int $bind_index, $bind_value, string $bind_value_type = null): void
+{
+    error_clear_last();
+    if ($bind_value_type !== null) {
+        $result = \cubrid_lob2_bind($req_identifier, $bind_index, $bind_value, $bind_value_type);
+    } else {
+        $result = \cubrid_lob2_bind($req_identifier, $bind_index, $bind_value);
+    }
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_lob2_close function is used to close LOB object
+ * returned from cubrid_lob2_new or got from the result set.
+ *
+ * @param resource $lob_identifier Lob identifier as a result of cubrid_lob2_new or get from the result set.
+ * @throws CubridException
+ *
+ */
+function cubrid_lob2_close($lob_identifier): void
+{
+    error_clear_last();
+    $result = \cubrid_lob2_close($lob_identifier);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_lob2_export function is used to save the
+ * contents of BLOB/CLOB data to a file. To use this function, you must use
+ * cubrid_lob2_new or fetch a lob object from CUBRID
+ * database first. If the file already exists, the operation will fail.
+ * This function will not influence the cursor position of the lob object.
+ * It operates the entire lob object.
+ *
+ * @param resource $lob_identifier Lob identifier as a result of cubrid_lob2_new or get from the result set.
+ * @param string $file_name File name you want to store BLOB/CLOB data. It also supports the path of the file.
+ * @throws CubridException
+ *
+ */
+function cubrid_lob2_export($lob_identifier, string $file_name): void
+{
+    error_clear_last();
+    $result = \cubrid_lob2_export($lob_identifier, $file_name);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_lob2_import function is used to save the
+ * contents of BLOB/CLOB data from a file. To use this function, you must use
+ * cubrid_lob2_new or fetch a lob object from CUBRID database
+ * first. If the file already exists, the operation will fail.
+ * This function will not influence the cursor position of the lob object.
+ * It operates the entire lob object.
+ *
+ * @param resource $lob_identifier Lob identifier as a result of cubrid_lob2_new or get from the result set.
+ * @param string $file_name File name you want to import BLOB/CLOB data. It also supports the path of the file.
+ * @throws CubridException
+ *
+ */
+function cubrid_lob2_import($lob_identifier, string $file_name): void
+{
+    error_clear_last();
+    $result = \cubrid_lob2_import($lob_identifier, $file_name);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
 /**
  * The cubrid_lob2_new function is used to create a lob object (both BLOB and CLOB).
  * This function should be used before you bind a lob object.
@@ -256,8 +909,6 @@ function cubrid_insert_id($conn_identifier = null): string
  * cubrid_connect_with_url is assumed.
  * @param string $type It may be "BLOB" or "CLOB", it won't be case-sensitive. The default value is "BLOB".
  * @return resource Lob identifier when it is successful.
- *
- * FALSE  on failure.
  * @throws CubridException
  *
  */
@@ -278,13 +929,109 @@ function cubrid_lob2_new($conn_identifier = null, string $type = "BLOB")
 }
 
 
+/**
+ * The cubrid_lob2_read function reads len bytes from the
+ * LOB data and returns the bytes read.
+ *
+ * @param resource $lob_identifier Lob identifier as a result of cubrid_lob2_new or get from the result set.
+ * @param int $len Length from buffer you want to read from the lob data.
+ * @return string Returns the contents as a string, FALSE when there is no more data.
+ * @throws CubridException
+ *
+ */
+function cubrid_lob2_read($lob_identifier, int $len): string
+{
+    error_clear_last();
+    $result = \cubrid_lob2_read($lob_identifier, $len);
+    if ($result === null) {
+        throw CubridException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * The cubrid_lob2_seek function is used to move the cursor
+ * position of a lob object by the value set in the offset
+ * argument, to the direction set in the origin argument.
+ *
+ * To set the origin argument, you can use CUBRID_CURSOR_FIRST
+ * to set the cursor position moving forward offset units from
+ * the first beginning. In this case, offset must be a positive value.
+ *
+ * If you use CUBRID_CURSOR_CURRENT for origin, you can move
+ * forward or backward. and offset can be positive or negative.
+ *
+ * If you use CUBRID_CURSOR_LAST for origin, you can move
+ * backward offset units from the end of LOB object and
+ * offset only can be positive.
+ *
+ * @param resource $lob_identifier Lob identifier as a result of cubrid_lob2_new or get from the result set.
+ * @param int $offset Number of units you want to move the cursor.
+ * @param int $origin This parameter can be the following values:
+ *
+ * CUBRID_CURSOR_FIRST: move forward from the first beginning.
+ *
+ * CUBRID_CURSOR_CURRENT: move forward or backward from the current position.
+ *
+ * CUBRID_CURSOR_LAST: move backward at the end of LOB object.
+ * @throws CubridException
+ *
+ */
+function cubrid_lob2_seek($lob_identifier, int $offset, int $origin = CUBRID_CURSOR_CURRENT): void
+{
+    error_clear_last();
+    $result = \cubrid_lob2_seek($lob_identifier, $offset, $origin);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_lob2_seek64 function is used to move the cursor
+ * position of a lob object by the value set in the offset
+ * argument, to the direction set in the origin argument.
+ * If the offset you want to move is larger than an integer
+ * data can be stored, you can use this function.
+ *
+ * To set the origin argument, you can use CUBRID_CURSOR_FIRST
+ * to set the cursor position moving forward offset units from
+ * the first beginning. In this case, offset must be a positive value.
+ *
+ * If you use CUBRID_CURSOR_CURRENT for origin, you can move
+ * forward or backward. and offset can be positive or negative.
+ *
+ * If you use CUBRID_CURSOR_LAST for origin, you can move backward
+ * offset units from the end of LOB object and offset only can be positive.
+ *
+ * @param resource $lob_identifier Lob identifier as a result of cubrid_lob2_new or get from the result set.
+ * @param string $offset Number of units you want to move the cursor.
+ * @param int $origin This parameter can be the following values:
+ *
+ * CUBRID_CURSOR_FIRST: move forward from the first beginning.
+ *
+ * CUBRID_CURSOR_CURRENT: move forward or backward from the current position.
+ *
+ * CUBRID_CURSOR_LAST: move backward at the end of LOB object.
+ * @throws CubridException
+ *
+ */
+function cubrid_lob2_seek64($lob_identifier, string $offset, int $origin = CUBRID_CURSOR_CURRENT): void
+{
+    error_clear_last();
+    $result = \cubrid_lob2_seek64($lob_identifier, $offset, $origin);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
 /**
  * The cubrid_lob2_size function is used to get the size of a lob object.
  *
  * @param resource $lob_identifier Lob identifier as a result of cubrid_lob2_new or get from the result set.
  * @return int It will return the size of the LOB object when it processes successfully.
- *
- * FALSE on failure.
  * @throws CubridException
  *
  */
@@ -307,8 +1054,6 @@ function cubrid_lob2_size($lob_identifier): int
  *
  * @param resource $lob_identifier Lob identifier as a result of cubrid_lob2_new or get from the result set.
  * @return string It will return the size of the LOB object as a string when it processes successfully.
- *
- * FALSE on failure.
  * @throws CubridException
  *
  */
@@ -328,8 +1073,6 @@ function cubrid_lob2_size64($lob_identifier): string
  *
  * @param resource $lob_identifier Lob identifier as a result of cubrid_lob2_new or get from the result set.
  * @return int It will return the cursor position on the LOB object when it processes successfully.
- *
- * FALSE on failure.
  * @throws CubridException
  *
  */
@@ -352,8 +1095,6 @@ function cubrid_lob2_tell($lob_identifier): int
  *
  * @param resource $lob_identifier Lob identifier as a result of cubrid_lob2_new or get from the result set.
  * @return string It will return the cursor position on the LOB object as a string when it processes successfully.
- *
- * FALSE on failure.
  * @throws CubridException
  *
  */
@@ -369,26 +1110,928 @@ function cubrid_lob2_tell64($lob_identifier): string
 
 
 /**
- * The cubrid_set_db_parameter function is used to set
- * the CUBRID database parameters. It can set the following CUBRID database
- * parameters:
+ * The cubrid_lob2_write function reads as much as data
+ * from buf and stores it to the LOB object. Note that
+ * this function can only append characters now.
  *
+ * @param resource $lob_identifier Lob identifier as a result of cubrid_lob2_new or get from the result set.
+ * @param string $buf Data that need to be written to the lob object.
+ * @throws CubridException
  *
- * PARAM_ISOLATION_LEVEL
- * PARAM_LOCK_TIMEOUT
+ */
+function cubrid_lob2_write($lob_identifier, string $buf): void
+{
+    error_clear_last();
+    $result = \cubrid_lob2_write($lob_identifier, $buf);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_lock_read function is used to put read
+ * lock on the instance pointed by given oid.
  *
+ * @param resource $conn_identifier Connection identifier.
+ * @param string $oid OID of the instance that you want to put read lock on.
+ * @throws CubridException
  *
- * @param resource $conn_identifier The CUBRID connection. If the connection identifier is not specified,
- * the last link opened by cubrid_connect is assumed.
- * @param int $param_type Database parameter type.
- * @param int $param_value Isolation level value (1-6) or lock timeout (in seconds) value.
+ */
+function cubrid_lock_read($conn_identifier, string $oid): void
+{
+    error_clear_last();
+    $result = \cubrid_lock_read($conn_identifier, $oid);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_lock_write function is used to put write
+ * lock on the instance pointed by the given oid.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @param string $oid OID of the instance that you want to put write lock on.
  * @throws CubridException
  *
  */
-function cubrid_set_db_parameter($conn_identifier, int $param_type, int $param_value): void
+function cubrid_lock_write($conn_identifier, string $oid): void
 {
     error_clear_last();
-    $result = \cubrid_set_db_parameter($conn_identifier, $param_type, $param_value);
+    $result = \cubrid_lock_write($conn_identifier, $oid);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_move_cursor function is used to move the
+ * current cursor location of req_identifier by the
+ * value set in the offset argument, to the direction
+ * set in the origin argument. To set the
+ * origin argument, you can use CUBRID_CURSOR_FIRST
+ * for the first part of the result, CUBRID_CURSOR_CURRENT for the current
+ * location of the result, or CUBRID_CURSOR_LAST for the last part of the
+ * result. If origin argument is not explicitly
+ * designated, then the function uses CUBRID_CURSOR_CURRENT as its default
+ * value.
+ *
+ * If the value of cursor movement range goes over the valid limit, then the
+ * cursor moves to the next location after the valid range for the cursor.
+ * For example, if you move 20 units in the result with the size of 10, then
+ * the cursor will move to 11th place and return CUBRID_NO_MORE_DATA.
+ *
+ * @param resource $req_identifier Request identifier.
+ * @param int $offset Number of units you want to move the cursor.
+ * @param int $origin Location where you want to move the cursor from CUBRID_CURSOR_FIRST, CUBRID_CURSOR_CURRENT, CUBRID_CURSOR_LAST.
+ * @return int Returns TRUE on success.
+ * @throws CubridException
+ *
+ */
+function cubrid_move_cursor($req_identifier, int $offset, int $origin = CUBRID_CURSOR_CURRENT): int
+{
+    error_clear_last();
+    $result = \cubrid_move_cursor($req_identifier, $offset, $origin);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * The cubrid_next_result function is used to get
+ * results of next query if multiple SQL statements are executed and
+ * CUBRID_EXEC_QUERY_ALL flag is set upon
+ * cubrid_execute.
+ *
+ * @param resource $result result comes from a call to cubrid_execute
+ * @throws CubridException
+ *
+ */
+function cubrid_next_result($result): void
+{
+    error_clear_last();
+    $result = \cubrid_next_result($result);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * Establishes a persistent connection to a CUBRID server.
+ *
+ * cubrid_pconnect_with_url acts very much like
+ * cubrid_connect_with_url with two major differences.
+ *
+ * First, when connecting, the function would first try to find a (persistent)
+ * link that's already open with the same host, port, dbname and userid. If
+ * one is found, an identifier for it will be returned instead of opening a
+ * new connection.
+ *
+ * Second, the connection to the SQL server will not be closed when the
+ * execution of the script ends.  Instead, the link will remain open for
+ * future use (cubrid_close or
+ * cubrid_disconnect will not close links established by
+ * cubrid_pconnect_with_url).
+ *
+ * This type of link is therefore called 'persistent'.
+ *
+ * &lt;url&gt; ::= CUBRID:&lt;host&gt;:&lt;db_name&gt;:&lt;db_user&gt;:&lt;db_password&gt;:[?&lt;properties&gt;]
+ *
+ * &lt;properties&gt; ::= &lt;property&gt; [&amp;&lt;property&gt;]
+ *
+ * &lt;properties&gt; ::= alhosts=&lt;alternative_hosts&gt;[ &amp;rctime=&lt;time&gt;]
+ *
+ * &lt;properties&gt; ::= login_timeout=&lt;milli_sec&gt;
+ *
+ * &lt;properties&gt; ::= query_timeout=&lt;milli_sec&gt;
+ *
+ * &lt;properties&gt; ::= disconnect_on_query_timeout=true|false
+ *
+ * &lt;alternative_hosts&gt; ::= &lt;standby_broker1_host&gt;:&lt;port&gt; [,&lt;standby_broker2_host&gt;:&lt;port&gt;]
+ *
+ * &lt;host&gt; := HOSTNAME | IP_ADDR
+ *
+ * &lt;time&gt; := SECOND
+ *
+ * &lt;milli_sec&gt; := MILLI SECOND
+ *
+ *
+ * host : A host name or IP address of the master database
+ * db_name : A name of the database
+ * db_user : A name of the database user
+ * db_password : A database user password
+ *
+ * alhosts : Specifies the broker information of the standby server, which is
+ * used for failover when it is impossible to connect to the active server.
+ * You can specify multiple brokers for failover, and the connection to the brokers
+ * is attempted in the order listed in alhosts
+ *
+ * rctime : An interval between the attempts to connect to the active broker in
+ * which failure occurred. After a failure occurs, the system connects to the
+ * broker specified by althosts (failover), terminates the transaction, and then
+ * attempts to connect to the active broker of the master database at every rctime.
+ * The default value is 600 seconds.
+ *
+ * login_timeout : Timeout value (unit: msec.) for database login. The default
+ * value is 0, which means infinite postponement.
+ *
+ *
+ * query_timeout : Timeout value (unit: msec.) for query request. Upon timeout,
+ * a message to cancel requesting a query transferred to server is sent. The return
+ * value can depend on the disconnect_on_query_timeout configuration; even though the
+ * message to cancel a request is sent to server, that request may succeed.
+ *
+ *
+ * disconnect_on_query_timeout : Configures a value whether to immediately return
+ * an error of function being executed upon timeout. The default value is false.
+ *
+ *
+ *
+ * @param string $conn_url A character string that contains server connection information.
+ * @param string $userid User name for the database.
+ * @param string $passwd User password.
+ * @return resource Connection identifier, when process is successful.
+ * @throws CubridException
+ *
+ */
+function cubrid_pconnect_with_url(string $conn_url, string $userid = null, string $passwd = null)
+{
+    error_clear_last();
+    if ($passwd !== null) {
+        $result = \cubrid_pconnect_with_url($conn_url, $userid, $passwd);
+    } elseif ($userid !== null) {
+        $result = \cubrid_pconnect_with_url($conn_url, $userid);
+    } else {
+        $result = \cubrid_pconnect_with_url($conn_url);
+    }
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Establishes a persistent connection to a CUBRID server.
+ *
+ * cubrid_pconnect acts very much like
+ * cubrid_connect with two major differences.
+ *
+ * First, when connecting, the function would first try to find a (persistent)
+ * link that's already open with the same host, port, dbname and userid. If
+ * one is found, an identifier for it will be returned instead of opening a
+ * new connection.
+ *
+ * Second, the connection to the SQL server will not be closed when the
+ * execution of the script ends.  Instead, the link will remain open for
+ * future use (cubrid_close or
+ * cubrid_disconnect will not close links established by
+ * cubrid_pconnect).
+ *
+ * This type of link is therefore called 'persistent'.
+ *
+ * @param string $host Host name or IP address of CUBRID CAS server.
+ * @param int $port Port number of CUBRID CAS server (BROKER_PORT configured in $CUBRID/conf/cubrid_broker.conf).
+ * @param string $dbname Name of database.
+ * @param string $userid User name for the database.
+ * @param string $passwd User password.
+ * @return resource Connection identifier, when process is successful.
+ * @throws CubridException
+ *
+ */
+function cubrid_pconnect(string $host, int $port, string $dbname, string $userid = null, string $passwd = null)
+{
+    error_clear_last();
+    if ($passwd !== null) {
+        $result = \cubrid_pconnect($host, $port, $dbname, $userid, $passwd);
+    } elseif ($userid !== null) {
+        $result = \cubrid_pconnect($host, $port, $dbname, $userid);
+    } else {
+        $result = \cubrid_pconnect($host, $port, $dbname);
+    }
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * The cubrid_prepare function is a sort of API which represents SQL statements
+ * compiled previously to a given connection handle. This pre-compiled SQL statement will be included
+ * in the cubrid_prepare.
+ *
+ * Accordingly, you can use this statement effectively to execute several times repeatedly or to
+ * process long data. Only a single statement can be used and a parameter may put a question mark (?)
+ * to appropriate area in the SQL statement. Add a parameter when you bind a value in the VALUES
+ * clause of INSERT statement or in the WHERE clause. Note that it is allowed to bind a value to a
+ * MARK(?) by using the cubrid_bind function only.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @param string $prepare_stmt Prepare query.
+ * @param int $option OID return option CUBRID_INCLUDE_OID.
+ * @return resource Request identifier, if process is successful.
+ * @throws CubridException
+ *
+ */
+function cubrid_prepare($conn_identifier, string $prepare_stmt, int $option = 0)
+{
+    error_clear_last();
+    $result = \cubrid_prepare($conn_identifier, $prepare_stmt, $option);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * The cubrid_put function is used to update an
+ * attribute of the instance of the given oid.
+ *
+ * You can update single attribute by using string data type to set
+ * attr.  In such case, you can use integer,
+ * floating point or string type data for the value
+ * argument. To update multiple number of attributes, you can disregard the
+ * attr argument, and set
+ * value argument with associative array data type.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @param string $oid OID of the instance that you want to update.
+ * @param string $attr Name of the attribute that you want to update.
+ * @param mixed $value New value that you want to assign to the attribute.
+ * @throws CubridException
+ *
+ */
+function cubrid_put($conn_identifier, string $oid, string $attr = null, $value = null): void
+{
+    error_clear_last();
+    if ($value !== null) {
+        $result = \cubrid_put($conn_identifier, $oid, $attr, $value);
+    } elseif ($attr !== null) {
+        $result = \cubrid_put($conn_identifier, $oid, $attr);
+    } else {
+        $result = \cubrid_put($conn_identifier, $oid);
+    }
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_rollback function executes rollback on the
+ * transaction pointed by conn_identifier, currently in
+ * progress.
+ *
+ * Connection to server is closed after calling
+ * cubrid_rollback. Connection handle, however, is
+ * still valid.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @throws CubridException
+ *
+ */
+function cubrid_rollback($conn_identifier): void
+{
+    error_clear_last();
+    $result = \cubrid_rollback($conn_identifier);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_schema function is used to get the
+ * requested schema information from database. To get information about specific class,
+ * set the class_name, to get information about specific attribute
+ * (can be used only with CUBRID_SCH_ATTR_PRIVILEGE),
+ * set the attr_name.
+ *
+ * The result of the cubrid_schema function is returned as a two-dimensional
+ * array (column (associative array) * row (numeric array)). The following
+ * tables shows types of schema and the column structure of the result array to
+ * be returned based on the schema type.
+ *
+ *
+ * Result Composition of Each Type
+ *
+ *
+ *
+ * Schema
+ * Column Number
+ * Column Name
+ * Value
+ *
+ *
+ *
+ *
+ * CUBRID_SCH_CLASS
+ * 1
+ * NAME
+ *
+ *
+ *
+ *
+ * 2
+ * TYPE
+ * 0:system class 1:vclass 2:class
+ *
+ *
+ *
+ * CUBRID_SCH_VCLASS
+ * 1
+ * NAME
+ *
+ *
+ *
+ *
+ * 2
+ * TYPE
+ * 1:vclass
+ *
+ *
+ *
+ * CUBRID_SCH_QUERY_SPEC
+ * 1
+ * QUERY_SPEC
+ *
+ *
+ *
+ *
+ * CUBRID_SCH_ATTRIBUTE / CUBRID_SCH_CLASS_ATTRIBUTE
+ * 1
+ * ATTR_NAME
+ *
+ *
+ *
+ *
+ * 2
+ * DOMAIN
+ *
+ *
+ *
+ *
+ * 3
+ * SCALE
+ *
+ *
+ *
+ *
+ * 4
+ * PRECISION
+ *
+ *
+ *
+ *
+ * 5
+ * INDEXED
+ * 1:indexed
+ *
+ *
+ *
+ * 6
+ * NOT NULL
+ * 1:not null
+ *
+ *
+ *
+ * 7
+ * SHARED
+ * 1:shared
+ *
+ *
+ *
+ * 8
+ * UNIQUE
+ * 1:unique
+ *
+ *
+ *
+ * 9
+ * DEFAULT
+ *
+ *
+ *
+ *
+ * 10
+ * ATTR_ORDER
+ * base:1
+ *
+ *
+ *
+ * 11
+ * CLASS_NAME
+ *
+ *
+ *
+ *
+ * 12
+ * SOURCE_CLASS
+ *
+ *
+ *
+ *
+ * 13
+ * IS_KEY
+ * 1:key
+ *
+ *
+ *
+ * CUBRID_SCH_METHOD / CUBRID_SCH_CLASS_METHOD
+ * 1
+ * NAME
+ *
+ *
+ *
+ *
+ * 2
+ * RET_DOMAIN
+ *
+ *
+ *
+ *
+ * 3
+ * ARG_DOMAIN
+ *
+ *
+ *
+ *
+ * CUBRID_SCH_METHOD_FILE
+ * 1
+ * METHOD_FILE
+ *
+ *
+ *
+ *
+ * CUBRID_SCH_SUPERCLASS / CUBRID_SCH_DIRECT_SUPER_CLASS / CUBRID_SCH_SUBCLASS
+ * 1
+ * CLASS_NAME
+ *
+ *
+ *
+ *
+ * 2
+ * TYPE
+ * 0:system class 1:vclass 2:class
+ *
+ *
+ *
+ * CUBRID_SCH_CONSTRAINT
+ * 1
+ * TYPE
+ * 0:unique 1:index 2:reverse unique 3:reverse index
+ *
+ *
+ *
+ * 2
+ * NAME
+ *
+ *
+ *
+ *
+ * 3
+ * ATTR_NAME
+ *
+ *
+ *
+ *
+ * 4
+ * NUM_PAGES
+ *
+ *
+ *
+ *
+ * 5
+ * NUM_KEYS
+ *
+ *
+ *
+ *
+ * 6
+ * PRIMARY_KEY
+ * 1:primary key
+ *
+ *
+ *
+ * 7
+ * KEY_ORDER
+ * base:1
+ *
+ *
+ *
+ * CUBRID_SCH_TRIGGER
+ * 1
+ * NAME
+ *
+ *
+ *
+ *
+ * 2
+ * STATUS
+ *
+ *
+ *
+ *
+ * 3
+ * EVENT
+ *
+ *
+ *
+ *
+ * 4
+ * TARGET_CLASS
+ *
+ *
+ *
+ *
+ * 5
+ * TARGET_ATTR
+ *
+ *
+ *
+ *
+ * 6
+ * ACTION_TIME
+ *
+ *
+ *
+ *
+ * 7
+ * ACTION
+ *
+ *
+ *
+ *
+ * 8
+ * PRIORITY
+ *
+ *
+ *
+ *
+ * 9
+ * CONDITION_TIME
+ *
+ *
+ *
+ *
+ * 10
+ * CONDITION
+ *
+ *
+ *
+ *
+ * CUBRID_SCH_CLASS_PRIVILEGE / CUBRID_SCH_ATTR_PRIVILEGE
+ * 1
+ * CLASS_NAME / ATTR_NAME
+ *
+ *
+ *
+ *
+ * 2
+ * PRIVILEGE
+ *
+ *
+ *
+ *
+ * 3
+ * GRANTABLE
+ *
+ *
+ *
+ *
+ * CUBRID_SCH_PRIMARY_KEY
+ * 1
+ * CLASS_NAME
+ *
+ *
+ *
+ *
+ * 2
+ * ATTR_NAME
+ *
+ *
+ *
+ *
+ * 3
+ * KEY_SEQ
+ * base:1
+ *
+ *
+ *
+ * 4
+ * KEY_NAME
+ *
+ *
+ *
+ *
+ * CUBRID_SCH_IMPORTED_KEYS / CUBRID_SCH_EXPORTED_KEYS / CUBRID_SCH_CROSS_REFERENCE
+ * 1
+ * PKTABLE_NAME
+ *
+ *
+ *
+ *
+ * 2
+ * PKCOLUMN_NAME
+ *
+ *
+ *
+ *
+ * 3
+ * FKTABLE_NAME
+ * base:1
+ *
+ *
+ *
+ * 4
+ * FKCOLUMN_NAME
+ *
+ *
+ *
+ *
+ * 5
+ * KEY_SEQ
+ * base:1
+ *
+ *
+ *
+ * 6
+ * UPDATE_ACTION
+ * 0:cascade 1:restrict 2:no action 3:set null
+ *
+ *
+ *
+ * 7
+ * DELETE_ACTION
+ * 0:cascade 1:restrict 2:no action 3:set null
+ *
+ *
+ *
+ * 8
+ * FK_NAME
+ *
+ *
+ *
+ *
+ * 9
+ * PK_NAME
+ *
+ *
+ *
+ *
+ *
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @param int $schema_type Schema data that you want to know.
+ * @param string $class_name Class you want to know the schema of.
+ * @param string $attr_name Attribute you want to know the schema of.
+ * @return array Array containing the schema information, when process is successful.
+ * @throws CubridException
+ *
+ */
+function cubrid_schema($conn_identifier, int $schema_type, string $class_name = null, string $attr_name = null): array
+{
+    error_clear_last();
+    if ($attr_name !== null) {
+        $result = \cubrid_schema($conn_identifier, $schema_type, $class_name, $attr_name);
+    } elseif ($class_name !== null) {
+        $result = \cubrid_schema($conn_identifier, $schema_type, $class_name);
+    } else {
+        $result = \cubrid_schema($conn_identifier, $schema_type);
+    }
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * The cubrid_seq_drop function is used to delete an
+ * element you request from the given sequence type attribute in the
+ * database.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @param string $oid OID of the instance you want to work with.
+ * @param string $attr_name Name of the attribute that you want to delete an element from.
+ * @param int $index Index of the element that you want to delete (1-based).
+ * @throws CubridException
+ *
+ */
+function cubrid_seq_drop($conn_identifier, string $oid, string $attr_name, int $index): void
+{
+    error_clear_last();
+    $result = \cubrid_seq_drop($conn_identifier, $oid, $attr_name, $index);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_col_insert function is used to insert an
+ * element to a sequence type attribute in a requested location.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @param string $oid OID of the instance you want to work with.
+ * @param string $attr_name Name of the attribute you want to insert an instance to.
+ * @param int $index Location of the element, you want to insert the element to (1-based).
+ * @param string $seq_element Content of the element that you want to insert.
+ * @throws CubridException
+ *
+ */
+function cubrid_seq_insert($conn_identifier, string $oid, string $attr_name, int $index, string $seq_element): void
+{
+    error_clear_last();
+    $result = \cubrid_seq_insert($conn_identifier, $oid, $attr_name, $index, $seq_element);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_seq_put function is used to update the
+ * content of the requested element in a sequent type attribute using OID.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @param string $oid OID of the instance you want to work with.
+ * @param string $attr_name Name of the attribute that you want to update an element.
+ * @param int $index Index (1-based) of the element that you want to update.
+ * @param string $seq_element New content that you want to use for the update.
+ * @throws CubridException
+ *
+ */
+function cubrid_seq_put($conn_identifier, string $oid, string $attr_name, int $index, string $seq_element): void
+{
+    error_clear_last();
+    $result = \cubrid_seq_put($conn_identifier, $oid, $attr_name, $index, $seq_element);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_set_add function is used to insert a
+ * single element to a set type attribute (set, multiset, sequence) you
+ * requested.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @param string $oid OID of the instance you want to work with.
+ * @param string $attr_name Name of the attribute you want to insert an element.
+ * @param string $set_element Content of the element you want to insert.
+ * @throws CubridException
+ *
+ */
+function cubrid_set_add($conn_identifier, string $oid, string $attr_name, string $set_element): void
+{
+    error_clear_last();
+    $result = \cubrid_set_add($conn_identifier, $oid, $attr_name, $set_element);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_set_autocommit function is used to set the
+ * CUBRID database auto-commit mode of the current database connection.
+ *
+ * In CUBRID PHP, auto-commit mode is disabled by default for transaction
+ * management. When auto-commit mode is truned from off to on, any pending work is
+ * automatically committed.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @param bool $mode Auto-commit mode. The following constants can be used:
+ *
+ *
+ * CUBRID_AUTOCOMMIT_FALSE
+ * CUBRID_AUTOCOMMIT_TRUE
+ *
+ * @throws CubridException
+ *
+ */
+function cubrid_set_autocommit($conn_identifier, bool $mode): void
+{
+    error_clear_last();
+    $result = \cubrid_set_autocommit($conn_identifier, $mode);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_set_db_parameter function is used to set
+ * the CUBRID database parameters. It can set the following CUBRID database
+ * parameters:
+ *
+ *
+ * PARAM_ISOLATION_LEVEL
+ * PARAM_LOCK_TIMEOUT
+ *
+ *
+ * @param resource $conn_identifier The CUBRID connection. If the connection identifier is not specified,
+ * the last link opened by cubrid_connect is assumed.
+ * @param int $param_type Database parameter type.
+ * @param int $param_value Isolation level value (1-6) or lock timeout (in seconds) value.
+ * @throws CubridException
+ *
+ */
+function cubrid_set_db_parameter($conn_identifier, int $param_type, int $param_value): void
+{
+    error_clear_last();
+    $result = \cubrid_set_db_parameter($conn_identifier, $param_type, $param_value);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_set_drop function is used to delete an
+ * element that you request from the given set type (set, multiset) attribute
+ * of the database.
+ *
+ * @param resource $conn_identifier Connection identifier.
+ * @param string $oid OID of the instance you want to work with.
+ * @param string $attr_name Name of the attribute you want to delete an element from.
+ * @param string $set_element Content of the element you want to delete.
+ * @throws CubridException
+ *
+ */
+function cubrid_set_drop($conn_identifier, string $oid, string $attr_name, string $set_element): void
+{
+    error_clear_last();
+    $result = \cubrid_set_drop($conn_identifier, $oid, $attr_name, $set_element);
+    if ($result === false) {
+        throw CubridException::createFromPhpError();
+    }
+}
+
+
+/**
+ * The cubrid_set_query_timeout function is used to set
+ * the timeout time of query execution.
+ *
+ * @param resource $req_identifier Request identifier.
+ * @param int $timeout Timeout time in milliseconds.
+ * @throws CubridException
+ *
+ */
+function cubrid_set_query_timeout($req_identifier, int $timeout): void
+{
+    error_clear_last();
+    $result = \cubrid_set_query_timeout($req_identifier, $timeout);
     if ($result === false) {
         throw CubridException::createFromPhpError();
     }
diff --git a/generated/curl.php b/generated/curl.php
index f89e6624..0593a29f 100644
--- a/generated/curl.php
+++ b/generated/curl.php
@@ -85,7 +85,7 @@ function curl_exec($handle)
  *
  *
  * CURLINFO_HTTP_CODE -  The last response code.
- * As of PHP 5.5.0 and cURL 7.10.8, this is a legacy alias of
+ * As of cURL 7.10.8, this is a legacy alias of
  * CURLINFO_RESPONSE_CODE
  *
  *
@@ -701,18 +701,6 @@ function curl_multi_init()
  *
  *
  *
- * CURLOPT_BINARYTRANSFER
- *
- * TRUE to return the raw output when
- * CURLOPT_RETURNTRANSFER is used.
- *
- *
- * From PHP 5.1.3, this option has no effect: the raw output will
- * always be returned when
- * CURLOPT_RETURNTRANSFER is used.
- *
- *
- *
  * CURLOPT_COOKIESESSION
  *
  * TRUE to mark this as a new cookie "session". It will force libcurl
@@ -733,7 +721,6 @@ function curl_multi_init()
  *
  *
  * Added in cURL 7.19.1.
- * Available since PHP 5.3.2.
  * Requires CURLOPT_VERBOSE to be on to have an effect.
  *
  *
@@ -746,7 +733,6 @@ function curl_multi_init()
  *
  *
  * Added in 7.15.2.
- * Available since PHP 5.5.0.
  *
  *
  *
@@ -912,7 +898,7 @@ function curl_multi_init()
  * the number of small packets on the network.
  *
  *
- * Available since PHP 5.2.1 for versions compiled with libcurl 7.11.2 or
+ * Available for versions compiled with libcurl 7.11.2 or
  * greater.
  *
  *
@@ -948,7 +934,7 @@ function curl_multi_init()
  * TRUE to track the handle's request string.
  *
  *
- * Available since PHP 5.1.3. The CURLINFO_
+ * The CURLINFO_
  * prefix is intentional.
  *
  *
@@ -986,7 +972,7 @@ function curl_multi_init()
  * FALSE to get the raw HTTP response body.
  *
  *
- * Available as of PHP 5.5.0 if built against libcurl &gt;= 7.16.2.
+ * Available if built against libcurl &gt;= 7.16.2.
  *
  *
  *
@@ -1279,21 +1265,6 @@ function curl_multi_init()
  *
  *
  *
- * CURLOPT_CLOSEPOLICY
- *
- * One of the CURLCLOSEPOLICY_* values.
- *
- *
- * This option is deprecated, as it was never implemented in cURL and
- * never had any effect.
- *
- *
- *
- *
- * Removed in PHP 5.6.0.
- *
- *
- *
  * CURLOPT_CONNECTTIMEOUT
  *
  * The number of seconds to wait while trying to connect. Use 0 to
@@ -1313,7 +1284,7 @@ function curl_multi_init()
  * timeouts with a minimum timeout allowed of one second.
  *
  *
- * Added in cURL 7.16.2. Available since PHP 5.2.3.
+ * Added in cURL 7.16.2.
  *
  *
  *
@@ -1504,7 +1475,7 @@ function curl_multi_init()
  * specific type of redirect occurs.
  *
  *
- * Added in cURL 7.19.1. Available since PHP 5.3.2.
+ * Added in cURL 7.19.1.
  *
  *
  *
@@ -1651,10 +1622,11 @@ function curl_multi_init()
  *
  * CURLOPT_SSL_VERIFYHOST
  *
- * 1 to check the existence of a common name in the
- * SSL peer certificate. 2 to check the existence of
- * a common name and also verify that it matches the hostname
- * provided. 0 to not check the names. In production environments the value of this option
+ * 2 to verify that a Common Name field or a Subject Alternate Name
+ * field in the SSL peer certificate matches the provided hostname.
+ * 0 to not check the names.
+ * 1 should not be used.
+ * In production environments the value of this option
  * should be kept at 2 (default value).
  *
  *
@@ -1771,7 +1743,7 @@ function curl_multi_init()
  * supports them. If set to 0 (default) keepalive probes are disabled.
  *
  *
- * Added in cURL 7.25.0. Available since PHP 5.5.0.
+ * Added in cURL 7.25.0.
  *
  *
  *
@@ -1783,7 +1755,7 @@ function curl_multi_init()
  * The default is 60.
  *
  *
- * Added in cURL 7.25.0. Available since PHP 5.5.0.
+ * Added in cURL 7.25.0.
  *
  *
  *
@@ -1795,7 +1767,7 @@ function curl_multi_init()
  * The default is 60.
  *
  *
- * Added in cURL 7.25.0. Available since PHP 5.5.0.
+ * Added in cURL 7.25.0.
  *
  *
  *
@@ -1833,7 +1805,7 @@ function curl_multi_init()
  * timeouts with a minimum timeout allowed of one second.
  *
  *
- * Added in cURL 7.16.2. Available since PHP 5.2.3.
+ * Added in cURL 7.16.2.
  *
  *
  *
@@ -1868,7 +1840,7 @@ function curl_multi_init()
  * Defaults to unlimited speed.
  *
  *
- * Added in cURL 7.15.5. Available since PHP 5.4.0.
+ * Added in cURL 7.15.5.
  *
  *
  *
@@ -1880,7 +1852,7 @@ function curl_multi_init()
  * Defaults to unlimited speed.
  *
  *
- * Added in cURL 7.15.5. Available since PHP 5.4.0.
+ * Added in cURL 7.15.5.
  *
  *
  *
@@ -1921,16 +1893,13 @@ function curl_multi_init()
  * CURLFTPMETHOD_SINGLECWD.
  *
  *
- * Added in cURL 7.15.1. Available since PHP 5.3.0.
+ * Added in cURL 7.15.1.
  *
  *
  *
  *
  *
  *
- * This option is deprecated, as it was never implemented in cURL and
- * never had any effect.
- *
  * The HTTP authentication method(s) to use. The options are:
  * CURLAUTH_BASIC,
  * CURLAUTH_DIGEST,
@@ -2085,7 +2054,7 @@ function curl_multi_init()
  * "RELOAD" loads all cookies from the files specified by CURLOPT_COOKIEFILE.
  *
  *
- * Available since PHP 5.5.0 and cURL 7.14.1.
+ * Available since cURL 7.14.1.
  *
  *
  *
@@ -2710,7 +2679,16 @@ function curl_multi_init()
  * The user name to use in authentication.
  *
  *
- * Added in cURL 7.19.1. Available since PHP 5.5.0.
+ * Added in cURL 7.19.1.
+ *
+ *
+ *
+ * CURLOPT_PASSWORD
+ *
+ * The password to use in authentication.
+ *
+ *
+ * Added in cURL 7.19.1.
  *
  *
  *
@@ -2865,7 +2843,7 @@ function curl_multi_init()
  *
  *
  *
- * Added in cURL 7.21.3. Available since PHP 5.5.0.
+ * Added in cURL 7.21.3.
  *
  *
  *
diff --git a/generated/datetime.php b/generated/datetime.php
index b0fef547..59243c91 100644
--- a/generated/datetime.php
+++ b/generated/datetime.php
@@ -357,38 +357,6 @@ function date_sunset(int $timestamp, int $returnFormat = SUNFUNCS_RET_STRING, fl
 }
 
 
-/**
- * Returns a string formatted according to the given format string using the
- * given integer timestamp or the current time
- * if no timestamp is given.  In other words, timestamp
- * is optional and defaults to the value of time.
- *
- * @param string $format Format accepted by DateTimeInterface::format.
- * @param int $timestamp The optional timestamp parameter is an
- * int Unix timestamp that defaults to the current
- * local time if timestamp is omitted or NULL. In other
- * words, it defaults to the value of time.
- * @return string Returns a formatted date string. If a non-numeric value is used for
- * timestamp, FALSE is returned and an
- * E_WARNING level error is emitted.
- * @throws DatetimeException
- *
- */
-function date(string $format, int $timestamp = null): string
-{
-    error_clear_last();
-    if ($timestamp !== null) {
-        $result = \date($format, $timestamp);
-    } else {
-        $result = \date($format);
-    }
-    if ($result === false) {
-        throw DatetimeException::createFromPhpError();
-    }
-    return $result;
-}
-
-
 /**
  * Identical to mktime except the passed parameters represents a
  * GMT date. gmmktime internally uses mktime
@@ -634,8 +602,7 @@ function idate(string $format, int $timestamp = null): int
  * with values between 0-69 mapping to 2000-2069 and 70-100 to
  * 1970-2000. On systems where time_t is a 32bit signed integer, as
  * most common today, the valid range for year
- * is somewhere between 1901 and 2038. However, before PHP 5.1.0 this
- * range was limited from 1970 to 2038 on some systems (e.g. Windows).
+ * is somewhere between 1901 and 2038.
  * @return int mktime returns the Unix timestamp of the arguments
  * given.
  * If the arguments are invalid, the function returns FALSE.
diff --git a/generated/dir.php b/generated/dir.php
index 1f23ea92..4752fba1 100644
--- a/generated/dir.php
+++ b/generated/dir.php
@@ -31,6 +31,9 @@ function chdir(string $directory): void
  * only when using the CLI, CGI or Embed SAPI. Also, this function
  * requires root privileges.
  *
+ * Calling this function does not change the values of the __DIR__
+ * and __FILE__ magic constants.
+ *
  * @param string $directory The path to change the root directory to.
  * @throws DirException
  *
diff --git a/generated/eio.php b/generated/eio.php
index 68f17045..1fffa900 100644
--- a/generated/eio.php
+++ b/generated/eio.php
@@ -413,6 +413,57 @@ function eio_fchmod($fd, int $mode, int $pri = EIO_PRI_DEFAULT, callable $callba
 }
 
 
+/**
+ * eio_fchown changes ownership of the file specified by
+ * fd file descriptor.
+ *
+ * @param mixed $fd Stream, Socket resource, or numeric file descriptor.
+ * @param int $uid User ID. Is ignored when equal to -1.
+ * @param int $gid Group ID. Is ignored when equal to -1.
+ * @param int $pri The request priority: EIO_PRI_DEFAULT, EIO_PRI_MIN, EIO_PRI_MAX, or NULL.
+ * If NULL passed, pri internally is set to
+ * EIO_PRI_DEFAULT.
+ * @param callable $callback
+ * callback function is called when the request is done.
+ * It should match the following prototype:
+ *
+ *
+ * data
+ * is custom data passed to the request.
+ *
+ *
+ * result
+ * request-specific result value; basically, the value returned by corresponding
+ * system call.
+ *
+ *
+ * req
+ * is optional request resource which can be used with functions like eio_get_last_error
+ *
+ *
+ *
+ * is custom data passed to the request.
+ *
+ * request-specific result value; basically, the value returned by corresponding
+ * system call.
+ *
+ * is optional request resource which can be used with functions like eio_get_last_error
+ * @param mixed $data is custom data passed to the request.
+ * @return resource eio_chmod returns request resource on success.
+ * @throws EioException
+ *
+ */
+function eio_fchown($fd, int $uid, int $gid = -1, int $pri = EIO_PRI_DEFAULT, callable $callback = null, $data = null)
+{
+    error_clear_last();
+    $result = \eio_fchown($fd, $uid, $gid, $pri, $callback, $data);
+    if ($result === false) {
+        throw EioException::createFromPhpError();
+    }
+    return $result;
+}
+
+
 /**
  * eio_fdatasync synchronizes a file's in-core state with storage device.
  *
@@ -1061,7 +1112,8 @@ function eio_readahead($fd, int $offset, int $length, int $pri = EIO_PRI_DEFAULT
  *
  * is optional request resource which can be used with functions like eio_get_last_error
  * @param string $data is custom data passed to the request.
- * @return resource eio_readdir returns request resource on success. Sets result argument of
+ * @return resource eio_readdir returns request resource on success.
+ * Sets result argument of
  * callback function according to
  * flags:
  *
@@ -1672,7 +1724,8 @@ function eio_stat(string $path, int $pri, callable $callback, $data = null)
  *
  * is optional request resource which can be used with functions like eio_get_last_error
  * @param mixed $data is custom data passed to the request.
- * @return resource eio_statvfs returns request resource on success. On success assigns result argument of
+ * @return resource eio_statvfs returns request resource on success.
+ * On success assigns result argument of
  * callback to an array.
  * @throws EioException
  *
diff --git a/generated/fileinfo.php b/generated/fileinfo.php
index c062e17b..237dd81e 100644
--- a/generated/fileinfo.php
+++ b/generated/fileinfo.php
@@ -43,10 +43,14 @@ function finfo_close($finfo): void
  * @throws FileinfoException
  *
  */
-function finfo_open(int $flags = FILEINFO_NONE, string $magic_database = "")
+function finfo_open(int $flags = FILEINFO_NONE, string $magic_database = null)
 {
     error_clear_last();
-    $result = \finfo_open($flags, $magic_database);
+    if ($magic_database !== null) {
+        $result = \finfo_open($flags, $magic_database);
+    } else {
+        $result = \finfo_open($flags);
+    }
     if ($result === false) {
         throw FileinfoException::createFromPhpError();
     }
diff --git a/generated/filesystem.php b/generated/filesystem.php
index 9702676b..b2240977 100644
--- a/generated/filesystem.php
+++ b/generated/filesystem.php
@@ -207,7 +207,7 @@ function fflush($stream): void
  * This function is similar to file, except that
  * file_get_contents returns the file in a
  * string, starting at the specified offset
- * up to maxlen bytes. On failure,
+ * up to length bytes. On failure,
  * file_get_contents will return FALSE.
  *
  * file_get_contents is the preferred way to read the
@@ -230,18 +230,18 @@ function fflush($stream): void
  * Seeking (offset) is not supported with remote files.
  * Attempting to seek on non-local files may work with small offsets, but this
  * is unpredictable because it works on the buffered stream.
- * @param int $maxlen Maximum length of data read. The default is to read until end
+ * @param int $length Maximum length of data read. The default is to read until end
  * of file is reached. Note that this parameter is applied to the
  * stream processed by the filters.
  * @return string The function returns the read data.
  * @throws FilesystemException
  *
  */
-function file_get_contents(string $filename, bool $use_include_path = false, $context = null, int $offset = 0, int $maxlen = null): string
+function file_get_contents(string $filename, bool $use_include_path = false, $context = null, int $offset = 0, int $length = null): string
 {
     error_clear_last();
-    if ($maxlen !== null) {
-        $result = \file_get_contents($filename, $use_include_path, $context, $offset, $maxlen);
+    if ($length !== null) {
+        $result = \file_get_contents($filename, $use_include_path, $context, $offset, $length);
     } elseif ($offset !== 0) {
         $result = \file_get_contents($filename, $use_include_path, $context, $offset);
     } elseif ($context !== null) {
@@ -694,9 +694,8 @@ function flock($stream, int $operation, ?int &$would_block = null): void
  *
  * 'w+'
  *
- * Open for reading and writing; place the file pointer at
- * the beginning of the file and truncate the file to zero
- * length.  If the file does not exist, attempt to create it.
+ * Open for reading and writing; otherwise it has the
+ * same behavior as 'w'.
  *
  *
  *
@@ -837,7 +836,7 @@ function fopen(string $filename, string $mode, bool $use_include_path = false, $
  * fsockopen (and not yet closed by
  * fclose).
  * @param array $fields An array of strings.
- * @param string $delimiter The optional delimiter parameter sets the field
+ * @param string $separator The optional separator parameter sets the field
  * delimiter (one character only).
  * @param string $enclosure The optional enclosure parameter sets the field
  * enclosure (one character only).
@@ -848,10 +847,10 @@ function fopen(string $filename, string $mode, bool $use_include_path = false, $
  * @throws FilesystemException
  *
  */
-function fputcsv($handle, array $fields, string $delimiter = ",", string $enclosure = '"', string $escape_char = "\\"): int
+function fputcsv($handle, array $fields, string $separator = ",", string $enclosure = '"', string $escape_char = "\\"): int
 {
     error_clear_last();
-    $result = \fputcsv($handle, $fields, $delimiter, $enclosure, $escape_char);
+    $result = \fputcsv($handle, $fields, $separator, $enclosure, $escape_char);
     if ($result === false) {
         throw FilesystemException::createFromPhpError();
     }
@@ -971,11 +970,6 @@ function ftruncate($stream, int $size): void
  * stop after length bytes have been written or
  * the end of string is reached, whichever comes
  * first.
- *
- * Note that if the length argument is given,
- * then the magic_quotes_runtime
- * configuration option will be ignored and no slashes will be
- * stripped from string.
  * @return int
  * @throws FilesystemException
  *
@@ -1186,32 +1180,32 @@ function lstat(string $filename): array
 
 
 /**
- * Attempts to create the directory specified by pathname.
+ * Attempts to create the directory specified by directory.
  *
- * @param string $pathname The directory path.
- * @param int $mode The mode is 0777 by default, which means the widest possible
- * access. For more information on modes, read the details
+ * @param string $directory The directory path.
+ * @param int $permissions The permissions are 0777 by default, which means the widest possible
+ * access. For more information on permissions, read the details
  * on the chmod page.
  *
- * mode is ignored on Windows.
+ * permissions is ignored on Windows.
  *
- * Note that you probably want to specify the mode as an octal number,
- * which means it should have a leading zero. The mode is also modified
+ * Note that you probably want to specify the permissions as an octal number,
+ * which means it should have a leading zero. The permissions is also modified
  * by the current umask, which you can change using
  * umask.
  * @param bool $recursive Allows the creation of nested directories specified in the
- * pathname.
+ * directory.
  * @param resource $context
  * @throws FilesystemException
  *
  */
-function mkdir(string $pathname, int $mode = 0777, bool $recursive = false, $context = null): void
+function mkdir(string $directory, int $permissions = 0777, bool $recursive = false, $context = null): void
 {
     error_clear_last();
     if ($context !== null) {
-        $result = \mkdir($pathname, $mode, $recursive, $context);
+        $result = \mkdir($directory, $permissions, $recursive, $context);
     } else {
-        $result = \mkdir($pathname, $mode, $recursive);
+        $result = \mkdir($directory, $permissions, $recursive);
     }
     if ($result === false) {
         throw FilesystemException::createFromPhpError();
@@ -1435,22 +1429,22 @@ function rewind($stream): void
 
 
 /**
- * Attempts to remove the directory named by dirname.
+ * Attempts to remove the directory named by directory.
  * The directory must be empty, and the relevant permissions must permit this.
  * A E_WARNING level error will be generated on failure.
  *
- * @param string $dirname Path to the directory.
+ * @param string $directory Path to the directory.
  * @param resource $context
  * @throws FilesystemException
  *
  */
-function rmdir(string $dirname, $context = null): void
+function rmdir(string $directory, $context = null): void
 {
     error_clear_last();
     if ($context !== null) {
-        $result = \rmdir($dirname, $context);
+        $result = \rmdir($directory, $context);
     } else {
-        $result = \rmdir($dirname);
+        $result = \rmdir($directory);
     }
     if ($result === false) {
         throw FilesystemException::createFromPhpError();
diff --git a/generated/functionsList.php b/generated/functionsList.php
index c4016050..59e6da68 100644
--- a/generated/functionsList.php
+++ b/generated/functionsList.php
@@ -46,18 +46,60 @@
     'copy',
     'count_chars',
     'create_function',
+    'cubrid_bind',
+    'cubrid_column_names',
+    'cubrid_column_types',
+    'cubrid_col_size',
+    'cubrid_commit',
+    'cubrid_connect',
+    'cubrid_connect_with_url',
+    'cubrid_current_oid',
+    'cubrid_disconnect',
+    'cubrid_drop',
     'cubrid_free_result',
     'cubrid_get_charset',
+    'cubrid_get_class_name',
     'cubrid_get_client_info',
     'cubrid_get_db_parameter',
+    'cubrid_get_query_timeout',
     'cubrid_get_server_info',
     'cubrid_insert_id',
+    'cubrid_lob2_bind',
+    'cubrid_lob2_close',
+    'cubrid_lob2_export',
+    'cubrid_lob2_import',
     'cubrid_lob2_new',
+    'cubrid_lob2_read',
+    'cubrid_lob2_seek',
+    'cubrid_lob2_seek64',
     'cubrid_lob2_size',
     'cubrid_lob2_size64',
     'cubrid_lob2_tell',
     'cubrid_lob2_tell64',
+    'cubrid_lob2_write',
+    'cubrid_lob_close',
+    'cubrid_lob_export',
+    'cubrid_lob_get',
+    'cubrid_lob_send',
+    'cubrid_lob_size',
+    'cubrid_lock_read',
+    'cubrid_lock_write',
+    'cubrid_move_cursor',
+    'cubrid_next_result',
+    'cubrid_pconnect',
+    'cubrid_pconnect_with_url',
+    'cubrid_prepare',
+    'cubrid_put',
+    'cubrid_rollback',
+    'cubrid_schema',
+    'cubrid_seq_drop',
+    'cubrid_seq_insert',
+    'cubrid_seq_put',
+    'cubrid_set_add',
+    'cubrid_set_autocommit',
     'cubrid_set_db_parameter',
+    'cubrid_set_drop',
+    'cubrid_set_query_timeout',
     'curl_copy_handle',
     'curl_escape',
     'curl_exec',
@@ -70,7 +112,6 @@
     'curl_share_errno',
     'curl_share_setopt',
     'curl_unescape',
-    'date',
     'date_parse',
     'date_parse_from_format',
     'date_sunrise',
@@ -105,6 +146,7 @@
     'eio_event_loop',
     'eio_fallocate',
     'eio_fchmod',
+    'eio_fchown',
     'eio_fdatasync',
     'eio_fstat',
     'eio_fstatvfs',
@@ -199,7 +241,6 @@
     'getprotobynumber',
     'getrusage',
     'getservbyport',
-    'get_headers',
     'get_include_path',
     'get_meta_tags',
     'glob',
@@ -278,6 +319,8 @@
     'imagecolorat',
     'imagecolordeallocate',
     'imagecolormatch',
+    'imagecolorset',
+    'imagecolorsforindex',
     'imageconvolution',
     'imagecopy',
     'imagecopymerge',
@@ -309,18 +352,20 @@
     'imagefilltoborder',
     'imagefilter',
     'imageflip',
+    'imageftbbox',
+    'imagefttext',
     'imagegammacorrect',
     'imagegd',
     'imagegd2',
     'imagegif',
     'imagegrabscreen',
-    'imagegrabwindow',
     'imagejpeg',
     'imagelayereffect',
     'imageline',
     'imageloadfont',
     'imagepng',
     'imagerectangle',
+    'imageresolution',
     'imagerotate',
     'imagesavealpha',
     'imagescale',
@@ -395,18 +440,6 @@
     'inflate_get_read_len',
     'inflate_get_status',
     'inflate_init',
-    'ingres_autocommit',
-    'ingres_close',
-    'ingres_commit',
-    'ingres_connect',
-    'ingres_execute',
-    'ingres_field_name',
-    'ingres_field_type',
-    'ingres_free_result',
-    'ingres_pconnect',
-    'ingres_result_seek',
-    'ingres_rollback',
-    'ingres_set_environment',
     'ini_get',
     'ini_set',
     'inotify_init',
@@ -507,13 +540,6 @@
     'msg_set_queue',
     'msg_stat_queue',
     'mysqli_get_client_stats',
-    'mysqlnd_ms_dump_servers',
-    'mysqlnd_ms_fabric_select_global',
-    'mysqlnd_ms_fabric_select_shard',
-    'mysqlnd_ms_get_last_used_connection',
-    'mysqlnd_qc_clear_cache',
-    'mysqlnd_qc_set_is_select',
-    'mysqlnd_qc_set_storage_handler',
     'mysql_close',
     'mysql_connect',
     'mysql_create_db',
@@ -686,6 +712,7 @@
     'pcntl_signal_dispatch',
     'pcntl_sigprocmask',
     'pcntl_strerror',
+    'pfsockopen',
     'pg_cancel_query',
     'pg_client_encoding',
     'pg_close',
@@ -936,9 +963,21 @@
     'socket_wsaprotocol_info_export',
     'socket_wsaprotocol_info_import',
     'socket_wsaprotocol_info_release',
+    'sodium_crypto_aead_aes256gcm_decrypt',
+    'sodium_crypto_aead_chacha20poly1305_decrypt',
+    'sodium_crypto_aead_chacha20poly1305_encrypt',
+    'sodium_crypto_aead_chacha20poly1305_ietf_decrypt',
+    'sodium_crypto_aead_chacha20poly1305_ietf_encrypt',
+    'sodium_crypto_aead_xchacha20poly1305_ietf_decrypt',
+    'sodium_crypto_aead_xchacha20poly1305_ietf_encrypt',
+    'sodium_crypto_auth_verify',
+    'sodium_crypto_box_open',
+    'sodium_crypto_box_seal_open',
+    'sodium_crypto_generichash_update',
+    'sodium_crypto_sign_open',
+    'sodium_crypto_sign_verify_detached',
     'solr_get_version',
     'sort',
-    'spl_autoload_register',
     'spl_autoload_unregister',
     'sprintf',
     'sqlsrv_begin_transaction',
diff --git a/generated/gettext.php b/generated/gettext.php
index e1269035..f7816e38 100644
--- a/generated/gettext.php
+++ b/generated/gettext.php
@@ -10,6 +10,7 @@
  *
  * @param string $domain The domain.
  * @param string $directory The directory path.
+ * An empty string means the current directory.
  * If NULL, the currently set directory is returned.
  * @return string The full pathname for the domain currently being set.
  * @throws GettextException
diff --git a/generated/image.php b/generated/image.php
index 2999a978..f6b81bf9 100644
--- a/generated/image.php
+++ b/generated/image.php
@@ -131,11 +131,11 @@ function image2wbmp($image, ?string $filename = null, int $foreground = null): v
 /**
  *
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param array $affine Array with keys 0 to 5.
- * @param array $clip Array with keys "x", "y", "width" and "height".
- * @return resource Return affined image resource on success.
+ * @param array $clip Array with keys "x", "y", "width" and "height"; or NULL.
+ * @return resource Return affined image object on success.
  * @throws ImageException
  *
  */
@@ -159,19 +159,19 @@ function imageaffine($image, array $affine, array $clip = null)
  * what is useful if multiple transformations should be applied to the same
  * image in one go.
  *
- * @param array $m1 An affine transformation matrix (an array with keys
+ * @param array $matrix1 An affine transformation matrix (an array with keys
  * 0 to 5 and float values).
- * @param array $m2 An affine transformation matrix (an array with keys
+ * @param array $matrix2 An affine transformation matrix (an array with keys
  * 0 to 5 and float values).
  * @return array{0:float,1:float,2:float,3:float,4:float,5:float} An affine transformation matrix (an array with keys
  * 0 to 5 and float values).
  * @throws ImageException
  *
  */
-function imageaffinematrixconcat(array $m1, array $m2): array
+function imageaffinematrixconcat(array $matrix1, array $matrix2): array
 {
     error_clear_last();
-    $result = \imageaffinematrixconcat($m1, $m2);
+    $result = \imageaffinematrixconcat($matrix1, $matrix2);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -196,14 +196,10 @@ function imageaffinematrixconcat(array $m1, array $m2): array
  * @throws ImageException
  *
  */
-function imageaffinematrixget(int $type, $options = null): array
+function imageaffinematrixget(int $type, $options): array
 {
     error_clear_last();
-    if ($options !== null) {
-        $result = \imageaffinematrixget($type, $options);
-    } else {
-        $result = \imageaffinematrixget($type);
-    }
+    $result = \imageaffinematrixget($type, $options);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -223,17 +219,17 @@ function imageaffinematrixget(int $type, $options = null): array
  * information, replacing the destination pixel.  Blending mode is not available
  * when drawing on palette images.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param bool $blendmode Whether to enable the blending mode or not. On true color images
+ * @param bool $enable Whether to enable the blending mode or not. On true color images
  * the default value is TRUE otherwise the default value is FALSE
  * @throws ImageException
  *
  */
-function imagealphablending($image, bool $blendmode): void
+function imagealphablending($image, bool $enable): void
 {
     error_clear_last();
-    $result = \imagealphablending($image, $blendmode);
+    $result = \imagealphablending($image, $enable);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -252,16 +248,16 @@ function imagealphablending($image, bool $blendmode): void
  * other colors. The lack of alpha component support does not allow an alpha
  * based antialiasing method.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param bool $enabled Whether to enable antialiasing or not.
+ * @param bool $enable Whether to enable antialiasing or not.
  * @throws ImageException
  *
  */
-function imageantialias($image, bool $enabled): void
+function imageantialias($image, bool $enable): void
 {
     error_clear_last();
-    $result = \imageantialias($image, $enabled);
+    $result = \imageantialias($image, $enable);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -272,24 +268,24 @@ function imageantialias($image, bool $enabled): void
  * imagearc draws an arc of circle centered at the given
  * coordinates.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param int $cx x-coordinate of the center.
- * @param int $cy y-coordinate of the center.
+ * @param int $center_x x-coordinate of the center.
+ * @param int $center_y y-coordinate of the center.
  * @param int $width The arc width.
  * @param int $height The arc height.
- * @param int $start The arc start angle, in degrees.
- * @param int $end The arc end angle, in degrees.
+ * @param int $start_angle The arc start angle, in degrees.
+ * @param int $end_angle The arc end angle, in degrees.
  * 0° is located at the three-o'clock position, and the arc is drawn
  * clockwise.
  * @param int $color A color identifier created with imagecolorallocate.
  * @throws ImageException
  *
  */
-function imagearc($image, int $cx, int $cy, int $width, int $height, int $start, int $end, int $color): void
+function imagearc($image, int $center_x, int $center_y, int $width, int $height, int $start_angle, int $end_angle, int $color): void
 {
     error_clear_last();
-    $result = \imagearc($image, $cx, $cy, $width, $height, $start, $end, $color);
+    $result = \imagearc($image, $center_x, $center_y, $width, $height, $start_angle, $end_angle, $color);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -299,9 +295,9 @@ function imagearc($image, int $cx, int $cy, int $width, int $height, int $start,
 /**
  * Outputs or saves a BMP version of the given image.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param string|resource|null $to The path or an open stream resource (which is automatically being closed after this function returns) to save the file to. If not set or NULL, the raw image stream will be outputted directly.
+ * @param string|resource|null $file The path or an open stream resource (which is automatically being closed after this function returns) to save the file to. If not set or NULL, the raw image stream will be outputted directly.
  *
  * NULL is invalid if the compressed arguments is
  * not used.
@@ -309,13 +305,13 @@ function imagearc($image, int $cx, int $cy, int $width, int $height, int $start,
  * @throws ImageException
  *
  */
-function imagebmp($image, $to = null, bool $compressed = true): void
+function imagebmp($image, $file = null, bool $compressed = true): void
 {
     error_clear_last();
     if ($compressed !== true) {
-        $result = \imagebmp($image, $to, $compressed);
-    } elseif ($to !== null) {
-        $result = \imagebmp($image, $to);
+        $result = \imagebmp($image, $file, $compressed);
+    } elseif ($file !== null) {
+        $result = \imagebmp($image, $file);
     } else {
         $result = \imagebmp($image);
     }
@@ -327,27 +323,27 @@ function imagebmp($image, $to = null, bool $compressed = true): void
 
 /**
  * imagechar draws the first character of
- * c in the image identified by
+ * char in the image identified by
  * image with its upper-left at
  * x,y (top left is 0,
  * 0) with the color color.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $font Can be 1, 2, 3, 4, 5 for built-in
  * fonts in latin2 encoding (where higher numbers corresponding to larger fonts) or any of your
  * own font identifiers registered with imageloadfont.
  * @param int $x x-coordinate of the start.
  * @param int $y y-coordinate of the start.
- * @param string $c The character to draw.
+ * @param string $char The character to draw.
  * @param int $color A color identifier created with imagecolorallocate.
  * @throws ImageException
  *
  */
-function imagechar($image, int $font, int $x, int $y, string $c, int $color): void
+function imagechar($image, int $font, int $x, int $y, string $char, int $color): void
 {
     error_clear_last();
-    $result = \imagechar($image, $font, $x, $y, $c, $color);
+    $result = \imagechar($image, $font, $x, $y, $char, $color);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -355,25 +351,25 @@ function imagechar($image, int $font, int $x, int $y, string $c, int $color): vo
 
 
 /**
- * Draws the character c vertically at the specified
+ * Draws the character char vertically at the specified
  * coordinate on the given image.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $font Can be 1, 2, 3, 4, 5 for built-in
  * fonts in latin2 encoding (where higher numbers corresponding to larger fonts) or any of your
  * own font identifiers registered with imageloadfont.
  * @param int $x x-coordinate of the start.
  * @param int $y y-coordinate of the start.
- * @param string $c The character to draw.
+ * @param string $char The character to draw.
  * @param int $color A color identifier created with imagecolorallocate.
  * @throws ImageException
  *
  */
-function imagecharup($image, int $font, int $x, int $y, string $c, int $color): void
+function imagecharup($image, int $font, int $x, int $y, string $char, int $color): void
 {
     error_clear_last();
-    $result = \imagecharup($image, $font, $x, $y, $c, $color);
+    $result = \imagecharup($image, $font, $x, $y, $char, $color);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -389,7 +385,7 @@ function imagecharup($image, int $font, int $x, int $y, string $c, int $color):
  * integer. Use bitshifting and masking to access the distinct red, green and blue
  * component values:
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $x x-coordinate of the point.
  * @param int $y y-coordinate of the point.
@@ -413,7 +409,7 @@ function imagecolorat($image, int $x, int $y): int
  * imagecolorallocate or
  * imagecolorallocatealpha.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $color The color identifier.
  * @throws ImageException
@@ -432,8 +428,8 @@ function imagecolordeallocate($image, int $color): void
 /**
  * Makes the colors of the palette version of an image more closely match the true color version.
  *
- * @param resource $image1 A truecolor image resource.
- * @param resource $image2 A palette image resource pointing to an image that has the same
+ * @param resource $image1 A truecolor image object.
+ * @param resource $image2 A palette image object pointing to an image that has the same
  * size as image1.
  * @throws ImageException
  *
@@ -448,22 +444,70 @@ function imagecolormatch($image1, $image2): void
 }
 
 
+/**
+ * This sets the specified index in the palette to the specified
+ * color. This is useful for creating flood-fill-like effects in
+ * palleted images without the overhead of performing the actual
+ * flood-fill.
+ *
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
+ * such as imagecreatetruecolor.
+ * @param int $color An index in the palette.
+ * @param int $red Value of red component.
+ * @param int $green Value of green component.
+ * @param int $blue Value of blue component.
+ * @param int $alpha Value of alpha component.
+ * @throws ImageException
+ *
+ */
+function imagecolorset($image, int $color, int $red, int $green, int $blue, int $alpha = 0): void
+{
+    error_clear_last();
+    $result = \imagecolorset($image, $color, $red, $green, $blue, $alpha);
+    if ($result === false) {
+        throw ImageException::createFromPhpError();
+    }
+}
+
+
+/**
+ * Gets the color for a specified index.
+ *
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
+ * such as imagecreatetruecolor.
+ * @param int $color The color index.
+ * @return array Returns an associative array with red, green, blue and alpha keys that
+ * contain the appropriate values for the specified color index.
+ * @throws ImageException
+ *
+ */
+function imagecolorsforindex($image, int $color): array
+{
+    error_clear_last();
+    $result = \imagecolorsforindex($image, $color);
+    if ($result === false) {
+        throw ImageException::createFromPhpError();
+    }
+    return $result;
+}
+
+
 /**
  * Applies a convolution matrix on the image, using the given coefficient and
  * offset.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param array $matrix A 3x3 matrix: an array of three arrays of three floats.
- * @param float $div The divisor of the result of the convolution, used for normalization.
+ * @param float $divisor The divisor of the result of the convolution, used for normalization.
  * @param float $offset Color offset.
  * @throws ImageException
  *
  */
-function imageconvolution($image, array $matrix, float $div, float $offset): void
+function imageconvolution($image, array $matrix, float $divisor, float $offset): void
 {
     error_clear_last();
-    $result = \imageconvolution($image, $matrix, $div, $offset);
+    $result = \imageconvolution($image, $matrix, $divisor, $offset);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -471,29 +515,29 @@ function imageconvolution($image, array $matrix, float $div, float $offset): voi
 
 
 /**
- * Copy a part of src_im onto
- * dst_im starting at the x,y coordinates
+ * Copy a part of src_image onto
+ * dst_image starting at the x,y coordinates
  * src_x, src_y  with
- * a width of src_w and a height of
- * src_h.  The portion defined will be copied
+ * a width of src_width and a height of
+ * src_height.  The portion defined will be copied
  * onto the x,y coordinates, dst_x and
  * dst_y.
  *
- * @param resource $dst_im Destination image resource.
- * @param resource $src_im Source image resource.
+ * @param resource $dst_image Destination image resource.
+ * @param resource $src_image Source image resource.
  * @param int $dst_x x-coordinate of destination point.
  * @param int $dst_y y-coordinate of destination point.
  * @param int $src_x x-coordinate of source point.
  * @param int $src_y y-coordinate of source point.
- * @param int $src_w Source width.
- * @param int $src_h Source height.
+ * @param int $src_width Source width.
+ * @param int $src_height Source height.
  * @throws ImageException
  *
  */
-function imagecopy($dst_im, $src_im, int $dst_x, int $dst_y, int $src_x, int $src_y, int $src_w, int $src_h): void
+function imagecopy($dst_image, $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $src_width, int $src_height): void
 {
     error_clear_last();
-    $result = \imagecopy($dst_im, $src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h);
+    $result = \imagecopy($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $src_width, $src_height);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -501,22 +545,22 @@ function imagecopy($dst_im, $src_im, int $dst_x, int $dst_y, int $src_x, int $sr
 
 
 /**
- * Copy a part of src_im onto
- * dst_im starting at the x,y coordinates
+ * Copy a part of src_image onto
+ * dst_image starting at the x,y coordinates
  * src_x, src_y  with
- * a width of src_w and a height of
- * src_h.  The portion defined will be copied
+ * a width of src_width and a height of
+ * src_height.  The portion defined will be copied
  * onto the x,y coordinates, dst_x and
  * dst_y.
  *
- * @param resource $dst_im Destination image resource.
- * @param resource $src_im Source image resource.
+ * @param resource $dst_image Destination image resource.
+ * @param resource $src_image Source image resource.
  * @param int $dst_x x-coordinate of destination point.
  * @param int $dst_y y-coordinate of destination point.
  * @param int $src_x x-coordinate of source point.
  * @param int $src_y y-coordinate of source point.
- * @param int $src_w Source width.
- * @param int $src_h Source height.
+ * @param int $src_width Source width.
+ * @param int $src_height Source height.
  * @param int $pct The two images will be merged according to pct
  * which can range from 0 to 100.  When pct = 0,
  * no action is taken, when 100 this function behaves identically
@@ -526,10 +570,10 @@ function imagecopy($dst_im, $src_im, int $dst_x, int $dst_y, int $src_x, int $sr
  * @throws ImageException
  *
  */
-function imagecopymerge($dst_im, $src_im, int $dst_x, int $dst_y, int $src_x, int $src_y, int $src_w, int $src_h, int $pct): void
+function imagecopymerge($dst_image, $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $src_width, int $src_height, int $pct): void
 {
     error_clear_last();
-    $result = \imagecopymerge($dst_im, $src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $pct);
+    $result = \imagecopymerge($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $src_width, $src_height, $pct);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -537,11 +581,11 @@ function imagecopymerge($dst_im, $src_im, int $dst_x, int $dst_y, int $src_x, in
 
 
 /**
- * imagecopymergegray copy a part of src_im onto
- * dst_im starting at the x,y coordinates
+ * imagecopymergegray copy a part of src_image onto
+ * dst_image starting at the x,y coordinates
  * src_x, src_y  with
- * a width of src_w and a height of
- * src_h.  The portion defined will be copied
+ * a width of src_width and a height of
+ * src_height.  The portion defined will be copied
  * onto the x,y coordinates, dst_x and
  * dst_y.
  *
@@ -549,15 +593,15 @@ function imagecopymerge($dst_im, $src_im, int $dst_x, int $dst_y, int $src_x, in
  * that when merging it preserves the hue of the source by converting
  * the destination pixels to gray scale before the copy operation.
  *
- * @param resource $dst_im Destination image resource.
- * @param resource $src_im Source image resource.
+ * @param resource $dst_image Destination image resource.
+ * @param resource $src_image Source image resource.
  * @param int $dst_x x-coordinate of destination point.
  * @param int $dst_y y-coordinate of destination point.
  * @param int $src_x x-coordinate of source point.
  * @param int $src_y y-coordinate of source point.
- * @param int $src_w Source width.
- * @param int $src_h Source height.
- * @param int $pct The src_im will be changed to grayscale according
+ * @param int $src_width Source width.
+ * @param int $src_height Source height.
+ * @param int $pct The src_image will be changed to grayscale according
  * to pct where 0 is fully grayscale and 100 is
  * unchanged. When pct = 100 this function behaves
  * identically to imagecopy for pallete images, except for
@@ -566,10 +610,10 @@ function imagecopymerge($dst_im, $src_im, int $dst_x, int $dst_y, int $src_x, in
  * @throws ImageException
  *
  */
-function imagecopymergegray($dst_im, $src_im, int $dst_x, int $dst_y, int $src_x, int $src_y, int $src_w, int $src_h, int $pct): void
+function imagecopymergegray($dst_image, $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $src_width, int $src_height, int $pct): void
 {
     error_clear_last();
-    $result = \imagecopymergegray($dst_im, $src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $pct);
+    $result = \imagecopymergegray($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $src_width, $src_height, $pct);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -584,10 +628,10 @@ function imagecopymergegray($dst_im, $src_im, int $dst_x, int $dst_y, int $src_x
  *
  * In other words, imagecopyresampled will take a
  * rectangular area from src_image of width
- * src_w and height src_h at
+ * src_width and height src_height at
  * position (src_x,src_y)
  * and place it in a rectangular area of dst_image
- * of width dst_w and height dst_h
+ * of width dst_width and height dst_height
  * at position (dst_x,dst_y).
  *
  * If the source and destination coordinates and width and heights
@@ -604,17 +648,17 @@ function imagecopymergegray($dst_im, $src_im, int $dst_x, int $dst_y, int $src_x
  * @param int $dst_y y-coordinate of destination point.
  * @param int $src_x x-coordinate of source point.
  * @param int $src_y y-coordinate of source point.
- * @param int $dst_w Destination width.
- * @param int $dst_h Destination height.
- * @param int $src_w Source width.
- * @param int $src_h Source height.
+ * @param int $dst_width Destination width.
+ * @param int $dst_height Destination height.
+ * @param int $src_width Source width.
+ * @param int $src_height Source height.
  * @throws ImageException
  *
  */
-function imagecopyresampled($dst_image, $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $dst_w, int $dst_h, int $src_w, int $src_h): void
+function imagecopyresampled($dst_image, $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $dst_width, int $dst_height, int $src_width, int $src_height): void
 {
     error_clear_last();
-    $result = \imagecopyresampled($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
+    $result = \imagecopyresampled($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_width, $dst_height, $src_width, $src_height);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -629,10 +673,10 @@ function imagecopyresampled($dst_image, $src_image, int $dst_x, int $dst_y, int
  *
  * In other words, imagecopyresized will take a
  * rectangular area from src_image of width
- * src_w and height src_h at
+ * src_width and height src_height at
  * position (src_x,src_y)
  * and place it in a rectangular area of dst_image
- * of width dst_w and height dst_h
+ * of width dst_width and height dst_height
  * at position (dst_x,dst_y).
  *
  * If the source and destination coordinates and width and heights
@@ -649,17 +693,17 @@ function imagecopyresampled($dst_image, $src_image, int $dst_x, int $dst_y, int
  * @param int $dst_y y-coordinate of destination point.
  * @param int $src_x x-coordinate of source point.
  * @param int $src_y y-coordinate of source point.
- * @param int $dst_w Destination width.
- * @param int $dst_h Destination height.
- * @param int $src_w Source width.
- * @param int $src_h Source height.
+ * @param int $dst_width Destination width.
+ * @param int $dst_height Destination height.
+ * @param int $src_width Source width.
+ * @param int $src_height Source height.
  * @throws ImageException
  *
  */
-function imagecopyresized($dst_image, $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $dst_w, int $dst_h, int $src_w, int $src_h): void
+function imagecopyresized($dst_image, $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $dst_width, int $dst_height, int $src_width, int $src_height): void
 {
     error_clear_last();
-    $result = \imagecopyresized($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
+    $result = \imagecopyresized($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_width, $dst_height, $src_width, $src_height);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -680,7 +724,7 @@ function imagecopyresized($dst_image, $src_image, int $dst_x, int $dst_y, int $s
  *
  * @param int $width The image width.
  * @param int $height The image height.
- * @return resource Returns an image resource identifier on success, FALSE on errors.
+ * @return resource Returns an image object on success, FALSE on errors.
  * @throws ImageException
  *
  */
@@ -700,7 +744,7 @@ function imagecreate(int $width, int $height)
  * representing the image obtained from the given filename.
  *
  * @param string $filename Path to the BMP image.
- * @return resource Returns an image resource identifier on success, FALSE on errors.
+ * @return resource Returns an image object on success, FALSE on errors.
  * @throws ImageException
  *
  */
@@ -719,7 +763,7 @@ function imagecreatefrombmp(string $filename)
  * Create a new image from GD file or URL.
  *
  * @param string $filename Path to the GD file.
- * @return resource Returns an image resource identifier on success, FALSE on errors.
+ * @return resource Returns an image object on success, FALSE on errors.
  * @throws ImageException
  *
  */
@@ -738,7 +782,7 @@ function imagecreatefromgd(string $filename)
  * Create a new image from GD2 file or URL.
  *
  * @param string $filename Path to the GD2 image.
- * @return resource Returns an image resource identifier on success, FALSE on errors.
+ * @return resource Returns an image object on success, FALSE on errors.
  * @throws ImageException
  *
  */
@@ -757,18 +801,18 @@ function imagecreatefromgd2(string $filename)
  * Create a new image from a given part of GD2 file or URL.
  *
  * @param string $filename Path to the GD2 image.
- * @param int $srcX x-coordinate of source point.
- * @param int $srcY y-coordinate of source point.
+ * @param int $x x-coordinate of source point.
+ * @param int $y y-coordinate of source point.
  * @param int $width Source width.
  * @param int $height Source height.
- * @return resource Returns an image resource identifier on success, FALSE on errors.
+ * @return resource Returns an image object on success, FALSE on errors.
  * @throws ImageException
  *
  */
-function imagecreatefromgd2part(string $filename, int $srcX, int $srcY, int $width, int $height)
+function imagecreatefromgd2part(string $filename, int $x, int $y, int $width, int $height)
 {
     error_clear_last();
-    $result = \imagecreatefromgd2part($filename, $srcX, $srcY, $width, $height);
+    $result = \imagecreatefromgd2part($filename, $x, $y, $width, $height);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -781,7 +825,7 @@ function imagecreatefromgd2part(string $filename, int $srcX, int $srcY, int $wid
  * representing the image obtained from the given filename.
  *
  * @param string $filename Path to the GIF image.
- * @return resource Returns an image resource identifier on success, FALSE on errors.
+ * @return resource Returns an image object on success, FALSE on errors.
  * @throws ImageException
  *
  */
@@ -801,7 +845,7 @@ function imagecreatefromgif(string $filename)
  * representing the image obtained from the given filename.
  *
  * @param string $filename Path to the JPEG image.
- * @return resource Returns an image resource identifier on success, FALSE on errors.
+ * @return resource Returns an image object on success, FALSE on errors.
  * @throws ImageException
  *
  */
@@ -821,7 +865,7 @@ function imagecreatefromjpeg(string $filename)
  * representing the image obtained from the given filename.
  *
  * @param string $filename Path to the PNG image.
- * @return resource Returns an image resource identifier on success, FALSE on errors.
+ * @return resource Returns an image object on success, FALSE on errors.
  * @throws ImageException
  *
  */
@@ -841,7 +885,7 @@ function imagecreatefrompng(string $filename)
  * representing the image obtained from the given filename.
  *
  * @param string $filename Path to the WBMP image.
- * @return resource Returns an image resource identifier on success, FALSE on errors.
+ * @return resource Returns an image object on success, FALSE on errors.
  * @throws ImageException
  *
  */
@@ -861,7 +905,7 @@ function imagecreatefromwbmp(string $filename)
  * representing the image obtained from the given filename.
  *
  * @param string $filename Path to the WebP image.
- * @return resource Returns an image resource identifier on success, FALSE on errors.
+ * @return resource Returns an image object on success, FALSE on errors.
  * @throws ImageException
  *
  */
@@ -881,7 +925,7 @@ function imagecreatefromwebp(string $filename)
  * representing the image obtained from the given filename.
  *
  * @param string $filename Path to the XBM image.
- * @return resource Returns an image resource identifier on success, FALSE on errors.
+ * @return resource Returns an image object on success, FALSE on errors.
  * @throws ImageException
  *
  */
@@ -901,7 +945,7 @@ function imagecreatefromxbm(string $filename)
  * representing the image obtained from the given filename.
  *
  * @param string $filename Path to the XPM image.
- * @return resource Returns an image resource identifier on success, FALSE on errors.
+ * @return resource Returns an image object on success, FALSE on errors.
  * @throws ImageException
  *
  */
@@ -917,12 +961,12 @@ function imagecreatefromxpm(string $filename)
 
 
 /**
- * imagecreatetruecolor returns an image identifier
+ * imagecreatetruecolor returns an image object
  * representing a black image of the specified size.
  *
  * @param int $width Image width.
  * @param int $height Image height.
- * @return resource Returns an image resource identifier on success, FALSE on errors.
+ * @return resource Returns an image object on success, FALSE on errors.
  * @throws ImageException
  *
  */
@@ -941,19 +985,19 @@ function imagecreatetruecolor(int $width, int $height)
  * Crops an image to the given rectangular area and returns the resulting image.
  * The given image is not modified.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param array $rect The cropping rectangle as array with keys
+ * @param array $rectangle The cropping rectangle as array with keys
  * x, y, width and
  * height.
- * @return resource Return cropped image resource on success.
+ * @return resource Return cropped image object on success.
  * @throws ImageException
  *
  */
-function imagecrop($image, array $rect)
+function imagecrop($image, array $rectangle)
 {
     error_clear_last();
-    $result = \imagecrop($image, $rect);
+    $result = \imagecrop($image, $rectangle);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -965,17 +1009,17 @@ function imagecrop($image, array $rect)
  * Automatically crops an image according to the given
  * mode.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $mode One of the following constants:
  * @param float $threshold
  * @param int $color
- * @return resource Returns a cropped image resource on success.
+ * @return resource Returns a cropped image object on success.
  * If the complete image was cropped, imagecrop returns FALSE.
  * @throws ImageException
  *
  */
-function imagecropauto($image, int $mode = IMG_CROP_DEFAULT, float $threshold = .5, int $color = -1)
+function imagecropauto($image, int $mode = IMG_CROP_DEFAULT, float $threshold = 0.5, int $color = -1)
 {
     error_clear_last();
     $result = \imagecropauto($image, $mode, $threshold, $color);
@@ -991,7 +1035,7 @@ function imagecropauto($image, int $mode = IMG_CROP_DEFAULT, float $threshold =
  * imagesetstyle and imageline
  * instead.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $x1 Upper left x coordinate.
  * @param int $y1 Upper left y coordinate 0, 0 is the top left corner of the image.
@@ -1012,10 +1056,10 @@ function imagedashedline($image, int $x1, int $y1, int $x2, int $y2, int $color)
 
 
 /**
- * imagedestroy frees any memory associated
+ * Prior to PHP 8.0.0, imagedestroy freed any memory associated
  * with image image.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @throws ImageException
  *
@@ -1033,20 +1077,20 @@ function imagedestroy($image): void
 /**
  * Draws an ellipse centered at the specified coordinates.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param int $cx x-coordinate of the center.
- * @param int $cy y-coordinate of the center.
+ * @param int $center_x x-coordinate of the center.
+ * @param int $center_y y-coordinate of the center.
  * @param int $width The ellipse width.
  * @param int $height The ellipse height.
  * @param int $color The color of the ellipse. A color identifier created with imagecolorallocate.
  * @throws ImageException
  *
  */
-function imageellipse($image, int $cx, int $cy, int $width, int $height, int $color): void
+function imageellipse($image, int $center_x, int $center_y, int $width, int $height, int $color): void
 {
     error_clear_last();
-    $result = \imageellipse($image, $cx, $cy, $width, $height, $color);
+    $result = \imageellipse($image, $center_x, $center_y, $width, $height, $color);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -1058,7 +1102,7 @@ function imageellipse($image, int $cx, int $cy, int $width, int $height, int $co
  * with the given color in the
  * image.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $x x-coordinate of start point.
  * @param int $y y-coordinate of start point.
@@ -1080,14 +1124,14 @@ function imagefill($image, int $x, int $y, int $color): void
  * Draws a partial arc centered at the specified coordinate in the
  * given image.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param int $cx x-coordinate of the center.
- * @param int $cy y-coordinate of the center.
+ * @param int $center_x x-coordinate of the center.
+ * @param int $center_y y-coordinate of the center.
  * @param int $width The arc width.
  * @param int $height The arc height.
- * @param int $start The arc start angle, in degrees.
- * @param int $end The arc end angle, in degrees.
+ * @param int $start_angle The arc start angle, in degrees.
+ * @param int $end_angle The arc end angle, in degrees.
  * 0° is located at the three-o'clock position, and the arc is drawn
  * clockwise.
  * @param int $color A color identifier created with imagecolorallocate.
@@ -1110,10 +1154,10 @@ function imagefill($image, int $x, int $y, int $color): void
  * @throws ImageException
  *
  */
-function imagefilledarc($image, int $cx, int $cy, int $width, int $height, int $start, int $end, int $color, int $style): void
+function imagefilledarc($image, int $center_x, int $center_y, int $width, int $height, int $start_angle, int $end_angle, int $color, int $style): void
 {
     error_clear_last();
-    $result = \imagefilledarc($image, $cx, $cy, $width, $height, $start, $end, $color, $style);
+    $result = \imagefilledarc($image, $center_x, $center_y, $width, $height, $start_angle, $end_angle, $color, $style);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -1124,20 +1168,20 @@ function imagefilledarc($image, int $cx, int $cy, int $width, int $height, int $
  * Draws an ellipse centered at the specified coordinate on the given
  * image.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param int $cx x-coordinate of the center.
- * @param int $cy y-coordinate of the center.
+ * @param int $center_x x-coordinate of the center.
+ * @param int $center_y y-coordinate of the center.
  * @param int $width The ellipse width.
  * @param int $height The ellipse height.
  * @param int $color The fill color. A color identifier created with imagecolorallocate.
  * @throws ImageException
  *
  */
-function imagefilledellipse($image, int $cx, int $cy, int $width, int $height, int $color): void
+function imagefilledellipse($image, int $center_x, int $center_y, int $width, int $height, int $color): void
 {
     error_clear_last();
-    $result = \imagefilledellipse($image, $cx, $cy, $width, $height, $color);
+    $result = \imagefilledellipse($image, $center_x, $center_y, $width, $height, $color);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -1149,7 +1193,7 @@ function imagefilledellipse($image, int $cx, int $cy, int $width, int $height, i
  * image starting at point 1 and ending at point 2.
  * 0, 0 is the top left corner of the image.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $x1 x-coordinate for point 1.
  * @param int $y1 y-coordinate for point 1.
@@ -1171,24 +1215,24 @@ function imagefilledrectangle($image, int $x1, int $y1, int $x2, int $y2, int $c
 
 /**
  * imagefilltoborder performs a flood fill
- * whose border color is defined by border.
+ * whose border color is defined by border_color.
  * The starting point for the fill is x,
  * y (top left is 0, 0) and the region is
  * filled with color color.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $x x-coordinate of start.
  * @param int $y y-coordinate of start.
- * @param int $border The border color. A color identifier created with imagecolorallocate.
+ * @param int $border_color The border color. A color identifier created with imagecolorallocate.
  * @param int $color The fill color. A color identifier created with imagecolorallocate.
  * @throws ImageException
  *
  */
-function imagefilltoborder($image, int $x, int $y, int $border, int $color): void
+function imagefilltoborder($image, int $x, int $y, int $border_color, int $color): void
 {
     error_clear_last();
-    $result = \imagefilltoborder($image, $x, $y, $border, $color);
+    $result = \imagefilltoborder($image, $x, $y, $border_color, $color);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -1197,11 +1241,11 @@ function imagefilltoborder($image, int $x, int $y, int $border, int $color): voi
 
 /**
  * imagefilter applies the given filter
- * filtertype on the image.
+ * filter on the image.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param int $filtertype filtertype can be one of the following:
+ * @param int $filter filter can be one of the following:
  *
  *
  *
@@ -1221,14 +1265,14 @@ function imagefilltoborder($image, int $x, int $y, int $border, int $color): voi
  *
  *
  * IMG_FILTER_BRIGHTNESS: Changes the brightness
- * of the image. Use arg1 to set the level of
+ * of the image. Use args to set the level of
  * brightness. The range for the brightness is -255 to 255.
  *
  *
  *
  *
  * IMG_FILTER_CONTRAST: Changes the contrast of
- * the image. Use arg1 to set the level of
+ * the image. Use args to set the level of
  * contrast.
  *
  *
@@ -1236,7 +1280,7 @@ function imagefilltoborder($image, int $x, int $y, int $border, int $color): voi
  *
  * IMG_FILTER_COLORIZE: Like
  * IMG_FILTER_GRAYSCALE, except you can specify the
- * color. Use arg1, arg2 and
+ * color. Use args, arg2 and
  * arg3 in the form of
  * red, green,
  * blue and arg4 for the
@@ -1274,27 +1318,27 @@ function imagefilltoborder($image, int $x, int $y, int $border, int $color): voi
  *
  *
  * IMG_FILTER_SMOOTH: Makes the image smoother.
- * Use arg1 to set the level of smoothness.
+ * Use args to set the level of smoothness.
  *
  *
  *
  *
  * IMG_FILTER_PIXELATE: Applies pixelation effect
- * to the image, use arg1 to set the block size
+ * to the image, use args to set the block size
  * and arg2 to set the pixelation effect mode.
  *
  *
  *
  *
  * IMG_FILTER_SCATTER: Applies scatter effect
- * to the image, use arg1 and
+ * to the image, use args and
  * arg2 to define the effect strength and
  * additionally arg3 to only apply the
  * on select pixel colors.
  *
  *
  *
- * @param int $arg1
+ * @param int $args
  *
  *
  * IMG_FILTER_BRIGHTNESS: Brightness level.
@@ -1328,117 +1372,278 @@ function imagefilltoborder($image, int $x, int $y, int $border, int $color): voi
  *
  *
  *
- * @param int $arg2
+ * @throws ImageException
+ *
+ */
+function imagefilter($image, int $filter, int  ...$args): void
+{
+    error_clear_last();
+    if ($args !== []) {
+        $result = \imagefilter($image, $filter, ...$args);
+    } else {
+        $result = \imagefilter($image, $filter);
+    }
+    if ($result === false) {
+        throw ImageException::createFromPhpError();
+    }
+}
+
+
+/**
+ * Flips the image image using the given
+ * mode.
+ *
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
+ * such as imagecreatetruecolor.
+ * @param int $mode Flip mode, this can be one of the IMG_FLIP_* constants:
+ *
+ *
  *
  *
- * IMG_FILTER_COLORIZE: Value of green component.
  *
+ * Constant
+ * Meaning
  *
  *
  *
- * IMG_FILTER_PIXELATE: Whether to use advanced pixelation
- * effect or not (defaults to FALSE).
  *
+ * IMG_FLIP_HORIZONTAL
  *
+ * Flips the image horizontally.
  *
  *
- * IMG_FILTER_SCATTER: Effect addition level.
  *
+ * IMG_FLIP_VERTICAL
  *
+ * Flips the image vertically.
  *
- * @param int $arg3
  *
  *
- * IMG_FILTER_COLORIZE: Value of blue component.
+ * IMG_FLIP_BOTH
+ *
+ * Flips the image both horizontally and vertically.
  *
  *
  *
  *
- * IMG_FILTER_SCATTER: Optional array indexed color values
- * to apply effect at.
+ *
+ * @throws ImageException
+ *
+ */
+function imageflip($image, int $mode): void
+{
+    error_clear_last();
+    $result = \imageflip($image, $mode);
+    if ($result === false) {
+        throw ImageException::createFromPhpError();
+    }
+}
+
+
+/**
+ * This function calculates and returns the bounding box in pixels
+ * for a FreeType text.
+ *
+ * @param float $size The font size in points.
+ * @param float $angle Angle in degrees in which string will be
+ * measured.
+ * @param string $font_filename The name of the TrueType font file (can be a URL). Depending on
+ * which version of the GD library that PHP is using, it may attempt to
+ * search for files that do not begin with a leading '/' by appending
+ * '.ttf' to the filename and searching along a library-defined font path.
+ * @param string $string The string to be measured.
+ * @param array $options
+ * Possible array indexes for options
+ *
+ *
+ *
+ * Key
+ * Type
+ * Meaning
  *
  *
  *
- * @param int $arg4
  *
+ * linespacing
+ * float
+ * Defines drawing linespacing
  *
- * IMG_FILTER_COLORIZE: Alpha channel, A value
- * between 0 and 127. 0 indicates completely opaque while 127 indicates
- * completely transparent.
  *
  *
  *
+ * @return array imageftbbox returns an array with 8
+ * elements representing four points making the bounding box of the
+ * text:
+ *
+ *
+ *
+ *
+ * 0
+ * lower left corner, X position
+ *
+ *
+ * 1
+ * lower left corner, Y position
+ *
+ *
+ * 2
+ * lower right corner, X position
+ *
+ *
+ * 3
+ * lower right corner, Y position
+ *
+ *
+ * 4
+ * upper right corner, X position
+ *
+ *
+ * 5
+ * upper right corner, Y position
+ *
+ *
+ * 6
+ * upper left corner, X position
+ *
+ *
+ * 7
+ * upper left corner, Y position
+ *
+ *
+ *
+ *
+ *
+ * The points are relative to the text regardless of the
+ * angle, so "upper left" means in the top left-hand
+ * corner seeing the text horizontally.
+ *
+ * On failure, FALSE is returned.
  * @throws ImageException
  *
  */
-function imagefilter($image, int $filtertype, int $arg1 = null, int $arg2 = null, int $arg3 = null, int $arg4 = null): void
+function imageftbbox(float $size, float $angle, string $font_filename, string $string, array $options = []): array
 {
     error_clear_last();
-    if ($arg4 !== null) {
-        $result = \imagefilter($image, $filtertype, $arg1, $arg2, $arg3, $arg4);
-    } elseif ($arg3 !== null) {
-        $result = \imagefilter($image, $filtertype, $arg1, $arg2, $arg3);
-    } elseif ($arg2 !== null) {
-        $result = \imagefilter($image, $filtertype, $arg1, $arg2);
-    } elseif ($arg1 !== null) {
-        $result = \imagefilter($image, $filtertype, $arg1);
-    } else {
-        $result = \imagefilter($image, $filtertype);
-    }
+    $result = \imageftbbox($size, $angle, $font_filename, $string, $options);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
+    return $result;
 }
 
 
 /**
- * Flips the image image using the given
- * mode.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ *
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param int $mode Flip mode, this can be one of the IMG_FLIP_* constants:
+ * @param float $size The font size to use in points.
+ * @param float $angle The angle in degrees, with 0 degrees being left-to-right reading text.
+ * Higher values represent a counter-clockwise rotation. For example, a
+ * value of 90 would result in bottom-to-top reading text.
+ * @param int $x The coordinates given by x and
+ * y will define the basepoint of the first
+ * character (roughly the lower-left corner of the character). This
+ * is different from the imagestring, where
+ * x and y define the
+ * upper-left corner of the first character. For example, "top left"
+ * is 0, 0.
+ * @param int $y The y-ordinate. This sets the position of the fonts baseline, not the
+ * very bottom of the character.
+ * @param int $color The index of the desired color for the text, see
+ * imagecolorexact.
+ * @param string $font_filename The path to the TrueType font you wish to use.
  *
+ * Depending on which version of the GD library PHP is using, when
+ * font_filename does not begin with a leading
+ * / then .ttf will be appended
+ * to the filename and the library will attempt to search for that
+ * filename along a library-defined font path.
  *
+ * When using versions of the GD library lower than 2.0.18, a space character,
+ * rather than a semicolon, was used as the 'path separator' for different font files.
+ * Unintentional use of this feature will result in the warning message:
+ * Warning: Could not find/open font. For these affected versions, the
+ * only solution is moving the font to a path which does not contain spaces.
  *
+ * In many cases where a font resides in the same directory as the script using it
+ * the following trick will alleviate any include problems.
  *
  *
- * Constant
+ * ]]>
+ *
+ * @param string $text Text to be inserted into image.
+ * @param array $options
+ * Possible array indexes for options
+ *
+ *
+ *
+ * Key
+ * Type
  * Meaning
  *
  *
  *
  *
- * IMG_FLIP_HORIZONTAL
+ * linespacing
+ * float
+ * Defines drawing linespacing
  *
- * Flips the image horizontally.
  *
  *
  *
- * IMG_FLIP_VERTICAL
+ * @return array This function returns an array defining the four points of the box, starting in the lower left and moving counter-clockwise:
  *
- * Flips the image vertically.
  *
  *
  *
- * IMG_FLIP_BOTH
+ * 0
+ * lower left x-coordinate
  *
- * Flips the image both horizontally and vertically.
+ *
+ * 1
+ * lower left y-coordinate
+ *
+ *
+ * 2
+ * lower right x-coordinate
+ *
+ *
+ * 3
+ * lower right y-coordinate
+ *
+ *
+ * 4
+ * upper right x-coordinate
+ *
+ *
+ * 5
+ * upper right y-coordinate
+ *
+ *
+ * 6
+ * upper left x-coordinate
+ *
+ *
+ * 7
+ * upper left y-coordinate
  *
  *
  *
  *
  *
+ * On failure, FALSE is returned.
  * @throws ImageException
  *
  */
-function imageflip($image, int $mode): void
+function imagefttext($image, float $size, float $angle, int $x, int $y, int $color, string $font_filename, string $text, array $options = []): array
 {
     error_clear_last();
-    $result = \imageflip($image, $mode);
+    $result = \imagefttext($image, $size, $angle, $x, $y, $color, $font_filename, $text, $options);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
+    return $result;
 }
 
 
@@ -1446,17 +1651,17 @@ function imageflip($image, int $mode): void
  * Applies gamma correction to the given gd image
  * given an input and an output gamma.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param float $inputgamma The input gamma.
- * @param float $outputgamma The output gamma.
+ * @param float $input_gamma The input gamma.
+ * @param float $output_gamma The output gamma.
  * @throws ImageException
  *
  */
-function imagegammacorrect($image, float $inputgamma, float $outputgamma): void
+function imagegammacorrect($image, float $input_gamma, float $output_gamma): void
 {
     error_clear_last();
-    $result = \imagegammacorrect($image, $inputgamma, $outputgamma);
+    $result = \imagegammacorrect($image, $input_gamma, $output_gamma);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -1464,18 +1669,22 @@ function imagegammacorrect($image, float $inputgamma, float $outputgamma): void
 
 
 /**
- * Outputs a GD image to the given to.
+ * Outputs a GD image to the given file.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param string|resource|null $to The path or an open stream resource (which is automatically being closed after this function returns) to save the file to. If not set or NULL, the raw image stream will be outputted directly.
+ * @param string|resource|null $file The path or an open stream resource (which is automatically being closed after this function returns) to save the file to. If not set or NULL, the raw image stream will be outputted directly.
  * @throws ImageException
  *
  */
-function imagegd($image, $to = null): void
+function imagegd($image, $file = null): void
 {
     error_clear_last();
-    $result = \imagegd($image, $to);
+    if ($file !== null) {
+        $result = \imagegd($image, $file);
+    } else {
+        $result = \imagegd($image);
+    }
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -1483,22 +1692,30 @@ function imagegd($image, $to = null): void
 
 
 /**
- * Outputs a GD2 image to the given to.
+ * Outputs a GD2 image to the given file.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param string|resource|null $to The path or an open stream resource (which is automatically being closed after this function returns) to save the file to. If not set or NULL, the raw image stream will be outputted directly.
+ * @param string|resource|null $file The path or an open stream resource (which is automatically being closed after this function returns) to save the file to. If not set or NULL, the raw image stream will be outputted directly.
  * @param int $chunk_size Chunk size.
- * @param int $type Either IMG_GD2_RAW or
+ * @param int $mode Either IMG_GD2_RAW or
  * IMG_GD2_COMPRESSED. Default is
  * IMG_GD2_RAW.
  * @throws ImageException
  *
  */
-function imagegd2($image, $to = null, int $chunk_size = 128, int $type = IMG_GD2_RAW): void
+function imagegd2($image, $file = null, int $chunk_size = 128, int $mode = IMG_GD2_RAW): void
 {
     error_clear_last();
-    $result = \imagegd2($image, $to, $chunk_size, $type);
+    if ($mode !== IMG_GD2_RAW) {
+        $result = \imagegd2($image, $file, $chunk_size, $mode);
+    } elseif ($chunk_size !== 128) {
+        $result = \imagegd2($image, $file, $chunk_size);
+    } elseif ($file !== null) {
+        $result = \imagegd2($image, $file);
+    } else {
+        $result = \imagegd2($image);
+    }
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -1507,7 +1724,7 @@ function imagegd2($image, $to = null, int $chunk_size = 128, int $type = IMG_GD2
 
 /**
  * imagegif creates the GIF
- * file in to from the image image. The
+ * file in file from the image image. The
  * image argument is the return from the
  * imagecreate or imagecreatefrom*
  * function.
@@ -1517,17 +1734,17 @@ function imagegd2($image, $to = null, int $chunk_size = 128, int $type = IMG_GD2
  * imagecolortransparent, in which case the
  * image format will be GIF89a.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param string|resource|null $to The path or an open stream resource (which is automatically being closed after this function returns) to save the file to. If not set or NULL, the raw image stream will be outputted directly.
+ * @param string|resource|null $file The path or an open stream resource (which is automatically being closed after this function returns) to save the file to. If not set or NULL, the raw image stream will be outputted directly.
  * @throws ImageException
  *
  */
-function imagegif($image, $to = null): void
+function imagegif($image, $file = null): void
 {
     error_clear_last();
-    if ($to !== null) {
-        $result = \imagegif($image, $to);
+    if ($file !== null) {
+        $result = \imagegif($image, $file);
     } else {
         $result = \imagegif($image);
     }
@@ -1540,7 +1757,7 @@ function imagegif($image, $to = null): void
 /**
  * Grabs a screenshot of the whole screen.
  *
- * @return resource Returns an image resource identifier on success, FALSE on failure.
+ * @return resource Returns an image object on success, FALSE on failure.
  * @throws ImageException
  *
  */
@@ -1555,46 +1772,26 @@ function imagegrabscreen()
 }
 
 
-/**
- * Grabs a window or its client area using a windows handle (HWND property in COM instance)
- *
- * @param int $window_handle The HWND window ID.
- * @param int $client_area Include the client area of the application window.
- * @return resource Returns an image resource identifier on success, FALSE on failure.
- * @throws ImageException
- *
- */
-function imagegrabwindow(int $window_handle, int $client_area = 0)
-{
-    error_clear_last();
-    $result = \imagegrabwindow($window_handle, $client_area);
-    if ($result === false) {
-        throw ImageException::createFromPhpError();
-    }
-    return $result;
-}
-
-
 /**
  * imagejpeg creates a JPEG file from
  * the given image.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param string|resource|null $to The path or an open stream resource (which is automatically being closed after this function returns) to save the file to. If not set or NULL, the raw image stream will be outputted directly.
+ * @param string|resource|null $file The path or an open stream resource (which is automatically being closed after this function returns) to save the file to. If not set or NULL, the raw image stream will be outputted directly.
  * @param int $quality quality is optional, and ranges from 0 (worst
  * quality, smaller file) to 100 (best quality, biggest file). The
  * default (-1) uses the default IJG quality value (about 75).
  * @throws ImageException
  *
  */
-function imagejpeg($image, $to = null, int $quality = -1): void
+function imagejpeg($image, $file = null, int $quality = -1): void
 {
     error_clear_last();
     if ($quality !== -1) {
-        $result = \imagejpeg($image, $to, $quality);
-    } elseif ($to !== null) {
-        $result = \imagejpeg($image, $to);
+        $result = \imagejpeg($image, $file, $quality);
+    } elseif ($file !== null) {
+        $result = \imagejpeg($image, $file);
     } else {
         $result = \imagejpeg($image);
     }
@@ -1607,7 +1804,7 @@ function imagejpeg($image, $to = null, int $quality = -1): void
 /**
  * Set the alpha blending flag to use layering effects.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $effect One of the following constants:
  *
@@ -1672,7 +1869,7 @@ function imagelayereffect($image, int $effect): void
 /**
  * Draws a line between the two given points.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $x1 x-coordinate for first point.
  * @param int $y1 y-coordinate for first point.
@@ -1696,7 +1893,7 @@ function imageline($image, int $x1, int $y1, int $x2, int $y2, int $color): void
  * imageloadfont loads a user-defined bitmap and returns
  * its identifier.
  *
- * @param string $file The font file format is currently binary and architecture
+ * @param string $filename The font file format is currently binary and architecture
  * dependent.  This means you should generate the font files on the
  * same type of CPU as the machine you are running PHP on.
  *
@@ -1749,10 +1946,10 @@ function imageline($image, int $x1, int $y1, int $x2, int $y2, int $color): void
  * @throws ImageException
  *
  */
-function imageloadfont(string $file): int
+function imageloadfont(string $filename): int
 {
     error_clear_last();
-    $result = \imageloadfont($file);
+    $result = \imageloadfont($filename);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -1764,9 +1961,9 @@ function imageloadfont(string $file): int
  * Outputs or saves a PNG image from the given
  * image.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param string|resource|null $to The path or an open stream resource (which is automatically being closed after this function returns) to save the file to. If not set or NULL, the raw image stream will be outputted directly.
+ * @param string|resource|null $file The path or an open stream resource (which is automatically being closed after this function returns) to save the file to. If not set or NULL, the raw image stream will be outputted directly.
  *
  * NULL is invalid if the quality and
  * filters arguments are not used.
@@ -1782,15 +1979,15 @@ function imageloadfont(string $file): int
  * @throws ImageException
  *
  */
-function imagepng($image, $to = null, int $quality = -1, int $filters = -1): void
+function imagepng($image, $file = null, int $quality = -1, int $filters = -1): void
 {
     error_clear_last();
     if ($filters !== -1) {
-        $result = \imagepng($image, $to, $quality, $filters);
+        $result = \imagepng($image, $file, $quality, $filters);
     } elseif ($quality !== -1) {
-        $result = \imagepng($image, $to, $quality);
-    } elseif ($to !== null) {
-        $result = \imagepng($image, $to);
+        $result = \imagepng($image, $file, $quality);
+    } elseif ($file !== null) {
+        $result = \imagepng($image, $file);
     } else {
         $result = \imagepng($image);
     }
@@ -1804,7 +2001,7 @@ function imagepng($image, $to = null, int $quality = -1, int $filters = -1): voi
  * imagerectangle creates a rectangle starting at
  * the specified coordinates.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $x1 Upper left x coordinate.
  * @param int $y1 Upper left y coordinate
@@ -1825,6 +2022,48 @@ function imagerectangle($image, int $x1, int $y1, int $x2, int $y2, int $color):
 }
 
 
+/**
+ * imageresolution allows to set and get the resolution of
+ * an image in DPI (dots per inch). If the optional parameters are NULL,
+ * the current resolution is returned as an indexed array. If only
+ * resolution_x is not NULL, the horizontal and vertical resolution
+ * are set to this value. If none of the optional parameters are NULL, the horizontal
+ * and vertical resolution are set to these values, respectively.
+ *
+ * The resolution is only used as meta information when images are read from and
+ * written to formats supporting this kind of information (curently PNG and
+ * JPEG). It does not affect any drawing operations. The default resolution
+ * for new images is 96 DPI.
+ *
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
+ * such as imagecreatetruecolor.
+ * @param int $resolution_x The horizontal resolution in DPI.
+ * @param int $resolution_y The vertical resolution in DPI.
+ * @return mixed When used as getter,
+ * it returns an indexed array of the horizontal and vertical resolution on
+ * success.
+ * When used as setter, it returns
+ * TRUE on success.
+ * @throws ImageException
+ *
+ */
+function imageresolution($image, int $resolution_x = null, int $resolution_y = null)
+{
+    error_clear_last();
+    if ($resolution_y !== null) {
+        $result = \imageresolution($image, $resolution_x, $resolution_y);
+    } elseif ($resolution_x !== null) {
+        $result = \imageresolution($image, $resolution_x);
+    } else {
+        $result = \imageresolution($image);
+    }
+    if ($result === false) {
+        throw ImageException::createFromPhpError();
+    }
+    return $result;
+}
+
+
 /**
  * Rotates the image image using the given
  * angle in degrees.
@@ -1832,20 +2071,20 @@ function imagerectangle($image, int $x1, int $y1, int $x2, int $y2, int $color):
  * The center of rotation is the center of the image, and the rotated
  * image may have different dimensions than the original image.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param float $angle Rotation angle, in degrees. The rotation angle is interpreted as the
  * number of degrees to rotate the image anticlockwise.
- * @param int $bgd_color Specifies the color of the uncovered zone after the rotation
+ * @param int $background_color Specifies the color of the uncovered zone after the rotation
  * @param bool $ignore_transparent This parameter is unused.
- * @return resource Returns an image resource for the rotated image.
+ * @return resource Returns an image object for the rotated image.
  * @throws ImageException
  *
  */
-function imagerotate($image, float $angle, int $bgd_color, bool $ignore_transparent = false)
+function imagerotate($image, float $angle, int $background_color, bool $ignore_transparent = false)
 {
     error_clear_last();
-    $result = \imagerotate($image, $angle, $bgd_color, $ignore_transparent);
+    $result = \imagerotate($image, $angle, $background_color, $ignore_transparent);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -1861,16 +2100,16 @@ function imagerotate($image, float $angle, int $bgd_color, bool $ignore_transpar
  * Alphablending has to be disabled (imagealphablending($im, false))
  * to retain the alpha-channel in the first place.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param bool $saveflag Whether to save the alpha channel or not. Defaults to FALSE.
+ * @param bool $enable Whether to save the alpha channel or not. Defaults to FALSE.
  * @throws ImageException
  *
  */
-function imagesavealpha($image, bool $saveflag): void
+function imagesavealpha($image, bool $enable): void
 {
     error_clear_last();
-    $result = \imagesavealpha($image, $saveflag);
+    $result = \imagesavealpha($image, $enable);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -1881,10 +2120,10 @@ function imagesavealpha($image, bool $saveflag): void
  * imagescale scales an image using the given
  * interpolation algorithm.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param int $new_width The width to scale the image to.
- * @param int $new_height The height to scale the image to. If omitted or negative, the aspect
+ * @param int $width The width to scale the image to.
+ * @param int $height The height to scale the image to. If omitted or negative, the aspect
  * ratio will be preserved.
  * @param int $mode One of IMG_NEAREST_NEIGHBOUR,
  * IMG_BILINEAR_FIXED,
@@ -1896,14 +2135,14 @@ function imagesavealpha($image, bool $saveflag): void
  * IMG_WEIGHTED4 is not yet supported.
  *
  *
- * @return resource Return the scaled image resource on success.
+ * @return resource Return the scaled image object on success.
  * @throws ImageException
  *
  */
-function imagescale($image, int $new_width, int $new_height = -1, int $mode = IMG_BILINEAR_FIXED)
+function imagescale($image, int $width, int $height = -1, int $mode = IMG_BILINEAR_FIXED)
 {
     error_clear_last();
-    $result = \imagescale($image, $new_width, $new_height, $mode);
+    $result = \imagescale($image, $width, $height, $mode);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -1918,9 +2157,9 @@ function imagescale($image, int $new_width, int $new_height = -1, int $mode = IM
  * colors IMG_COLOR_BRUSHED or
  * IMG_COLOR_STYLEDBRUSHED.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param resource $brush An image resource.
+ * @param resource $brush An image object.
  * @throws ImageException
  *
  */
@@ -1938,7 +2177,7 @@ function imagesetbrush($image, $brush): void
  * imagesetclip sets the current clipping rectangle, i.e.
  * the area beyond which no pixels will be drawn.
  *
- * @param resource $im An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $x1 The x-coordinate of the upper left corner.
  * @param int $y1 The y-coordinate of the upper left corner.
@@ -1947,10 +2186,10 @@ function imagesetbrush($image, $brush): void
  * @throws ImageException
  *
  */
-function imagesetclip($im, int $x1, int $y1, int $x2, int $y2): void
+function imagesetclip($image, int $x1, int $y1, int $x2, int $y2): void
 {
     error_clear_last();
-    $result = \imagesetclip($im, $x1, $y1, $x2, $y2);
+    $result = \imagesetclip($image, $x1, $y1, $x2, $y2);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -1961,7 +2200,7 @@ function imagesetclip($im, int $x1, int $y1, int $x2, int $y2): void
  * Sets the interpolation method, setting an interpolation method affects the rendering
  * of various functions in GD, such as the imagerotate function.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $method The interpolation method, which can be one of the following:
  *
@@ -2088,7 +2327,7 @@ function imagesetinterpolation($image, int $method = IMG_BILINEAR_FIXED): void
  * imagesetpixel draws a pixel at the specified
  * coordinate.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $x x-coordinate.
  * @param int $y y-coordinate.
@@ -2113,7 +2352,7 @@ function imagesetpixel($image, int $x, int $y, int $color): void
  * color IMG_COLOR_STYLED or lines of images with color
  * IMG_COLOR_STYLEDBRUSHED.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param array $style An array of pixel colors. You can use the
  * IMG_COLOR_TRANSPARENT constant to add a
@@ -2137,7 +2376,7 @@ function imagesetstyle($image, array $style): void
  * drawn when drawing rectangles, polygons, arcs etc. to
  * thickness pixels.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $thickness Thickness, in pixels.
  * @throws ImageException
@@ -2164,9 +2403,9 @@ function imagesetthickness($image, int $thickness): void
  * image with imagecolortransparent, a tile allows certain parts
  * of the underlying area to shine through can be created.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param resource $tile The image resource to be used as a tile.
+ * @param resource $tile The image object to be used as a tile.
  * @throws ImageException
  *
  */
@@ -2183,7 +2422,7 @@ function imagesettile($image, $tile): void
 /**
  * Draws a string at the given coordinates.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $font Can be 1, 2, 3, 4, 5 for built-in
  * fonts in latin2 encoding (where higher numbers corresponding to larger fonts) or any of your
@@ -2209,7 +2448,7 @@ function imagestring($image, int $font, int $x, int $y, string $string, int $col
  * Draws a string vertically at the given
  * coordinates.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param int $font Can be 1, 2, 3, 4, 5 for built-in
  * fonts in latin2 encoding (where higher numbers corresponding to larger fonts) or any of your
@@ -2232,9 +2471,9 @@ function imagestringup($image, int $font, int $x, int $y, string $string, int $c
 
 
 /**
- * Returns the width of the given image resource.
+ * Returns the width of the given image object.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @return int Return the width of the images.
  * @throws ImageException
@@ -2252,9 +2491,9 @@ function imagesx($image): int
 
 
 /**
- * Returns the height of the given image resource.
+ * Returns the height of the given image object.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @return int Return the height of the images.
  * @throws ImageException
@@ -2281,19 +2520,19 @@ function imagesy($image): int
  * usually best to simply produce a truecolor output image instead, which
  * guarantees the highest output quality.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param bool $dither Indicates if the image should be dithered - if it is TRUE then
  * dithering will be used which will result in a more speckled image but
  * with better color approximation.
- * @param int $ncolors Sets the maximum number of colors that should be retained in the palette.
+ * @param int $num_colors Sets the maximum number of colors that should be retained in the palette.
  * @throws ImageException
  *
  */
-function imagetruecolortopalette($image, bool $dither, int $ncolors): void
+function imagetruecolortopalette($image, bool $dither, int $num_colors): void
 {
     error_clear_last();
-    $result = \imagetruecolortopalette($image, $dither, $ncolors);
+    $result = \imagetruecolortopalette($image, $dither, $num_colors);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -2305,8 +2544,8 @@ function imagetruecolortopalette($image, bool $dither, int $ncolors): void
  * for a TrueType text.
  *
  * @param float $size The font size in points.
- * @param float $angle Angle in degrees in which text will be measured.
- * @param string $fontfile The path to the TrueType font you wish to use.
+ * @param float $angle Angle in degrees in which string will be measured.
+ * @param string $font_filename The path to the TrueType font you wish to use.
  *
  * Depending on which version of the GD library PHP is using, when
  * fontfile does not begin with a leading
@@ -2329,7 +2568,8 @@ function imagetruecolortopalette($image, bool $dither, int $ncolors): void
  *
  * Note that open_basedir does
  * not apply to fontfile.
- * @param string $text The string to be measured.
+ * @param string $string The string to be measured.
+ * @param array $options
  * @return array imagettfbbox returns an array with 8
  * elements representing four points making the bounding box of the
  * text on success and FALSE on error.
@@ -2384,10 +2624,10 @@ function imagetruecolortopalette($image, bool $dither, int $ncolors): void
  * @throws ImageException
  *
  */
-function imagettfbbox(float $size, float $angle, string $fontfile, string $text): array
+function imagettfbbox(float $size, float $angle, string $font_filename, string $string, array $options = []): array
 {
     error_clear_last();
-    $result = \imagettfbbox($size, $angle, $fontfile, $text);
+    $result = \imagettfbbox($size, $angle, $font_filename, $string, $options);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -2399,7 +2639,7 @@ function imagettfbbox(float $size, float $angle, string $fontfile, string $text)
  * Writes the given text into the image using TrueType
  * fonts.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param float $size The font size in points.
  * @param float $angle The angle in degrees, with 0 degrees being left-to-right reading text.
@@ -2416,7 +2656,7 @@ function imagettfbbox(float $size, float $angle, string $fontfile, string $text)
  * very bottom of the character.
  * @param int $color The color index. Using the negative of a color index has the effect of
  * turning off antialiasing. See imagecolorallocate.
- * @param string $fontfile The path to the TrueType font you wish to use.
+ * @param string $font_filename The path to the TrueType font you wish to use.
  *
  * Depending on which version of the GD library PHP is using, when
  * fontfile does not begin with a leading
@@ -2452,6 +2692,7 @@ function imagettfbbox(float $size, float $angle, string $fontfile, string $text)
  *
  * If a character is used in the string which is not supported by the
  * font, a hollow rectangle will replace the character.
+ * @param array $options
  * @return array Returns an array with 8 elements representing four points making the
  * bounding box of the text. The order of the points is lower left, lower
  * right, upper right, upper left. The points are relative to the text
@@ -2460,10 +2701,10 @@ function imagettfbbox(float $size, float $angle, string $fontfile, string $text)
  * @throws ImageException
  *
  */
-function imagettftext($image, float $size, float $angle, int $x, int $y, int $color, string $fontfile, string $text): array
+function imagettftext($image, float $size, float $angle, int $x, int $y, int $color, string $font_filename, string $text, array $options = []): array
 {
     error_clear_last();
-    $result = \imagettftext($image, $size, $angle, $x, $y, $color, $fontfile, $text);
+    $result = \imagettftext($image, $size, $angle, $x, $y, $color, $font_filename, $text, $options);
     if ($result === false) {
         throw ImageException::createFromPhpError();
     }
@@ -2475,22 +2716,22 @@ function imagettftext($image, float $size, float $angle, int $x, int $y, int $co
  * imagewbmp outputs or save a WBMP
  * version of the given image.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param string|resource|null $to The path or an open stream resource (which is automatically being closed after this function returns) to save the file to. If not set or NULL, the raw image stream will be outputted directly.
- * @param int $foreground You can set the foreground color with this parameter by setting an
+ * @param string|resource|null $file The path or an open stream resource (which is automatically being closed after this function returns) to save the file to. If not set or NULL, the raw image stream will be outputted directly.
+ * @param int $foreground_color You can set the foreground color with this parameter by setting an
  * identifier obtained from imagecolorallocate.
  * The default foreground color is black.
  * @throws ImageException
  *
  */
-function imagewbmp($image, $to = null, int $foreground = null): void
+function imagewbmp($image, $file = null, int $foreground_color = null): void
 {
     error_clear_last();
-    if ($foreground !== null) {
-        $result = \imagewbmp($image, $to, $foreground);
-    } elseif ($to !== null) {
-        $result = \imagewbmp($image, $to);
+    if ($foreground_color !== null) {
+        $result = \imagewbmp($image, $file, $foreground_color);
+    } elseif ($file !== null) {
+        $result = \imagewbmp($image, $file);
     } else {
         $result = \imagewbmp($image);
     }
@@ -2503,21 +2744,21 @@ function imagewbmp($image, $to = null, int $foreground = null): void
 /**
  * Outputs or saves a WebP version of the given image.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
- * @param string|resource|null $to The path or an open stream resource (which is automatically being closed after this function returns) to save the file to. If not set or NULL, the raw image stream will be outputted directly.
+ * @param string|resource|null $file The path or an open stream resource (which is automatically being closed after this function returns) to save the file to. If not set or NULL, the raw image stream will be outputted directly.
  * @param int $quality quality ranges from 0 (worst
  * quality, smaller file) to 100 (best quality, biggest file).
  * @throws ImageException
  *
  */
-function imagewebp($image, $to = null, int $quality = 80): void
+function imagewebp($image, $file = null, int $quality = -1): void
 {
     error_clear_last();
-    if ($quality !== 80) {
-        $result = \imagewebp($image, $to, $quality);
-    } elseif ($to !== null) {
-        $result = \imagewebp($image, $to);
+    if ($quality !== -1) {
+        $result = \imagewebp($image, $file, $quality);
+    } elseif ($file !== null) {
+        $result = \imagewebp($image, $file);
     } else {
         $result = \imagewebp($image);
     }
@@ -2531,7 +2772,7 @@ function imagewebp($image, $to = null, int $quality = 80): void
  * Outputs or save an XBM version of the given
  * image.
  *
- * @param resource $image An image resource, returned by one of the image creation functions,
+ * @param resource $image A GdImage object, returned by one of the image creation functions,
  * such as imagecreatetruecolor.
  * @param string|resource|null $filename The path to save the file to, given as string. If NULL, the raw image stream will be output directly.
  *
@@ -2540,18 +2781,18 @@ function imagewebp($image, $to = null, int $quality = 80): void
  * alphanumeric characters of the current locale are substituted by
  * underscores. If filename is set to NULL,
  * image is used to build the C identifiers.
- * @param int $foreground You can set the foreground color with this parameter by setting an
+ * @param int $foreground_color You can set the foreground color with this parameter by setting an
  * identifier obtained from imagecolorallocate.
  * The default foreground color is black. All other colors are treated as
  * background.
  * @throws ImageException
  *
  */
-function imagexbm($image, $filename, int $foreground = null): void
+function imagexbm($image, $filename, int $foreground_color = null): void
 {
     error_clear_last();
-    if ($foreground !== null) {
-        $result = \imagexbm($image, $filename, $foreground);
+    if ($foreground_color !== null) {
+        $result = \imagexbm($image, $filename, $foreground_color);
     } else {
         $result = \imagexbm($image, $filename);
     }
diff --git a/generated/ingres-ii.php b/generated/ingres-ii.php
deleted file mode 100644
index dee0195e..00000000
--- a/generated/ingres-ii.php
+++ /dev/null
@@ -1,720 +0,0 @@
-<?php
-
-namespace Safe;
-
-use Safe\Exceptions\IngresiiException;
-
-/**
- * ingres_autocommit is called before opening a
- * transaction (before the first call to
- * ingres_query or just after a call to
- * ingres_rollback or
- * ingres_commit) to switch the
- * autocommit mode of the server on or off (when the script begins
- * the autocommit mode is off).
- *
- * When autocommit mode is on, every query is automatically
- * committed by the server, as if ingres_commit
- * was called after every call to ingres_query.
- * To see if autocommit is enabled use,
- * ingres_autocommit_state.
- *
- * By default Ingres will rollback any uncommitted transactions at the end of
- * a request. Use this function or ingres_commit to
- * ensure your data is committed to the database.
- *
- * @param resource $link The connection link identifier
- * @throws IngresiiException
- *
- */
-function ingres_autocommit($link): void
-{
-    error_clear_last();
-    $result = \ingres_autocommit($link);
-    if ($result === false) {
-        throw IngresiiException::createFromPhpError();
-    }
-}
-
-
-/**
- * ingres_close closes the connection to
- * the Ingres server that is associated with the specified link.
- *
- * ingres_close is usually unnecessary, as it
- * will not close persistent connections and all non-persistent connections
- * are automatically closed at the end of the script.
- *
- * @param resource $link The connection link identifier
- * @throws IngresiiException
- *
- */
-function ingres_close($link): void
-{
-    error_clear_last();
-    $result = \ingres_close($link);
-    if ($result === false) {
-        throw IngresiiException::createFromPhpError();
-    }
-}
-
-
-/**
- * ingres_commit commits the currently open
- * transaction, making all changes made to the database permanent.
- *
- * This closes the transaction. A new transaction can be opened by sending a
- * query with ingres_query.
- *
- * You can also have the server commit automatically after every
- * query by calling ingres_autocommit before
- * opening the transaction.
- *
- * By default Ingres will roll back any uncommitted transactions at the end of
- * a request. Use this function or ingres_autocommit to
- * ensure your that data is committed to the database.
- *
- * @param resource $link The connection link identifier
- * @throws IngresiiException
- *
- */
-function ingres_commit($link): void
-{
-    error_clear_last();
-    $result = \ingres_commit($link);
-    if ($result === false) {
-        throw IngresiiException::createFromPhpError();
-    }
-}
-
-
-/**
- * ingres_connect opens a connection with the
- * given Ingres database.
- *
- * The connection is closed when the script ends or when
- * ingres_close is called on this link.
- *
- * @param string $database The database name. Must follow the syntax:
- *
- * [vnode::]dbname[/svr_class]
- * @param string $username The Ingres user name
- * @param string $password The password associated with username
- * @param array $options ingres_connect options
- *
- *
- *
- *
- * Option name
- * Option type
- * Description
- * Example
- *
- *
- *
- *
- * date_century_boundary
- * int
- * The threshold by which a 2-digit year is determined to be in
- * the current century or in the next century. Equivalent to II_DATE_CENTURY_BOUNDARY.
- * 50
- *
- *
- * group
- * string
- * Specifies the group ID of the user, equivalent to the "-G"
- * flag
- * payroll
- *
- *
- * role
- * string
- * The role ID of the application. If a role password is
- * required, the parameter value should be specified as "role/password"
- *
- *
- * effective_user
- * string
- * The ingres user account being impersonated, equivalent to the "-u" flag
- * another_user
- *
- *
- * dbms_password
- * string
- * The internal database password for the user connecting to Ingres
- * s3cr3t
- *
- *
- * table_structure
- * string
- *
- * The default structure for new tables.
- * Valid values for table_structure are:
- *
- * INGRES_STRUCTURE_BTREE
- * INGRES_STRUCTURE_HASH
- * INGRES_STRUCTURE_HEAP
- * INGRES_STRUCTURE_ISAM
- * INGRES_STRUCTURE_CBTREE
- * INGRES_STRUCTURE_CISAM
- * INGRES_STRUCTURE_CHASH
- * INGRES_STRUCTURE_CHEAP
- *
- *
- *
- * INGRES_STRUCTURE_BTREE
- *
- *
- * index_structure
- * string
- *
- * The default structure for new secondary indexes. Valid values
- * for index_structure are:
- *
- * INGRES_STRUCTURE_CBTREE
- * INGRES_STRUCTURE_CISAM
- * INGRES_STRUCTURE_CHASH
- * INGRES_STRUCTURE_BTREE
- * INGRES_STRUCTURE_HASH
- * INGRES_STRUCTURE_ISAM
- *
- *
- *
- * INGRES_STRUCTURE_HASH
- *
- *
- * login_local
- * bool
- * Determines how the connection user ID and password are
- * used when a VNODE is included in the target database string.
- * If set to TRUE, the user ID and password are used to locally access
- * the VNODE, and the VNODE login information is used to establish the DBMS
- * connection. If set to FALSE, the process user ID is used to access
- * the VNODE, and the connection user ID and password are used in place
- * of the VNODE login information to establish the DBMS connection.
- * This parameter is ignored if no VNODE is included in the target
- * database string. The default is FALSE.
- * TRUE
- *
- *
- * timezone
- * string
- * Controls the timezone of the session. If not set it will
- * default to the value defined by II_TIMEZONE_NAME. If
- * II_TIMEZONE_NAME is not defined, NA-PACIFIC (GMT-8 with Daylight
- * Savings) is used.
- *
- *
- * date_format
- * int
- * Sets the allowable input and output format for Ingres dates.
- * Defaults to the value defined by II_DATE_FORMAT. If II_DATE_FORMAT is
- * not set the default date format is US, e.g. mm/dd/yy. Valid values
- * for date_format are:
- *
- * INGRES_DATE_DMY
- * INGRES_DATE_FINISH
- * INGRES_DATE_GERMAN
- * INGRES_DATE_ISO
- * INGRES_DATE_ISO4
- * INGRES_DATE_MDY
- * INGRES_DATE_MULTINATIONAL
- * INGRES_DATE_MULTINATIONAL4
- * INGRES_DATE_YMD
- * INGRES_DATE_US
- *
- *
- *
- * INGRES_DATE_MULTINATIONAL4
- *
- *
- * decimal_separator
- * string
- * The character identifier for decimal data
- * ","
- *
- *
- * money_lort
- * int
- * Leading or trailing currency sign. Valid values for money_lort
- * are:
- *
- * INGRES_MONEY_LEADING
- * INGRES_MONEY_TRAILING
- *
- *
- *
- * INGRES_MONEY_TRAILING
- *
- *
- * money_sign
- * string
- * The currency symbol to be used with the MONEY datatype
- * €
- *
- *
- * money_precision
- * int
- * The precision of the MONEY datatype
- * 3
- *
- *
- * float4_precision
- * int
- * Precision of the FLOAT4 datatype
- * 10
- *
- *
- * float8_precision
- * int
- * Precision of the FLOAT8 data
- * 10
- *
- *
- * blob_segment_length
- * int
- * The amount of data in bytes to fetch at a time when retrieving
- * BLOB or CLOB data, defaults to 4096 bytes when not explicitly set
- * 8192
- *
- *
- *
- *
- *
- * The default structure for new tables.
- * Valid values for table_structure are:
- *
- * INGRES_STRUCTURE_BTREE
- * INGRES_STRUCTURE_HASH
- * INGRES_STRUCTURE_HEAP
- * INGRES_STRUCTURE_ISAM
- * INGRES_STRUCTURE_CBTREE
- * INGRES_STRUCTURE_CISAM
- * INGRES_STRUCTURE_CHASH
- * INGRES_STRUCTURE_CHEAP
- *
- *
- * The default structure for new secondary indexes. Valid values
- * for index_structure are:
- *
- * INGRES_STRUCTURE_CBTREE
- * INGRES_STRUCTURE_CISAM
- * INGRES_STRUCTURE_CHASH
- * INGRES_STRUCTURE_BTREE
- * INGRES_STRUCTURE_HASH
- * INGRES_STRUCTURE_ISAM
- *
- *
- * Sets the allowable input and output format for Ingres dates.
- * Defaults to the value defined by II_DATE_FORMAT. If II_DATE_FORMAT is
- * not set the default date format is US, e.g. mm/dd/yy. Valid values
- * for date_format are:
- *
- * INGRES_DATE_DMY
- * INGRES_DATE_FINISH
- * INGRES_DATE_GERMAN
- * INGRES_DATE_ISO
- * INGRES_DATE_ISO4
- * INGRES_DATE_MDY
- * INGRES_DATE_MULTINATIONAL
- * INGRES_DATE_MULTINATIONAL4
- * INGRES_DATE_YMD
- * INGRES_DATE_US
- *
- *
- * Leading or trailing currency sign. Valid values for money_lort
- * are:
- *
- * INGRES_MONEY_LEADING
- * INGRES_MONEY_TRAILING
- *
- * @return resource Returns a Ingres link resource on success
- * @throws IngresiiException
- *
- */
-function ingres_connect(string $database = null, string $username = null, string $password = null, array $options = null)
-{
-    error_clear_last();
-    if ($options !== null) {
-        $result = \ingres_connect($database, $username, $password, $options);
-    } elseif ($password !== null) {
-        $result = \ingres_connect($database, $username, $password);
-    } elseif ($username !== null) {
-        $result = \ingres_connect($database, $username);
-    } elseif ($database !== null) {
-        $result = \ingres_connect($database);
-    } else {
-        $result = \ingres_connect();
-    }
-    if ($result === false) {
-        throw IngresiiException::createFromPhpError();
-    }
-    return $result;
-}
-
-
-/**
- * Execute a query prepared using ingres_prepare.
- *
- * @param resource $result The result query identifier
- * @param array $params An array of parameter values to be used with the query
- * @param string $types A string containing a sequence of types for the parameter values
- * passed. See the types parameter in
- * ingres_query for the list of type codes.
- * @throws IngresiiException
- *
- */
-function ingres_execute($result, array $params = null, string $types = null): void
-{
-    error_clear_last();
-    if ($types !== null) {
-        $result = \ingres_execute($result, $params, $types);
-    } elseif ($params !== null) {
-        $result = \ingres_execute($result, $params);
-    } else {
-        $result = \ingres_execute($result);
-    }
-    if ($result === false) {
-        throw IngresiiException::createFromPhpError();
-    }
-}
-
-
-/**
- * ingres_field_name returns the name of a field
- * in a query result.
- *
- * @param resource $result The query result identifier
- * @param int $index index is the field whose name will be
- * retrieved.
- *
- * The possible values of index depend upon
- * the value
- * of ingres.array_index_start.
- * If ingres.array_index_start
- * is 1 (the default)
- * then index must be
- * between 1 and the value returned
- * by ingres_num_fields. If ingres.array_index_start
- * is 0 then index must
- * be between 0
- * and ingres_num_fields -
- * 1.
- * @return string Returns the name of a field
- * in a query result
- * @throws IngresiiException
- *
- */
-function ingres_field_name($result, int $index): string
-{
-    error_clear_last();
-    $result = \ingres_field_name($result, $index);
-    if ($result === false) {
-        throw IngresiiException::createFromPhpError();
-    }
-    return $result;
-}
-
-
-/**
- * Get the type of a field in a query result.
- *
- * @param resource $result The query result identifier
- * @param int $index index is the field whose type will be
- * retrieved.
- *
- * The possible values of index depend upon
- * the value
- * of ingres.array_index_start.
- * If ingres.array_index_start
- * is 1 (the default)
- * then index must be
- * between 1 and the value returned
- * by ingres_num_fields. If ingres.array_index_start
- * is 0 then index must
- * be between 0
- * and ingres_num_fields -
- * 1.
- * @return string ingres_field_type returns the type of a
- * field in a query result.  Examples of
- * types returned are IIAPI_BYTE_TYPE,
- * IIAPI_CHA_TYPE, IIAPI_DTE_TYPE,
- * IIAPI_FLT_TYPE, IIAPI_INT_TYPE,
- * IIAPI_VCH_TYPE. Some of these types can map to more
- * than one SQL type depending on the length of the field (see
- * ingres_field_length). For example
- * IIAPI_FLT_TYPE can be a float4 or a float8. For detailed
- * information, see the Ingres OpenAPI User Guide, Appendix
- * "Data Types" in the Ingres documentation.
- * @throws IngresiiException
- *
- */
-function ingres_field_type($result, int $index): string
-{
-    error_clear_last();
-    $result = \ingres_field_type($result, $index);
-    if ($result === false) {
-        throw IngresiiException::createFromPhpError();
-    }
-    return $result;
-}
-
-
-/**
- *
- *
- * @param resource $result The query result identifier
- * @throws IngresiiException
- *
- */
-function ingres_free_result($result): void
-{
-    error_clear_last();
-    $result = \ingres_free_result($result);
-    if ($result === false) {
-        throw IngresiiException::createFromPhpError();
-    }
-}
-
-
-/**
- * Open a persistent connection to an Ingres database.
- *
- * There are only two differences between this function and
- * ingres_connect: First, when connecting, the
- * function will initially try to find a (persistent) link that is
- * already opened with the same parameters.  If one is found, an
- * identifier for it will be returned instead of opening a new
- * connection. Second, the connection to the Ingres server will not
- * be closed when the execution of the script ends.  Instead, the
- * link will remain open for future use
- * (ingres_close will not close links
- * established by ingres_pconnect). This type
- * of link is therefore called "persistent".
- *
- * @param string $database The database name. Must follow the syntax:
- *
- * [vnode::]dbname[/svr_class]
- * @param string $username The Ingres user name
- * @param string $password The password associated with username
- * @param array $options See ingres_connect for the list of options that
- * can be passed
- * @return resource Returns an Ingres link resource on success
- * @throws IngresiiException
- *
- */
-function ingres_pconnect(string $database = null, string $username = null, string $password = null, array $options = null)
-{
-    error_clear_last();
-    if ($options !== null) {
-        $result = \ingres_pconnect($database, $username, $password, $options);
-    } elseif ($password !== null) {
-        $result = \ingres_pconnect($database, $username, $password);
-    } elseif ($username !== null) {
-        $result = \ingres_pconnect($database, $username);
-    } elseif ($database !== null) {
-        $result = \ingres_pconnect($database);
-    } else {
-        $result = \ingres_pconnect();
-    }
-    if ($result === false) {
-        throw IngresiiException::createFromPhpError();
-    }
-    return $result;
-}
-
-
-/**
- * This function is used to position the cursor associated with the result
- * resource before issuing a fetch.  If ingres.array_index_start
- * is set to 0 then the first row is 0 else it is 1.
- * ingres_result_seek can be used only with queries that
- * make use of scrollable
- * cursors. It cannot be used with
- * ingres_unbuffered_query.
- *
- * @param resource $result The result identifier for a query
- * @param int $position The row to position the cursor on. If ingres.array_index_start
- * is set to 0, then the first row is 0, else it is 1
- * @throws IngresiiException
- *
- */
-function ingres_result_seek($result, int $position): void
-{
-    error_clear_last();
-    $result = \ingres_result_seek($result, $position);
-    if ($result === false) {
-        throw IngresiiException::createFromPhpError();
-    }
-}
-
-
-/**
- * ingres_rollback rolls back the currently
- * open transaction, actually cancelling all changes made to the
- * database during the transaction.
- *
- * This closes the transaction. A new transaction can be opened by sending a
- * query with ingres_query.
- *
- * @param resource $link The connection link identifier
- * @throws IngresiiException
- *
- */
-function ingres_rollback($link): void
-{
-    error_clear_last();
-    $result = \ingres_rollback($link);
-    if ($result === false) {
-        throw IngresiiException::createFromPhpError();
-    }
-}
-
-
-/**
- * ingres_set_environment is called to set environmental
- * options that affect the output of certain values from Ingres, such as the
- * timezone, date format, decimal character separator, and float precision.
- *
- * @param resource $link The connection link identifier
- * @param array $options An enumerated array of option name/value pairs. The following table
- * lists the option name and the expected type
- *
- *
- *
- *
- *
- * Option name
- * Option type
- * Description
- * Example
- *
- *
- *
- *
- * date_century_boundary
- * int
- * The threshold by which a 2-digit year is determined to be in
- * the current century or in the next century. Equivalent to II_DATE_CENTURY_BOUNDARY
- * 50
- *
- *
- * timezone
- * string
- * Controls the timezone of the session. If not set, it will
- * default the value defined by II_TIMEZONE_NAME. If
- * II_TIMEZONE_NAME is not defined, NA-PACIFIC (GMT-8 with Daylight
- * Savings) is used.
- * UNITED-KINGDOM
- *
- *
- * date_format
- * int
- * Sets the allowable input and output format for Ingres dates.
- * Defaults to the value defined by II_DATE_FORMAT. If II_DATE_FORMAT is
- * not set, the default date format is US, for example mm/dd/yy. Valid values
- * for date_format are:
- *
- * INGRES_DATE_DMY
- * INGRES_DATE_FINISH
- * INGRES_DATE_GERMAN
- * INGRES_DATE_ISO
- * INGRES_DATE_ISO4
- * INGRES_DATE_MDY
- * INGRES_DATE_MULTINATIONAL
- * INGRES_DATE_MULTINATIONAL4
- * INGRES_DATE_YMD
- * INGRES_DATE_US
- *
- *
- *
- * INGRES_DATE_ISO4
- *
- *
- * decimal_separator
- * string
- * The character identifier for decimal data
- * ","
- *
- *
- * money_lort
- * int
- * Leading or trailing currency sign. Valid values for money_lort
- * are:
- *
- * INGRES_MONEY_LEADING
- * INGRES_MONEY_TRAILING
- *
- *
- *
- * INGRES_MONEY_LEADING
- *
- *
- * money_sign
- * string
- * The currency symbol to be used with the MONEY datatype
- * €
- *
- *
- * money_precision
- * int
- * The precision of the MONEY datatype
- * 2
- *
- *
- * float4_precision
- * int
- * Precision of the FLOAT4 datatype
- * 10
- *
- *
- * float8_precision
- * int
- * Precision of the FLOAT8 data
- * 10
- *
- *
- * blob_segment_length
- * int
- * The amount of data in bytes to fetch at a time when retrieving
- * BLOB or CLOB data. Defaults to 4096 bytes when not set explicitly
- * 8192
- *
- *
- *
- *
- *
- * Sets the allowable input and output format for Ingres dates.
- * Defaults to the value defined by II_DATE_FORMAT. If II_DATE_FORMAT is
- * not set, the default date format is US, for example mm/dd/yy. Valid values
- * for date_format are:
- *
- * INGRES_DATE_DMY
- * INGRES_DATE_FINISH
- * INGRES_DATE_GERMAN
- * INGRES_DATE_ISO
- * INGRES_DATE_ISO4
- * INGRES_DATE_MDY
- * INGRES_DATE_MULTINATIONAL
- * INGRES_DATE_MULTINATIONAL4
- * INGRES_DATE_YMD
- * INGRES_DATE_US
- *
- *
- * Leading or trailing currency sign. Valid values for money_lort
- * are:
- *
- * INGRES_MONEY_LEADING
- * INGRES_MONEY_TRAILING
- *
- * @throws IngresiiException
- *
- */
-function ingres_set_environment($link, array $options): void
-{
-    error_clear_last();
-    $result = \ingres_set_environment($link, $options);
-    if ($result === false) {
-        throw IngresiiException::createFromPhpError();
-    }
-}
diff --git a/generated/ldap.php b/generated/ldap.php
index b579ac29..27bb8517 100644
--- a/generated/ldap.php
+++ b/generated/ldap.php
@@ -57,7 +57,7 @@ function ldap_add_ext($ldap, string $dn, array $entry, array $controls = null)
 /**
  * Add entries in the LDAP directory.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param string $dn The distinguished name of an LDAP entity.
  * @param array $entry An array that specifies the information about the entry. The values in
  * the entries are indexed by individual attributes.
@@ -120,7 +120,7 @@ function ldap_bind_ext($ldap, ?string $dn = null, ?string $password = null, arra
 /**
  * Binds to the LDAP directory with specified RDN and password.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param string|null $dn
  * @param string|null $password
  * @throws LdapException
@@ -145,7 +145,7 @@ function ldap_bind($ldap, ?string $dn = null, ?string $password = null): void
 /**
  * Retrieve the pagination information send by the server.
  *
- * @param resource $link An LDAP link identifier, returned by ldap_connect.
+ * @param resource $link An LDAP resource, returned by ldap_connect.
  * @param resource $result
  * @param string|null $cookie An opaque structure sent by the server.
  * @param int|null $estimated The estimated number of entries to retrieve.
@@ -165,7 +165,7 @@ function ldap_control_paged_result_response($link, $result, ?string &$cookie = n
 /**
  * Enable LDAP pagination by sending the pagination control (page size, cookie...).
  *
- * @param resource $link An LDAP link identifier, returned by ldap_connect.
+ * @param resource $link An LDAP resource, returned by ldap_connect.
  * @param int $pagesize The number of entries by page.
  * @param bool $iscritical Indicates whether the pagination is critical or not.
  * If true and if the server doesn't support pagination, the search
@@ -189,8 +189,8 @@ function ldap_control_paged_result($link, int $pagesize, bool $iscritical = fals
  * Returns the number of entries stored in the result of previous search
  * operations.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
- * @param resource $result The internal LDAP result.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
+ * @param resource $result An LDAP result resource, returned by ldap_list or ldap_search.
  * @return int Returns number of entries in the result.
  * @throws LdapException
  *
@@ -234,7 +234,7 @@ function ldap_delete_ext($ldap, string $dn, array $controls = null)
 /**
  * Deletes a particular entry in LDAP directory.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param string $dn The distinguished name of an LDAP entity.
  * @param array $controls Array of LDAP Controls to send with the request.
  * @throws LdapException
@@ -277,7 +277,7 @@ function ldap_dn2ufn(string $dn): string
 /**
  * Performs a PASSWD extended operation.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param string $user dn of the user to change the password of.
  * @param string $old_password The old password of this user. May be ommited depending of server configuration.
  * @param string $new_password The new password for this user. May be omitted or empty to have a generated password.
@@ -303,7 +303,7 @@ function ldap_exop_passwd($ldap, string $user = "", string $old_password = "", s
 /**
  * Performs a WHOAMI extended operation and returns the data.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @return string|bool The data returned by the server.
  * @throws LdapException
  *
@@ -324,7 +324,7 @@ function ldap_exop_whoami($ldap)
  * reqoid the OID of the operation and
  * reqdata the data.
  *
- * @param resource $link An LDAP link identifier, returned by ldap_connect.
+ * @param resource $link An LDAP resource, returned by ldap_connect.
  * @param string $reqoid The extended operation request OID. You may use one of LDAP_EXOP_START_TLS, LDAP_EXOP_MODIFY_PASSWD, LDAP_EXOP_REFRESH, LDAP_EXOP_WHO_AM_I, LDAP_EXOP_TURN, or a string with the OID of the operation you want to send.
  * @param string $reqdata The extended operation request data. May be NULL for some operations like LDAP_EXOP_WHO_AM_I, may also need to be BER encoded.
  * @param array|null $serverctrls Array of LDAP Controls to send with the request.
@@ -393,7 +393,7 @@ function ldap_explode_dn(string $dn, int $with_attrib): array
  * Similar to reading entries, attributes are also read one by one from a
  * particular entry.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param resource $entry
  * @return string Returns the first attribute in the entry on success and FALSE on
  * error.
@@ -420,10 +420,9 @@ function ldap_first_attribute($ldap, $entry): string
  * ldap_first_entry and
  * ldap_next_entry functions.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
- * @param resource $result
- * @return resource Returns the result entry identifier for the first entry on success and
- * FALSE on error.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
+ * @param resource $result An LDAP result resource, returned by ldap_list or ldap_search.
+ * @return resource Returns the result entry identifier for the first entry on success.
  * @throws LdapException
  *
  */
@@ -447,14 +446,14 @@ function ldap_first_entry($ldap, $result)
  * return large result sets, ldap_free_result could be
  * called to keep the runtime memory usage by the script low.
  *
- * @param resource $ldap
+ * @param resource $result An LDAP result resource, returned by ldap_list or ldap_search.
  * @throws LdapException
  *
  */
-function ldap_free_result($ldap): void
+function ldap_free_result($result): void
 {
     error_clear_last();
-    $result = \ldap_free_result($ldap);
+    $result = \ldap_free_result($result);
     if ($result === false) {
         throw LdapException::createFromPhpError();
     }
@@ -476,7 +475,7 @@ function ldap_free_result($ldap): void
  *
  *
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param resource $entry
  * @return array Returns a complete entry information in a multi-dimensional array
  * on success and FALSE on error.
@@ -497,7 +496,7 @@ function ldap_get_attributes($ldap, $entry): array
 /**
  * Finds out the DN of an entry in the result.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param resource $entry
  * @return string Returns the DN of the result entry and FALSE on error.
  * @throws LdapException
@@ -518,10 +517,10 @@ function ldap_get_dn($ldap, $entry): string
  * Reads multiple entries from the given result, and then reading the
  * attributes and multiple values.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
- * @param resource $result
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
+ * @param resource $result An LDAP result resource, returned by ldap_list or ldap_search.
  * @return array Returns a complete result information in a multi-dimensional array on
- * success and FALSE on error.
+ * success.
  *
  * The structure of the array is as follows.
  * The attribute index is converted to lowercase. (Attributes are
@@ -549,7 +548,7 @@ function ldap_get_entries($ldap, $result): array
 /**
  * Sets value to the value of the specified option.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param int $option The parameter option can be one of:
  *
  *
@@ -744,7 +743,7 @@ function ldap_get_option($ldap, int $option, &$value = null): void
  * This function is used exactly like ldap_get_values
  * except that it handles binary data and not string data.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param resource $entry
  * @param string $attribute
  * @return array Returns an array of values for the attribute on success and FALSE on
@@ -777,7 +776,7 @@ function ldap_get_values_len($ldap, $entry, string $attribute): array
  * the ldap_get_attributes call to work out
  * what attributes exist for a given entry.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param resource $entry
  * @param string $attribute
  * @return array Returns an array of values for the attribute on success and FALSE on
@@ -819,7 +818,7 @@ function ldap_get_values($ldap, $entry, string $attribute): array
  * (Equivalent to typing "ls" and getting a list of files and folders in the
  * current working directory.)
  *
- * @param resource|array $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource|array $ldap An LDAP resource, returned by ldap_connect.
  * @param string $base The base DN for the directory.
  * @param string $filter
  * @param array $attributes An array of the required attributes, e.g. array("mail", "sn", "cn").
@@ -927,7 +926,7 @@ function ldap_mod_add_ext($ldap, string $dn, array $entry, array $controls = nul
  * Adds one or more attribute values to the specified dn.
  * To add a whole new object see ldap_add function.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param string $dn The distinguished name of an LDAP entity.
  * @param array $entry An associative array listing the attirbute values to add. If an attribute was not existing yet it will be added. If an attribute is existing you can only add values to it if it supports multiple values.
  * @param array $controls Array of LDAP Controls to send with the request.
@@ -979,7 +978,7 @@ function ldap_mod_del_ext($ldap, string $dn, array $entry, array $controls = nul
  * Object deletions are done by the
  * ldap_delete function.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param string $dn The distinguished name of an LDAP entity.
  * @param array $entry
  * @param array $controls Array of LDAP Controls to send with the request.
@@ -1030,7 +1029,7 @@ function ldap_mod_replace_ext($ldap, string $dn, array $entry, array $controls =
  * Replaces one or more attributes from the specified dn.
  * It may also add or remove attributes.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param string $dn The distinguished name of an LDAP entity.
  * @param array $entry An associative array listing the attributes to replace. Sending an empty array as value will remove the attribute, while sending an attribute not existing yet on this entry will add it.
  * @param array $controls Array of LDAP Controls to send with the request.
@@ -1055,7 +1054,7 @@ function ldap_mod_replace($ldap, string $dn, array $entry, array $controls = nul
  * Modifies an existing entry in the LDAP directory. Allows detailed
  * specification of the modifications to perform.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param string $dn The distinguished name of an LDAP entity.
  * @param array $modifications_info An array that specifies the modifications to make. Each entry in this
  * array is an associative array with two or three keys:
@@ -1156,7 +1155,7 @@ function ldap_modify_batch($ldap, string $dn, array $modifications_info, array $
  * entry returned from
  * ldap_first_attribute.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param resource $entry
  * @return string Returns the next attribute in an entry on success and FALSE on
  * error.
@@ -1177,7 +1176,7 @@ function ldap_next_attribute($ldap, $entry): string
 /**
  * Parse LDAP extended operation data from result object result
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param resource $result An LDAP result resource, returned by ldap_exop.
  * @param string|null $response_data Will be filled by the response data.
  * @param string|null $response_oid Will be filled by the response OID.
@@ -1197,9 +1196,8 @@ function ldap_parse_exop($ldap, $result, ?string &$response_data = null, ?string
 /**
  * Parses an LDAP search result.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
- * @param resource $result An LDAP result resource, returned by ldap_list or
- * ldap_search.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
+ * @param resource $result An LDAP result resource, returned by ldap_list or ldap_search.
  * @param int|null $error_code A reference to a variable that will be set to the LDAP error code in
  * the result, or 0 if no error occurred.
  * @param string|null $matched_dn A reference to a variable that will be set to a matched DN if one was
@@ -1228,7 +1226,7 @@ function ldap_parse_result($ldap, $result, ?int &$error_code, ?string &$matched_
  * directory with the scope LDAP_SCOPE_BASE. So it is
  * equivalent to reading an entry from the directory.
  *
- * @param resource|array $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource|array $ldap An LDAP resource, returned by ldap_connect.
  * @param string $base The base DN for the directory.
  * @param string $filter An empty filter is not allowed. If you want to retrieve absolutely all
  * information for this entry, use a filter of
@@ -1341,7 +1339,7 @@ function ldap_rename_ext($ldap, string $dn, string $new_rdn, string $new_parent,
 /**
  * The entry specified by dn is renamed/moved.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @param string $dn The distinguished name of an LDAP entity.
  * @param string $new_rdn The new RDN.
  * @param string $new_parent The new parent/superior entry.
@@ -1425,7 +1423,7 @@ function ldap_sasl_bind($ldap, string $dn = null, string $password = null, strin
  * normal search returns FALSE while the parallel search returns an
  * identifier.
  *
- * @param resource|array $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource|array $ldap An LDAP resource, returned by ldap_connect.
  * @param string $base The base DN for the directory.
  * @param string $filter The search filter can be simple or advanced, using boolean operators in
  * the format described in the LDAP documentation (see the Netscape Directory SDK or
@@ -1509,7 +1507,7 @@ function ldap_search($ldap, string $base, string $filter, array $attributes = []
 /**
  * Sets the value of the specified option to be value.
  *
- * @param resource|null $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource|null $ldap An LDAP resource, returned by ldap_connect.
  * @param int $option The parameter option can be one of:
  *
  *
@@ -1695,7 +1693,7 @@ function ldap_set_option($ldap, int $option, $value): void
 /**
  * Unbinds from the LDAP directory.
  *
- * @param resource $ldap An LDAP link identifier, returned by ldap_connect.
+ * @param resource $ldap An LDAP resource, returned by ldap_connect.
  * @throws LdapException
  *
  */
diff --git a/generated/misc.php b/generated/misc.php
index 95bfa6a6..3c14aa12 100644
--- a/generated/misc.php
+++ b/generated/misc.php
@@ -7,7 +7,7 @@
 /**
  * Defines a named constant at runtime.
  *
- * @param string $name The name of the constant.
+ * @param string $constant_name The name of the constant.
  *
  * It is possible to define constants with reserved or
  * even invalid names, whose value can (only) be retrieved with
@@ -28,10 +28,10 @@
  * @throws MiscException
  *
  */
-function define(string $name, $value, bool $case_insensitive = false): void
+function define(string $constant_name, $value, bool $case_insensitive = false): void
 {
     error_clear_last();
-    $result = \define($name, $value, $case_insensitive);
+    $result = \define($constant_name, $value, $case_insensitive);
     if ($result === false) {
         throw MiscException::createFromPhpError();
     }
@@ -256,7 +256,7 @@ function hrtime(bool $as_number = false)
  *
  *
  * Z
- * NUL-padded string (new in PHP 5.5)
+ * NUL-padded string
  *
  *
  * @
diff --git a/generated/mysqli.php b/generated/mysqli.php
index 083a7df6..13839c6c 100644
--- a/generated/mysqli.php
+++ b/generated/mysqli.php
@@ -6,7 +6,6 @@
 
 /**
  * Returns client per-process statistics.
- * Available only with mysqlnd.
  *
  * @return array Returns an array with client stats if success, FALSE otherwise.
  * @throws MysqliException
diff --git a/generated/mysqlndMs.php b/generated/mysqlndMs.php
deleted file mode 100644
index 2fd4f32a..00000000
--- a/generated/mysqlndMs.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-namespace Safe;
-
-use Safe\Exceptions\MysqlndMsException;
-
-/**
- * Returns a list of currently configured servers.
- *
- * @param mixed $connection A MySQL connection handle obtained from any of the
- * connect functions of the mysqli,
- * mysql or
- * PDO_MYSQL extensions.
- * @return array FALSE on error. Otherwise, returns an array with two entries
- * masters and slaves each of which contains
- * an array listing all corresponding servers.
- *
- * The function can be used to check and debug the list of servers currently
- * used by the plugin. It is mostly useful when the list of servers changes at
- * runtime, for example, when using MySQL Fabric.
- *
- * masters and slaves server entries
- * @throws MysqlndMsException
- *
- */
-function mysqlnd_ms_dump_servers($connection): array
-{
-    error_clear_last();
-    $result = \mysqlnd_ms_dump_servers($connection);
-    if ($result === false) {
-        throw MysqlndMsException::createFromPhpError();
-    }
-    return $result;
-}
-
-
-/**
- * MySQL Fabric related.
- *
- * Switch the connection to the nodes handling global sharding queries
- * for the given table name.
- *
- * @param mixed $connection A MySQL connection handle obtained from any of the
- * connect functions of the mysqli,
- * mysql or
- * PDO_MYSQL extensions.
- * @param mixed $table_name The table name to ask Fabric about.
- * @return array FALSE on error. Otherwise, TRUE
- * @throws MysqlndMsException
- *
- */
-function mysqlnd_ms_fabric_select_global($connection, $table_name): array
-{
-    error_clear_last();
-    $result = \mysqlnd_ms_fabric_select_global($connection, $table_name);
-    if ($result === false) {
-        throw MysqlndMsException::createFromPhpError();
-    }
-    return $result;
-}
-
-
-/**
- * MySQL Fabric related.
- *
- * Switch the connection to the shards responsible for the
- * given table name and shard key.
- *
- * @param mixed $connection A MySQL connection handle obtained from any of the
- * connect functions of the mysqli,
- * mysql or
- * PDO_MYSQL extensions.
- * @param mixed $table_name The table name to ask Fabric about.
- * @param mixed $shard_key The shard key to ask Fabric about.
- * @return array FALSE on error. Otherwise, TRUE
- * @throws MysqlndMsException
- *
- */
-function mysqlnd_ms_fabric_select_shard($connection, $table_name, $shard_key): array
-{
-    error_clear_last();
-    $result = \mysqlnd_ms_fabric_select_shard($connection, $table_name, $shard_key);
-    if ($result === false) {
-        throw MysqlndMsException::createFromPhpError();
-    }
-    return $result;
-}
-
-
-/**
- * Returns an array which describes the last used connection from the plugins
- * connection pool currently pointed to by the user connection handle. If using the
- * plugin, a user connection handle represents a pool of database connections.
- * It is not possible to tell from the user connection handles properties to which
- * database server from the pool the user connection handle points.
- *
- * The function can be used to debug or monitor PECL mysqlnd_ms.
- *
- * @param mixed $connection A MySQL connection handle obtained from any of the
- * connect functions of the mysqli,
- * mysql or
- * PDO_MYSQL extensions.
- * @return array FALSE on error. Otherwise, an
- * array which describes the connection used to
- * execute the last statement on.
- *
- * Array which describes the connection.
- * @throws MysqlndMsException
- *
- */
-function mysqlnd_ms_get_last_used_connection($connection): array
-{
-    error_clear_last();
-    $result = \mysqlnd_ms_get_last_used_connection($connection);
-    if ($result === false) {
-        throw MysqlndMsException::createFromPhpError();
-    }
-    return $result;
-}
diff --git a/generated/mysqlndQc.php b/generated/mysqlndQc.php
deleted file mode 100644
index 9a99a379..00000000
--- a/generated/mysqlndQc.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace Safe;
-
-use Safe\Exceptions\MysqlndQcException;
-
-/**
- * Flush all cache contents.
- *
- * Flushing the cache is a storage handler responsibility.
- * All built-in storage handler but the
- * memcache storage
- * handler support flushing the cache. The
- * memcache
- * storage handler cannot flush its cache contents.
- *
- * User-defined storage handler may or may not support the operation.
- *
- * @throws MysqlndQcException
- *
- */
-function mysqlnd_qc_clear_cache(): void
-{
-    error_clear_last();
-    $result = \mysqlnd_qc_clear_cache();
-    if ($result === false) {
-        throw MysqlndQcException::createFromPhpError();
-    }
-}
-
-
-/**
- * Installs a callback which decides whether a statement is cached.
- *
- * There are several ways of hinting PELC/mysqlnd_qc to cache a query.
- * By default, PECL/mysqlnd_qc attempts to cache a if caching of all statements
- * is enabled or the query string begins with a certain SQL hint.
- * The plugin internally calls a function named is_select()
- * to find out. This internal function can be replaced with a user-defined callback.
- * Then, the user-defined callback is responsible to decide whether the plugin
- * attempts to cache a statement. Because the internal function is replaced
- * with the callback, the callback gains full control. The callback is free
- * to ignore the configuration setting mysqlnd_qc.cache_by_default
- * and SQL hints.
- *
- * The callback is invoked for every statement inspected by the plugin.
- * It is given the statements string as a parameter. The callback returns
- * FALSE if the statement shall not be cached. It returns TRUE to
- * make the plugin attempt to cache the statements result set, if any.
- * A so-created cache entry is given the default TTL set with the
- * PHP configuration directive mysqlnd_qc.ttl.
- * If a different TTL shall be used, the callback returns a numeric
- * value to be used as the TTL.
- *
- * The internal is_select function is part of the internal
- * cache storage handler interface. Thus, a user-defined storage handler
- * offers the same capabilities.
- *
- * @param string $callback
- * @return mixed Returns TRUE on success.
- * @throws MysqlndQcException
- *
- */
-function mysqlnd_qc_set_is_select(string $callback)
-{
-    error_clear_last();
-    $result = \mysqlnd_qc_set_is_select($callback);
-    if ($result === false) {
-        throw MysqlndQcException::createFromPhpError();
-    }
-    return $result;
-}
-
-
-/**
- * Sets the storage handler used by the query cache. A list of available
- * storage handler can be obtained from
- * mysqlnd_qc_get_available_handlers.
- * Which storage are available depends on the compile time
- * configuration of the query cache plugin. The
- * default storage handler is always available.
- * All other storage handler must be enabled explicitly when building the
- * extension.
- *
- * @param string $handler Handler can be of type string representing the name of a
- * built-in storage handler or an object of type
- * mysqlnd_qc_handler_default.
- * The names of the built-in storage handler are
- * default,
- * APC,
- * MEMCACHE,
- * sqlite.
- * @throws MysqlndQcException
- *
- */
-function mysqlnd_qc_set_storage_handler(string $handler): void
-{
-    error_clear_last();
-    $result = \mysqlnd_qc_set_storage_handler($handler);
-    if ($result === false) {
-        throw MysqlndQcException::createFromPhpError();
-    }
-}
diff --git a/generated/network.php b/generated/network.php
index 007b21c5..49c621e5 100644
--- a/generated/network.php
+++ b/generated/network.php
@@ -208,7 +208,7 @@ function closelog(): void
  *
  *
  *
- * A6(PHP &gt;= 5.1.0)
+ * A6
  *
  * masklen: Length (in bits) to inherit from the target
  * specified by chain.
@@ -608,6 +608,39 @@ function openlog(string $prefix, int $flags, int $facility): void
 }
 
 
+/**
+ * This function behaves exactly as fsockopen with the
+ * difference that the connection is not closed after the script finishes.
+ * It is the persistent version of fsockopen.
+ *
+ * @param string $hostname
+ * @param int $port
+ * @param int|null $errno
+ * @param string|null $errstr
+ * @param float $timeout
+ * @return resource pfsockopen returns a file pointer which may be used
+ * together with the other file functions (such as
+ * fgets, fgetss,
+ * fwrite, fclose, and
+ * feof).
+ * @throws NetworkException
+ *
+ */
+function pfsockopen(string $hostname, int $port = -1, ?int &$errno = null, ?string &$errstr = null, float $timeout = null)
+{
+    error_clear_last();
+    if ($timeout !== null) {
+        $result = \pfsockopen($hostname, $port, $errno, $errstr, $timeout);
+    } else {
+        $result = \pfsockopen($hostname, $port, $errno, $errstr);
+    }
+    if ($result === false) {
+        throw NetworkException::createFromPhpError();
+    }
+    return $result;
+}
+
+
 /**
  * syslog generates a log message that will be
  * distributed by the system logger.
@@ -666,10 +699,7 @@ function openlog(string $prefix, int $flags, int $facility): void
  *
  *
  *
- * @param string $message The message to send, except that the two characters
- * %m will be replaced by the error message string
- * (strerror) corresponding to the present value of
- * errno.
+ * @param string $message The message to send.
  * @throws NetworkException
  *
  */
diff --git a/generated/oci8.php b/generated/oci8.php
index 2966fbb4..0aa39db7 100644
--- a/generated/oci8.php
+++ b/generated/oci8.php
@@ -168,7 +168,7 @@ function oci_bind_array_by_name($statement, string $name, array &$var_array, int
  * SQL statement, as this can be a security risk if unfiltered user
  * text is concatenated.
  *
- * @param resource $statement A valid OCI8 statement identifer.
+ * @param resource $statement A valid OCI8 statement identifier.
  * @param string $bv_name The colon-prefixed bind variable placeholder used in the
  * statement.  The colon is optional
  * in bv_name. Oracle does not use question
@@ -869,7 +869,7 @@ function oci_field_type($statement, $field)
 /**
  * Frees a descriptor allocated by oci_new_descriptor.
  *
- * @param resource $descriptor
+ * @param resource $descriptor Descriptor allocated by oci_new_descriptor.
  * @throws Oci8Exception
  *
  */
diff --git a/generated/openssl.php b/generated/openssl.php
index 5d6664e6..c3e5965a 100644
--- a/generated/openssl.php
+++ b/generated/openssl.php
@@ -801,15 +801,15 @@ function openssl_pkcs7_encrypt(string $input_filename, string $output_filename,
 /**
  *
  *
- * @param string $input_filename
- * @param array|null $certificates
+ * @param string $data The string of data you wish to parse (p7b format).
+ * @param array|null $certificates The array of PEM certificates from the p7b input data.
  * @throws OpensslException
  *
  */
-function openssl_pkcs7_read(string $input_filename, ?array &$certificates): void
+function openssl_pkcs7_read(string $data, ?array &$certificates): void
 {
     error_clear_last();
-    $result = \openssl_pkcs7_read($input_filename, $certificates);
+    $result = \openssl_pkcs7_read($data, $certificates);
     if ($result === false) {
         throw OpensslException::createFromPhpError();
     }
diff --git a/generated/password.php b/generated/password.php
index 85d91250..0529d014 100644
--- a/generated/password.php
+++ b/generated/password.php
@@ -90,6 +90,11 @@
  *
  *
  *
+ * Only available when PHP use libargon2, not with libsodium implementation.
+ *
+ *
+ *
+ *
  *
  * @param string $password The user's password.
  *
diff --git a/generated/pgsql.php b/generated/pgsql.php
index 2a3f7163..d824e282 100644
--- a/generated/pgsql.php
+++ b/generated/pgsql.php
@@ -814,7 +814,7 @@ function pg_lo_export($connection = null, int $oid = null, string $pathname = nu
  * @param  $object_id If an object_id is given the function
  * will try to create a large object with this id, else a free
  * object id is assigned by the server. The parameter
- * was added in PHP 5.3 and relies on functionality that first
+ * relies on functionality that first
  * appeared in PostgreSQL 8.1.
  * @return int The OID of the newly created large object.
  * @throws PgsqlException
diff --git a/generated/readline.php b/generated/readline.php
index 5bc1c84a..ddbf5a35 100644
--- a/generated/readline.php
+++ b/generated/readline.php
@@ -32,38 +32,6 @@ function readline_add_history(string $prompt): void
  * stream_select as it allows interleaving of IO and
  * user input, unlike readline.
  *
- *
- * Readline Callback Interface Example
- *
- * 10) {
- * $prompting = false;
- * readline_callback_handler_remove();
- * } else {
- * readline_callback_handler_install("[$c] Enter something: ", 'rl_callback');
- * }
- * }
- *
- * $c = 1;
- * $prompting = true;
- *
- * readline_callback_handler_install("[$c] Enter something: ", 'rl_callback');
- *
- * while ($prompting) {
- * $w = NULL;
- * $e = NULL;
- * $n = stream_select($r = array(STDIN), $w, $e, null);
- * if ($n && in_array(STDIN, $r)) {
- * // read a character, will call the callback when a newline is entered
- * readline_callback_read_char();
- * }
- * }
- *
- * echo "Prompting disabled. All done.\n";
- * ?>
- * ]]>
- *
- *
- *
  * @param string $prompt The prompt message.
  * @param callable $callback The callback function takes one parameter; the
  * user input returned.
diff --git a/generated/simplexml.php b/generated/simplexml.php
index 9276ab76..410a4d9a 100644
--- a/generated/simplexml.php
+++ b/generated/simplexml.php
@@ -18,7 +18,7 @@
  * @throws SimplexmlException
  *
  */
-function simplexml_import_dom(\DOMNode $node, string $class_name = "SimpleXMLElement"): \SimpleXMLElement
+function simplexml_import_dom(\DOMNode $node, string $class_name = SimpleXMLElement::class): \SimpleXMLElement
 {
     error_clear_last();
     $result = \simplexml_import_dom($node, $class_name);
@@ -33,31 +33,24 @@ function simplexml_import_dom(\DOMNode $node, string $class_name = "SimpleXMLEle
  * Convert the well-formed XML document in the given file to an object.
  *
  * @param string $filename Path to the XML file
- *
- * Libxml 2 unescapes the URI, so if you want to pass e.g.
- * b&amp;c as the URI parameter a,
- * you have to call
- * simplexml_load_file(rawurlencode('http://example.com/?a=' .
- * urlencode('b&amp;c'))). Since PHP 5.1.0 you don't need to do
- * this because PHP will do it for you.
  * @param string $class_name You may use this optional parameter so that
  * simplexml_load_file will return an object of
  * the specified class. That class should extend the
  * SimpleXMLElement class.
- * @param int $options Since PHP 5.1.0 and Libxml 2.6.0, you may also use the
+ * @param int $options Since Libxml 2.6.0, you may also use the
  * options parameter to specify additional Libxml parameters.
- * @param string $ns Namespace prefix or URI.
- * @param bool $is_prefix TRUE if ns is a prefix, FALSE if it's a URI;
+ * @param string $namespace_or_prefix Namespace prefix or URI.
+ * @param bool $is_prefix TRUE if namespace_or_prefix is a prefix, FALSE if it's a URI;
  * defaults to FALSE.
  * @return \SimpleXMLElement Returns an object of class SimpleXMLElement with
  * properties containing the data held within the XML document.
  * @throws SimplexmlException
  *
  */
-function simplexml_load_file(string $filename, string $class_name = "SimpleXMLElement", int $options = 0, string $ns = "", bool $is_prefix = false): \SimpleXMLElement
+function simplexml_load_file(string $filename, string $class_name = SimpleXMLElement::class, int $options = 0, string $namespace_or_prefix = "", bool $is_prefix = false): \SimpleXMLElement
 {
     error_clear_last();
-    $result = \simplexml_load_file($filename, $class_name, $options, $ns, $is_prefix);
+    $result = \simplexml_load_file($filename, $class_name, $options, $namespace_or_prefix, $is_prefix);
     if ($result === false) {
         throw SimplexmlException::createFromPhpError();
     }
@@ -73,20 +66,20 @@ function simplexml_load_file(string $filename, string $class_name = "SimpleXMLEl
  * simplexml_load_string will return an object of
  * the specified class. That class should extend the
  * SimpleXMLElement class.
- * @param int $options Since PHP 5.1.0 and Libxml 2.6.0, you may also use the
+ * @param int $options Since Libxml 2.6.0, you may also use the
  * options parameter to specify additional Libxml parameters.
- * @param string $ns Namespace prefix or URI.
- * @param bool $is_prefix TRUE if ns is a prefix, FALSE if it's a URI;
+ * @param string $namespace_or_prefix Namespace prefix or URI.
+ * @param bool $is_prefix TRUE if namespace_or_prefix is a prefix, FALSE if it's a URI;
  * defaults to FALSE.
  * @return \SimpleXMLElement Returns an object of class SimpleXMLElement with
  * properties containing the data held within the xml document.
  * @throws SimplexmlException
  *
  */
-function simplexml_load_string(string $data, string $class_name = "SimpleXMLElement", int $options = 0, string $ns = "", bool $is_prefix = false): \SimpleXMLElement
+function simplexml_load_string(string $data, string $class_name = SimpleXMLElement::class, int $options = 0, string $namespace_or_prefix = "", bool $is_prefix = false): \SimpleXMLElement
 {
     error_clear_last();
-    $result = \simplexml_load_string($data, $class_name, $options, $ns, $is_prefix);
+    $result = \simplexml_load_string($data, $class_name, $options, $namespace_or_prefix, $is_prefix);
     if ($result === false) {
         throw SimplexmlException::createFromPhpError();
     }
diff --git a/generated/sodium.php b/generated/sodium.php
new file mode 100644
index 00000000..b2b68717
--- /dev/null
+++ b/generated/sodium.php
@@ -0,0 +1,303 @@
+<?php
+
+namespace Safe;
+
+use Safe\Exceptions\SodiumException;
+
+/**
+ * Verify then decrypt with AES-256-GCM.
+ * Only available if sodium_crypto_aead_aes256gcm_is_available returns TRUE.
+ *
+ * @param string $ciphertext Must be in the format provided by sodium_crypto_aead_aes256gcm_encrypt
+ * (ciphertext and tag, concatenated).
+ * @param string $additional_data Additional, authenticated data. This is used in the verification of the authentication tag
+ * appended to the ciphertext, but it is not encrypted or stored in the ciphertext.
+ * @param string $nonce A number that must be only used once, per message. 12 bytes long.
+ * @param string $key Encryption key (256-bit).
+ * @return string Returns the plaintext on success.
+ * @throws SodiumException
+ *
+ */
+function sodium_crypto_aead_aes256gcm_decrypt(string $ciphertext, string $additional_data, string $nonce, string $key): string
+{
+    error_clear_last();
+    $result = \sodium_crypto_aead_aes256gcm_decrypt($ciphertext, $additional_data, $nonce, $key);
+    if ($result === false) {
+        throw SodiumException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Verify then decrypt with ChaCha20-Poly1305.
+ *
+ * @param string $ciphertext Must be in the format provided by sodium_crypto_aead_chacha20poly1305_encrypt
+ * (ciphertext and tag, concatenated).
+ * @param string $additional_data Additional, authenticated data. This is used in the verification of the authentication tag
+ * appended to the ciphertext, but it is not encrypted or stored in the ciphertext.
+ * @param string $nonce A number that must be only used once, per message. 8 bytes long.
+ * @param string $key Encryption key (256-bit).
+ * @return string Returns the plaintext on success.
+ * @throws SodiumException
+ *
+ */
+function sodium_crypto_aead_chacha20poly1305_decrypt(string $ciphertext, string $additional_data, string $nonce, string $key): string
+{
+    error_clear_last();
+    $result = \sodium_crypto_aead_chacha20poly1305_decrypt($ciphertext, $additional_data, $nonce, $key);
+    if ($result === false) {
+        throw SodiumException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Encrypt then authenticate with ChaCha20-Poly1305.
+ *
+ * @param string $message The plaintext message to encrypt.
+ * @param string $additional_data Additional, authenticated data. This is used in the verification of the authentication tag
+ * appended to the ciphertext, but it is not encrypted or stored in the ciphertext.
+ * @param string $nonce A number that must be only used once, per message. 8 bytes long.
+ * @param string $key Encryption key (256-bit).
+ * @return string Returns the ciphertext and tag on success.
+ * @throws SodiumException
+ *
+ */
+function sodium_crypto_aead_chacha20poly1305_encrypt(string $message, string $additional_data, string $nonce, string $key): string
+{
+    error_clear_last();
+    $result = \sodium_crypto_aead_chacha20poly1305_encrypt($message, $additional_data, $nonce, $key);
+    if ($result === false) {
+        throw SodiumException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Verify then decrypt with ChaCha20-Poly1305 (IETF variant).
+ *
+ * The IETF variant uses 96-bit nonces and 32-bit internal counters, instead of 64-bit for both.
+ *
+ * @param string $ciphertext Must be in the format provided by sodium_crypto_aead_chacha20poly1305_ietf_encrypt
+ * (ciphertext and tag, concatenated).
+ * @param string $additional_data Additional, authenticated data. This is used in the verification of the authentication tag
+ * appended to the ciphertext, but it is not encrypted or stored in the ciphertext.
+ * @param string $nonce A number that must be only used once, per message. 12 bytes long.
+ * @param string $key Encryption key (256-bit).
+ * @return string Returns the plaintext on success.
+ * @throws SodiumException
+ *
+ */
+function sodium_crypto_aead_chacha20poly1305_ietf_decrypt(string $ciphertext, string $additional_data, string $nonce, string $key): string
+{
+    error_clear_last();
+    $result = \sodium_crypto_aead_chacha20poly1305_ietf_decrypt($ciphertext, $additional_data, $nonce, $key);
+    if ($result === false) {
+        throw SodiumException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Encrypt then authenticate with ChaCha20-Poly1305 (IETF variant).
+ *
+ * The IETF variant uses 96-bit nonces and 32-bit internal counters, instead of 64-bit for both.
+ *
+ * @param string $message The plaintext message to encrypt.
+ * @param string $additional_data Additional, authenticated data. This is used in the verification of the authentication tag
+ * appended to the ciphertext, but it is not encrypted or stored in the ciphertext.
+ * @param string $nonce A number that must be only used once, per message. 12 bytes long.
+ * @param string $key Encryption key (256-bit).
+ * @return string Returns the ciphertext and tag on success.
+ * @throws SodiumException
+ *
+ */
+function sodium_crypto_aead_chacha20poly1305_ietf_encrypt(string $message, string $additional_data, string $nonce, string $key): string
+{
+    error_clear_last();
+    $result = \sodium_crypto_aead_chacha20poly1305_ietf_encrypt($message, $additional_data, $nonce, $key);
+    if ($result === false) {
+        throw SodiumException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Verify then decrypt with ChaCha20-Poly1305 (eXtended-nonce variant).
+ *
+ * Generally, XChaCha20-Poly1305 is the best of the provided AEAD modes to use.
+ *
+ * @param string $ciphertext Must be in the format provided by sodium_crypto_aead_chacha20poly1305_ietf_encrypt
+ * (ciphertext and tag, concatenated).
+ * @param string $additional_data Additional, authenticated data. This is used in the verification of the authentication tag
+ * appended to the ciphertext, but it is not encrypted or stored in the ciphertext.
+ * @param string $nonce A number that must be only used once, per message. 24 bytes long.
+ * This is a large enough bound to generate randomly (i.e. random_bytes).
+ * @param string $key Encryption key (256-bit).
+ * @return string Returns the plaintext on success.
+ * @throws SodiumException
+ *
+ */
+function sodium_crypto_aead_xchacha20poly1305_ietf_decrypt(string $ciphertext, string $additional_data, string $nonce, string $key): string
+{
+    error_clear_last();
+    $result = \sodium_crypto_aead_xchacha20poly1305_ietf_decrypt($ciphertext, $additional_data, $nonce, $key);
+    if ($result === false) {
+        throw SodiumException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Encrypt then authenticate with XChaCha20-Poly1305 (eXtended-nonce variant).
+ *
+ * Generally, XChaCha20-Poly1305 is the best of the provided AEAD modes to use.
+ *
+ * @param string $message The plaintext message to encrypt.
+ * @param string $additional_data Additional, authenticated data. This is used in the verification of the authentication tag
+ * appended to the ciphertext, but it is not encrypted or stored in the ciphertext.
+ * @param string $nonce A number that must be only used once, per message. 24 bytes long.
+ * This is a large enough bound to generate randomly (i.e. random_bytes).
+ * @param string $key Encryption key (256-bit).
+ * @return string Returns the ciphertext and tag on success.
+ * @throws SodiumException
+ *
+ */
+function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt(string $message, string $additional_data, string $nonce, string $key): string
+{
+    error_clear_last();
+    $result = \sodium_crypto_aead_xchacha20poly1305_ietf_encrypt($message, $additional_data, $nonce, $key);
+    if ($result === false) {
+        throw SodiumException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Verify the authentication tag is valid for a given message and key.
+ *
+ * Unlike with digital signatures (e.g. sodium_crypto_sign_verify_detached),
+ * any party capable of verifying a message is also capable of authenticating
+ * their own messages. (Hence, symmetric authentication.)
+ *
+ * @param string $mac Authentication tag produced by sodium_crypto_auth
+ * @param string $message Message
+ * @param string $key Authentication key
+ * @throws SodiumException
+ *
+ */
+function sodium_crypto_auth_verify(string $mac, string $message, string $key): void
+{
+    error_clear_last();
+    $result = \sodium_crypto_auth_verify($mac, $message, $key);
+    if ($result === false) {
+        throw SodiumException::createFromPhpError();
+    }
+}
+
+
+/**
+ * Decrypt a message using asymmetric (public key) cryptography.
+ *
+ * @param string $ciphertext The encrypted message to attempt to decrypt.
+ * @param string $nonce A number that must be only used once, per message. 24 bytes long.
+ * This is a large enough bound to generate randomly (i.e. random_bytes).
+ * @param string $key_pair See sodium_crypto_box_keypair_from_secretkey_and_publickey.
+ * This should include the sender's public key and the recipient's secret key.
+ * @return string Returns the plaintext message on success.
+ * @throws SodiumException
+ *
+ */
+function sodium_crypto_box_open(string $ciphertext, string $nonce, string $key_pair): string
+{
+    error_clear_last();
+    $result = \sodium_crypto_box_open($ciphertext, $nonce, $key_pair);
+    if ($result === false) {
+        throw SodiumException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Decrypt a message that was encrypted with sodium_crypto_box_seal
+ *
+ * @param string $ciphertext The encrypted message
+ * @param string $key_pair The keypair of the recipient. Must include the secret key.
+ * @return string The plaintext on success.
+ * @throws SodiumException
+ *
+ */
+function sodium_crypto_box_seal_open(string $ciphertext, string $key_pair): string
+{
+    error_clear_last();
+    $result = \sodium_crypto_box_seal_open($ciphertext, $key_pair);
+    if ($result === false) {
+        throw SodiumException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Appends a message to the internal hash state.
+ *
+ * @param string $state The return value of sodium_crypto_generichash_init.
+ * @param string $message Data to append to the hashing state.
+ * @throws SodiumException
+ *
+ */
+function sodium_crypto_generichash_update(string &$state, string $message): void
+{
+    error_clear_last();
+    $result = \sodium_crypto_generichash_update($state, $message);
+    if ($result === false) {
+        throw SodiumException::createFromPhpError();
+    }
+}
+
+
+/**
+ * Verify the signature attached to a message and return the message
+ *
+ * @param string $signed_message A message signed with sodium_crypto_sign
+ * @param string $public_key An Ed25519 public key
+ * @return string Returns the original signed message on success.
+ * @throws SodiumException
+ *
+ */
+function sodium_crypto_sign_open(string $signed_message, string $public_key): string
+{
+    error_clear_last();
+    $result = \sodium_crypto_sign_open($signed_message, $public_key);
+    if ($result === false) {
+        throw SodiumException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Verify signature for the message
+ *
+ * @param string $signature The cryptographic signature obtained from sodium_crypto_sign_detached
+ * @param string $message The message being verified
+ * @param string $public_key Ed25519 public key
+ * @throws SodiumException
+ *
+ */
+function sodium_crypto_sign_verify_detached(string $signature, string $message, string $public_key): void
+{
+    error_clear_last();
+    $result = \sodium_crypto_sign_verify_detached($signature, $message, $public_key);
+    if ($result === false) {
+        throw SodiumException::createFromPhpError();
+    }
+}
diff --git a/generated/spl.php b/generated/spl.php
index d052f11d..926b8924 100644
--- a/generated/spl.php
+++ b/generated/spl.php
@@ -9,8 +9,7 @@
  * given class and its parents implement.
  *
  * @param object|string $class An object (class instance) or a string (class or interface name).
- * @param bool $autoload Whether to allow this function to load the class automatically through
- * the __autoload magic method.
+ * @param bool $autoload Whether to call __autoload by default.
  * @return array An array on success.
  * @throws SplException
  *
@@ -31,8 +30,7 @@ function class_implements($class, bool $autoload = true): array
  * the given class.
  *
  * @param object|string $class An object (class instance) or a string (class name).
- * @param bool $autoload Whether to allow this function to load the class automatically through
- * the __autoload magic method.
+ * @param bool $autoload Whether to call __autoload by default.
  * @return array An array on success.
  * @throws SplException
  *
@@ -54,8 +52,7 @@ function class_parents($class, bool $autoload = true): array
  * any traits used by a parent class.
  *
  * @param object|string $class An object (class instance) or a string (class name).
- * @param bool $autoload Whether to allow this function to load the class automatically through
- * the __autoload magic method.
+ * @param bool $autoload Whether to call __autoload by default.
  * @return array An array on success.
  * @throws SplException
  *
@@ -71,52 +68,6 @@ function class_uses($class, bool $autoload = true): array
 }
 
 
-/**
- * Register a function with the spl provided __autoload queue. If the queue
- * is not yet activated it will be activated.
- *
- * If your code has an existing __autoload function then
- * this function must be explicitly registered on the __autoload queue. This
- * is because spl_autoload_register will effectively
- * replace the engine cache for the __autoload function
- * by either spl_autoload or
- * spl_autoload_call.
- *
- * If there must be multiple autoload functions, spl_autoload_register
- * allows for this. It effectively creates a queue of autoload functions, and
- * runs through each of them in the order they are defined. By contrast,
- * __autoload may only be defined once.
- *
- * @param callable(string):void $autoload_function The autoload function being registered.
- * If no parameter is provided, then the default implementation of
- * spl_autoload will be registered.
- * @param bool $throw This parameter specifies whether
- * spl_autoload_register should throw
- * exceptions when the autoload_function
- * cannot be registered.
- * @param bool $prepend If true, spl_autoload_register will prepend
- * the autoloader on the autoload queue instead of appending it.
- * @throws SplException
- *
- */
-function spl_autoload_register(callable $autoload_function = null, bool $throw = true, bool $prepend = false): void
-{
-    error_clear_last();
-    if ($prepend !== false) {
-        $result = \spl_autoload_register($autoload_function, $throw, $prepend);
-    } elseif ($throw !== true) {
-        $result = \spl_autoload_register($autoload_function, $throw);
-    } elseif ($autoload_function !== null) {
-        $result = \spl_autoload_register($autoload_function);
-    } else {
-        $result = \spl_autoload_register();
-    }
-    if ($result === false) {
-        throw SplException::createFromPhpError();
-    }
-}
-
-
 /**
  * Removes a function from the autoload queue. If the queue
  * is activated and empty after removing the given function then it will
diff --git a/generated/stream.php b/generated/stream.php
index 7497e300..cb7f9609 100644
--- a/generated/stream.php
+++ b/generated/stream.php
@@ -8,9 +8,7 @@
  * Sets parameters on the specified context.
  *
  * @param resource $context The stream or context to apply the parameters too.
- * @param array $params An array of parameters to set.
- *
- * params should be an associative array of the structure:
+ * @param array $params An associative array of parameters to be set in the following format:
  * $params['paramname'] = "paramvalue";.
  * @throws StreamException
  *
diff --git a/generated/strings.php b/generated/strings.php
index c944b104..0aacaf5c 100644
--- a/generated/strings.php
+++ b/generated/strings.php
@@ -256,7 +256,8 @@ function sha1_file(string $filename, bool $binary = false): string
  *
  *
  *
- * For g and G
+ * For g, G,
+ * h and H
  * specifiers: this is the maximum number of significant
  * digits to be printed.
  *
@@ -316,9 +317,6 @@ function sha1_file(string $filename, bool $binary = false): string
  * e
  *
  * The argument is treated as scientific notation (e.g. 1.2e+2).
- * The precision specifier stands for the number of digits after the
- * decimal point since PHP 5.2.1. In earlier versions, it was taken as
- * number of significant digits (one less).
  *
  *
  *
@@ -340,7 +338,6 @@ function sha1_file(string $filename, bool $binary = false): string
  *
  * The argument is treated as a float and presented
  * as a floating-point number (non-locale aware).
- * Available as of PHP 5.0.3.
  *
  *
  *
@@ -448,7 +445,7 @@ function sha1_file(string $filename, bool $binary = false): string
  * s
  *
  *
- * integer
+ * int
  *
  * d,
  * u,
@@ -460,14 +457,16 @@ function sha1_file(string $filename, bool $binary = false): string
  *
  *
  *
- * double
+ * float
  *
- * g,
- * G,
  * e,
  * E,
  * f,
- * F
+ * F,
+ * g,
+ * G,
+ * h,
+ * H
  *
  *
  *
@@ -641,7 +640,8 @@ function substr(string $string, int $offset, int $length = null): string
  *
  *
  *
- * For g and G
+ * For g, G,
+ * h and H
  * specifiers: this is the maximum number of significant
  * digits to be printed.
  *
@@ -701,9 +701,6 @@ function substr(string $string, int $offset, int $length = null): string
  * e
  *
  * The argument is treated as scientific notation (e.g. 1.2e+2).
- * The precision specifier stands for the number of digits after the
- * decimal point since PHP 5.2.1. In earlier versions, it was taken as
- * number of significant digits (one less).
  *
  *
  *
@@ -725,7 +722,6 @@ function substr(string $string, int $offset, int $length = null): string
  *
  * The argument is treated as a float and presented
  * as a floating-point number (non-locale aware).
- * Available as of PHP 5.0.3.
  *
  *
  *
@@ -833,7 +829,7 @@ function substr(string $string, int $offset, int $length = null): string
  * s
  *
  *
- * integer
+ * int
  *
  * d,
  * u,
@@ -845,14 +841,16 @@ function substr(string $string, int $offset, int $length = null): string
  *
  *
  *
- * double
+ * float
  *
- * g,
- * G,
  * e,
  * E,
  * f,
- * F
+ * F,
+ * g,
+ * G,
+ * h,
+ * H
  *
  *
  *
diff --git a/generated/url.php b/generated/url.php
index ff133072..16b2d668 100644
--- a/generated/url.php
+++ b/generated/url.php
@@ -28,35 +28,6 @@ function base64_decode(string $string, bool $strict = false): string
 }
 
 
-/**
- * get_headers returns an array with the headers sent
- * by the server in response to a HTTP request.
- *
- * @param string $url The target URL.
- * @param int $format If the optional format parameter is set to non-zero,
- * get_headers parses the response and sets the
- * array's keys.
- * @param resource $context A valid context resource created with
- * stream_context_create.
- * @return array Returns an indexed or associative array with the headers.
- * @throws UrlException
- *
- */
-function get_headers(string $url, int $format = 0, $context = null): array
-{
-    error_clear_last();
-    if ($context !== null) {
-        $result = \get_headers($url, $format, $context);
-    } else {
-        $result = \get_headers($url, $format);
-    }
-    if ($result === false) {
-        throw UrlException::createFromPhpError();
-    }
-    return $result;
-}
-
-
 /**
  * Opens filename and parses it line by line for
  * &lt;meta&gt; tags in the file. The parsing stops at
@@ -112,7 +83,7 @@ function get_meta_tags(string $filename, bool $use_include_path = false): array
  * The values of the array elements are not URL decoded.
  *
  * This function is not meant to validate
- * the given URL, it only breaks it up into the above listed parts. Partial
+ * the given URL, it only breaks it up into the above listed parts. Partial and invalid
  * URLs are also accepted, parse_url tries its best to
  * parse them correctly.
  *
diff --git a/generated/xml.php b/generated/xml.php
index a911441b..55afbcdf 100644
--- a/generated/xml.php
+++ b/generated/xml.php
@@ -11,8 +11,7 @@
  *
  * @param string $encoding The input encoding is automatically detected, so that the
  * encoding parameter specifies only the output
- * encoding. In PHP 5.0.0 and 5.0.1, the default output charset is
- * ISO-8859-1, while in PHP 5.0.2 and upper is UTF-8. The supported
+ * encoding. The default output charset is UTF-8. The supported
  * encodings are ISO-8859-1, UTF-8 and
  * US-ASCII.
  * @param string $separator With a namespace aware parser tag parameters passed to the various
@@ -44,15 +43,12 @@ function xml_parser_create_ns(string $encoding = null, string $separator = ":")
  * and returns a XMLParser instance to be used by the
  * other XML functions.
  *
- * @param string $encoding The optional encoding specifies the character
- * encoding for the input/output in PHP 4. Starting from PHP 5, the input
+ * @param string $encoding The input
  * encoding is automatically detected, so that the
  * encoding parameter specifies only the output
- * encoding. In PHP 4, the default output encoding is the same as the
- * input charset. If empty string is passed, the parser attempts to identify
+ * encoding. If empty string is passed, the parser attempts to identify
  * which encoding the document is encoded in by looking at the heading 3 or
- * 4 bytes. In PHP 5.0.0 and 5.0.1, the default output charset is
- * ISO-8859-1, while in PHP 5.0.2 and upper is UTF-8. The supported
+ * 4 bytes. The default output charset is UTF-8. The supported
  * encodings are ISO-8859-1, UTF-8 and
  * US-ASCII.
  * @return resource Returns a new XMLParser instance.
diff --git a/generated/zlib.php b/generated/zlib.php
index f261ba88..59c139c2 100644
--- a/generated/zlib.php
+++ b/generated/zlib.php
@@ -246,11 +246,7 @@ function gzdeflate(string $data, int $level = -1, int $encoding = ZLIB_ENCODING_
  * @param int $encoding The encoding mode. Can be FORCE_GZIP (the default)
  * or FORCE_DEFLATE.
  *
- * Prior to PHP 5.4.0, using FORCE_DEFLATE results in
- * a standard zlib deflated string (inclusive zlib headers) after a gzip
- * file header but without the trailing crc32 checksum.
- *
- * In PHP 5.4.0 and later, FORCE_DEFLATE generates
+ * FORCE_DEFLATE generates
  * RFC 1950 compliant output, consisting of a zlib header, the deflated
  * data, and an Adler checksum.
  * @return string The encoded string.
@@ -470,11 +466,6 @@ function gzuncompress(string $data, int $max_length = 0): string
  * stop after length (uncompressed) bytes have been
  * written or the end of data is reached,
  * whichever comes first.
- *
- * Note that if the length argument is given,
- * then the magic_quotes_runtime
- * configuration option will be ignored and no slashes will be
- * stripped from data.
  * @return int Returns the number of (uncompressed) bytes written to the given gz-file
  * stream.
  * @throws ZlibException
diff --git a/generator/config/ignoredFunctions.php b/generator/config/ignoredFunctions.php
index e3555d9a..5bd99a92 100644
--- a/generator/config/ignoredFunctions.php
+++ b/generator/config/ignoredFunctions.php
@@ -8,7 +8,6 @@
     // Type hints to object OCI-Lob (weird class that has a dash in its name!)
     'oci_lob_copy',
     'func_get_arg',
-    //'mktime', // 7th parameter has been removed in PHP 7
     'call_user_func_array',
     'mb_check_encoding',
     'array_search',
@@ -18,4 +17,6 @@
     'apcu_delete', // apcu_delete returns false when the $key does not exist in the cache store
     'filter_has_var', // this function is meant to return a boolean
     'array_multisort', // this function is too buggy, see PR #113 on GitHub
+    'imagegrabwindow',
+    'get_headers'
 ];
diff --git a/generator/doc/update.sh b/generator/doc/update.sh
index d3c6006a..2baaff72 100755
--- a/generator/doc/update.sh
+++ b/generator/doc/update.sh
@@ -1,11 +1,11 @@
 if [ ! -d "doc-en" ]; then
-    mkdir doc-en
-    cd doc-en
-    git clone https://github.com/salathe/phpdoc-base doc-base
-    git clone https://github.com/php/doc-en en
-  else
-    cd doc-en/en
-    git pull
-    cd ../doc-base
-    git pull
-  fi
\ No newline at end of file
+  mkdir doc-en
+  cd doc-en
+  git clone https://github.com/salathe/phpdoc-base doc-base
+  git clone https://github.com/php/doc-en en
+else
+  cd doc-en/en
+  git pull
+  cd ../doc-base
+  git pull
+fi
\ No newline at end of file
diff --git a/rector-migrate-0.7.php b/rector-migrate-0.7.php
index 2f901dc0..82a9fe78 100644
--- a/rector-migrate-0.7.php
+++ b/rector-migrate-0.7.php
@@ -56,18 +56,60 @@
             'copy' => 'Safe\copy',
             'count_chars' => 'Safe\count_chars',
             'create_function' => 'Safe\create_function',
+            'cubrid_bind' => 'Safe\cubrid_bind',
+            'cubrid_column_names' => 'Safe\cubrid_column_names',
+            'cubrid_column_types' => 'Safe\cubrid_column_types',
+            'cubrid_col_size' => 'Safe\cubrid_col_size',
+            'cubrid_commit' => 'Safe\cubrid_commit',
+            'cubrid_connect' => 'Safe\cubrid_connect',
+            'cubrid_connect_with_url' => 'Safe\cubrid_connect_with_url',
+            'cubrid_current_oid' => 'Safe\cubrid_current_oid',
+            'cubrid_disconnect' => 'Safe\cubrid_disconnect',
+            'cubrid_drop' => 'Safe\cubrid_drop',
             'cubrid_free_result' => 'Safe\cubrid_free_result',
             'cubrid_get_charset' => 'Safe\cubrid_get_charset',
+            'cubrid_get_class_name' => 'Safe\cubrid_get_class_name',
             'cubrid_get_client_info' => 'Safe\cubrid_get_client_info',
             'cubrid_get_db_parameter' => 'Safe\cubrid_get_db_parameter',
+            'cubrid_get_query_timeout' => 'Safe\cubrid_get_query_timeout',
             'cubrid_get_server_info' => 'Safe\cubrid_get_server_info',
             'cubrid_insert_id' => 'Safe\cubrid_insert_id',
+            'cubrid_lob2_bind' => 'Safe\cubrid_lob2_bind',
+            'cubrid_lob2_close' => 'Safe\cubrid_lob2_close',
+            'cubrid_lob2_export' => 'Safe\cubrid_lob2_export',
+            'cubrid_lob2_import' => 'Safe\cubrid_lob2_import',
             'cubrid_lob2_new' => 'Safe\cubrid_lob2_new',
+            'cubrid_lob2_read' => 'Safe\cubrid_lob2_read',
+            'cubrid_lob2_seek' => 'Safe\cubrid_lob2_seek',
+            'cubrid_lob2_seek64' => 'Safe\cubrid_lob2_seek64',
             'cubrid_lob2_size' => 'Safe\cubrid_lob2_size',
             'cubrid_lob2_size64' => 'Safe\cubrid_lob2_size64',
             'cubrid_lob2_tell' => 'Safe\cubrid_lob2_tell',
             'cubrid_lob2_tell64' => 'Safe\cubrid_lob2_tell64',
+            'cubrid_lob2_write' => 'Safe\cubrid_lob2_write',
+            'cubrid_lob_close' => 'Safe\cubrid_lob_close',
+            'cubrid_lob_export' => 'Safe\cubrid_lob_export',
+            'cubrid_lob_get' => 'Safe\cubrid_lob_get',
+            'cubrid_lob_send' => 'Safe\cubrid_lob_send',
+            'cubrid_lob_size' => 'Safe\cubrid_lob_size',
+            'cubrid_lock_read' => 'Safe\cubrid_lock_read',
+            'cubrid_lock_write' => 'Safe\cubrid_lock_write',
+            'cubrid_move_cursor' => 'Safe\cubrid_move_cursor',
+            'cubrid_next_result' => 'Safe\cubrid_next_result',
+            'cubrid_pconnect' => 'Safe\cubrid_pconnect',
+            'cubrid_pconnect_with_url' => 'Safe\cubrid_pconnect_with_url',
+            'cubrid_prepare' => 'Safe\cubrid_prepare',
+            'cubrid_put' => 'Safe\cubrid_put',
+            'cubrid_rollback' => 'Safe\cubrid_rollback',
+            'cubrid_schema' => 'Safe\cubrid_schema',
+            'cubrid_seq_drop' => 'Safe\cubrid_seq_drop',
+            'cubrid_seq_insert' => 'Safe\cubrid_seq_insert',
+            'cubrid_seq_put' => 'Safe\cubrid_seq_put',
+            'cubrid_set_add' => 'Safe\cubrid_set_add',
+            'cubrid_set_autocommit' => 'Safe\cubrid_set_autocommit',
             'cubrid_set_db_parameter' => 'Safe\cubrid_set_db_parameter',
+            'cubrid_set_drop' => 'Safe\cubrid_set_drop',
+            'cubrid_set_query_timeout' => 'Safe\cubrid_set_query_timeout',
             'curl_copy_handle' => 'Safe\curl_copy_handle',
             'curl_escape' => 'Safe\curl_escape',
             'curl_exec' => 'Safe\curl_exec',
@@ -80,7 +122,6 @@
             'curl_share_errno' => 'Safe\curl_share_errno',
             'curl_share_setopt' => 'Safe\curl_share_setopt',
             'curl_unescape' => 'Safe\curl_unescape',
-            'date' => 'Safe\date',
             'date_parse' => 'Safe\date_parse',
             'date_parse_from_format' => 'Safe\date_parse_from_format',
             'date_sunrise' => 'Safe\date_sunrise',
@@ -115,6 +156,7 @@
             'eio_event_loop' => 'Safe\eio_event_loop',
             'eio_fallocate' => 'Safe\eio_fallocate',
             'eio_fchmod' => 'Safe\eio_fchmod',
+            'eio_fchown' => 'Safe\eio_fchown',
             'eio_fdatasync' => 'Safe\eio_fdatasync',
             'eio_fstat' => 'Safe\eio_fstat',
             'eio_fstatvfs' => 'Safe\eio_fstatvfs',
@@ -209,7 +251,6 @@
             'getprotobynumber' => 'Safe\getprotobynumber',
             'getrusage' => 'Safe\getrusage',
             'getservbyport' => 'Safe\getservbyport',
-            'get_headers' => 'Safe\get_headers',
             'get_include_path' => 'Safe\get_include_path',
             'get_meta_tags' => 'Safe\get_meta_tags',
             'glob' => 'Safe\glob',
@@ -288,6 +329,8 @@
             'imagecolorat' => 'Safe\imagecolorat',
             'imagecolordeallocate' => 'Safe\imagecolordeallocate',
             'imagecolormatch' => 'Safe\imagecolormatch',
+            'imagecolorset' => 'Safe\imagecolorset',
+            'imagecolorsforindex' => 'Safe\imagecolorsforindex',
             'imageconvolution' => 'Safe\imageconvolution',
             'imagecopy' => 'Safe\imagecopy',
             'imagecopymerge' => 'Safe\imagecopymerge',
@@ -319,18 +362,20 @@
             'imagefilltoborder' => 'Safe\imagefilltoborder',
             'imagefilter' => 'Safe\imagefilter',
             'imageflip' => 'Safe\imageflip',
+            'imageftbbox' => 'Safe\imageftbbox',
+            'imagefttext' => 'Safe\imagefttext',
             'imagegammacorrect' => 'Safe\imagegammacorrect',
             'imagegd' => 'Safe\imagegd',
             'imagegd2' => 'Safe\imagegd2',
             'imagegif' => 'Safe\imagegif',
             'imagegrabscreen' => 'Safe\imagegrabscreen',
-            'imagegrabwindow' => 'Safe\imagegrabwindow',
             'imagejpeg' => 'Safe\imagejpeg',
             'imagelayereffect' => 'Safe\imagelayereffect',
             'imageline' => 'Safe\imageline',
             'imageloadfont' => 'Safe\imageloadfont',
             'imagepng' => 'Safe\imagepng',
             'imagerectangle' => 'Safe\imagerectangle',
+            'imageresolution' => 'Safe\imageresolution',
             'imagerotate' => 'Safe\imagerotate',
             'imagesavealpha' => 'Safe\imagesavealpha',
             'imagescale' => 'Safe\imagescale',
@@ -405,18 +450,6 @@
             'inflate_get_read_len' => 'Safe\inflate_get_read_len',
             'inflate_get_status' => 'Safe\inflate_get_status',
             'inflate_init' => 'Safe\inflate_init',
-            'ingres_autocommit' => 'Safe\ingres_autocommit',
-            'ingres_close' => 'Safe\ingres_close',
-            'ingres_commit' => 'Safe\ingres_commit',
-            'ingres_connect' => 'Safe\ingres_connect',
-            'ingres_execute' => 'Safe\ingres_execute',
-            'ingres_field_name' => 'Safe\ingres_field_name',
-            'ingres_field_type' => 'Safe\ingres_field_type',
-            'ingres_free_result' => 'Safe\ingres_free_result',
-            'ingres_pconnect' => 'Safe\ingres_pconnect',
-            'ingres_result_seek' => 'Safe\ingres_result_seek',
-            'ingres_rollback' => 'Safe\ingres_rollback',
-            'ingres_set_environment' => 'Safe\ingres_set_environment',
             'ini_get' => 'Safe\ini_get',
             'ini_set' => 'Safe\ini_set',
             'inotify_init' => 'Safe\inotify_init',
@@ -517,13 +550,6 @@
             'msg_set_queue' => 'Safe\msg_set_queue',
             'msg_stat_queue' => 'Safe\msg_stat_queue',
             'mysqli_get_client_stats' => 'Safe\mysqli_get_client_stats',
-            'mysqlnd_ms_dump_servers' => 'Safe\mysqlnd_ms_dump_servers',
-            'mysqlnd_ms_fabric_select_global' => 'Safe\mysqlnd_ms_fabric_select_global',
-            'mysqlnd_ms_fabric_select_shard' => 'Safe\mysqlnd_ms_fabric_select_shard',
-            'mysqlnd_ms_get_last_used_connection' => 'Safe\mysqlnd_ms_get_last_used_connection',
-            'mysqlnd_qc_clear_cache' => 'Safe\mysqlnd_qc_clear_cache',
-            'mysqlnd_qc_set_is_select' => 'Safe\mysqlnd_qc_set_is_select',
-            'mysqlnd_qc_set_storage_handler' => 'Safe\mysqlnd_qc_set_storage_handler',
             'mysql_close' => 'Safe\mysql_close',
             'mysql_connect' => 'Safe\mysql_connect',
             'mysql_create_db' => 'Safe\mysql_create_db',
@@ -696,6 +722,7 @@
             'pcntl_signal_dispatch' => 'Safe\pcntl_signal_dispatch',
             'pcntl_sigprocmask' => 'Safe\pcntl_sigprocmask',
             'pcntl_strerror' => 'Safe\pcntl_strerror',
+            'pfsockopen' => 'Safe\pfsockopen',
             'pg_cancel_query' => 'Safe\pg_cancel_query',
             'pg_client_encoding' => 'Safe\pg_client_encoding',
             'pg_close' => 'Safe\pg_close',
@@ -946,9 +973,21 @@
             'socket_wsaprotocol_info_export' => 'Safe\socket_wsaprotocol_info_export',
             'socket_wsaprotocol_info_import' => 'Safe\socket_wsaprotocol_info_import',
             'socket_wsaprotocol_info_release' => 'Safe\socket_wsaprotocol_info_release',
+            'sodium_crypto_aead_aes256gcm_decrypt' => 'Safe\sodium_crypto_aead_aes256gcm_decrypt',
+            'sodium_crypto_aead_chacha20poly1305_decrypt' => 'Safe\sodium_crypto_aead_chacha20poly1305_decrypt',
+            'sodium_crypto_aead_chacha20poly1305_encrypt' => 'Safe\sodium_crypto_aead_chacha20poly1305_encrypt',
+            'sodium_crypto_aead_chacha20poly1305_ietf_decrypt' => 'Safe\sodium_crypto_aead_chacha20poly1305_ietf_decrypt',
+            'sodium_crypto_aead_chacha20poly1305_ietf_encrypt' => 'Safe\sodium_crypto_aead_chacha20poly1305_ietf_encrypt',
+            'sodium_crypto_aead_xchacha20poly1305_ietf_decrypt' => 'Safe\sodium_crypto_aead_xchacha20poly1305_ietf_decrypt',
+            'sodium_crypto_aead_xchacha20poly1305_ietf_encrypt' => 'Safe\sodium_crypto_aead_xchacha20poly1305_ietf_encrypt',
+            'sodium_crypto_auth_verify' => 'Safe\sodium_crypto_auth_verify',
+            'sodium_crypto_box_open' => 'Safe\sodium_crypto_box_open',
+            'sodium_crypto_box_seal_open' => 'Safe\sodium_crypto_box_seal_open',
+            'sodium_crypto_generichash_update' => 'Safe\sodium_crypto_generichash_update',
+            'sodium_crypto_sign_open' => 'Safe\sodium_crypto_sign_open',
+            'sodium_crypto_sign_verify_detached' => 'Safe\sodium_crypto_sign_verify_detached',
             'solr_get_version' => 'Safe\solr_get_version',
             'sort' => 'Safe\sort',
-            'spl_autoload_register' => 'Safe\spl_autoload_register',
             'spl_autoload_unregister' => 'Safe\spl_autoload_unregister',
             'sprintf' => 'Safe\sprintf',
             'sqlsrv_begin_transaction' => 'Safe\sqlsrv_begin_transaction',

From 0e194b95bee6c3e955b6aa8e0460ac0e121f5e22 Mon Sep 17 00:00:00 2001
From: dbrekelmans <dbrekelmans@users.noreply.github.com>
Date: Mon, 19 Jul 2021 21:20:33 +0200
Subject: [PATCH 03/10] Fix tests

---
 generated/simplexml.php         |  6 ++---
 generator/phpunit.xml.dist      | 41 +++++++++++++++------------------
 generator/tests/DocPageTest.php |  2 +-
 3 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/generated/simplexml.php b/generated/simplexml.php
index 410a4d9a..cfc3456c 100644
--- a/generated/simplexml.php
+++ b/generated/simplexml.php
@@ -18,7 +18,7 @@
  * @throws SimplexmlException
  *
  */
-function simplexml_import_dom(\DOMNode $node, string $class_name = SimpleXMLElement::class): \SimpleXMLElement
+function simplexml_import_dom(\DOMNode $node, string $class_name = \SimpleXMLElement::class): \SimpleXMLElement
 {
     error_clear_last();
     $result = \simplexml_import_dom($node, $class_name);
@@ -47,7 +47,7 @@ function simplexml_import_dom(\DOMNode $node, string $class_name = SimpleXMLElem
  * @throws SimplexmlException
  *
  */
-function simplexml_load_file(string $filename, string $class_name = SimpleXMLElement::class, int $options = 0, string $namespace_or_prefix = "", bool $is_prefix = false): \SimpleXMLElement
+function simplexml_load_file(string $filename, string $class_name = \SimpleXMLElement::class, int $options = 0, string $namespace_or_prefix = "", bool $is_prefix = false): \SimpleXMLElement
 {
     error_clear_last();
     $result = \simplexml_load_file($filename, $class_name, $options, $namespace_or_prefix, $is_prefix);
@@ -76,7 +76,7 @@ function simplexml_load_file(string $filename, string $class_name = SimpleXMLEle
  * @throws SimplexmlException
  *
  */
-function simplexml_load_string(string $data, string $class_name = SimpleXMLElement::class, int $options = 0, string $namespace_or_prefix = "", bool $is_prefix = false): \SimpleXMLElement
+function simplexml_load_string(string $data, string $class_name = \SimpleXMLElement::class, int $options = 0, string $namespace_or_prefix = "", bool $is_prefix = false): \SimpleXMLElement
 {
     error_clear_last();
     $result = \simplexml_load_string($data, $class_name, $options, $namespace_or_prefix, $is_prefix);
diff --git a/generator/phpunit.xml.dist b/generator/phpunit.xml.dist
index 8ade109b..869325fc 100644
--- a/generator/phpunit.xml.dist
+++ b/generator/phpunit.xml.dist
@@ -1,28 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
          bootstrap="vendor/autoload.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
 >
-    <testsuites>
-        <testsuite name="Main test Suite">
-            <directory>./tests/</directory>
-            <exclude>./tests/rector</exclude>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-html" target="build/coverage"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/coverage"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Main test Suite">
+      <directory>./tests/</directory>
+      <exclude>./tests/rector</exclude>
+    </testsuite>
+  </testsuites>
+  <logging/>
 </phpunit>
diff --git a/generator/tests/DocPageTest.php b/generator/tests/DocPageTest.php
index 7183382b..6a12d87b 100644
--- a/generator/tests/DocPageTest.php
+++ b/generator/tests/DocPageTest.php
@@ -28,7 +28,7 @@ public function testDetectFalsyFunction()
         $this->assertTrue($fsockopen->detectFalsyFunction());
         $this->assertFalse($arrayReplace->detectFalsyFunction());
         $this->assertTrue($mktime->detectFalsyFunction());
-        $this->assertTrue($date->detectFalsyFunction());
+        $this->assertFalse($date->detectFalsyFunction());
     }
 
     public function testDetectNullsyFunction()

From 6d1ab960f839fd15ffbd9b0f0a7f03878db811b9 Mon Sep 17 00:00:00 2001
From: dbrekelmans <dbrekelmans@users.noreply.github.com>
Date: Mon, 19 Jul 2021 21:22:01 +0200
Subject: [PATCH 04/10] Revert

---
 generator/tests/DocPageTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generator/tests/DocPageTest.php b/generator/tests/DocPageTest.php
index 6a12d87b..7183382b 100644
--- a/generator/tests/DocPageTest.php
+++ b/generator/tests/DocPageTest.php
@@ -28,7 +28,7 @@ public function testDetectFalsyFunction()
         $this->assertTrue($fsockopen->detectFalsyFunction());
         $this->assertFalse($arrayReplace->detectFalsyFunction());
         $this->assertTrue($mktime->detectFalsyFunction());
-        $this->assertFalse($date->detectFalsyFunction());
+        $this->assertTrue($date->detectFalsyFunction());
     }
 
     public function testDetectNullsyFunction()

From b79066be3ea20b9d40c8cdb6958b612d35239f2a Mon Sep 17 00:00:00 2001
From: dbrekelmans <dbrekelmans@users.noreply.github.com>
Date: Mon, 19 Jul 2021 21:38:51 +0200
Subject: [PATCH 05/10] WIP fix rector

---
 .github/workflows/rector-continuous-integration.yml   | 8 ++++----
 .gitignore                                            | 2 +-
 README.md                                             | 2 +-
 generator/src/GenerateCommand.php                     | 2 +-
 generator/tests/rector/{0.7 => }/composer.json        | 6 +++---
 generator/tests/rector/{0.7 => }/phpunit.xml.dist     | 7 -------
 generator/tests/rector/{0.7 => }/src/test.php         | 0
 generator/tests/rector/{0.7 => }/tests/RectorTest.php | 0
 rector-migrate-0.7.php => rector-migrate.php          | 2 +-
 9 files changed, 11 insertions(+), 18 deletions(-)
 rename generator/tests/rector/{0.7 => }/composer.json (75%)
 rename generator/tests/rector/{0.7 => }/phpunit.xml.dist (62%)
 rename generator/tests/rector/{0.7 => }/src/test.php (100%)
 rename generator/tests/rector/{0.7 => }/tests/RectorTest.php (100%)
 rename rector-migrate-0.7.php => rector-migrate.php (99%)

diff --git a/.github/workflows/rector-continuous-integration.yml b/.github/workflows/rector-continuous-integration.yml
index b7046899..10f5eb98 100644
--- a/.github/workflows/rector-continuous-integration.yml
+++ b/.github/workflows/rector-continuous-integration.yml
@@ -9,7 +9,7 @@ on:
 jobs:
 
   rector-continuous-integration:
-    name: "Check if refactoring can be done with rector/rector:~0.7.0"
+    name: "Check if refactoring can be done with rector/rector"
 
     runs-on: "ubuntu-latest"
 
@@ -32,13 +32,13 @@ jobs:
 
       - name: "Composer install"
         run: "composer install && composer rector && composer test"
-        working-directory: "generator/tests/rector/0.7"
+        working-directory: "generator/tests/rector"
 
       - name: "Run rector"
         run: "composer rector"
-        working-directory: "generator/tests/rector/0.7"
+        working-directory: "generator/tests/rector"
 
       - name: "Run tests"
         run: "composer test"
-        working-directory: "generator/tests/rector/0.7"
+        working-directory: "generator/tests/rector"
 
diff --git a/.gitignore b/.gitignore
index c16f3ae5..4a7f4685 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,5 @@
 /generator/doc/entities/generated.ent
 /composer.lock
 vendor/
-/generator/tests/rector/0.7/composer.lock
+/generator/tests/rector/composer.lock
 .phpunit.result.cache
diff --git a/README.md b/README.md
index 3c2ee624..7d18ca7e 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ to install `rector/rector`.
 Run
 
 ```bash
-vendor/bin/rector process src/ --config vendor/thecodingmachine/safe/rector-migrate-0.7.php
+vendor/bin/rector process src/ --config vendor/thecodingmachine/safe/rector-migrate.php
 ```
 
 to run `rector/rector`.
diff --git a/generator/src/GenerateCommand.php b/generator/src/GenerateCommand.php
index dd61fd39..cdb38650 100644
--- a/generator/src/GenerateCommand.php
+++ b/generator/src/GenerateCommand.php
@@ -37,7 +37,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $fileCreator = new FileCreator();
         $fileCreator->generatePhpFile($functions, __DIR__ . '/../../generated/');
         $fileCreator->generateFunctionsList($functions, __DIR__ . '/../../generated/functionsList.php');
-        $fileCreator->generateRectorFileForZeroPointSeven($functions, __DIR__ . '/../../rector-migrate-0.7.php');
+        $fileCreator->generateRectorFileForZeroPointSeven($functions, __DIR__ . '/../../rector-migrate.php');
 
 
         $modules = [];
diff --git a/generator/tests/rector/0.7/composer.json b/generator/tests/rector/composer.json
similarity index 75%
rename from generator/tests/rector/0.7/composer.json
rename to generator/tests/rector/composer.json
index 8a0f1859..ef8f0a58 100644
--- a/generator/tests/rector/0.7/composer.json
+++ b/generator/tests/rector/composer.json
@@ -6,13 +6,13 @@
   },
   "require": {
     "php": "^8.0",
-    "rector/rector": "^0.7.6"
+    "rector/rector": "^0.8.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7"
+    "phpunit/phpunit": "^9.5"
   },
   "scripts": {
-    "rector": "rector process src/ --config ../../../../rector-migrate-0.7.php",
+    "rector": "rector process src/ --config ../../../../rector-migrate.php",
     "test": "phpunit"
   }
 }
diff --git a/generator/tests/rector/0.7/phpunit.xml.dist b/generator/tests/rector/phpunit.xml.dist
similarity index 62%
rename from generator/tests/rector/0.7/phpunit.xml.dist
rename to generator/tests/rector/phpunit.xml.dist
index ceab14d8..c5799a29 100644
--- a/generator/tests/rector/0.7/phpunit.xml.dist
+++ b/generator/tests/rector/phpunit.xml.dist
@@ -3,15 +3,8 @@
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-    backupGlobals="false"
-    backupStaticAttributes="false"
     bootstrap="vendor/autoload.php"
     colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnFailure="false"
 >
     <testsuites>
         <testsuite name="Main test Suite">
diff --git a/generator/tests/rector/0.7/src/test.php b/generator/tests/rector/src/test.php
similarity index 100%
rename from generator/tests/rector/0.7/src/test.php
rename to generator/tests/rector/src/test.php
diff --git a/generator/tests/rector/0.7/tests/RectorTest.php b/generator/tests/rector/tests/RectorTest.php
similarity index 100%
rename from generator/tests/rector/0.7/tests/RectorTest.php
rename to generator/tests/rector/tests/RectorTest.php
diff --git a/rector-migrate-0.7.php b/rector-migrate.php
similarity index 99%
rename from rector-migrate-0.7.php
rename to rector-migrate.php
index 82a9fe78..8e352e4c 100644
--- a/rector-migrate-0.7.php
+++ b/rector-migrate.php
@@ -5,7 +5,7 @@
 use Rector\Renaming\Rector\FuncCall\RenameFunctionRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
-# This file configures rector/rector:~0.7.0 to replace all PHP functions with their equivalent "safe" functions
+# This file configures rector/rector to replace all PHP functions with their equivalent "safe" functions
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 

From c0b1499206f09e6a286d08fdf08698ab317cd1a7 Mon Sep 17 00:00:00 2001
From: dbrekelmans <dbrekelmans@users.noreply.github.com>
Date: Mon, 19 Jul 2021 21:44:34 +0200
Subject: [PATCH 06/10] Fix rector

---
 generator/tests/rector/composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generator/tests/rector/composer.json b/generator/tests/rector/composer.json
index ef8f0a58..fde03978 100644
--- a/generator/tests/rector/composer.json
+++ b/generator/tests/rector/composer.json
@@ -6,13 +6,13 @@
   },
   "require": {
     "php": "^8.0",
-    "rector/rector": "^0.8.1"
+    "rector/rector": "^0.11.36"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.5"
   },
   "scripts": {
-    "rector": "rector process src/ --config ../../../../rector-migrate.php",
+    "rector": "rector process src/ --config ../../../rector-migrate.php",
     "test": "phpunit"
   }
 }

From e81547f7bfb81a89c3a0a98bbb536ab6a40b031f Mon Sep 17 00:00:00 2001
From: dbrekelmans <dbrekelmans@users.noreply.github.com>
Date: Mon, 19 Jul 2021 21:47:18 +0200
Subject: [PATCH 07/10] Fix unit test

---
 generator/tests/rector/tests/RectorTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generator/tests/rector/tests/RectorTest.php b/generator/tests/rector/tests/RectorTest.php
index bfdca087..75bd940e 100644
--- a/generator/tests/rector/tests/RectorTest.php
+++ b/generator/tests/rector/tests/RectorTest.php
@@ -8,6 +8,6 @@ public function testRectorSucceeded()
     {
         $content = file_get_contents(__DIR__.'/../src/test.php');
 
-        $this->assertContains('Safe', $content);
+        self::assertStringContainsString('Safe', $content);
     }
 }

From 1b87acd4d2707accfc07645251e3875ecfe460e0 Mon Sep 17 00:00:00 2001
From: dbrekelmans <dbrekelmans@users.noreply.github.com>
Date: Mon, 19 Jul 2021 22:04:37 +0200
Subject: [PATCH 08/10] Fix simplexml special cases

---
 composer.json                                 |  1 -
 generated/simplexml.php                       | 87 -------------------
 generator/config/ignoredFunctions.php         |  2 +-
 generator/config/specialCasesFunctions.php    |  3 +
 generator/src/FileCreator.php                 |  6 +-
 generator/src/GenerateCommand.php             |  2 +-
 .../Exceptions/SimplexmlException.php         |  2 +
 lib/special_cases.php                         | 83 ++++++++++++++++++
 8 files changed, 93 insertions(+), 93 deletions(-)
 delete mode 100644 generated/simplexml.php
 rename {generated => lib}/Exceptions/SimplexmlException.php (91%)

diff --git a/composer.json b/composer.json
index c4522f3c..f2ac3b57 100644
--- a/composer.json
+++ b/composer.json
@@ -74,7 +74,6 @@
             "generated/sem.php",
             "generated/session.php",
             "generated/shmop.php",
-            "generated/simplexml.php",
             "generated/sockets.php",
             "generated/sodium.php",
             "generated/solr.php",
diff --git a/generated/simplexml.php b/generated/simplexml.php
deleted file mode 100644
index cfc3456c..00000000
--- a/generated/simplexml.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace Safe;
-
-use Safe\Exceptions\SimplexmlException;
-
-/**
- * This function takes a node of a DOM
- * document and makes it into a SimpleXML node. This new object can
- * then be used as a native SimpleXML element.
- *
- * @param \DOMNode $node A DOM Element node
- * @param string $class_name You may use this optional parameter so that
- * simplexml_import_dom will return an object of
- * the specified class. That class should extend the
- * SimpleXMLElement class.
- * @return \SimpleXMLElement Returns a SimpleXMLElement.
- * @throws SimplexmlException
- *
- */
-function simplexml_import_dom(\DOMNode $node, string $class_name = \SimpleXMLElement::class): \SimpleXMLElement
-{
-    error_clear_last();
-    $result = \simplexml_import_dom($node, $class_name);
-    if ($result === null) {
-        throw SimplexmlException::createFromPhpError();
-    }
-    return $result;
-}
-
-
-/**
- * Convert the well-formed XML document in the given file to an object.
- *
- * @param string $filename Path to the XML file
- * @param string $class_name You may use this optional parameter so that
- * simplexml_load_file will return an object of
- * the specified class. That class should extend the
- * SimpleXMLElement class.
- * @param int $options Since Libxml 2.6.0, you may also use the
- * options parameter to specify additional Libxml parameters.
- * @param string $namespace_or_prefix Namespace prefix or URI.
- * @param bool $is_prefix TRUE if namespace_or_prefix is a prefix, FALSE if it's a URI;
- * defaults to FALSE.
- * @return \SimpleXMLElement Returns an object of class SimpleXMLElement with
- * properties containing the data held within the XML document.
- * @throws SimplexmlException
- *
- */
-function simplexml_load_file(string $filename, string $class_name = \SimpleXMLElement::class, int $options = 0, string $namespace_or_prefix = "", bool $is_prefix = false): \SimpleXMLElement
-{
-    error_clear_last();
-    $result = \simplexml_load_file($filename, $class_name, $options, $namespace_or_prefix, $is_prefix);
-    if ($result === false) {
-        throw SimplexmlException::createFromPhpError();
-    }
-    return $result;
-}
-
-
-/**
- * Takes a well-formed XML string and returns it as an object.
- *
- * @param string $data A well-formed XML string
- * @param string $class_name You may use this optional parameter so that
- * simplexml_load_string will return an object of
- * the specified class. That class should extend the
- * SimpleXMLElement class.
- * @param int $options Since Libxml 2.6.0, you may also use the
- * options parameter to specify additional Libxml parameters.
- * @param string $namespace_or_prefix Namespace prefix or URI.
- * @param bool $is_prefix TRUE if namespace_or_prefix is a prefix, FALSE if it's a URI;
- * defaults to FALSE.
- * @return \SimpleXMLElement Returns an object of class SimpleXMLElement with
- * properties containing the data held within the xml document.
- * @throws SimplexmlException
- *
- */
-function simplexml_load_string(string $data, string $class_name = \SimpleXMLElement::class, int $options = 0, string $namespace_or_prefix = "", bool $is_prefix = false): \SimpleXMLElement
-{
-    error_clear_last();
-    $result = \simplexml_load_string($data, $class_name, $options, $namespace_or_prefix, $is_prefix);
-    if ($result === false) {
-        throw SimplexmlException::createFromPhpError();
-    }
-    return $result;
-}
diff --git a/generator/config/ignoredFunctions.php b/generator/config/ignoredFunctions.php
index 5bd99a92..5706b388 100644
--- a/generator/config/ignoredFunctions.php
+++ b/generator/config/ignoredFunctions.php
@@ -18,5 +18,5 @@
     'filter_has_var', // this function is meant to return a boolean
     'array_multisort', // this function is too buggy, see PR #113 on GitHub
     'imagegrabwindow',
-    'get_headers'
+    'get_headers',
 ];
diff --git a/generator/config/specialCasesFunctions.php b/generator/config/specialCasesFunctions.php
index 8943ff59..4704eddf 100644
--- a/generator/config/specialCasesFunctions.php
+++ b/generator/config/specialCasesFunctions.php
@@ -11,4 +11,7 @@
     'openssl_encrypt',
     'readdir',
     'socket_write',
+    'simplexml_import_dom',
+    'simplexml_load_file',
+    'simplexml_load_string',
 ];
diff --git a/generator/src/FileCreator.php b/generator/src/FileCreator.php
index 92069ad8..d7f5dbae 100644
--- a/generator/src/FileCreator.php
+++ b/generator/src/FileCreator.php
@@ -81,12 +81,12 @@ public function generateFunctionsList(array $functions, string $path): void
     }
 
     /**
-     * Generates a configuration file for replacing all functions when using rector/rector:~0.6.
+     * Generates a configuration file for replacing all functions when using rector/rector.
      *
      * @param Method[] $functions
      * @param string $path
      */
-    public function generateRectorFileForZeroPointSeven(array $functions, string $path): void
+    public function generateRectorFile(array $functions, string $path): void
     {
         $functionNames = $this->getFunctionsNameList($functions);
 
@@ -104,7 +104,7 @@ public function generateRectorFileForZeroPointSeven(array $functions, string $pa
 use Rector\Renaming\Rector\FuncCall\RenameFunctionRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
-# This file configures rector/rector:~0.7.0 to replace all PHP functions with their equivalent "safe" functions
+# This file configures rector/rector to replace all PHP functions with their equivalent "safe" functions
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
diff --git a/generator/src/GenerateCommand.php b/generator/src/GenerateCommand.php
index cdb38650..3b0bfbdb 100644
--- a/generator/src/GenerateCommand.php
+++ b/generator/src/GenerateCommand.php
@@ -37,7 +37,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $fileCreator = new FileCreator();
         $fileCreator->generatePhpFile($functions, __DIR__ . '/../../generated/');
         $fileCreator->generateFunctionsList($functions, __DIR__ . '/../../generated/functionsList.php');
-        $fileCreator->generateRectorFileForZeroPointSeven($functions, __DIR__ . '/../../rector-migrate.php');
+        $fileCreator->generateRectorFile($functions, __DIR__ . '/../../rector-migrate.php');
 
 
         $modules = [];
diff --git a/generated/Exceptions/SimplexmlException.php b/lib/Exceptions/SimplexmlException.php
similarity index 91%
rename from generated/Exceptions/SimplexmlException.php
rename to lib/Exceptions/SimplexmlException.php
index 67804e13..a04e6cdc 100644
--- a/generated/Exceptions/SimplexmlException.php
+++ b/lib/Exceptions/SimplexmlException.php
@@ -1,6 +1,8 @@
 <?php
 namespace Safe\Exceptions;
 
+use function error_get_last;
+
 class SimplexmlException extends \ErrorException implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
diff --git a/lib/special_cases.php b/lib/special_cases.php
index d2093b59..605b8ded 100644
--- a/lib/special_cases.php
+++ b/lib/special_cases.php
@@ -14,6 +14,7 @@
 use Safe\Exceptions\JsonException;
 use Safe\Exceptions\OpensslException;
 use Safe\Exceptions\PcreException;
+use Safe\Exceptions\SimplexmlException;
 
 /**
  * Wrapper for json_decode that throws when an error occurs.
@@ -239,3 +240,85 @@ function socket_write(\Socket $socket, string $buffer, int $length = 0): int
     }
     return $result;
 }
+
+/**
+ * This function takes a node of a DOM
+ * document and makes it into a SimpleXML node. This new object can
+ * then be used as a native SimpleXML element.
+ *
+ * @param \DOMNode $node A DOM Element node
+ * @param string $class_name You may use this optional parameter so that
+ * simplexml_import_dom will return an object of
+ * the specified class. That class should extend the
+ * SimpleXMLElement class.
+ * @return \SimpleXMLElement Returns a SimpleXMLElement.
+ * @throws SimplexmlException
+ *
+ */
+function simplexml_import_dom(\DOMNode $node, string $class_name = \SimpleXMLElement::class): \SimpleXMLElement
+{
+    error_clear_last();
+    $result = \simplexml_import_dom($node, $class_name);
+    if ($result === null) {
+        throw SimplexmlException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Convert the well-formed XML document in the given file to an object.
+ *
+ * @param string $filename Path to the XML file
+ * @param string $class_name You may use this optional parameter so that
+ * simplexml_load_file will return an object of
+ * the specified class. That class should extend the
+ * SimpleXMLElement class.
+ * @param int $options Since Libxml 2.6.0, you may also use the
+ * options parameter to specify additional Libxml parameters.
+ * @param string $namespace_or_prefix Namespace prefix or URI.
+ * @param bool $is_prefix TRUE if namespace_or_prefix is a prefix, FALSE if it's a URI;
+ * defaults to FALSE.
+ * @return \SimpleXMLElement Returns an object of class SimpleXMLElement with
+ * properties containing the data held within the XML document.
+ * @throws SimplexmlException
+ *
+ */
+function simplexml_load_file(string $filename, string $class_name = \SimpleXMLElement::class, int $options = 0, string $namespace_or_prefix = "", bool $is_prefix = false): \SimpleXMLElement
+{
+    error_clear_last();
+    $result = \simplexml_load_file($filename, $class_name, $options, $namespace_or_prefix, $is_prefix);
+    if ($result === false) {
+        throw SimplexmlException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Takes a well-formed XML string and returns it as an object.
+ *
+ * @param string $data A well-formed XML string
+ * @param string $class_name You may use this optional parameter so that
+ * simplexml_load_string will return an object of
+ * the specified class. That class should extend the
+ * SimpleXMLElement class.
+ * @param int $options Since Libxml 2.6.0, you may also use the
+ * options parameter to specify additional Libxml parameters.
+ * @param string $namespace_or_prefix Namespace prefix or URI.
+ * @param bool $is_prefix TRUE if namespace_or_prefix is a prefix, FALSE if it's a URI;
+ * defaults to FALSE.
+ * @return \SimpleXMLElement Returns an object of class SimpleXMLElement with
+ * properties containing the data held within the xml document.
+ * @throws SimplexmlException
+ *
+ */
+function simplexml_load_string(string $data, string $class_name = \SimpleXMLElement::class, int $options = 0, string $namespace_or_prefix = "", bool $is_prefix = false): \SimpleXMLElement
+{
+    error_clear_last();
+    $result = \simplexml_load_string($data, $class_name, $options, $namespace_or_prefix, $is_prefix);
+    if ($result === false) {
+        throw SimplexmlException::createFromPhpError();
+    }
+    return $result;
+}

From ba39c87b7746e043e8560925be866e84619ca7a8 Mon Sep 17 00:00:00 2001
From: dbrekelmans <dbrekelmans@users.noreply.github.com>
Date: Mon, 19 Jul 2021 22:08:43 +0200
Subject: [PATCH 09/10] Fix test case

---
 generator/tests/GeneratedFilesTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generator/tests/GeneratedFilesTest.php b/generator/tests/GeneratedFilesTest.php
index df03d9f3..021c3b70 100644
--- a/generator/tests/GeneratedFilesTest.php
+++ b/generator/tests/GeneratedFilesTest.php
@@ -48,9 +48,9 @@ public function testPregMatch()
 
     public function testObjects()
     {
-        require_once __DIR__ . '/../../generated/simplexml.php';
+        require_once __DIR__ . '/../../lib/special_cases.php';
         require_once __DIR__ . '/../../lib/Exceptions/SafeExceptionInterface.php';
-        require_once __DIR__ . '/../../generated/Exceptions/SimplexmlException.php';
+        require_once __DIR__ . '/../../lib/Exceptions/SimplexmlException.php';
 
         $xmlStr = <<<XML
 <?xml version='1.0' standalone='yes'?>

From 59803f6aa1c0b374a4175c31a11b4515ab28ec73 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 28 Jul 2021 20:57:24 +0200
Subject: [PATCH 10/10] Automatically regenerate the files (#2)

---
 composer.json                         |   1 +
 generated/Exceptions/DomException.php |  11 ++
 generated/datetime.php                |  32 +++++
 generated/dom.php                     |  26 ++++
 generated/exec.php                    |  20 +++
 generated/filesystem.php              |  11 +-
 generated/functionsList.php           |  11 ++
 generated/password.php                |  13 +-
 generated/rrd.php                     | 167 ++++++++++++++++++++++++++
 rector-migrate.php                    |  11 ++
 10 files changed, 289 insertions(+), 14 deletions(-)
 create mode 100644 generated/Exceptions/DomException.php
 create mode 100644 generated/dom.php

diff --git a/composer.json b/composer.json
index f2ac3b57..f754c2c9 100644
--- a/composer.json
+++ b/composer.json
@@ -27,6 +27,7 @@
             "generated/curl.php",
             "generated/datetime.php",
             "generated/dir.php",
+            "generated/dom.php",
             "generated/eio.php",
             "generated/errorfunc.php",
             "generated/exec.php",
diff --git a/generated/Exceptions/DomException.php b/generated/Exceptions/DomException.php
new file mode 100644
index 00000000..401173cb
--- /dev/null
+++ b/generated/Exceptions/DomException.php
@@ -0,0 +1,11 @@
+<?php
+namespace Safe\Exceptions;
+
+class DomException extends \ErrorException implements SafeExceptionInterface
+{
+    public static function createFromPhpError(): self
+    {
+        $error = error_get_last();
+        return new self($error['message'] ?? 'An error occured', 0, $error['type'] ?? 1);
+    }
+}
diff --git a/generated/datetime.php b/generated/datetime.php
index 59243c91..8dc81328 100644
--- a/generated/datetime.php
+++ b/generated/datetime.php
@@ -357,6 +357,38 @@ function date_sunset(int $timestamp, int $returnFormat = SUNFUNCS_RET_STRING, fl
 }
 
 
+/**
+ * Returns a string formatted according to the given format string using the
+ * given integer timestamp or the current time
+ * if no timestamp is given.  In other words, timestamp
+ * is optional and defaults to the value of time.
+ *
+ * @param string $format Format accepted by DateTimeInterface::format.
+ * @param int $timestamp The optional timestamp parameter is an
+ * int Unix timestamp that defaults to the current
+ * local time if timestamp is omitted or NULL. In other
+ * words, it defaults to the value of time.
+ * @return string Returns a formatted date string. If a non-numeric value is used for
+ * timestamp, FALSE is returned and an
+ * E_WARNING level error is emitted.
+ * @throws DatetimeException
+ *
+ */
+function date(string $format, int $timestamp = null): string
+{
+    error_clear_last();
+    if ($timestamp !== null) {
+        $result = \date($format, $timestamp);
+    } else {
+        $result = \date($format);
+    }
+    if ($result === false) {
+        throw DatetimeException::createFromPhpError();
+    }
+    return $result;
+}
+
+
 /**
  * Identical to mktime except the passed parameters represents a
  * GMT date. gmmktime internally uses mktime
diff --git a/generated/dom.php b/generated/dom.php
new file mode 100644
index 00000000..316d2ce2
--- /dev/null
+++ b/generated/dom.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Safe;
+
+use Safe\Exceptions\DomException;
+
+/**
+ * This function takes the node node of class
+ * SimpleXML and makes it into a
+ * DOMElement node. This new object can then be used
+ * as a native DOMElement node.
+ *
+ * @param \SimpleXMLElement $node The SimpleXMLElement node.
+ * @return \DOMElement|false The DOMElement node added.
+ * @throws DomException
+ *
+ */
+function dom_import_simplexml(\SimpleXMLElement $node): \DOMElement
+{
+    error_clear_last();
+    $result = \dom_import_simplexml($node);
+    if ($result === null) {
+        throw DomException::createFromPhpError();
+    }
+    return $result;
+}
diff --git a/generated/exec.php b/generated/exec.php
index afd33b77..24ad8f87 100644
--- a/generated/exec.php
+++ b/generated/exec.php
@@ -166,6 +166,26 @@ function proc_nice(int $priority): void
 }
 
 
+/**
+ * This function is identical to the backtick operator.
+ *
+ * @param string $cmd The command that will be executed.
+ * @return string A string containing the output from the executed command, FALSE if the pipe
+ * cannot be established or NULL if an error occurs or the command produces no output.
+ * @throws ExecException
+ *
+ */
+function shell_exec(string $cmd): string
+{
+    error_clear_last();
+    $result = \shell_exec($cmd);
+    if ($result === null) {
+        throw ExecException::createFromPhpError();
+    }
+    return $result;
+}
+
+
 /**
  * system is just like the C version of the
  * function in that it executes the given
diff --git a/generated/filesystem.php b/generated/filesystem.php
index b2240977..2026d66a 100644
--- a/generated/filesystem.php
+++ b/generated/filesystem.php
@@ -565,9 +565,8 @@ function filesize(string $filename): int
  * model which can be used on virtually every platform (including most Unix
  * derivatives and even Windows).
  *
- * On versions of PHP before 5.3.2, the lock is released also by
- * fclose (which is also called automatically when script
- * finished).
+ * The lock is released also by fclose,
+ * or when stream is garbage collected.
  *
  * PHP supports a portable way of locking complete files in an advisory way
  * (which means all accessing programs have to use the same way of locking
@@ -837,11 +836,11 @@ function fopen(string $filename, string $mode, bool $use_include_path = false, $
  * fclose).
  * @param array $fields An array of strings.
  * @param string $separator The optional separator parameter sets the field
- * delimiter (one character only).
+ * delimiter (one single-byte character only).
  * @param string $enclosure The optional enclosure parameter sets the field
- * enclosure (one character only).
+ * enclosure (one single-byte character only).
  * @param string $escape_char The optional escape_char parameter sets the
- * escape character (at most one character).
+ * escape character (at most one single-byte character).
  * An empty string ("") disables the proprietary escape mechanism.
  * @return int Returns the length of the written string.
  * @throws FilesystemException
diff --git a/generated/functionsList.php b/generated/functionsList.php
index 59e6da68..9e704b56 100644
--- a/generated/functionsList.php
+++ b/generated/functionsList.php
@@ -112,6 +112,7 @@
     'curl_share_errno',
     'curl_share_setopt',
     'curl_unescape',
+    'date',
     'date_parse',
     'date_parse_from_format',
     'date_sunrise',
@@ -137,6 +138,7 @@
     'disk_total_space',
     'dl',
     'dns_get_record',
+    'dom_import_simplexml',
     'eio_busy',
     'eio_chmod',
     'eio_chown',
@@ -897,6 +899,14 @@
     'rmdir',
     'rpmaddtag',
     'rrd_create',
+    'rrd_first',
+    'rrd_graph',
+    'rrd_info',
+    'rrd_lastupdate',
+    'rrd_restore',
+    'rrd_tune',
+    'rrd_update',
+    'rrd_xport',
     'rsort',
     'sapi_windows_cp_conv',
     'sapi_windows_cp_set',
@@ -924,6 +934,7 @@
     'set_include_path',
     'set_time_limit',
     'sha1_file',
+    'shell_exec',
     'shmop_delete',
     'shmop_read',
     'shm_attach',
diff --git a/generated/password.php b/generated/password.php
index 0529d014..672e803c 100644
--- a/generated/password.php
+++ b/generated/password.php
@@ -53,8 +53,9 @@
  *
  *
  *
- * The salt option has been deprecated as of PHP 7.0.0. It is now
+ * The salt option is deprecated. It is now
  * preferred to simply use the salt that is generated by default.
+ * As of PHP 8.0.0, an explicitly given salt is ignored.
  *
  *
  *
@@ -90,7 +91,7 @@
  *
  *
  *
- * Only available when PHP use libargon2, not with libsodium implementation.
+ * Only available when PHP uses libargon2, not with libsodium implementation.
  *
  *
  *
@@ -116,14 +117,10 @@
  * @throws PasswordException
  *
  */
-function password_hash(string $password, $algo, array $options = null): string
+function password_hash(string $password, $algo, array $options = []): string
 {
     error_clear_last();
-    if ($options !== null) {
-        $result = \password_hash($password, $algo, $options);
-    } else {
-        $result = \password_hash($password, $algo);
-    }
+    $result = \password_hash($password, $algo, $options);
     if ($result === false) {
         throw PasswordException::createFromPhpError();
     }
diff --git a/generated/rrd.php b/generated/rrd.php
index 9bb3b5c5..2da227d0 100644
--- a/generated/rrd.php
+++ b/generated/rrd.php
@@ -21,3 +21,170 @@ function rrd_create(string $filename, array $options): void
         throw RrdException::createFromPhpError();
     }
 }
+
+
+/**
+ * Returns the first data sample from the specified RRA of the RRD file.
+ *
+ * @param string $file RRD database file name.
+ * @param int $raaindex The index number of the RRA that is to be examined. Default value is 0.
+ * @return int Integer number of unix timestamp.
+ * @throws RrdException
+ *
+ */
+function rrd_first(string $file, int $raaindex = 0): int
+{
+    error_clear_last();
+    $result = \rrd_first($file, $raaindex);
+    if ($result === false) {
+        throw RrdException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Creates image for a particular data from RRD file.
+ *
+ * @param string $filename The filename to output the graph to. This will generally end in either
+ * .png, .svg or
+ * .eps, depending on the format you want to output.
+ * @param array $options Options for generating image. See man page of rrd graph for all
+ * possible options. All options (data definitions, variable definitions, etc.)
+ * are allowed.
+ * @return array Array with information about generated image is returned.
+ * @throws RrdException
+ *
+ */
+function rrd_graph(string $filename, array $options): array
+{
+    error_clear_last();
+    $result = \rrd_graph($filename, $options);
+    if ($result === false) {
+        throw RrdException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Returns information about particular RRD database file.
+ *
+ * @param string $filename RRD database file name.
+ * @return array Array with information about requested RRD file.
+ * @throws RrdException
+ *
+ */
+function rrd_info(string $filename): array
+{
+    error_clear_last();
+    $result = \rrd_info($filename);
+    if ($result === false) {
+        throw RrdException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Gets array of the UNIX timestamp and the values stored for each date in the
+ * most recent update of the RRD database file.
+ *
+ * @param string $filename RRD database file name.
+ * @return array Array of information about last update.
+ * @throws RrdException
+ *
+ */
+function rrd_lastupdate(string $filename): array
+{
+    error_clear_last();
+    $result = \rrd_lastupdate($filename);
+    if ($result === false) {
+        throw RrdException::createFromPhpError();
+    }
+    return $result;
+}
+
+
+/**
+ * Restores the RRD file from the XML dump.
+ *
+ * @param string $xml_file XML filename with the dump of the original RRD database file.
+ * @param string $rrd_file Restored RRD database file name.
+ * @param array $options Array of options for restoring. See man page for rrd restore.
+ * @throws RrdException
+ *
+ */
+function rrd_restore(string $xml_file, string $rrd_file, array $options = null): void
+{
+    error_clear_last();
+    if ($options !== null) {
+        $result = \rrd_restore($xml_file, $rrd_file, $options);
+    } else {
+        $result = \rrd_restore($xml_file, $rrd_file);
+    }
+    if ($result === false) {
+        throw RrdException::createFromPhpError();
+    }
+}
+
+
+/**
+ * Change some options in the RRD dabase header file. E.g. renames the source for
+ * the data etc.
+ *
+ * @param string $filename RRD database file name.
+ * @param array $options Options with RRD database file properties which will be changed. See
+ * rrd tune man page for details.
+ * @throws RrdException
+ *
+ */
+function rrd_tune(string $filename, array $options): void
+{
+    error_clear_last();
+    $result = \rrd_tune($filename, $options);
+    if ($result === false) {
+        throw RrdException::createFromPhpError();
+    }
+}
+
+
+/**
+ * Updates the RRD database file. The input data is time interpolated according to the
+ * properties of the RRD database file.
+ *
+ * @param string $filename RRD database file name. This database will be updated.
+ * @param array $options Options for updating the RRD database. This is list of strings. See man page of rrd update
+ * for whole list of options.
+ * @throws RrdException
+ *
+ */
+function rrd_update(string $filename, array $options): void
+{
+    error_clear_last();
+    $result = \rrd_update($filename, $options);
+    if ($result === false) {
+        throw RrdException::createFromPhpError();
+    }
+}
+
+
+/**
+ * Exports the information about RRD database file. This data can be converted
+ * to XML file via user space PHP script and then restored back as RRD database
+ * file.
+ *
+ * @param array $options Array of options for the export, see rrd xport man page.
+ * @return array Array with information about RRD database file.
+ * @throws RrdException
+ *
+ */
+function rrd_xport(array $options): array
+{
+    error_clear_last();
+    $result = \rrd_xport($options);
+    if ($result === false) {
+        throw RrdException::createFromPhpError();
+    }
+    return $result;
+}
diff --git a/rector-migrate.php b/rector-migrate.php
index 8e352e4c..b609912f 100644
--- a/rector-migrate.php
+++ b/rector-migrate.php
@@ -122,6 +122,7 @@
             'curl_share_errno' => 'Safe\curl_share_errno',
             'curl_share_setopt' => 'Safe\curl_share_setopt',
             'curl_unescape' => 'Safe\curl_unescape',
+            'date' => 'Safe\date',
             'date_parse' => 'Safe\date_parse',
             'date_parse_from_format' => 'Safe\date_parse_from_format',
             'date_sunrise' => 'Safe\date_sunrise',
@@ -147,6 +148,7 @@
             'disk_total_space' => 'Safe\disk_total_space',
             'dl' => 'Safe\dl',
             'dns_get_record' => 'Safe\dns_get_record',
+            'dom_import_simplexml' => 'Safe\dom_import_simplexml',
             'eio_busy' => 'Safe\eio_busy',
             'eio_chmod' => 'Safe\eio_chmod',
             'eio_chown' => 'Safe\eio_chown',
@@ -907,6 +909,14 @@
             'rmdir' => 'Safe\rmdir',
             'rpmaddtag' => 'Safe\rpmaddtag',
             'rrd_create' => 'Safe\rrd_create',
+            'rrd_first' => 'Safe\rrd_first',
+            'rrd_graph' => 'Safe\rrd_graph',
+            'rrd_info' => 'Safe\rrd_info',
+            'rrd_lastupdate' => 'Safe\rrd_lastupdate',
+            'rrd_restore' => 'Safe\rrd_restore',
+            'rrd_tune' => 'Safe\rrd_tune',
+            'rrd_update' => 'Safe\rrd_update',
+            'rrd_xport' => 'Safe\rrd_xport',
             'rsort' => 'Safe\rsort',
             'sapi_windows_cp_conv' => 'Safe\sapi_windows_cp_conv',
             'sapi_windows_cp_set' => 'Safe\sapi_windows_cp_set',
@@ -934,6 +944,7 @@
             'set_include_path' => 'Safe\set_include_path',
             'set_time_limit' => 'Safe\set_time_limit',
             'sha1_file' => 'Safe\sha1_file',
+            'shell_exec' => 'Safe\shell_exec',
             'shmop_delete' => 'Safe\shmop_delete',
             'shmop_read' => 'Safe\shmop_read',
             'shm_attach' => 'Safe\shm_attach',