Skip to content

Commit 057642e

Browse files
committed
update to support the symfony serializer 5.0
1 parent 97136d3 commit 057642e

21 files changed

+56
-32
lines changed

.phpunit.result.cache

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

.travis.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
sudo: false
22
language: php
33
php:
4+
- 7.0
45
- 7.1
56
- 7.2
67
- 7.3
7-
- 7.4snapshot
8-
matrix:
9-
allow_failures:
10-
- php: 7.4snapshot
8+
- 7.4
119
env:
1210
global:
13-
- ES_VERSION=7.4.0 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz
11+
- ES_VERSION=6.7.1 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
1412
install:
1513
- wget ${ES_DOWNLOAD_URL}
16-
- tar -xzf elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz
14+
- tar -xzf elasticsearch-${ES_VERSION}.tar.gz
1715
- ./elasticsearch-${ES_VERSION}/bin/elasticsearch -d
1816
before_script:
1917
- if [ "$GITHUB_COMPOSER_AUTH" ]; then composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH; fi

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"require-dev": {
1919
"elasticsearch/elasticsearch": "^6.0",
20-
"phpunit/phpunit": "~6.0",
20+
"phpunit/phpunit": "^7.0",
2121
"squizlabs/php_codesniffer": "^3.0"
2222
},
2323
"suggest": {

src/SearchEndpoint/AggregationsEndpoint.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AggregationsEndpoint extends AbstractSearchEndpoint
2727
/**
2828
* {@inheritdoc}
2929
*/
30-
public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
30+
public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])
3131
{
3232
$output = [];
3333
if (count($this->getAll()) > 0) {

src/SearchEndpoint/HighlightEndpoint.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class HighlightEndpoint extends AbstractSearchEndpoint
3737
/**
3838
* {@inheritdoc}
3939
*/
40-
public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
40+
public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])
4141
{
4242
if ($this->highlight) {
4343
return $this->highlight->toArray();

src/SearchEndpoint/InnerHitsEndpoint.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class InnerHitsEndpoint extends AbstractSearchEndpoint
2727
/**
2828
* {@inheritdoc}
2929
*/
30-
public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
30+
public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])
3131
{
3232
$output = [];
3333
if (count($this->getAll()) > 0) {

src/SearchEndpoint/PostFilterEndpoint.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class PostFilterEndpoint extends QueryEndpoint
2626
/**
2727
* {@inheritdoc}
2828
*/
29-
public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
29+
public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])
3030
{
3131
if (!$this->getBool()) {
3232
return null;

src/SearchEndpoint/QueryEndpoint.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class QueryEndpoint extends AbstractSearchEndpoint implements OrderedNormalizerI
3939
/**
4040
* {@inheritdoc}
4141
*/
42-
public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
42+
public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])
4343
{
4444
if (!$this->filtersSet && $this->hasReference('filter_query')) {
4545
/** @var BuilderInterface $filter */

src/SearchEndpoint/SortEndpoint.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class SortEndpoint extends AbstractSearchEndpoint
2626
/**
2727
* {@inheritdoc}
2828
*/
29-
public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
29+
public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])
3030
{
3131
$output = [];
3232

src/SearchEndpoint/SuggestEndpoint.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class SuggestEndpoint extends AbstractSearchEndpoint
2727
/**
2828
* {@inheritdoc}
2929
*/
30-
public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
30+
public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = [])
3131
{
3232
$output = [];
3333
if (count($this->getAll()) > 0) {

0 commit comments

Comments
 (0)