Merge branch '7.3' into 7.4

nicolas-grekas · nicolas-grekas · commit f4f3a32ef3da · 2025-06-05T19:06:43.000+02:00
* 7.3:
  Test AssetMapper with and without ext-brotli/ext-zstd in one job
  [JsonPath] Fix typo in comment in JsonCrawler
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -21,7 +21,7 @@ jobs:
     name: Unit Tests
 
     env:
-      extensions: amqp,apcu,igbinary,intl,mbstring,memcached,redis,relay
+      extensions: amqp,apcu,brotli,igbinary,intl,mbstring,memcached,redis,relay,zstd
 
     strategy:
       matrix:
@@ -33,9 +33,6 @@ jobs:
             mode: low-deps
           - php: '8.3'
           - php: '8.4'
-            # brotli and zstd extensions are optional, when not present the commands will be used instead,
-            # we must test both scenarios
-            extensions: amqp,apcu,brotli,igbinary,intl,mbstring,memcached,redis,relay,zstd
           - php: '8.5'
             #mode: experimental
       fail-fast: false
@@ -234,6 +231,12 @@ jobs:
         run: |
             script -e -c './phpunit --group tty' /dev/null
 
+      - name: Run AssetMapper without ext-brotli nor ext-zstd
+        if: "! matrix.mode"
+        run: |
+          sudo rm /etc/php/*/cli/conf.d/*-{brotli,zstd}.ini
+          ./phpunit src/Symfony/Component/AssetMapper
+
       - name: Run tests with SIGCHLD enabled PHP
         if: "matrix.php == '8.2' && ! matrix.mode"
         run: |
diff --git a/src/Symfony/Component/JsonPath/JsonCrawler.php b/src/Symfony/Component/JsonPath/JsonCrawler.php
@@ -222,7 +222,7 @@ private function evaluateBracket(string $expr, mixed $value): array
                 throw new JsonCrawlerException($expr, 'Invalid filter expression');
             }
 
-            // remove outrer filter parentheses
+            // remove outer filter parentheses
             $innerExpr = substr(substr($filterExpr, 1), 0, -1);
 
             return $this->evaluateFilter($innerExpr, $value);

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ private function evaluateBracket(string $expr, mixed $value): array`
`222`	`222`	`throw new JsonCrawlerException($expr, 'Invalid filter expression');`
`223`	`223`	`}`
`224`	`224`
`225`		`- // remove outrer filter parentheses`
	`225`	`+ // remove outer filter parentheses`
`226`	`226`	`$innerExpr = substr(substr($filterExpr, 1), 0, -1);`
`227`	`227`
`228`	`228`	`return $this->evaluateFilter($innerExpr, $value);`