Skip to content

Commit fdfd8f2

Browse files
committed
Merge branch 'master' into feature/pfa
2 parents 88c517f + 63eaec3 commit fdfd8f2

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
if: "!contains(github.event.head_commit.message, 'skip ci')"
1212
name: PHP ${{ matrix.php-versions }} on ${{ matrix.os }}
1313
runs-on: ${{ matrix.os }}
14-
continue-on-error: ${{ matrix.php-versions >= '8.5' }}
14+
continue-on-error: ${{ matrix.php-versions >= '8.6' }}
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
18+
php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '8.6']
1919
os: [ubuntu-latest, windows-latest]
2020

2121
steps:
@@ -48,7 +48,7 @@ jobs:
4848

4949
- name: Install dependencies
5050
run: >
51-
curl -sSL https://baltocdn.com/xp-framework/xp-runners/distribution/downloads/e/entrypoint/xp-run-9.1.0.sh > xp-run &&
51+
curl -sSL https://github.com/xp-runners/reference/releases/download/v9.2.0/xp-run-9.2.0.sh > xp-run &&
5252
sh .github/workflows/composer.sh
5353
5454
- name: Run test suite

ChangeLog.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ XP AST ChangeLog
33

44
## ?.?.? / ????-??-??
55

6+
## 11.8.0 / 2025-12-21
7+
8+
* Added PHP 8.6 to the test matrix following the Nov 2025 PHP 8.5 release
9+
(@thekid)
10+
* Made `lang.ast.syntax.PHP::type0()` public. This method parses a single
11+
type without support for unions and intersections
12+
(@thekid)
13+
614
## 11.7.1 / 2025-07-06
715

816
* Fixed more than one annotation on an element only yielding the last.

src/main/php/lang/ast/syntax/PHP.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,7 @@ private function member($parse) {
12481248
return $expr;
12491249
}
12501250

1251-
private function type0($parse, $optional) {
1251+
public function type0($parse, $optional= false) {
12521252
static $literal= [
12531253
'string' => true,
12541254
'int' => true,

0 commit comments

Comments
 (0)