Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ jobs:
uses: actions/checkout@v2

- name: Roave BC Check
uses: docker://nyholm/roave-bc-check-ga
uses: "addnab/docker-run-action@v3"
with:
image: "nyholm/roave-bc-check-ga"
options: "--env GITHUB_REPOSITORY=${{ github.repository }} --user 1001 --volume ${{ github.workspace }}:/app"
run: "/entrypoint.sh"
9 changes: 2 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
strategy:
max-parallel: 10
matrix:
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
sf_version: ['3.4.*', '4.4.*', '5.0.*', '6.4.*', '7.0.*']
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
sf_version: ['3.4.*', '4.4.*', '5.0.*', '6.4.*', '7.4.*', '8.0.*']

steps:
- name: Set up PHP
Expand Down Expand Up @@ -91,11 +91,6 @@ jobs:
- name: Run tests
run: ./vendor/bin/phpunit --coverage-text --coverage-clover=coverage.xml

- name: Upload coverage
run: |
wget https://scrutinizer-ci.com/ocular.phar
php ocular.phar code-coverage:upload --format=php-clover coverage.xml || true

h2push:
name: HTTP/2 Server Push
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.4-fpm-buster
FROM php:7.4-fpm-bullseye

# Install Nginx
RUN apt-get update -qq && apt-get install -y --no-install-recommends -qq nginx
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"psr/http-message": "^1.1 || ^2.0",
"psr/http-client": "^1.0",
"php-http/httplug": "^1.1 || ^2.0",
"symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
"symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
"psr/http-factory": "^1.0"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion lib/Client/AbstractCurl.php
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ private function setOptionsFromParameterBag($curl, ParameterBag $options): void
curl_setopt($curl, \CURLOPT_PROXY, $proxy);
}

$canFollow = !\ini_get('safe_mode') && !\ini_get('open_basedir') && $options->get('allow_redirects');
$canFollow = !\ini_get('open_basedir') && $options->get('allow_redirects');
curl_setopt($curl, \CURLOPT_FOLLOWLOCATION, $canFollow);
curl_setopt($curl, \CURLOPT_MAXREDIRS, $canFollow ? $options->get('max_redirects') : 0);
curl_setopt($curl, \CURLOPT_SSL_VERIFYPEER, $options->get('verify') ? 1 : 0);
Expand Down
Loading