Merge branch '9.18' into 9.19

Author: GrahamCampbell

.github/workflows/static.yml

@@ -17,7 +17,6 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: 7.4
-          extensions: curl
           tools: composer:v2
           coverage: none
 
@@ -50,7 +49,6 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: 7.4
-          extensions: curl
           tools: composer:v2
           coverage: none
 

.github/workflows/tests.yml

@@ -21,7 +21,6 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: curl
           tools: composer:v2
           coverage: none