Skip to content

Commit 5c6fb79

Browse files
authored
Merge branch 'codeigniter4:develop' into FEAT_deallocate_prepared_statements
2 parents 3bd2a24 + 583c8cf commit 5c6fb79

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

contributing/workflow.md

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -363,28 +363,16 @@ Update your `4.3` branch:
363363
> git push origin 4.3
364364
```
365365

366-
Create a new branch `feat-ab.new` from the correct branch `4.3`:
367-
368-
```console
369-
> git switch -c feat-abc.new 4.3
370-
```
371-
372-
Cherry-pick the commits you did:
373-
374-
```console
375-
> git cherry-pick <commit_id> <commit_id> <commit_id> ...
376-
```
377-
378-
Rename the PR branch `feat-abc`:
366+
(Optional) Create a new branch as a backup, just in case:
379367

380368
```console
381-
> git branch -m feat-abc feat-abc.old
369+
> git branch feat-abc.bk feat-abc
382370
```
383371

384-
Rename the new branch `feat-abc.new` to `feat-abc`.
372+
Rebase your PR branch from `develop` onto `4.3`:
385373

386374
```console
387-
> git branch -m feat-abc.new feat-abc
375+
> git rebase --onto 4.3 develop feat-abc
388376
```
389377

390378
Force push.

system/ThirdParty/Escaper/Exception/ExceptionInterface.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
namespace Laminas\Escaper\Exception;
66

7-
interface ExceptionInterface
7+
use Throwable;
8+
9+
interface ExceptionInterface extends Throwable
810
{
911
}

0 commit comments

Comments
 (0)