Skip to content

Commit f4f3a32

Browse files
Merge branch '7.3' into 7.4
* 7.3: Test AssetMapper with and without ext-brotli/ext-zstd in one job [JsonPath] Fix typo in comment in JsonCrawler
2 parents 0c00ffe + ae8efe2 commit f4f3a32

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.github/workflows/unit-tests.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
name: Unit Tests
2222

2323
env:
24-
extensions: amqp,apcu,igbinary,intl,mbstring,memcached,redis,relay
24+
extensions: amqp,apcu,brotli,igbinary,intl,mbstring,memcached,redis,relay,zstd
2525

2626
strategy:
2727
matrix:
@@ -33,9 +33,6 @@ jobs:
3333
mode: low-deps
3434
- php: '8.3'
3535
- php: '8.4'
36-
# brotli and zstd extensions are optional, when not present the commands will be used instead,
37-
# we must test both scenarios
38-
extensions: amqp,apcu,brotli,igbinary,intl,mbstring,memcached,redis,relay,zstd
3936
- php: '8.5'
4037
#mode: experimental
4138
fail-fast: false
@@ -234,6 +231,12 @@ jobs:
234231
run: |
235232
script -e -c './phpunit --group tty' /dev/null
236233
234+
- name: Run AssetMapper without ext-brotli nor ext-zstd
235+
if: "! matrix.mode"
236+
run: |
237+
sudo rm /etc/php/*/cli/conf.d/*-{brotli,zstd}.ini
238+
./phpunit src/Symfony/Component/AssetMapper
239+
237240
- name: Run tests with SIGCHLD enabled PHP
238241
if: "matrix.php == '8.2' && ! matrix.mode"
239242
run: |

src/Symfony/Component/JsonPath/JsonCrawler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ private function evaluateBracket(string $expr, mixed $value): array
222222
throw new JsonCrawlerException($expr, 'Invalid filter expression');
223223
}
224224

225-
// remove outrer filter parentheses
225+
// remove outer filter parentheses
226226
$innerExpr = substr(substr($filterExpr, 1), 0, -1);
227227

228228
return $this->evaluateFilter($innerExpr, $value);

0 commit comments

Comments
 (0)