Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-support Symfony 4 and 5 #99

Merged
merged 8 commits into from
Jan 18, 2022
Merged

Re-support Symfony 4 and 5 #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d91c3d5
Test Symfony 4,5,6
barryvdh Jan 18, 2022
559849f
Exclude some versions
barryvdh Jan 18, 2022
3404f8e
Typo
barryvdh Jan 18, 2022
e5b0d24
Fix matrix
barryvdh Jan 18, 2022
e835027
Loossen argument hints
barryvdh Jan 18, 2022
d766f60
Also change test
barryvdh Jan 18, 2022
2544993
SKip phpunit 8
barryvdh Jan 18, 2022
a3397e9
Use same handle
barryvdh Jan 18, 2022
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
21 changes: 17 additions & 4 deletions .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,23 @@ jobs:

strategy:
matrix:
php: [8.0, 8.1]
php: [7.1, 7.2, 7.3, 7.4, 8.0, 8.1]
symfony: [4.x, 5.x, 6.x]
dependency-version: [prefer-lowest, prefer-stable]
os: [ubuntu-latest]

name: PHP${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
exclude:
- symfony: 5.x
php: 7.1
- symfony: 6.x
php: 7.1
- symfony: 6.x
php: 7.2
- symfony: 6.x
php: 7.3
- symfony: 6.x
php: 7.4

name: PHP${{ matrix.php }} Symfony${{ matrix.symfony }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}

steps:
- name: Checkout code
Expand All @@ -28,7 +40,8 @@ jobs:

- name: Install dependencies
run: |
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
composer require "symfony/http-foundation:${{ matrix.symfony }}" "symfony/http-kernel:${{ matrix.symfony }}" --no-interaction --no-update
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest --with-all-dependencies

- name: Execute Unit Tests
run: vendor/bin/phpunit
Expand Down
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
}
],
"require": {
"php": "^8.0",
"symfony/http-foundation": "^6",
"symfony/http-kernel": "^6"
"php": "^7.1.3|^8.0",
"symfony/http-foundation": "^4|^5|^6",
"symfony/http-kernel": "^4|^5|^6"
},
"require-dev": {
"phpunit/phpunit": "^9",
"phpunit/phpunit": "^7|^9",
"squizlabs/php_codesniffer": "^3.5"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion src/Cors.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function __construct(HttpKernelInterface $app, array $options = [])
$this->cors = new CorsService(array_merge($this->defaultOptions, $options));
}

public function handle(Request $request, int $type = HttpKernelInterface::MAIN_REQUEST, bool $catch = true): Response
public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true): Response
{
if ($this->cors->isPreflightRequest($request)) {
$response = $this->cors->handlePreflightRequest($request);
Expand Down
2 changes: 1 addition & 1 deletion tests/MockApp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public function __construct(array $responseHeaders)
$this->responseHeaders = $responseHeaders;
}

public function handle(Request $request, int $type = HttpKernelInterface::MAIN_REQUEST, bool $catch = true): Response
public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true): Response
{
$response = new Response();

Expand Down