From ffa0c6ba239984f13977c3117d72725d73e715f8 Mon Sep 17 00:00:00 2001
From: Dmitry Zenovich <dzenovich@php.net>
Date: Thu, 22 Oct 2015 11:28:17 +0000
Subject: [PATCH] runkit: describe changes of 1.0.1

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@338018 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/runkit/constants.xml                | 32 ++++++++++++++++---
 reference/runkit/functions/runkit-import.xml  | 29 +++++++++++++++--
 .../runkit/functions/runkit-method-add.xml    |  3 +-
 .../functions/runkit-method-redefine.xml      |  3 +-
 4 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/reference/runkit/constants.xml b/reference/runkit/constants.xml
index 38b7e1ee8b..2b27330940 100644
--- a/reference/runkit/constants.xml
+++ b/reference/runkit/constants.xml
@@ -57,6 +57,19 @@
     </simpara>
    </listitem>
   </varlistentry>
+  <varlistentry xml:id="constant.runkit-import-class-static-props">
+   <term>
+    <constant>RUNKIT_IMPORT_CLASS_STATIC_PROPS</constant>
+     (<type>integer</type>)
+   </term>
+   <listitem>
+    <simpara>
+     <function>runkit_import</function> flag indicating
+     that class static properties should be imported
+     from the specified file. Available since Runkit 1.0.1.
+    </simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry xml:id="constant.runkit-import-classes">
    <term>
     <constant>RUNKIT_IMPORT_CLASSES</constant>
@@ -72,7 +85,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.runkit-import-override">
    <term>
-    <constant>RUNKIT_IMPORT_OVERRIDE</constant> 
+    <constant>RUNKIT_IMPORT_OVERRIDE</constant>
      (<type>integer</type>)
    </term>
    <listitem>
@@ -92,7 +105,7 @@
    </term>
    <listitem>
     <simpara>
-     PHP 5 specific flag to <function>runkit_method_add</function>
+     PHP 5 specific flag to <function>runkit_method_add</function> and <function>runkit_method_redefine</function>
     </simpara>
    </listitem>
   </varlistentry>
@@ -103,7 +116,7 @@
    </term>
    <listitem>
     <simpara>
-     PHP 5 specific flag to <function>runkit_method_add</function>
+     PHP 5 specific flag to <function>runkit_method_add</function> and <function>runkit_method_redefine</function>
     </simpara>
    </listitem>
   </varlistentry>
@@ -114,7 +127,18 @@
    </term>
    <listitem>
     <simpara>
-     PHP 5 specific flag to <function>runkit_method_add</function>
+     PHP 5 specific flag to <function>runkit_method_add</function> and <function>runkit_method_redefine</function>
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry xml:id="constant.runkit-acc-static">
+   <term>
+    <constant>RUNKIT_ACC_STATIC</constant>
+     (<type>integer</type>)
+   </term>
+   <listitem>
+    <simpara>
+     PHP 5 specific flag to <function>runkit_method_add</function> and <function>runkit_method_redefine</function>. Available since Runkit 1.0.1.
     </simpara>
    </listitem>
   </varlistentry>
diff --git a/reference/runkit/functions/runkit-import.xml b/reference/runkit/functions/runkit-import.xml
index fa6b125ce9..0837d0b90f 100644
--- a/reference/runkit/functions/runkit-import.xml
+++ b/reference/runkit/functions/runkit-import.xml
@@ -20,7 +20,7 @@
    of a function or class is simply ignored.
    Additionally, depending on the value of <parameter>flags</parameter>,
    any functions or classes which already exist in the currently running environment
-   will be automatically overwritten by their new definitions.
+   may be automatically overwritten by their new definitions.
   </para>
  </refsect1>
 
@@ -40,7 +40,8 @@
      <term><parameter>flags</parameter></term>
      <listitem>
       <para>
-       Bitwise OR of the <constant>RUNKIT_IMPORT_*</constant> family of constants.
+       Bitwise OR of the <link linkend="runkit.constants"><literal>RUNKIT_IMPORT_*</literal>
+       family of constants</link>.
       </para>
      </listitem>
     </varlistentry>
@@ -55,6 +56,30 @@
   </para>
  </refsect1>
 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title><function>runkit_import</function> example</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+// import classes entirely
+runkit_import('myfile.inc', RUNKIT_IMPORT_CLASSES);
+
+/* import classes, but not imports their static properties
+   (RUNKIT_IMPORT_CLASS_STATIC_PROPS is available since 1.0.1) */
+runkit_import('myfile.inc', RUNKIT_IMPORT_CLASSES & ~RUNKIT_IMPORT_CLASS_STATIC_PROPS);
+
+/* import only static properties of classes
+   (RUNKIT_IMPORT_CLASS_STATIC_PROPS is available since 1.0.1) */
+runkit_import('myfile.inc', RUNKIT_IMPORT_CLASS_STATIC_PROPS);
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+ </refsect1>
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/runkit/functions/runkit-method-add.xml b/reference/runkit/functions/runkit-method-add.xml
index 674d51ad18..ed76d4b00e 100644
--- a/reference/runkit/functions/runkit-method-add.xml
+++ b/reference/runkit/functions/runkit-method-add.xml
@@ -60,7 +60,8 @@
        The type of method to create, can be
        <constant>RUNKIT_ACC_PUBLIC</constant>,
        <constant>RUNKIT_ACC_PROTECTED</constant> or
-       <constant>RUNKIT_ACC_PRIVATE</constant>
+       <constant>RUNKIT_ACC_PRIVATE</constant> optionally combined via bitwise OR with
+       <constant>RUNKIT_ACC_STATIC</constant> (since 1.0.1)
       </para>
       <note>
        <para>
diff --git a/reference/runkit/functions/runkit-method-redefine.xml b/reference/runkit/functions/runkit-method-redefine.xml
index 9f29fe292a..a81f418f3f 100644
--- a/reference/runkit/functions/runkit-method-redefine.xml
+++ b/reference/runkit/functions/runkit-method-redefine.xml
@@ -61,7 +61,8 @@
        The redefined method can be
        <constant>RUNKIT_ACC_PUBLIC</constant>,
        <constant>RUNKIT_ACC_PROTECTED</constant> or
-       <constant>RUNKIT_ACC_PRIVATE</constant>
+       <constant>RUNKIT_ACC_PRIVATE</constant> optionally combined via bitwise OR with
+       <constant>RUNKIT_ACC_STATIC</constant> (since 1.0.1)
       </para>
       <note>
        <para>