From 7234d3834fa9f2064d466369418db5ce31c49551 Mon Sep 17 00:00:00 2001 From: Jeremiah VALERIE Date: Mon, 13 Sep 2021 08:41:31 +0200 Subject: [PATCH 1/3] Bump ci ubuntu version to fix setup-php build see https://github.com/shivammathur/setup-php/issues/452 --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3cf89f3b8..a5bfee844 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ env: jobs: build: - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: @@ -107,7 +107,7 @@ jobs: run: composer test coding-standard: - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 name: Coding Standard steps: - name: "Checkout" @@ -135,7 +135,7 @@ jobs: run: composer check-cs benchmark: - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 name: Benchmark steps: - name: "Checkout" @@ -163,7 +163,7 @@ jobs: run: composer bench static-analysis: - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 name: "Static analysis" steps: - name: "Checkout" @@ -191,7 +191,7 @@ jobs: run: composer static-analysis coverage: - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 name: "Coverage" steps: - name: "Checkout" From e75941d226555381f99581988be27814446e9a77 Mon Sep 17 00:00:00 2001 From: Jeremiah VALERIE Date: Mon, 13 Sep 2021 11:38:33 +0200 Subject: [PATCH 2/3] Rectrict to Symfony 5.2 --- composer.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 0048facde..9aba67ece 100644 --- a/composer.json +++ b/composer.json @@ -30,13 +30,13 @@ "require": { "php": ">=5.6", "psr/log": "^1.0", - "symfony/config": "^3.1 || ^4.0 || ^5.0", - "symfony/dependency-injection": "^3.1 || ^4.0 || ^5.0", - "symfony/event-dispatcher": "^3.1 || ^4.0 || ^5.0", - "symfony/expression-language": "^3.1 || ^4.0 || ^5.0", - "symfony/framework-bundle": "^3.1 || ^4.0 || ^5.0", - "symfony/options-resolver": "^3.1 || ^4.0 || ^5.0", - "symfony/property-access": "^3.1 || ^4.0 || ^5.0", + "symfony/config": "3.1 - 5.2", + "symfony/dependency-injection": "3.1 - 5.2", + "symfony/event-dispatcher": "3.1 - 5.2", + "symfony/expression-language": "3.1 - 5.2", + "symfony/framework-bundle": "3.1 - 5.2", + "symfony/options-resolver": "3.1 - 5.2", + "symfony/property-access": "3.1 - 5.2", "webonyx/graphql-php": "^0.11.2 || ^0.12.0 || ^0.13.0" }, "replace": { @@ -50,14 +50,14 @@ "require-dev": { "phpunit/phpunit": "^5.7.26 || ^6.0 || ^7.2", "react/promise": "^2.5", - "symfony/asset": "^3.1 || ^4.0 || ^5.0", - "symfony/browser-kit": "^3.1 || ^4.0 || ^5.0", - "symfony/console": "^3.1 || ^4.0 || ^5.0", - "symfony/css-selector": "^3.1 || ^4.0 || ^5.0", - "symfony/phpunit-bridge": "^3.1 || ^4.0 || ^5.0", - "symfony/process": "^3.1 || ^4.0 || ^5.0", - "symfony/security-bundle": "^3.1 || ^4.0 || ^5.0", - "symfony/yaml": "^3.1 || ^4.0 || ^5.0" + "symfony/asset": "3.1 - 5.2", + "symfony/browser-kit": "3.1 - 5.2", + "symfony/console": "3.1 - 5.2", + "symfony/css-selector": "3.1 - 5.2", + "symfony/phpunit-bridge": "3.1 - 5.2", + "symfony/process": "3.1 - 5.2", + "symfony/security-bundle": "3.1 - 5.2", + "symfony/yaml": "3.1 - 5.2" }, "extra": { "branch-alias": { From a52463458e0901120b5d1820871345183aa0140a Mon Sep 17 00:00:00 2001 From: Jeremiah VALERIE Date: Wed, 22 Sep 2021 16:48:54 +0200 Subject: [PATCH 3/3] Fix TestCase::getContainer method signature --- tests/Functional/TestCase.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Functional/TestCase.php b/tests/Functional/TestCase.php index 1426d3b33..c9c914da8 100644 --- a/tests/Functional/TestCase.php +++ b/tests/Functional/TestCase.php @@ -9,6 +9,7 @@ use Symfony\Bundle\FrameworkBundle\Client; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; +use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\HttpFoundation\Request; @@ -90,7 +91,7 @@ protected static function assertGraphQL(string $query, array $expectedData = nul static::assertSame($expected, $result, \json_encode($result)); } - protected static function getContainer() + protected static function getContainer(): ContainerInterface { return static::$kernel->getContainer(); }