diff --git a/language/predefined/exception/clone.xml b/language/predefined/exception/clone.xml
index db137381dcf3..c59bdae69034 100644
--- a/language/predefined/exception/clone.xml
+++ b/language/predefined/exception/clone.xml
@@ -8,10 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis role="Exception">
-   <modifier>private</modifier> <type>void</type><methodname>Exception::__clone</methodname>
-   <void/>
-  </methodsynopsis>
+  <?phpdoc synopsis="Exception::__clone" ?>
   <simpara>
    Exceptions do not support cloning; this method exists only to prevent it.
   </simpara>
diff --git a/language/predefined/exception/construct.xml b/language/predefined/exception/construct.xml
index 2b907ed6487d..9b90510c7b12 100644
--- a/language/predefined/exception/construct.xml
+++ b/language/predefined/exception/construct.xml
@@ -8,12 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <constructorsynopsis role="Exception">
-   <modifier>public</modifier> <methodname>Exception::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>message</parameter><initializer>""</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>code</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>Throwable</type><type>null</type></type><parameter>previous</parameter><initializer>&null;</initializer></methodparam>
-  </constructorsynopsis>
+  <?phpdoc synopsis="Exception::__construct" ?>
   <para>
    Constructs the Exception.
   </para>
diff --git a/language/predefined/exception/getcode.xml b/language/predefined/exception/getcode.xml
index e625d44fb10e..88bb342d040e 100644
--- a/language/predefined/exception/getcode.xml
+++ b/language/predefined/exception/getcode.xml
@@ -8,10 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis role="Exception">
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>Exception::getCode</methodname>
-   <void/>
-  </methodsynopsis>
+  <?phpdoc synopsis="Exception::getCode" ?>
   <para>
    Returns the Exception code.
   </para>
diff --git a/language/predefined/exception/getfile.xml b/language/predefined/exception/getfile.xml
index 0e347c7b1d13..d201c80519a7 100644
--- a/language/predefined/exception/getfile.xml
+++ b/language/predefined/exception/getfile.xml
@@ -8,10 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis role="Exception">
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>Exception::getFile</methodname>
-   <void/>
-  </methodsynopsis>
+  <?phpdoc synopsis="Exception::getFile" ?>
   <para>
    Get the name of the file in which the exception was created.
   </para>
diff --git a/language/predefined/exception/getline.xml b/language/predefined/exception/getline.xml
index 9c4ebdfb672b..c086b5c7729c 100644
--- a/language/predefined/exception/getline.xml
+++ b/language/predefined/exception/getline.xml
@@ -8,10 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis role="Exception">
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>Exception::getLine</methodname>
-   <void/>
-  </methodsynopsis>
+  <?phpdoc synopsis="Exception::getLine" ?>
   <para>
    Get line number where the exception was created.
   </para>
diff --git a/language/predefined/exception/getmessage.xml b/language/predefined/exception/getmessage.xml
index 52d28cc40043..21d306579bd9 100644
--- a/language/predefined/exception/getmessage.xml
+++ b/language/predefined/exception/getmessage.xml
@@ -8,10 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis role="Exception">
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>Exception::getMessage</methodname>
-   <void/>
-  </methodsynopsis>
+  <?phpdoc synopsis="Exception::getMessage" ?>
   <para>
    Returns the Exception message.
   </para>
diff --git a/language/predefined/exception/getprevious.xml b/language/predefined/exception/getprevious.xml
index 03943d4cbe50..a0224f5452ec 100644
--- a/language/predefined/exception/getprevious.xml
+++ b/language/predefined/exception/getprevious.xml
@@ -8,10 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis role="Exception">
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>Throwable</type><type>null</type></type><methodname>Exception::getPrevious</methodname>
-   <void/>
-  </methodsynopsis>
+  <?phpdoc synopsis="Exception::getPrevious" ?>
   <para>
    Returns previous <classname>Throwable</classname>
    (which had been passed as the third parameter of <methodname>Exception::__construct</methodname>).
diff --git a/language/predefined/exception/gettrace.xml b/language/predefined/exception/gettrace.xml
index f632ef33db04..1c4b6a89483c 100644
--- a/language/predefined/exception/gettrace.xml
+++ b/language/predefined/exception/gettrace.xml
@@ -8,10 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis role="Exception">
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>Exception::getTrace</methodname>
-   <void/>
-  </methodsynopsis>
+  <?phpdoc synopsis="Exception::getTrace" ?>
   <para>
    Returns the Exception stack trace.
   </para>
diff --git a/language/predefined/exception/gettraceasstring.xml b/language/predefined/exception/gettraceasstring.xml
index 5033c4bebbe9..29fbb263c210 100644
--- a/language/predefined/exception/gettraceasstring.xml
+++ b/language/predefined/exception/gettraceasstring.xml
@@ -8,10 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis role="Exception">
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>Exception::getTraceAsString</methodname>
-   <void/>
-  </methodsynopsis>
+  <?phpdoc synopsis="Exception::getTraceAsString" ?>
   <para>
    Returns the Exception stack trace as a string.
   </para>
diff --git a/language/predefined/exception/tostring.xml b/language/predefined/exception/tostring.xml
index f9dd6583ad6d..8bdc4a20c4fd 100644
--- a/language/predefined/exception/tostring.xml
+++ b/language/predefined/exception/tostring.xml
@@ -8,10 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis role="Exception">
-   <modifier>public</modifier> <type>string</type><methodname>Exception::__toString</methodname>
-   <void/>
-  </methodsynopsis>
+  <?phpdoc synopsis="Exception::__toString" ?>
   <para>
    Returns the <type>string</type> representation of the exception.
   </para>
diff --git a/reference/openssl/functions/openssl-cipher-iv-length.xml b/reference/openssl/functions/openssl-cipher-iv-length.xml
index 21d4598d105e..b45e91715a38 100644
--- a/reference/openssl/functions/openssl-cipher-iv-length.xml
+++ b/reference/openssl/functions/openssl-cipher-iv-length.xml
@@ -8,10 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>openssl_cipher_iv_length</methodname>
-   <methodparam><type>string</type><parameter>cipher_algo</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_cipher_iv_length" ?>
   <para>
    Gets the cipher initialization vector (iv) length.
   </para>
diff --git a/reference/openssl/functions/openssl-cipher-key-length.xml b/reference/openssl/functions/openssl-cipher-key-length.xml
index 069f8159244f..72b59cbcad50 100644
--- a/reference/openssl/functions/openssl-cipher-key-length.xml
+++ b/reference/openssl/functions/openssl-cipher-key-length.xml
@@ -7,10 +7,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>openssl_cipher_key_length</methodname>
-   <methodparam><type>string</type><parameter>cipher_algo</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_cipher_key_length" ?>
   <para>
    Gets the cipher key length.
   </para>
diff --git a/reference/openssl/functions/openssl-cms-decrypt.xml b/reference/openssl/functions/openssl-cms-decrypt.xml
index 27fbc552fdd2..4a84dc875878 100644
--- a/reference/openssl/functions/openssl-cms-decrypt.xml
+++ b/reference/openssl/functions/openssl-cms-decrypt.xml
@@ -8,14 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_cms_decrypt</methodname>
-   <methodparam><type>string</type><parameter>input_filename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>output_filename</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLCertificate</type><type>string</type></type><parameter>certificate</parameter></methodparam>
-   <methodparam choice="opt"><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type><type>null</type></type><parameter>private_key</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>encoding</parameter><initializer><constant>OPENSSL_ENCODING_SMIME</constant></initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_cms_decrypt" ?>
   <para>
    Decrypts a CMS message.
   </para>
diff --git a/reference/openssl/functions/openssl-cms-encrypt.xml b/reference/openssl/functions/openssl-cms-encrypt.xml
index b6508b26d7b7..567e97b83cfb 100644
--- a/reference/openssl/functions/openssl-cms-encrypt.xml
+++ b/reference/openssl/functions/openssl-cms-encrypt.xml
@@ -8,16 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_cms_encrypt</methodname>
-   <methodparam><type>string</type><parameter>input_filename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>output_filename</parameter></methodparam>
-   <methodparam><type class="union"><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>certificate</parameter></methodparam>
-   <methodparam><type class="union"><type>array</type><type>null</type></type><parameter>headers</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>encoding</parameter><initializer><constant>OPENSSL_ENCODING_SMIME</constant></initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>int</type></type><parameter>cipher_algo</parameter><initializer><constant>OPENSSL_CIPHER_AES_128_CBC</constant></initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_cms_encrypt" ?>
   <para>
    This function encrypts content to one or more recipients,
    based on the certificates that are passed to it.
diff --git a/reference/openssl/functions/openssl-cms-read.xml b/reference/openssl/functions/openssl-cms-read.xml
index 29866a2ecf5d..36e7e192a38d 100644
--- a/reference/openssl/functions/openssl-cms-read.xml
+++ b/reference/openssl/functions/openssl-cms-read.xml
@@ -9,11 +9,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_cms_read</methodname>
-   <methodparam><type>string</type><parameter>input_filename</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">certificates</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_cms_read" ?>
   <para>
    Performs the exact analog to <function>openssl_pkcs7_read</function>.
   </para>
diff --git a/reference/openssl/functions/openssl-cms-sign.xml b/reference/openssl/functions/openssl-cms-sign.xml
index e3eef16471bb..ff3dc2c81366 100644
--- a/reference/openssl/functions/openssl-cms-sign.xml
+++ b/reference/openssl/functions/openssl-cms-sign.xml
@@ -8,17 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_cms_sign</methodname>
-   <methodparam><type>string</type><parameter>input_filename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>output_filename</parameter></methodparam>
-   <methodparam><type class="union"><type>OpenSSLCertificate</type><type>string</type></type><parameter>certificate</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>private_key</parameter></methodparam>
-   <methodparam><type class="union"><type>array</type><type>null</type></type><parameter>headers</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>encoding</parameter><initializer><constant>OPENSSL_ENCODING_SMIME</constant></initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>untrusted_certificates_filename</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_cms_sign" ?>
   <para>
    This function signs a file with an X.509 certificate and key.
   </para>
diff --git a/reference/openssl/functions/openssl-cms-verify.xml b/reference/openssl/functions/openssl-cms-verify.xml
index c547ff03a17b..5e3e96a3c1ec 100644
--- a/reference/openssl/functions/openssl-cms-verify.xml
+++ b/reference/openssl/functions/openssl-cms-verify.xml
@@ -9,18 +9,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_cms_verify</methodname>
-   <methodparam><type>string</type><parameter>input_filename</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>certificates</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>ca_info</parameter><initializer>[]</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>untrusted_certificates_filename</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>content</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>pk7</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>sigfile</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>encoding</parameter><initializer><constant>OPENSSL_ENCODING_SMIME</constant></initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_cms_verify" ?>
   <para>
    This function verifies a CMS signature, either attached or detached, with the specified encoding.
   </para>
diff --git a/reference/openssl/functions/openssl-csr-export-to-file.xml b/reference/openssl/functions/openssl-csr-export-to-file.xml
index d6454056e2e8..5e612c2209c9 100644
--- a/reference/openssl/functions/openssl-csr-export-to-file.xml
+++ b/reference/openssl/functions/openssl-csr-export-to-file.xml
@@ -8,12 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_csr_export_to_file</methodname>
-   <methodparam><type class="union"><type>OpenSSLCertificateSigningRequest</type><type>string</type></type><parameter>csr</parameter></methodparam>
-   <methodparam><type>string</type><parameter>output_filename</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>no_text</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_csr_export_to_file" ?>
   <para>
    <function>openssl_csr_export_to_file</function> takes the Certificate
    Signing Request represented by <parameter>csr</parameter> and saves it
diff --git a/reference/openssl/functions/openssl-csr-export.xml b/reference/openssl/functions/openssl-csr-export.xml
index 4872864125db..e2a36cd9d898 100644
--- a/reference/openssl/functions/openssl-csr-export.xml
+++ b/reference/openssl/functions/openssl-csr-export.xml
@@ -8,12 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_csr_export</methodname>
-   <methodparam><type class="union"><type>OpenSSLCertificateSigningRequest</type><type>string</type></type><parameter>csr</parameter></methodparam>
-   <methodparam><type>string</type><parameter role="reference">output</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>no_text</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_csr_export" ?>
   <para>
    <function>openssl_csr_export</function> takes the Certificate Signing
    Request represented by <parameter>csr</parameter> and stores it in
diff --git a/reference/openssl/functions/openssl-csr-get-public-key.xml b/reference/openssl/functions/openssl-csr-get-public-key.xml
index 22aaa549eabe..bb0bb50738cb 100644
--- a/reference/openssl/functions/openssl-csr-get-public-key.xml
+++ b/reference/openssl/functions/openssl-csr-get-public-key.xml
@@ -8,11 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>OpenSSLAsymmetricKey</type><type>false</type></type><methodname>openssl_csr_get_public_key</methodname>
-   <methodparam><type class="union"><type>OpenSSLCertificateSigningRequest</type><type>string</type></type><parameter>csr</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>short_names</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_csr_get_public_key" ?>
   <para>
    <function>openssl_csr_get_public_key</function> extracts the public key 
    from <parameter>csr</parameter> and prepares it for use by other functions.
diff --git a/reference/openssl/functions/openssl-csr-get-subject.xml b/reference/openssl/functions/openssl-csr-get-subject.xml
index 7cc1ccd3b2ca..1358ea8267ad 100644
--- a/reference/openssl/functions/openssl-csr-get-subject.xml
+++ b/reference/openssl/functions/openssl-csr-get-subject.xml
@@ -8,11 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>openssl_csr_get_subject</methodname>
-   <methodparam><type class="union"><type>OpenSSLCertificateSigningRequest</type><type>string</type></type><parameter>csr</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>short_names</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_csr_get_subject" ?>
   <para>
    <function>openssl_csr_get_subject</function> returns subject
    distinguished name information encoded in the <parameter>csr</parameter>
diff --git a/reference/openssl/functions/openssl-csr-new.xml b/reference/openssl/functions/openssl-csr-new.xml
index dccaac79374f..b1fc65e99161 100644
--- a/reference/openssl/functions/openssl-csr-new.xml
+++ b/reference/openssl/functions/openssl-csr-new.xml
@@ -8,13 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>OpenSSLCertificateSigningRequest</type><type>bool</type></type><methodname>openssl_csr_new</methodname>
-   <methodparam><type>array</type><parameter>distinguished_names</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>null</type></type><parameter role="reference">private_key</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>extra_attributes</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_csr_new" ?>
   <para>
    <function>openssl_csr_new</function> generates a new <acronym>CSR</acronym>
    based on the information provided by <parameter>distinguished_names</parameter>.
diff --git a/reference/openssl/functions/openssl-csr-sign.xml b/reference/openssl/functions/openssl-csr-sign.xml
index 607f5a0ffe24..0840ebc682e8 100644
--- a/reference/openssl/functions/openssl-csr-sign.xml
+++ b/reference/openssl/functions/openssl-csr-sign.xml
@@ -8,16 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>OpenSSLCertificate</type><type>false</type></type><methodname>openssl_csr_sign</methodname>
-   <methodparam><type class="union"><type>OpenSSLCertificateSigningRequest</type><type>string</type></type><parameter>csr</parameter></methodparam>
-   <methodparam><type class="union"><type>OpenSSLCertificate</type><type>string</type><type>null</type></type><parameter>ca_certificate</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>private_key</parameter></methodparam>
-   <methodparam><type>int</type><parameter>days</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>serial</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>serial_hex</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_csr_sign" ?>
   <para>
    <function>openssl_csr_sign</function> generates an x509 certificate from the given <acronym>CSR</acronym>.
   </para>
diff --git a/reference/openssl/functions/openssl-decrypt.xml b/reference/openssl/functions/openssl-decrypt.xml
index 1db682383b1b..bb0919d8e3c1 100644
--- a/reference/openssl/functions/openssl-decrypt.xml
+++ b/reference/openssl/functions/openssl-decrypt.xml
@@ -8,16 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>openssl_decrypt</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>string</type><parameter>cipher_algo</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>string</type><parameter>passphrase</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>iv</parameter><initializer>""</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>tag</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>aad</parameter><initializer>""</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_decrypt" ?>
   <para>
    Takes a raw or base64 encoded string and decrypts it using a given method and passphrase.
   </para>
diff --git a/reference/openssl/functions/openssl-dh-compute-key.xml b/reference/openssl/functions/openssl-dh-compute-key.xml
index 5b71bb5fadd6..548022e8658e 100644
--- a/reference/openssl/functions/openssl-dh-compute-key.xml
+++ b/reference/openssl/functions/openssl-dh-compute-key.xml
@@ -8,11 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>openssl_dh_compute_key</methodname>
-   <methodparam><type>string</type><parameter>public_key</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>OpenSSLAsymmetricKey</type><parameter>private_key</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_dh_compute_key" ?>
   <para>
    The shared secret returned by <function>openssl_dh_compute_key</function> is
    often used as an encryption key to secretly communicate with a remote party.
diff --git a/reference/openssl/functions/openssl-digest.xml b/reference/openssl/functions/openssl-digest.xml
index b48101256f7d..0b2e496a597d 100644
--- a/reference/openssl/functions/openssl-digest.xml
+++ b/reference/openssl/functions/openssl-digest.xml
@@ -8,12 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>openssl_digest</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>string</type><parameter>digest_algo</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>binary</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_digest" ?>
   <para>
    Computes a digest hash value for the given data using a given method,
    and returns a raw or binhex encoded string.
diff --git a/reference/openssl/functions/openssl-encrypt.xml b/reference/openssl/functions/openssl-encrypt.xml
index b9e2bf8335da..122998b6f733 100644
--- a/reference/openssl/functions/openssl-encrypt.xml
+++ b/reference/openssl/functions/openssl-encrypt.xml
@@ -8,17 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>openssl_encrypt</methodname>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>string</type><parameter>cipher_algo</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>string</type><parameter>passphrase</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>iv</parameter><initializer>""</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter role="reference">tag</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>aad</parameter><initializer>""</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>tag_length</parameter><initializer>16</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_encrypt" ?>
   <para>
    Encrypts given data with given method and passphrase, returns a raw
    or base64 encoded string
diff --git a/reference/openssl/functions/openssl-error-string.xml b/reference/openssl/functions/openssl-error-string.xml
index b64b3de14666..899a4623b718 100644
--- a/reference/openssl/functions/openssl-error-string.xml
+++ b/reference/openssl/functions/openssl-error-string.xml
@@ -8,10 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>openssl_error_string</methodname>
-   <void/>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_error_string" ?>
   <para>
    <function>openssl_error_string</function> returns the last error from the
    openSSL library.  Error messages are queued, so this function should be
diff --git a/reference/openssl/functions/openssl-free-key.xml b/reference/openssl/functions/openssl-free-key.xml
index 500292162bd3..ec42349e86e7 100644
--- a/reference/openssl/functions/openssl-free-key.xml
+++ b/reference/openssl/functions/openssl-free-key.xml
@@ -12,11 +12,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier role="attribute">#[\Deprecated(since: '8.0', message: 'as OpenSSLAsymmetricKey objects are freed automatically')]</modifier>
-   <type>void</type><methodname>openssl_free_key</methodname>
-   <methodparam><type>OpenSSLAsymmetricKey</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_free_key" ?>
   <para>
    <function>openssl_free_key</function> frees the key associated with
    the specified <parameter>key</parameter> from memory.
diff --git a/reference/openssl/functions/openssl-get-cert-locations.xml b/reference/openssl/functions/openssl-get-cert-locations.xml
index 66d5a2f0c452..1a0415e6e2a0 100644
--- a/reference/openssl/functions/openssl-get-cert-locations.xml
+++ b/reference/openssl/functions/openssl-get-cert-locations.xml
@@ -9,10 +9,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>openssl_get_cert_locations</methodname>
-   <void />
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_get_cert_locations" ?>
   <para>
    <function>openssl_get_cert_locations</function> returns an array with
    information about the available certificate locations that will be searched
diff --git a/reference/openssl/functions/openssl-get-cipher-methods.xml b/reference/openssl/functions/openssl-get-cipher-methods.xml
index b4267369d416..29ff060b3bae 100644
--- a/reference/openssl/functions/openssl-get-cipher-methods.xml
+++ b/reference/openssl/functions/openssl-get-cipher-methods.xml
@@ -9,10 +9,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>openssl_get_cipher_methods</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>aliases</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_get_cipher_methods" ?>
   <para>
    Gets a list of available cipher methods.
   </para>
diff --git a/reference/openssl/functions/openssl-get-curve-names.xml b/reference/openssl/functions/openssl-get-curve-names.xml
index 637bbbce4143..ca83adc1d1d9 100644
--- a/reference/openssl/functions/openssl-get-curve-names.xml
+++ b/reference/openssl/functions/openssl-get-curve-names.xml
@@ -8,10 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>openssl_get_curve_names</methodname>
-   <void/>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_get_curve_names" ?>
   <para>
    Gets the list of available curve names for use in Elliptic curve 
    cryptography (ECC) for public/private key operations. The two most widely 
diff --git a/reference/openssl/functions/openssl-get-md-methods.xml b/reference/openssl/functions/openssl-get-md-methods.xml
index c61371a99528..4a5fcf5e6a7c 100644
--- a/reference/openssl/functions/openssl-get-md-methods.xml
+++ b/reference/openssl/functions/openssl-get-md-methods.xml
@@ -9,10 +9,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>openssl_get_md_methods</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>aliases</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_get_md_methods" ?>
   <para>
    Gets a list of available digest methods.
   </para>
diff --git a/reference/openssl/functions/openssl-open.xml b/reference/openssl/functions/openssl-open.xml
index 12c104c88ee0..b8555bb1ca1a 100644
--- a/reference/openssl/functions/openssl-open.xml
+++ b/reference/openssl/functions/openssl-open.xml
@@ -8,15 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_open</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>string</type><parameter role="reference">output</parameter></methodparam>
-   <methodparam><type>string</type><parameter>encrypted_key</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>private_key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>cipher_algo</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>iv</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_open" ?>
   <para>
    <function>openssl_open</function> opens (decrypts) <parameter>data</parameter> using an envelope
    key that is decrypted from <parameter>encrypted_key</parameter> using
diff --git a/reference/openssl/functions/openssl-password-hash.xml b/reference/openssl/functions/openssl-password-hash.xml
index 96f33a6b5cdb..7cc2e6d123ca 100644
--- a/reference/openssl/functions/openssl-password-hash.xml
+++ b/reference/openssl/functions/openssl-password-hash.xml
@@ -7,12 +7,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>openssl_password_hash</methodname>
-   <methodparam><type>string</type><parameter>algo</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>string</type><parameter>password</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_password_hash" ?>
   <para>
    Creates a password hash using OpenSSL's Argon2 implementation. This is an
    alternative to <function>password_hash</function> that uses OpenSSL as
diff --git a/reference/openssl/functions/openssl-password-verify.xml b/reference/openssl/functions/openssl-password-verify.xml
index f2c4d61bf4ab..6fd1371aab6b 100644
--- a/reference/openssl/functions/openssl-password-verify.xml
+++ b/reference/openssl/functions/openssl-password-verify.xml
@@ -7,12 +7,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_password_verify</methodname>
-   <methodparam><type>string</type><parameter>algo</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>string</type><parameter>password</parameter></methodparam>
-   <methodparam><type>string</type><parameter>hash</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_password_verify" ?>
   <para>
    Verifies that a password matches a hash created by
    <function>openssl_password_hash</function>.
diff --git a/reference/openssl/functions/openssl-pbkdf2.xml b/reference/openssl/functions/openssl-pbkdf2.xml
index babf75c33e5f..4455c29a863b 100644
--- a/reference/openssl/functions/openssl-pbkdf2.xml
+++ b/reference/openssl/functions/openssl-pbkdf2.xml
@@ -8,14 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>openssl_pbkdf2</methodname>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>string</type><parameter>password</parameter></methodparam>
-   <methodparam><type>string</type><parameter>salt</parameter></methodparam>
-   <methodparam><type>int</type><parameter>key_length</parameter></methodparam>
-   <methodparam><type>int</type><parameter>iterations</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>digest_algo</parameter><initializer>"sha1"</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pbkdf2" ?>
   <para>
    <function>openssl_pbkdf2</function> computes PBKDF2 (Password-Based Key Derivation Function 2),
    a key derivation function defined in PKCS5 v2.
diff --git a/reference/openssl/functions/openssl-pkcs12-export-to-file.xml b/reference/openssl/functions/openssl-pkcs12-export-to-file.xml
index 59f5d9df6451..9c2299987397 100644
--- a/reference/openssl/functions/openssl-pkcs12-export-to-file.xml
+++ b/reference/openssl/functions/openssl-pkcs12-export-to-file.xml
@@ -8,14 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_pkcs12_export_to_file</methodname>
-   <methodparam><type class="union"><type>OpenSSLCertificate</type><type>string</type></type><parameter>certificate</parameter></methodparam>
-   <methodparam><type>string</type><parameter>output_filename</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>private_key</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>string</type><parameter>passphrase</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pkcs12_export_to_file" ?>
   <para>
    <function>openssl_pkcs12_export_to_file</function> stores
    <parameter>certificate</parameter> into a file named by
diff --git a/reference/openssl/functions/openssl-pkcs12-export.xml b/reference/openssl/functions/openssl-pkcs12-export.xml
index db7013f6b6bd..6951cba2b829 100644
--- a/reference/openssl/functions/openssl-pkcs12-export.xml
+++ b/reference/openssl/functions/openssl-pkcs12-export.xml
@@ -8,14 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_pkcs12_export</methodname>
-   <methodparam><type class="union"><type>OpenSSLCertificate</type><type>string</type></type><parameter>certificate</parameter></methodparam>
-   <methodparam><type>string</type><parameter role="reference">output</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>private_key</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>string</type><parameter>passphrase</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pkcs12_export" ?>
   <para>
    <function>openssl_pkcs12_export</function> stores
    <parameter>certificate</parameter> into a string named by
diff --git a/reference/openssl/functions/openssl-pkcs12-read.xml b/reference/openssl/functions/openssl-pkcs12-read.xml
index aa8ec52d5f46..d54760151ca8 100644
--- a/reference/openssl/functions/openssl-pkcs12-read.xml
+++ b/reference/openssl/functions/openssl-pkcs12-read.xml
@@ -8,12 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_pkcs12_read</methodname>
-   <methodparam><type>string</type><parameter>pkcs12</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">certificates</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>string</type><parameter>passphrase</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pkcs12_read" ?>
   <para>
    <function>openssl_pkcs12_read</function> parses the <acronym>PKCS</acronym>#12 certificate store supplied by
    <parameter>pkcs12</parameter> into an array named
diff --git a/reference/openssl/functions/openssl-pkcs7-decrypt.xml b/reference/openssl/functions/openssl-pkcs7-decrypt.xml
index d73916271310..d51bd0dc46a2 100644
--- a/reference/openssl/functions/openssl-pkcs7-decrypt.xml
+++ b/reference/openssl/functions/openssl-pkcs7-decrypt.xml
@@ -8,13 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_pkcs7_decrypt</methodname>
-   <methodparam><type>string</type><parameter>input_filename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>output_filename</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLCertificate</type><type>string</type></type><parameter>certificate</parameter></methodparam>
-   <methodparam choice="opt"><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type><type>null</type></type><parameter>private_key</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pkcs7_decrypt" ?>
   <para>
    Decrypts the S/MIME encrypted message contained in the file specified by
    <parameter>input_filename</parameter> using the certificate and its
diff --git a/reference/openssl/functions/openssl-pkcs7-encrypt.xml b/reference/openssl/functions/openssl-pkcs7-encrypt.xml
index c61bda50904d..10e05f2a5ca0 100644
--- a/reference/openssl/functions/openssl-pkcs7-encrypt.xml
+++ b/reference/openssl/functions/openssl-pkcs7-encrypt.xml
@@ -8,15 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_pkcs7_encrypt</methodname>
-   <methodparam><type>string</type><parameter>input_filename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>output_filename</parameter></methodparam>
-   <methodparam><type class="union"><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>certificate</parameter></methodparam>
-   <methodparam><type class="union"><type>array</type><type>null</type></type><parameter>headers</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>cipher_algo</parameter><initializer><constant>OPENSSL_CIPHER_AES_128_CBC</constant></initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pkcs7_encrypt" ?>
   <para>
    <function>openssl_pkcs7_encrypt</function> takes the contents of the
    file named <parameter>input_filename</parameter> and encrypts them using an RC2
diff --git a/reference/openssl/functions/openssl-pkcs7-read.xml b/reference/openssl/functions/openssl-pkcs7-read.xml
index 35b662a35579..76c962b9011a 100644
--- a/reference/openssl/functions/openssl-pkcs7-read.xml
+++ b/reference/openssl/functions/openssl-pkcs7-read.xml
@@ -8,11 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_pkcs7_read</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">certificates</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pkcs7_read" ?>
   <para>
 
   </para>
diff --git a/reference/openssl/functions/openssl-pkcs7-sign.xml b/reference/openssl/functions/openssl-pkcs7-sign.xml
index f533fedd1902..02152e8f1e5c 100644
--- a/reference/openssl/functions/openssl-pkcs7-sign.xml
+++ b/reference/openssl/functions/openssl-pkcs7-sign.xml
@@ -8,16 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_pkcs7_sign</methodname>
-   <methodparam><type>string</type><parameter>input_filename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>output_filename</parameter></methodparam>
-   <methodparam><type class="union"><type>OpenSSLCertificate</type><type>string</type></type><parameter>certificate</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>private_key</parameter></methodparam>
-   <methodparam><type class="union"><type>array</type><type>null</type></type><parameter>headers</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>PKCS7_DETACHED</constant></initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>untrusted_certificates_filename</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pkcs7_sign" ?>
   <para>
    <function>openssl_pkcs7_sign</function> takes the contents of the file
    named <parameter>input_filename</parameter> and signs them using the
diff --git a/reference/openssl/functions/openssl-pkcs7-verify.xml b/reference/openssl/functions/openssl-pkcs7-verify.xml
index e31d0356b49e..b632f7bd9eb3 100644
--- a/reference/openssl/functions/openssl-pkcs7-verify.xml
+++ b/reference/openssl/functions/openssl-pkcs7-verify.xml
@@ -8,16 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>bool</type><type>int</type></type><methodname>openssl_pkcs7_verify</methodname>
-   <methodparam><type>string</type><parameter>input_filename</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>signers_certificates_filename</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>ca_info</parameter><initializer>[]</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>untrusted_certificates_filename</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>content</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>output_filename</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pkcs7_verify" ?>
   <para>
    <function>openssl_pkcs7_verify</function> reads the S/MIME message
    contained in the given file and examines the digital signature.
diff --git a/reference/openssl/functions/openssl-pkey-derive.xml b/reference/openssl/functions/openssl-pkey-derive.xml
index 24188aeb4065..5f708c3c81d3 100644
--- a/reference/openssl/functions/openssl-pkey-derive.xml
+++ b/reference/openssl/functions/openssl-pkey-derive.xml
@@ -8,12 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>openssl_pkey_derive</methodname>
-   <methodparam><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>public_key</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>private_key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>key_length</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pkey_derive" ?>
   <para>
    <function>openssl_pkey_derive</function> takes a set of a <parameter>public_key</parameter>
    and <parameter>private_key</parameter> and derives a shared secret, for either DH or EC keys.
diff --git a/reference/openssl/functions/openssl-pkey-export-to-file.xml b/reference/openssl/functions/openssl-pkey-export-to-file.xml
index 0fad499d40b4..ff30219f45b0 100644
--- a/reference/openssl/functions/openssl-pkey-export-to-file.xml
+++ b/reference/openssl/functions/openssl-pkey-export-to-file.xml
@@ -8,13 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_pkey_export_to_file</methodname>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>output_filename</parameter></methodparam>
-   <methodparam choice="opt"><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>string</type><type>null</type></type><parameter>passphrase</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pkey_export_to_file" ?>
   <para>
    <function>openssl_pkey_export_to_file</function> saves an ascii-armoured
    (<acronym>PEM</acronym> encoded) rendition of <parameter>key</parameter> into the file named
diff --git a/reference/openssl/functions/openssl-pkey-export.xml b/reference/openssl/functions/openssl-pkey-export.xml
index 5ed6cf0cfb61..119a58a6be36 100644
--- a/reference/openssl/functions/openssl-pkey-export.xml
+++ b/reference/openssl/functions/openssl-pkey-export.xml
@@ -8,13 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_pkey_export</methodname>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter role="reference">output</parameter></methodparam>
-   <methodparam choice="opt"><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>string</type><type>null</type></type><parameter>passphrase</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pkey_export" ?>
   <para>
    <function>openssl_pkey_export</function> exports
    <parameter>key</parameter> as a <acronym>PEM</acronym> encoded string and stores it into
diff --git a/reference/openssl/functions/openssl-pkey-free.xml b/reference/openssl/functions/openssl-pkey-free.xml
index 14cf2bfefc47..6d7ef831323b 100644
--- a/reference/openssl/functions/openssl-pkey-free.xml
+++ b/reference/openssl/functions/openssl-pkey-free.xml
@@ -12,11 +12,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier role="attribute">#[\Deprecated(since: '8.0', message: 'as OpenSSLAsymmetricKey objects are freed automatically')]</modifier>
-   <type>void</type><methodname>openssl_pkey_free</methodname>
-   <methodparam><type>OpenSSLAsymmetricKey</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pkey_free" ?>
   &note.resource-migration-8.0-dead-function;
   <para>
    This function frees a private key created by
diff --git a/reference/openssl/functions/openssl-pkey-get-details.xml b/reference/openssl/functions/openssl-pkey-get-details.xml
index 438aae356730..1608462cc823 100644
--- a/reference/openssl/functions/openssl-pkey-get-details.xml
+++ b/reference/openssl/functions/openssl-pkey-get-details.xml
@@ -8,10 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>openssl_pkey_get_details</methodname>
-   <methodparam><type>OpenSSLAsymmetricKey</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pkey_get_details" ?>
   <para>
    This function returns the key details (bits, key, type).
   </para>
diff --git a/reference/openssl/functions/openssl-pkey-get-private.xml b/reference/openssl/functions/openssl-pkey-get-private.xml
index c04411bf76cf..ddaf80d63977 100644
--- a/reference/openssl/functions/openssl-pkey-get-private.xml
+++ b/reference/openssl/functions/openssl-pkey-get-private.xml
@@ -8,11 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>OpenSSLAsymmetricKey</type><type>false</type></type><methodname>openssl_pkey_get_private</methodname>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>private_key</parameter></methodparam>
-   <methodparam choice="opt"><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>string</type><type>null</type></type><parameter>passphrase</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pkey_get_private" ?>
   <para>
    <function>openssl_pkey_get_private</function> parses
    <parameter>private_key</parameter> and prepares it for use by other functions.
diff --git a/reference/openssl/functions/openssl-pkey-get-public.xml b/reference/openssl/functions/openssl-pkey-get-public.xml
index 0ac48a6a4ecc..9d061694b53f 100644
--- a/reference/openssl/functions/openssl-pkey-get-public.xml
+++ b/reference/openssl/functions/openssl-pkey-get-public.xml
@@ -8,10 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>OpenSSLAsymmetricKey</type><type>false</type></type><methodname>openssl_pkey_get_public</methodname>
-   <methodparam><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>public_key</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pkey_get_public" ?>
   <para>
    <function>openssl_pkey_get_public</function> extracts the public key from
    <parameter>public_key</parameter> and prepares it for use by other
diff --git a/reference/openssl/functions/openssl-pkey-new.xml b/reference/openssl/functions/openssl-pkey-new.xml
index 6960b3e310a8..29a3facf88a4 100644
--- a/reference/openssl/functions/openssl-pkey-new.xml
+++ b/reference/openssl/functions/openssl-pkey-new.xml
@@ -8,10 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>OpenSSLAsymmetricKey</type><type>false</type></type><methodname>openssl_pkey_new</methodname>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_pkey_new" ?>
   <para>
    <function>openssl_pkey_new</function> generates a new private
    key.
diff --git a/reference/openssl/functions/openssl-private-decrypt.xml b/reference/openssl/functions/openssl-private-decrypt.xml
index 93667da2deb6..9db06b5b423c 100644
--- a/reference/openssl/functions/openssl-private-decrypt.xml
+++ b/reference/openssl/functions/openssl-private-decrypt.xml
@@ -8,14 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_private_decrypt</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>string</type><parameter role="reference">decrypted_data</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>private_key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>padding</parameter><initializer><constant>OPENSSL_PKCS1_PADDING</constant></initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>digest_algo</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_private_decrypt" ?>
   <para>
    <function>openssl_private_decrypt</function> decrypts
    <parameter>data</parameter> that was previously encrypted via
diff --git a/reference/openssl/functions/openssl-private-encrypt.xml b/reference/openssl/functions/openssl-private-encrypt.xml
index 7c7cac59bbdb..dbf76c1c4db6 100644
--- a/reference/openssl/functions/openssl-private-encrypt.xml
+++ b/reference/openssl/functions/openssl-private-encrypt.xml
@@ -8,13 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_private_encrypt</methodname>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>string</type><parameter role="reference">encrypted_data</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>private_key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>padding</parameter><initializer><constant>OPENSSL_PKCS1_PADDING</constant></initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_private_encrypt" ?>
   <para>
    <function>openssl_private_encrypt</function> encrypts <parameter>data</parameter>
    with private <parameter>private_key</parameter> and stores the result into
diff --git a/reference/openssl/functions/openssl-public-decrypt.xml b/reference/openssl/functions/openssl-public-decrypt.xml
index 55b51a1564b1..221c07c374a2 100644
--- a/reference/openssl/functions/openssl-public-decrypt.xml
+++ b/reference/openssl/functions/openssl-public-decrypt.xml
@@ -8,13 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_public_decrypt</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>string</type><parameter role="reference">decrypted_data</parameter></methodparam>
-   <methodparam><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>public_key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>padding</parameter><initializer><constant>OPENSSL_PKCS1_PADDING</constant></initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_public_decrypt" ?>
   <para>
    <function>openssl_public_decrypt</function> decrypts
    <parameter>data</parameter> that was previous encrypted via
diff --git a/reference/openssl/functions/openssl-public-encrypt.xml b/reference/openssl/functions/openssl-public-encrypt.xml
index 4a4b36eb9544..b368810ca6d9 100644
--- a/reference/openssl/functions/openssl-public-encrypt.xml
+++ b/reference/openssl/functions/openssl-public-encrypt.xml
@@ -8,14 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_public_encrypt</methodname>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>string</type><parameter role="reference">encrypted_data</parameter></methodparam>
-   <methodparam><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>public_key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>padding</parameter><initializer><constant>OPENSSL_PKCS1_PADDING</constant></initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>digest_algo</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_public_encrypt" ?>
   <para>
    <function>openssl_public_encrypt</function> encrypts <parameter>data</parameter>
    with public <parameter>public_key</parameter> and stores the result into
diff --git a/reference/openssl/functions/openssl-random-pseudo-bytes.xml b/reference/openssl/functions/openssl-random-pseudo-bytes.xml
index 923ece93b869..72be532f2431 100644
--- a/reference/openssl/functions/openssl-random-pseudo-bytes.xml
+++ b/reference/openssl/functions/openssl-random-pseudo-bytes.xml
@@ -8,11 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>openssl_random_pseudo_bytes</methodname>
-   <methodparam><type>int</type><parameter>length</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter role="reference">strong_result</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_random_pseudo_bytes" ?>
   <para>
    Generates a <type>string</type> of pseudo-random bytes, with the number of bytes
    determined by the <parameter>length</parameter> parameter. 
diff --git a/reference/openssl/functions/openssl-seal.xml b/reference/openssl/functions/openssl-seal.xml
index 03d4c0714e38..3a702fd437db 100644
--- a/reference/openssl/functions/openssl-seal.xml
+++ b/reference/openssl/functions/openssl-seal.xml
@@ -8,15 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>openssl_seal</methodname>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>string</type><parameter role="reference">sealed_data</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">encrypted_keys</parameter></methodparam>
-   <methodparam><type>array</type><parameter>public_key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>cipher_algo</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter role="reference">iv</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_seal" ?>
   <para>
    <function>openssl_seal</function> seals (encrypts) <parameter>data</parameter> using the
    specified <parameter>cipher_algo</parameter> with a randomly generated secret key. The key is
diff --git a/reference/openssl/functions/openssl-sign.xml b/reference/openssl/functions/openssl-sign.xml
index 3e5f7dbdea6c..8d0c913b7b79 100644
--- a/reference/openssl/functions/openssl-sign.xml
+++ b/reference/openssl/functions/openssl-sign.xml
@@ -8,14 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_sign</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>string</type><parameter role="reference">signature</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>private_key</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>int</type></type><parameter>algorithm</parameter><initializer><constant>OPENSSL_ALGO_SHA1</constant></initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>padding</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_sign" ?>
   <para>
    <function>openssl_sign</function> computes a signature for the
    specified <parameter>data</parameter> by generating a cryptographic
diff --git a/reference/openssl/functions/openssl-spki-export-challenge.xml b/reference/openssl/functions/openssl-spki-export-challenge.xml
index b8c9132e896c..699d776cfbef 100644
--- a/reference/openssl/functions/openssl-spki-export-challenge.xml
+++ b/reference/openssl/functions/openssl-spki-export-challenge.xml
@@ -8,10 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>openssl_spki_export_challenge</methodname>
-   <methodparam><type>string</type><parameter>spki</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_spki_export_challenge" ?>
   <para>
     Exports challenge from encoded signed public key and challenge
   </para>
diff --git a/reference/openssl/functions/openssl-spki-export.xml b/reference/openssl/functions/openssl-spki-export.xml
index ccaaf95413a3..72c03229caff 100644
--- a/reference/openssl/functions/openssl-spki-export.xml
+++ b/reference/openssl/functions/openssl-spki-export.xml
@@ -8,10 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>openssl_spki_export</methodname>
-   <methodparam><type>string</type><parameter>spki</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_spki_export" ?>
   <para>
     Exports <acronym>PEM</acronym> formatted public key from encoded signed public key and challenge
   </para>
diff --git a/reference/openssl/functions/openssl-spki-new.xml b/reference/openssl/functions/openssl-spki-new.xml
index 1804fdd2f9e6..9b6f8c081b44 100644
--- a/reference/openssl/functions/openssl-spki-new.xml
+++ b/reference/openssl/functions/openssl-spki-new.xml
@@ -8,12 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>openssl_spki_new</methodname>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>OpenSSLAsymmetricKey</type><parameter>private_key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>challenge</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>digest_algo</parameter><initializer><constant>OPENSSL_ALGO_MD5</constant></initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_spki_new" ?>
   <para>
    Generates a signed public key and challenge using specified hashing algorithm
   </para>
diff --git a/reference/openssl/functions/openssl-spki-verify.xml b/reference/openssl/functions/openssl-spki-verify.xml
index a5b869819f41..6ba0f5d2cefa 100644
--- a/reference/openssl/functions/openssl-spki-verify.xml
+++ b/reference/openssl/functions/openssl-spki-verify.xml
@@ -8,10 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_spki_verify</methodname>
-   <methodparam><type>string</type><parameter>spki</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_spki_verify" ?>
   <para>
     Validates the supplied signed public key and challenge
   </para>
diff --git a/reference/openssl/functions/openssl-verify.xml b/reference/openssl/functions/openssl-verify.xml
index b85f3a24150e..fe68394af8f5 100644
--- a/reference/openssl/functions/openssl-verify.xml
+++ b/reference/openssl/functions/openssl-verify.xml
@@ -8,14 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>openssl_verify</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>string</type><parameter>signature</parameter></methodparam>
-   <methodparam><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>public_key</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>int</type></type><parameter>algorithm</parameter><initializer><constant>OPENSSL_ALGO_SHA1</constant></initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>padding</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_verify" ?>
   <para>
    <function>openssl_verify</function> verifies that the
    <parameter>signature</parameter> is correct for the specified
diff --git a/reference/openssl/functions/openssl-x509-check-private-key.xml b/reference/openssl/functions/openssl-x509-check-private-key.xml
index 1a269f6f0b06..3fa6fb5db8ec 100644
--- a/reference/openssl/functions/openssl-x509-check-private-key.xml
+++ b/reference/openssl/functions/openssl-x509-check-private-key.xml
@@ -8,11 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_x509_check_private_key</methodname>
-   <methodparam><type class="union"><type>OpenSSLCertificate</type><type>string</type></type><parameter>certificate</parameter></methodparam>
-   <methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>private_key</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_x509_check_private_key" ?>
   <para>
    Checks whether the given <parameter>private_key</parameter> is the private key
    that corresponds to <parameter>certificate</parameter>.
diff --git a/reference/openssl/functions/openssl-x509-checkpurpose.xml b/reference/openssl/functions/openssl-x509-checkpurpose.xml
index 17bdd4f6f4c7..2e6421a37585 100644
--- a/reference/openssl/functions/openssl-x509-checkpurpose.xml
+++ b/reference/openssl/functions/openssl-x509-checkpurpose.xml
@@ -8,13 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>bool</type><type>int</type></type><methodname>openssl_x509_checkpurpose</methodname>
-   <methodparam><type class="union"><type>OpenSSLCertificate</type><type>string</type></type><parameter>certificate</parameter></methodparam>
-   <methodparam><type>int</type><parameter>purpose</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>ca_info</parameter><initializer>[]</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>untrusted_certificates_file</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_x509_checkpurpose" ?>
   <para>
    <function>openssl_x509_checkpurpose</function> examines a certificate to
    see if it can be used for the specified <parameter>purpose</parameter>.
diff --git a/reference/openssl/functions/openssl-x509-export-to-file.xml b/reference/openssl/functions/openssl-x509-export-to-file.xml
index 763904a1d1c1..36502c87c27a 100644
--- a/reference/openssl/functions/openssl-x509-export-to-file.xml
+++ b/reference/openssl/functions/openssl-x509-export-to-file.xml
@@ -8,12 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_x509_export_to_file</methodname>
-   <methodparam><type class="union"><type>OpenSSLCertificate</type><type>string</type></type><parameter>certificate</parameter></methodparam>
-   <methodparam><type>string</type><parameter>output_filename</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>no_text</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_x509_export_to_file" ?>
   <para>
    <function>openssl_x509_export_to_file</function> stores
    <parameter>certificate</parameter> into a file named by
diff --git a/reference/openssl/functions/openssl-x509-export.xml b/reference/openssl/functions/openssl-x509-export.xml
index f88f5b864612..87cc4566155f 100644
--- a/reference/openssl/functions/openssl-x509-export.xml
+++ b/reference/openssl/functions/openssl-x509-export.xml
@@ -8,12 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openssl_x509_export</methodname>
-   <methodparam><type class="union"><type>OpenSSLCertificate</type><type>string</type></type><parameter>certificate</parameter></methodparam>
-   <methodparam><type>string</type><parameter role="reference">output</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>no_text</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_x509_export" ?>
   <para>
    <function>openssl_x509_export</function> stores
    <parameter>certificate</parameter> into a string named by
diff --git a/reference/openssl/functions/openssl-x509-fingerprint.xml b/reference/openssl/functions/openssl-x509-fingerprint.xml
index a14921dcda9f..8b7250cc16bd 100644
--- a/reference/openssl/functions/openssl-x509-fingerprint.xml
+++ b/reference/openssl/functions/openssl-x509-fingerprint.xml
@@ -8,12 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>openssl_x509_fingerprint</methodname>
-   <methodparam><type class="union"><type>OpenSSLCertificate</type><type>string</type></type><parameter>certificate</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>digest_algo</parameter><initializer>"sha1"</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>binary</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_x509_fingerprint" ?>
   <para>
    <function>openssl_x509_fingerprint</function> returns the digest of
    <parameter>certificate</parameter> as a string.
diff --git a/reference/openssl/functions/openssl-x509-free.xml b/reference/openssl/functions/openssl-x509-free.xml
index 08999730d831..c476a4ad20f1 100644
--- a/reference/openssl/functions/openssl-x509-free.xml
+++ b/reference/openssl/functions/openssl-x509-free.xml
@@ -12,11 +12,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier role="attribute">#[\Deprecated(since: '8.0', message: 'as OpenSSLCertificate objects are freed automatically')]</modifier>
-   <type>void</type><methodname>openssl_x509_free</methodname>
-   <methodparam><type>OpenSSLCertificate</type><parameter>certificate</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_x509_free" ?>
   &note.resource-migration-8.0-dead-function;
   <para>
    <function>openssl_x509_free</function> frees the certificate associated
diff --git a/reference/openssl/functions/openssl-x509-parse.xml b/reference/openssl/functions/openssl-x509-parse.xml
index 1b303ccdfb72..604c51501982 100644
--- a/reference/openssl/functions/openssl-x509-parse.xml
+++ b/reference/openssl/functions/openssl-x509-parse.xml
@@ -8,11 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>openssl_x509_parse</methodname>
-   <methodparam><type class="union"><type>OpenSSLCertificate</type><type>string</type></type><parameter>certificate</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>short_names</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_x509_parse" ?>
   <para>
    <function>openssl_x509_parse</function> returns information about the
    supplied <parameter>certificate</parameter>, including fields such as subject
diff --git a/reference/openssl/functions/openssl-x509-read.xml b/reference/openssl/functions/openssl-x509-read.xml
index 9fe2459e1d73..d5b5974dcbd2 100644
--- a/reference/openssl/functions/openssl-x509-read.xml
+++ b/reference/openssl/functions/openssl-x509-read.xml
@@ -9,10 +9,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>OpenSSLCertificate</type><type>false</type></type><methodname>openssl_x509_read</methodname>
-   <methodparam><type class="union"><type>OpenSSLCertificate</type><type>string</type></type><parameter>certificate</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_x509_read" ?>
   <para>
    <function>openssl_x509_read</function> parses the certificate supplied by
    <parameter>certificate</parameter> and returns an <classname>OpenSSLCertificate</classname> object for
diff --git a/reference/openssl/functions/openssl-x509-verify.xml b/reference/openssl/functions/openssl-x509-verify.xml
index 5394c7170f31..88c77f58d44a 100644
--- a/reference/openssl/functions/openssl-x509-verify.xml
+++ b/reference/openssl/functions/openssl-x509-verify.xml
@@ -8,11 +8,7 @@
  
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>openssl_x509_verify</methodname>
-   <methodparam><type class="union"><type>OpenSSLCertificate</type><type>string</type></type><parameter>certificate</parameter></methodparam>
-   <methodparam><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>public_key</parameter></methodparam>
-  </methodsynopsis>
+  <?phpdoc synopsis="openssl_x509_verify" ?>
   <para>
    <function>openssl_x509_verify</function> verifies that the 
    <parameter>certificate</parameter> certificate was signed by the private