Skip to content

Commit 48a8d00

Browse files
committed
Merge branch '5.11.x' into 6.0.x
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.com.br>
2 parents 4f8ac4f + d541ff8 commit 48a8d00

3 files changed

Lines changed: 54 additions & 3 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,42 @@ jobs:
7777
with:
7878
cli-args: "--format=php-clover build/logs/clover.xml --revision=${{ github.event.pull_request.head.sha || github.sha }}"
7979

80+
test-php-with-newer-phpunit:
81+
name: Test on PHP ${{ matrix.php }} with PHPUnit ${{ matrix.phpunit }}
82+
runs-on: ubuntu-latest
83+
strategy:
84+
fail-fast: false
85+
matrix:
86+
include:
87+
- {php: '8.2', phpunit: '11'}
88+
- {php: '8.3', phpunit: '12'}
89+
- {php: '8.4', phpunit: '13'}
90+
steps:
91+
- name: Checkout code
92+
uses: actions/checkout@v7
93+
with:
94+
persist-credentials: false
95+
96+
- name: Set up PHP ${{ matrix.php }}
97+
uses: shivammathur/setup-php@v2
98+
with:
99+
php-version: ${{ matrix.php }}
100+
coverage: none
101+
102+
- name: Update composer.json
103+
shell: bash
104+
env:
105+
PHPUNIT_VERSION: ${{ matrix.phpunit }}
106+
run: |
107+
composer remove --dev vimeo/psalm psalm/plugin-phpunit --no-update --no-interaction --ansi
108+
composer require --dev phpunit/phpunit:^"$PHPUNIT_VERSION" --no-update --no-interaction --ansi
109+
110+
- name: Install Composer dependencies
111+
uses: ramsey/composer-install@v4
112+
113+
- name: Run PHP tests
114+
run: vendor/bin/phpunit --no-coverage --no-logging --display-all-issues
115+
80116
php-benchmark:
81117
name: Benchmark on PHP ${{ matrix.php-version }} and ${{ matrix.os }}
82118
runs-on: ${{ matrix.os }}

‎CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,22 @@
3030
* [#585](https://github.com/phpmyadmin/sql-parser/pull/585): Drop `Utils\Routine` class
3131
* [#594](https://github.com/phpmyadmin/sql-parser/pull/594): Remove alternative executable files
3232

33+
## [5.11.2] - 2026-10-07
34+
35+
### Added
36+
37+
- Add support for PHP 8.6 (#659)
38+
- Add support for PHPUnit 13 (#669)
39+
40+
### Fixed
41+
42+
- Build insert statement with context's quote style (#631)
43+
- Fix formatter spacing for JSON path operators (->, ->>) (#637)
44+
- Fix error when validating index with sort order (#636)
45+
- Fix attempt to read property "keyword" on null (#609)
46+
- Avoid using a null alias as an array offset in getAliases() (#658)
47+
- Fix PHP 8.5 deprecations (#664)
48+
3349
## [5.11.1] - 2025-07-20
3450

3551
### Added
@@ -658,6 +674,7 @@ __Breaking changes:__
658674
* First release of this library.
659675

660676
[6.0.0]: https://github.com/phpmyadmin/sql-parser/compare/5.11.1...6.0.0
677+
[5.11.2]: https://github.com/phpmyadmin/sql-parser/compare/5.11.1...5.11.2
661678
[5.11.1]: https://github.com/phpmyadmin/sql-parser/compare/5.11.0...5.11.1
662679
[5.11.0]: https://github.com/phpmyadmin/sql-parser/compare/5.10.3...5.11.0
663680
[5.10.3]: https://github.com/phpmyadmin/sql-parser/compare/5.10.2...5.10.3

‎src/Tools/CustomJsonSerializer.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ protected function extractObjectData($value, $ref, $properties): array
4040
}
4141

4242
try {
43-
$propRef = $ref->getProperty($property);
44-
$propRef->setAccessible(true);
45-
$data[$property] = $propRef->getValue($value);
43+
$data[$property] = $ref->getProperty($property)->getValue($value);
4644
} catch (ReflectionException) {
4745
$data[$property] = $value->$property;
4846
}

0 commit comments

Comments
 (0)