Merge original 4.x branch back to 3.x series#1693
Conversation
Accept multiple path arguments at CLI
| branches: [master] | ||
| branches: | ||
| - master | ||
| - 4.x |
There was a problem hiding this comment.
Adding 4.x into the list in current master will minimise the need for differences in our build.yml across branches and therefore future merge conflicts.
| public function __construct( | ||
| $message, | ||
| private $path, | ||
| string|array $paths, |
There was a problem hiding this comment.
Kept as string|array in 3.x for BC, but we can make this just array in 4.x
| * @return string | ||
| * @deprecated | ||
| */ | ||
| public function getPath() | ||
| public function getPath(): string | ||
| { | ||
| return $this->path; | ||
| return implode(', ', $this->paths); | ||
| } |
There was a problem hiding this comment.
We don't actually use this getter, but it is part of the public interface and kept for BC. Should be very limited impact to anyone if we remove it in 4.x.
| * Initializes exception. | ||
| * | ||
| * @param string $message | ||
| * @param string $path |
There was a problem hiding this comment.
should actually be documented as @param string|list<string> $paths to have the precise type.
There was a problem hiding this comment.
Good catch, thanks - fixed.
Brings the history of the old abandoned 4.x branch into the current master, ahead of creating a new 4.x branch. This will avoid us losing the record of these contributions when we restart development for 4.0. There are only very limited changes - there was only one functional PR subsequently implemented by a different contributor in Behat#1611, merged into master and released in 3.23.0. The solutions are essentially identical except for a change to WrongPathsException which I have kept both because it is more correct and in case anyone is already using the 4.x branch.
acoulton
force-pushed
the
merge-original-4.x
branch
from
4907925 to
2b50574
Compare
|
@stof friendly ping - if you're happy with this now I can get a 4.x branch started. |
3 participants
Brings the history of the old abandoned 4.x branch into the current master, ahead of creating a new 4.x branch. This will avoid us losing the record of these contributions when we restart development for 4.0.
There are only very limited changes - there was only one functional PR #1397 that was merged into 4.x in 2023. The same feature was subsequently implemented by a different contributor in #1611, merged into master and released in 3.23.0.
The solutions are essentially identical except for a change to WrongPathsException which I have kept both because it is more correct and in case anyone is already using the 4.x branch.
Once this PR is merged, I will delete the current 4.x branch and recreate it from master.
Replaces #1692