Skip to content

Refactor error/exception pages into an "Error handling" page #320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lacatoire merged 20 commits into from
Oct 6, 2026
Merged

Refactor error/exception pages into an "Error handling" page #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
79b0f2a
Refactor error pages into something more generic.
Girgias Jan 10, 2021
fb74194
Clarify finally and return example
Girgias Feb 4, 2021
9b92fa2
Expand finally and exit() interaction section
Girgias Feb 4, 2021
b4d26dd
Indent
Girgias Feb 4, 2021
68fbe01
Make intereaction between return and finally a section
Girgias Feb 4, 2021
fe0fa15
Add an initial section about yield and finally
Girgias Feb 4, 2021
0cb3660
Clarify what call-stack unwinding means
Girgias Feb 4, 2021
e4af9cc
Use variable in catch statement
Girgias Feb 4, 2021
bce9480
Add error_reporting() check when using a custom error handler
Girgias Feb 4, 2021
7bd4eb6
Cleanup docs related to @ operator
Girgias Feb 5, 2021
581d854
Nits
Girgias Feb 18, 2021
118df49
Front load logic of finally behaviour with various other bits
Girgias Feb 18, 2021
dca0095
Document weird finally exit and generator edge case
Girgias Feb 18, 2021
ec018a7
Add missing parenthesis
afilina Aug 17, 2021
ed73660
Update links to the removed exception and error pages
lacatoire Sep 29, 2026
7f032c4
Port master changes to the new error handling pages
lacatoire Sep 29, 2026
d605900
Fix inaccuracies in the error handling pages
lacatoire Sep 29, 2026
8438603
Use exceptionname for exception classes and leave the stomp page unto…
lacatoire Sep 29, 2026
8033f7a
Use simpara for inline-only paragraphs touched by the refactor
lacatoire Sep 29, 2026
da81e6b
Address review feedback on the error handling pages
lacatoire Oct 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions appendices/migration70/incompatible/error-handling.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
<classname>Error</classname> exceptions).
</para>

<para>
A fuller description of how errors operate in PHP 7 can be found
<link linkend="language.errors.php7">on the PHP 7 errors page</link>. This
<simpara>
A more complete description of how errors operate in PHP can be found
<link linkend="language.error-handling.throwable">on the Throwable errors page</link>. This
migration guide will merely enumerate the changes that affect backward
compatibility.
</para>
</simpara>

<sect3 xml:id="migration70.incompatible.error-handling.set-exception-handler">
<title>
Expand Down
8 changes: 4 additions & 4 deletions appendices/reserved.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<link linkend="control-structures.switch">case</link>
</entry>
<entry>
<link linkend="language.exceptions">catch</link>
<link linkend="control-structures.catch">catch</link>
</entry>
<entry>
<link linkend="language.oop5.basic.class">class</link>
Expand Down Expand Up @@ -134,7 +134,7 @@
<link linkend="language.oop5.final">final</link>
</entry>
<entry>
<link linkend="language.exceptions">finally</link>
<link linkend="control-structures.finally">finally</link>
</entry>
<entry>
<link linkend="functions.arrow">fn</link> (as of PHP 7.4)
Expand Down Expand Up @@ -236,13 +236,13 @@
<link linkend="control-structures.switch">switch</link>
</entry>
<entry>
<link linkend="language.exceptions">throw</link>
<link linkend="control-structures.throw">throw</link>
</entry>
<entry>
<link linkend="language.oop5.traits">trait</link>
</entry>
<entry>
<link linkend="language.exceptions">try</link>
<link linkend="control-structures.try">try</link>
</entry>
<entry>
<function>unset</function>
Expand Down
8 changes: 4 additions & 4 deletions appendices/tokens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ defined('T_FN') || define('T_FN', 10001);
(<type>int</type>)
</entry>
<entry>catch</entry>
<entry><xref linkend="language.exceptions"/></entry>
<entry><xref linkend="control-structures.catch"/></entry>
</row>
<row xml:id="constant.t-class">
<entry>
Expand Down Expand Up @@ -557,7 +557,7 @@ defined('T_FN') || define('T_FN', 10001);
(<type>int</type>)
</entry>
<entry>finally</entry>
<entry><xref linkend="language.exceptions"/></entry>
<entry><xref linkend="control-structures.finally"/></entry>
</row>
<row xml:id="constant.t-fn">
<entry>
Expand Down Expand Up @@ -1255,7 +1255,7 @@ defined('T_FN') || define('T_FN', 10001);
(<type>int</type>)
</entry>
<entry>throw</entry>
<entry><xref linkend="language.exceptions"/></entry>
<entry><xref linkend="control-structures.throw"/></entry>
</row>
<row xml:id="constant.t-trait">
<entry>
Expand All @@ -1279,7 +1279,7 @@ defined('T_FN') || define('T_FN', 10001);
(<type>int</type>)
</entry>
<entry>try</entry>
<entry><xref linkend="language.exceptions"/></entry>
<entry><xref linkend="control-structures.try"/></entry>
</row>
<row xml:id="constant.t-unset">
<entry>
Expand Down
8 changes: 4 additions & 4 deletions entities/entities.php.ent
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ There are a few <filename> tossed near and there.

<entity name="callback.cmp"><methodsynopsis><type>int</type><methodname><replaceable>callback</replaceable></methodname><methodparam><type>mixed</type><parameter>a</parameter></methodparam><methodparam><type>mixed</type><parameter>b</parameter></methodparam></methodsynopsis></entity>

<entity name="catch"><link linkend="language.exceptions.catch"><literal>catch</literal></link></entity>
<entity name="catch"><link linkend="control-structures.catch"><literal>catch</literal></link></entity>

<entity name="const"><link linkend="language.constants.syntax"><literal>const</literal></link></entity>

<entity name="declare"><link linkend="control-structures.declare"><literal>declare</literal></link></entity>

<entity name="false"><constant>false</constant></entity>

<entity name="finally"><link linkend="language.exceptions.finally"><literal>finally</literal></link></entity>
<entity name="finally"><link linkend="control-structures.finally"><literal>finally</literal></link></entity>

<entity name="float"><type>float</type></entity>

Expand Down Expand Up @@ -71,11 +71,11 @@ There are a few <filename> tossed near and there.

<entity name="string"><type>string</type></entity>

<entity name="throw"><link linkend="language.exceptions"><literal>throw</literal></link></entity>
<entity name="throw"><link linkend="control-structures.throw"><literal>throw</literal></link></entity>

<entity name="true"><constant>true</constant></entity>

<entity name="try"><link linkend="language.exceptions"><literal>try</literal></link></entity>
<entity name="try"><link linkend="control-structures.try"><literal>try</literal></link></entity>

<entity name="use.namespace"><link linkend="language.namespaces.importing"><literal>use</literal></link></entity>

Expand Down
3 changes: 3 additions & 0 deletions language/control-structures.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
&language.control-structures.require-once;
&language.control-structures.include-once;
&language.control-structures.goto;
&language.control-structures.throw;
&language.control-structures.try-catch;
&language.control-structures.finally;

</chapter>

Expand Down
Loading
Loading