Skip to content

Commit dc9ac8f

Browse files
authored
Merge pull request #3 from sirn-se/php8-2
Minor fix
2 parents 277101a + 5351cc2 commit dc9ac8f

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

.github/workflows/acceptance.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Test PHP 7.2
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v3
1212
- name: Set up PHP 7.2
1313
uses: shivammathur/setup-php@v2
1414
with:
@@ -23,7 +23,7 @@ jobs:
2323
name: Test PHP 7.3
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v2
26+
uses: actions/checkout@v3
2727
- name: Set up PHP 7.3
2828
uses: shivammathur/setup-php@v2
2929
with:
@@ -38,7 +38,7 @@ jobs:
3838
name: Test PHP 7.4
3939
steps:
4040
- name: Checkout
41-
uses: actions/checkout@v2
41+
uses: actions/checkout@v3
4242
- name: Set up PHP 7.4
4343
uses: shivammathur/setup-php@v2
4444
with:
@@ -53,7 +53,7 @@ jobs:
5353
name: Test PHP 8.0
5454
steps:
5555
- name: Checkout
56-
uses: actions/checkout@v2
56+
uses: actions/checkout@v3
5757
- name: Set up PHP 8.0
5858
uses: shivammathur/setup-php@v2
5959
with:
@@ -68,7 +68,7 @@ jobs:
6868
name: Test PHP 8.1
6969
steps:
7070
- name: Checkout
71-
uses: actions/checkout@v2
71+
uses: actions/checkout@v3
7272
- name: Set up PHP 8.1
7373
uses: shivammathur/setup-php@v2
7474
with:
@@ -84,7 +84,7 @@ jobs:
8484
name: Test PHP 8.2
8585
steps:
8686
- name: Checkout
87-
uses: actions/checkout@v2
87+
uses: actions/checkout@v3
8888
- name: Set up PHP 8.2
8989
uses: shivammathur/setup-php@v2
9090
with:
@@ -99,7 +99,7 @@ jobs:
9999
name: Code standard
100100
steps:
101101
- name: Checkout
102-
uses: actions/checkout@v2
102+
uses: actions/checkout@v3
103103
- name: Set up PHP 8.0
104104
uses: shivammathur/setup-php@v2
105105
with:
@@ -114,7 +114,7 @@ jobs:
114114
name: Code coverage
115115
steps:
116116
- name: Checkout
117-
uses: actions/checkout@v2
117+
uses: actions/checkout@v3
118118
- name: Set up PHP 8.0
119119
uses: shivammathur/setup-php@v2
120120
with:

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ $result = $handler->withAll(function () {
8686
```
8787
The examples above will run the callback code, but if an error occurs it will call the error callback as well.
8888
* `with()` will run the error callback immediately when error occured; error callback expects an ErrorException instance
89-
* `withAll()` will run the error callback when code is complete; error callback expects an array of ErrorException and the returened result of code callback
89+
* `withAll()` will run the error callback when code is complete; error callback expects an array of ErrorException and the returned result of code callback
9090

9191
### Filtering error types
9292

src/Phrity/Util/ErrorHandler.php

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public function restore(): bool
5454
public function with(callable $callback, $handling = null, int $levels = E_ALL)
5555
{
5656
$error = null;
57+
$result = null;
5758
try {
5859
$this->set(null, $levels);
5960
$result = $callback();

0 commit comments

Comments
 (0)