Merge remote-tracking branch 'refs/remotes/origin/master'

Author: derickr

appendices/migration74/new-features.xml

@@ -77,6 +77,33 @@ class ChildProducer extends Producer {
     Full variance support is only available if autoloading is used. Inside a
     single file only non-cyclic type references are possible, because all
     classes need to be available before they are referenced.
+    <informalexample>
+     <programlisting role="php">
+<![CDATA[
+<?php
+
+/**
+ * These classes satisfy the LSP requirements, because C is a subtype of A.
+ * However, at the time class B is declared, class C is not yet available
+ */
+class A
+{
+    public function method(): A {}
+}
+
+class B extends A
+{
+    // Fatal error: Could not check compatibility between B::method():C and
+    // A::method(): A, because class С is not available
+    public function method(): С {}
+}
+
+class C extends B {}
+
+?>
+]]>
+     </programlisting>
+    </informalexample>
    </para>
   </sect3>
 

reference/filesystem/functions/dirname.xml

@@ -103,30 +103,6 @@ dirname('C:\\'); // Will return 'C:\' on Windows and '.' on *nix systems.
   </caution>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>7.0.0</entry>
-       <entry>
-        Added the optional <parameter>levels</parameter> parameter.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>

reference/info/functions/getrusage.xml

@@ -44,30 +44,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>7.0.0</entry>
-       <entry>
-        This function is now supported on Windows.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>

reference/misc/functions/define.xml

@@ -42,10 +42,7 @@
      <term><parameter>value</parameter></term>
      <listitem>
       <para>
-       The value of the constant. In PHP 5, <parameter>value</parameter> must
-       be a <type>scalar</type> value (<type>int</type>,
-       <type>float</type>, <type>string</type>, <type>bool</type>, or
-       &null;). In PHP 7, <type>array</type> values are also accepted.
+       The value of the constant.
       </para>
       <warning>
        <para>
@@ -102,21 +99,21 @@
      </thead>
      <tbody>
       <row>
-       <entry>8.0.0</entry>
+       <entry>8.1.0</entry>
        <entry>
-        Passing &true; to <parameter>case_insensitive</parameter> now emits an <constant>E_WARNING</constant>. Passing &false; is still allowed.
+        <parameter>value</parameter> can now be an object.
        </entry>
       </row>
       <row>
-       <entry>7.3.0</entry>
+       <entry>8.0.0</entry>
        <entry>
-        <parameter>case_insensitive</parameter> has been deprecated and will be removed in version 8.0.0.
+        Passing &true; to <parameter>case_insensitive</parameter> now emits an <constant>E_WARNING</constant>. Passing &false; is still allowed.
        </entry>
       </row>
       <row>
-       <entry>7.0.0</entry>
+       <entry>7.3.0</entry>
        <entry>
-        <type>array</type> values are allowed.
+        <parameter>case_insensitive</parameter> has been deprecated and will be removed in version 8.0.0.
        </entry>
       </row>
      </tbody>