diff --git a/language/control-structures/foreach.xml b/language/control-structures/foreach.xml
index ded0de4dee78..44a0b3d47408 100644
--- a/language/control-structures/foreach.xml
+++ b/language/control-structures/foreach.xml
@@ -219,7 +219,7 @@ foreach ($array as [, , $c]) {
   </para>
 
   <para>
-   A notice will be generated if there aren't enough array elements to fill
+   A warning will be generated if there aren't enough array elements to fill
    the <function>list</function>:
 
    <informalexample>
@@ -239,10 +239,10 @@ foreach ($array as [$a, $b, $c]) {
     &example.outputs;
     <screen>
 <![CDATA[
-Notice: Undefined offset: 2 in example.php on line 7
+Warning: Undefined array key 2 in script on line 7
 A: 1; B: 2; C:
 
-Notice: Undefined offset: 2 in example.php on line 7
+Warning: Undefined array key 2 in script on line 7
 A: 3; B: 4; C:
 ]]>
     </screen>
diff --git a/language/oop5/anonymous.xml b/language/oop5/anonymous.xml
index e2281847d315..f8562ebcd603 100644
--- a/language/oop5/anonymous.xml
+++ b/language/oop5/anonymous.xml
@@ -63,8 +63,8 @@ var_dump(new class(10) extends SomeClass implements SomeInterface {
   &example.outputs;
   <screen>
 <![CDATA[
-object(class@anonymous)#1 (1) {
-  ["Command line code0x104c5b612":"class@anonymous":private]=>
+object(SomeClass@anonymous)#1 (1) {
+  ["num":"SomeClass@anonymous":private]=>
   int(10)
 }
 ]]>
@@ -153,11 +153,12 @@ same class
  </informalexample>
 
  <note>
-  <para>
+  <simpara>
    Note that anonymous classes are assigned a name by the engine, as
    demonstrated in the following example. This name has to be regarded an
-   implementation detail, which should not be relied upon.
-  </para>
+   implementation detail, which should not be relied upon. The generated name
+   contains a NUL byte, which is not visible in the output below.
+  </simpara>
   <informalexample>
    <programlisting role="php">
 <![CDATA[
@@ -168,7 +169,7 @@ echo get_class(new class {});
   &example.outputs.similar;
   <screen>
 <![CDATA[
-class@anonymous/in/oNi1A0x7f8636ad2021
+class@anonymousscript:2$0
 ]]>
    </screen>
   </informalexample>
diff --git a/language/oop5/magic.xml b/language/oop5/magic.xml
index 425f3c0a6c6f..43c901d71bfe 100644
--- a/language/oop5/magic.xml
+++ b/language/oop5/magic.xml
@@ -527,7 +527,7 @@ var_dump($c);
     &example.outputs;
     <screen>
 <![CDATA[
-string(60) "A::__set_state(array(
+string(61) "\A::__set_state(array(
    'var1' => 5,
    'var2' => 'foo',
 ))"
diff --git a/language/operators/precedence.xml b/language/operators/precedence.xml
index 35ac34c0cb7a..d54067490f40 100644
--- a/language/operators/precedence.xml
+++ b/language/operators/precedence.xml
@@ -377,10 +377,10 @@ $array[$i] = $i++; // may set either index 1 or 2
 <![CDATA[
 <?php
 $x = 4;
-// this line might result in unexpected output:
+// "-" binds tighter than ".", so $x-1 is one operand of the concatenation:
 echo "x minus one equals " . $x-1 . ", or so I hope\n";
 
-// the desired precedence can be enforced by using parentheses:
+// the same grouping, made explicit:
 echo "x minus one equals " . ($x-1) . ", or so I hope\n";
 
 // this is not allowed, and throws a TypeError:
@@ -391,9 +391,13 @@ echo (("x minus one equals " . $x) - 1) . ", or so I hope\n";
    &example.outputs;
    <screen>
 <![CDATA[
--1, or so I hope
--1, or so I hope
-Fatal error: Uncaught TypeError: Unsupported operand types: string - int
+x minus one equals 3, or so I hope
+x minus one equals 3, or so I hope
+
+Fatal error: Uncaught TypeError: Unsupported operand types: string - int in script:10
+Stack trace:
+#0 {main}
+  thrown in script on line 10
 ]]>
    </screen>
   </example>
diff --git a/language/operators/type.xml b/language/operators/type.xml
index 3c6dd538388b..6fbcbaa81d63 100644
--- a/language/operators/type.xml
+++ b/language/operators/type.xml
@@ -188,7 +188,7 @@ var_dump(FALSE instanceof stdClass);
 bool(false)
 bool(false)
 bool(false)
-PHP Fatal error:  instanceof expects an object instance, constant given
+bool(false)
 ]]>
    </screen>
   </example>
diff --git a/language/predefined/backedenum/from.xml b/language/predefined/backedenum/from.xml
index 4ecd30257c18..386c5e913f37 100644
--- a/language/predefined/backedenum/from.xml
+++ b/language/predefined/backedenum/from.xml
@@ -71,7 +71,11 @@ $b = Suit::from('B');
 <![CDATA[
 enum(Suit::Hearts)
 
-Fatal error: Uncaught ValueError: "B" is not a valid backing value for enum "Suit" in /file.php:15
+Fatal error: Uncaught ValueError: "B" is not a valid backing value for enum Suit in script:14
+Stack trace:
+#0 script(14): Suit::from('B')
+#1 {main}
+  thrown in script on line 14
 ]]>
    </screen>
   </example>
diff --git a/reference/mbstring/functions/mb-detect-encoding.xml b/reference/mbstring/functions/mb-detect-encoding.xml
index 692ff51ef435..304fd48cfe94 100644
--- a/reference/mbstring/functions/mb-detect-encoding.xml
+++ b/reference/mbstring/functions/mb-detect-encoding.xml
@@ -178,7 +178,8 @@ string(5) "ASCII"
 // 'áéóú' encoded in ISO-8859-1
 $str = "\xE1\xE9\xF3\xFA";
 
-// The string is not valid ASCII or UTF-8, but UTF-8 is considered a closer match
+// The string is valid in neither encoding: non-strict reports the closest
+// match, strict returns false
 var_dump(mb_detect_encoding($str, ['ASCII', 'UTF-8'], false));
 var_dump(mb_detect_encoding($str, ['ASCII', 'UTF-8'], true));
 
@@ -191,7 +192,7 @@ var_dump(mb_detect_encoding($str, ['ASCII', 'UTF-8', 'ISO-8859-1'], true));
     &example.outputs;
     <screen>
 <![CDATA[
-string(5) "UTF-8"
+string(5) "ASCII"
 bool(false)
 string(10) "ISO-8859-1"
 string(10) "ISO-8859-1"
diff --git a/reference/reflection/reflectionclass/tostring.xml b/reference/reflection/reflectionclass/tostring.xml
index a72e41b62ab5..b5a2d987c9b8 100644
--- a/reference/reflection/reflectionclass/tostring.xml
+++ b/reference/reflection/reflectionclass/tostring.xml
@@ -46,7 +46,7 @@ echo $reflectionClass->__toString();
     &example.outputs;
     <screen>
 <![CDATA[
-Class [ <internal:Core> class Exception ] {
+Class [ <internal:Core> class Exception implements Stringable, Throwable ] {
 
   - Constants [0] {
   }
@@ -58,50 +58,92 @@ Class [ <internal:Core> class Exception ] {
   }
 
   - Properties [7] {
-    Property [ <default> protected $message ]
-    Property [ <default> private $string ]
-    Property [ <default> protected $code ]
-    Property [ <default> protected $file ]
-    Property [ <default> protected $line ]
-    Property [ <default> private $trace ]
-    Property [ <default> private $previous ]
+    Property [ protected $message = '' ]
+    Property [ private string $string = '' ]
+    Property [ protected $code = 0 ]
+    Property [ protected string $file = '' ]
+    Property [ protected int $line = 0 ]
+    Property [ private array $trace = [] ]
+    Property [ private ?Throwable $previous = NULL ]
   }
 
-  - Methods [10] {
-    Method [ <internal:Core> final private method __clone ] {
+  - Methods [11] {
+    Method [ <internal:Core> private method __clone ] {
+
+      - Parameters [0] {
+      }
+      - Return [ void ]
     }
 
     Method [ <internal:Core, ctor> public method __construct ] {
 
       - Parameters [3] {
-        Parameter #0 [ <optional> $message ]
-        Parameter #1 [ <optional> $code ]
-        Parameter #2 [ <optional> $previous ]
+        Parameter #0 [ <optional> string $message = "" ]
+        Parameter #1 [ <optional> int $code = 0 ]
+        Parameter #2 [ <optional> ?Throwable $previous = null ]
       }
     }
 
-    Method [ <internal:Core> final public method getMessage ] {
+    Method [ <internal:Core> public method __wakeup ] {
+
+      - Parameters [0] {
+      }
+      - Tentative return [ void ]
     }
 
-    Method [ <internal:Core> final public method getCode ] {
+    Method [ <internal:Core, prototype Throwable> final public method getMessage ] {
+
+      - Parameters [0] {
+      }
+      - Return [ string ]
     }
 
-    Method [ <internal:Core> final public method getFile ] {
+    Method [ <internal:Core, prototype Throwable> final public method getCode ] {
+
+      - Parameters [0] {
+      }
+    }
+
+    Method [ <internal:Core, prototype Throwable> final public method getFile ] {
+
+      - Parameters [0] {
+      }
+      - Return [ string ]
     }
 
-    Method [ <internal:Core> final public method getLine ] {
+    Method [ <internal:Core, prototype Throwable> final public method getLine ] {
+
+      - Parameters [0] {
+      }
+      - Return [ int ]
     }
 
-    Method [ <internal:Core> final public method getTrace ] {
+    Method [ <internal:Core, prototype Throwable> final public method getTrace ] {
+
+      - Parameters [0] {
+      }
+      - Return [ array ]
     }
 
-    Method [ <internal:Core> final public method getPrevious ] {
+    Method [ <internal:Core, prototype Throwable> final public method getPrevious ] {
+
+      - Parameters [0] {
+      }
+      - Return [ ?Throwable ]
     }
 
-    Method [ <internal:Core> final public method getTraceAsString ] {
+    Method [ <internal:Core, prototype Throwable> final public method getTraceAsString ] {
+
+      - Parameters [0] {
+      }
+      - Return [ string ]
     }
 
-    Method [ <internal:Core> public method __toString ] {
+    Method [ <internal:Core, prototype Stringable> public method __toString ] {
+
+      - Parameters [0] {
+      }
+      - Return [ string ]
     }
   }
 }
diff --git a/reference/reflection/reflectionfunctionabstract/getreturntype.xml b/reference/reflection/reflectionfunctionabstract/getreturntype.xml
index 157c45706b19..b32a4196fdef 100644
--- a/reference/reflection/reflectionfunctionabstract/getreturntype.xml
+++ b/reference/reflection/reflectionfunctionabstract/getreturntype.xml
@@ -56,28 +56,30 @@ int
    </example>
 
    <example>
-    <title>Usage on built-in functions</title>
+    <title>Methods with a tentative return type</title>
     <programlisting role="php">
 <![CDATA[
 <?php
 
-$reflection2 = new ReflectionFunction('array_merge');
+$reflection2 = new ReflectionMethod('ArrayObject', 'count');
 
 var_dump($reflection2->getReturnType());
+echo $reflection2->getTentativeReturnType();
 ]]>
     </programlisting>
     &example.outputs;
     <screen>
 <![CDATA[
-null
+NULL
+int
 ]]>
     </screen>
    </example>
   </para>
   <para>
-   This is because many internal functions do not have types specified for their
-   parameters or return values. It is therefore best to avoid using this
-   method on built-in functions.
+   A tentative return type is not reported here; use
+   <methodname>ReflectionFunctionAbstract::getTentativeReturnType</methodname>
+   to obtain it.
   </para>
  </refsect1>
 
@@ -85,6 +87,7 @@ null
   &reftitle.seealso;
   <para>
    <simplelist>
+    <member><methodname>ReflectionFunctionAbstract::getTentativeReturnType</methodname></member>
     <member><methodname>ReflectionFunctionAbstract::hasReturnType</methodname></member>
     <member><methodname>ReflectionType::__toString</methodname></member>
    </simplelist>
diff --git a/reference/reflection/reflectionfunctionabstract/hasreturntype.xml b/reference/reflection/reflectionfunctionabstract/hasreturntype.xml
index 40846a250b97..0c77adcbeceb 100644
--- a/reference/reflection/reflectionfunctionabstract/hasreturntype.xml
+++ b/reference/reflection/reflectionfunctionabstract/hasreturntype.xml
@@ -56,20 +56,22 @@ bool(true)
    </example>
 
    <example>
-    <title>Usage on built-in functions</title>
+    <title>Methods with a tentative return type</title>
     <programlisting role="php">
 <![CDATA[
 <?php
 
-$reflection2 = new ReflectionFunction('array_merge');
+$reflection2 = new ReflectionMethod('ArrayObject', 'count');
 
 var_dump($reflection2->hasReturnType());
+var_dump($reflection2->hasTentativeReturnType());
 ]]>
     </programlisting>
     &example.outputs;
     <screen>
 <![CDATA[
 bool(false)
+bool(true)
 ]]>
     </screen>
    </example>
@@ -81,6 +83,7 @@ bool(false)
   <para>
    <simplelist>
     <member><methodname>ReflectionFunctionAbstract::getReturnType</methodname></member>
+    <member><methodname>ReflectionFunctionAbstract::hasTentativeReturnType</methodname></member>
    </simplelist>
   </para>
  </refsect1>