Skip to content

Commit 23e266e

Browse files
authored
Try #146:
2 parents 7da911b + 0546239 commit 23e266e

File tree

5 files changed

+26
-13
lines changed

5 files changed

+26
-13
lines changed

.github/workflows/tests.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,29 @@ jobs:
1717
runs-on: ubuntu-latest
1818
strategy:
1919
matrix:
20-
php-versions: ['7.4', '8.0']
21-
name: integration-tests (PHP ${{ matrix.php-versions }})
20+
php-version: ['7.4', '8.0', '8.1']
21+
include:
22+
- php-version: '7.4'
23+
sf-version: '4.4.*'
24+
- php-version: '7.4'
25+
sf-version: '5.4.*'
26+
- php-version: '8.0'
27+
sf-version: '6.0.*'
28+
- php-version: '8.1'
29+
sf-version: '6.0.*'
30+
name: integration-tests (PHP ${{ matrix.php-version }})
2231
steps:
2332
- uses: actions/checkout@v2
2433
- name: Install PHP
2534
uses: shivammathur/setup-php@v2
2635
with:
27-
php-version: ${{ matrix.php-versions }}
36+
php-version: ${{ matrix.php-version }}
37+
tools: composer:v2, flex
2838
- name: Validate composer.json and composer.lock
2939
run: composer validate
3040
- name: Install dependencies
41+
env:
42+
SYMFONY_REQUIRE: ${{ matrix.sf-version }}
3143
run: composer install --prefer-dist --no-progress --quiet
3244
- name: MeiliSearch setup with Docker
3345
run: docker run -d -p 7700:7700 getmeili/meilisearch:latest ./meilisearch --master-key=masterKey --no-analytics=true

bors.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
status = [
22
'integration-tests (PHP 7.4)',
33
'integration-tests (PHP 8.0)',
4+
'integration-tests (PHP 8.1)',
45
'Code style'
56
]
67
# 1 hour timeout

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"doctrine/doctrine-bundle": "^2.4",
2424
"illuminate/collections": "^8.47",
2525
"meilisearch/meilisearch-php": "^0.20",
26-
"symfony/filesystem": "^4.0 || ^5.0",
27-
"symfony/property-access": "^4.0 || ^5.0",
28-
"symfony/serializer": "^4.0 || ^5.0"
26+
"symfony/filesystem": "^4.4 || ^5.0 || ^6.0",
27+
"symfony/property-access": "^4.4 || ^5.0 || ^6.0",
28+
"symfony/serializer": "^4.4 || ^5.0 || ^6.0"
2929
},
3030
"require-dev": {
3131
"doctrine/orm": "^2.9",
@@ -38,10 +38,10 @@
3838
"phpstan/phpstan-symfony": "^0.12.37",
3939
"phpunit/php-code-coverage": "^9.2",
4040
"phpunit/phpunit": "^9.5",
41-
"symfony/doctrine-bridge": "^4.0 || ^5.0",
42-
"symfony/http-client": "^4.0 || ^5.0",
43-
"symfony/phpunit-bridge": "^4.0 || ^5.0",
44-
"symfony/yaml": "^4.0 || ^5.0"
41+
"symfony/doctrine-bridge": "^4.4 || ^5.0 || ^6.0",
42+
"symfony/http-client": "^4.4 || ^5.0 || ^6.0",
43+
"symfony/phpunit-bridge": "^4.4 || ^5.0 || ^6.0",
44+
"symfony/yaml": "^4.4 || ^5.0 || ^6.0"
4545
},
4646
"autoload": {
4747
"psr-4": {

tests/Entity/Link.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function setIsSponsored(bool $isSponsored): Link
8686
/**
8787
* {@inheritDoc}
8888
*/
89-
public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
89+
public function normalize(NormalizerInterface $normalizer, $format = null, array $context = []): array
9090
{
9191
if (Searchable::NORMALIZATION_FORMAT === $format) {
9292
return [

tests/Entity/Tag.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function setPublic(bool $public): Tag
8484
*
8585
* @throws ExceptionInterface
8686
*/
87-
public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
87+
public function normalize(NormalizerInterface $normalizer, $format = null, array $context = []): array
8888
{
8989
if (Searchable::NORMALIZATION_FORMAT === $format) {
9090
return [
@@ -95,6 +95,6 @@ public function normalize(NormalizerInterface $normalizer, $format = null, array
9595
];
9696
}
9797

98-
return true;
98+
return [];
9999
}
100100
}

0 commit comments

Comments
 (0)