Merge #146

146: Support Symfony 6 r=curquiza a=norkunas

# Pull Request

## What does this PR do?
Fixes #143
Embeds #145 (should be merged first)

## PR checklist
Please check if your PR fulfills the following requirements:
- [x] Does this PR fix an existing issue?
- [x] Have you read the contributing guidelines?
- [x] Have you made sure that the title is accurate and descriptive of the changes?


Co-authored-by: Tomas <[email protected]>

Author: bors[bot]

.github/workflows/tests.yml

@@ -17,17 +17,29 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-versions: ['7.4', '8.0']
-        name: integration-tests (PHP ${{ matrix.php-versions }})
+                php-version: ['7.4', '8.0', '8.1']
+                include:
+                    - php-version: '7.4'
+                      sf-version: '4.4.*'
+                    - php-version: '7.4'
+                      sf-version: '5.4.*'
+                    - php-version: '8.0'
+                      sf-version: '6.0.*'
+                    - php-version: '8.1'
+                      sf-version: '6.0.*'
+        name: integration-tests (PHP ${{ matrix.php-version }})
         steps:
             -   uses: actions/checkout@v2
             -   name: Install PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: ${{ matrix.php-versions }}
+                    php-version: ${{ matrix.php-version }}
+                    tools: composer:v2, flex
             -   name: Validate composer.json and composer.lock
                 run: composer validate
             -   name: Install dependencies
+                env:
+                    SYMFONY_REQUIRE: ${{ matrix.sf-version }}
                 run: composer install --prefer-dist --no-progress --quiet
             -   name: MeiliSearch setup with Docker
                 run: docker run -d -p 7700:7700 getmeili/meilisearch:latest ./meilisearch --master-key=masterKey --no-analytics=true

bors.toml

@@ -1,6 +1,7 @@
 status = [
     'integration-tests (PHP 7.4)',
     'integration-tests (PHP 8.0)',
+    'integration-tests (PHP 8.1)',
     'Code style'
 ]
 # 1 hour timeout

composer.json

@@ -23,9 +23,9 @@
         "doctrine/doctrine-bundle": "^2.4",
         "illuminate/collections": "^8.47",
         "meilisearch/meilisearch-php": "^0.20",
-        "symfony/filesystem": "^4.0 || ^5.0",
-        "symfony/property-access": "^4.0 || ^5.0",
-        "symfony/serializer": "^4.0 || ^5.0"
+        "symfony/filesystem": "^4.4 || ^5.0 || ^6.0",
+        "symfony/property-access": "^4.4 || ^5.0 || ^6.0",
+        "symfony/serializer": "^4.4 || ^5.0 || ^6.0"
     },
     "require-dev": {
         "doctrine/orm": "^2.9",
@@ -38,10 +38,10 @@
         "phpstan/phpstan-symfony": "^0.12.37",
         "phpunit/php-code-coverage": "^9.2",
         "phpunit/phpunit": "^9.5",
-        "symfony/doctrine-bridge": "^4.0 || ^5.0",
-        "symfony/http-client": "^4.0 || ^5.0",
-        "symfony/phpunit-bridge": "^4.0 || ^5.0",
-        "symfony/yaml": "^4.0 || ^5.0"
+        "symfony/doctrine-bridge": "^4.4 || ^5.0 || ^6.0",
+        "symfony/http-client": "^4.4 || ^5.0 || ^6.0",
+        "symfony/phpunit-bridge": "^4.4 || ^5.0 || ^6.0",
+        "symfony/yaml": "^4.4 || ^5.0 || ^6.0"
     },
     "autoload": {
         "psr-4": {

tests/Entity/Link.php

@@ -86,7 +86,7 @@ public function setIsSponsored(bool $isSponsored): Link
     /**
      * {@inheritDoc}
      */
-    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
+    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = []): array
     {
         if (Searchable::NORMALIZATION_FORMAT === $format) {
             return [

tests/Entity/Tag.php

@@ -84,7 +84,7 @@ public function setPublic(bool $public): Tag
      *
      * @throws ExceptionInterface
      */
-    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
+    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = []): array
     {
         if (Searchable::NORMALIZATION_FORMAT === $format) {
             return [
@@ -95,6 +95,6 @@ public function normalize(NormalizerInterface $normalizer, $format = null, array
             ];
         }
 
-        return true;
+        return [];
     }
 }