From a0f039f96da1e54c5c33126dd0d51512c68dcc45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Sun, 3 Jul 2022 14:09:47 +0200 Subject: [PATCH 1/2] Bump dependencies --- composer.json | 18 +++++++++--------- vendor-bin/infection/composer.json | 7 ++++++- vendor-bin/profiling/composer.json | 6 +++++- vendor-bin/symfony/composer.json | 6 +++++- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index b9fd0052..c8d6e0a3 100644 --- a/composer.json +++ b/composer.json @@ -20,27 +20,27 @@ ], "require": { - "php": "^8.0", + "php": "^8.1", "fakerphp/faker": "^1.10", "myclabs/deep-copy": "^1.10", "sebastian/comparator": "^3.0 || ^4.0", - "symfony/property-access": "^4.4 || ^5.4 || ^6.0", - "symfony/yaml": "^4.4 || ^5.4 || ^6.0" + "symfony/property-access": "^5.4 || ^6.0", + "symfony/yaml": "^5.4 || ^6.0" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.4.1", "phpspec/prophecy": "^1.6", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.3", - "symfony/config": "^4.4 || ^5.4 || ^6.0", - "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0", - "symfony/finder": "^4.4 || ^5.4 || ^6.0", - "symfony/http-kernel": "^4.4 || ^5.4 || ^6.0", + "symfony/config": "^5.4 || ^6.0", + "symfony/dependency-injection": "^5.4 || ^6.0", + "symfony/finder": "^5.4 || ^6.0", + "symfony/http-kernel": "^5.4 || ^6.0", "symfony/phpunit-bridge": "^5.4 || ^6.0", - "symfony/var-dumper": "^4.4 || ^5.4 || ^6.0" + "symfony/var-dumper": "^5.4 || ^6.0" }, "conflict": { - "symfony/framework-bundle": "<4.4 || >=5.0.0,<5.2.0" + "symfony/framework-bundle": "<5.4.0" }, "autoload": { diff --git a/vendor-bin/infection/composer.json b/vendor-bin/infection/composer.json index 033b2fef..c0da3ad0 100644 --- a/vendor-bin/infection/composer.json +++ b/vendor-bin/infection/composer.json @@ -5,6 +5,11 @@ }, "config": { "bin-dir": "bin", - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "infection/extension-installer": true, + "wikimedia/composer-merge-plugin": true, + "theofidry/composer-inheritance-plugin": true + } } } diff --git a/vendor-bin/profiling/composer.json b/vendor-bin/profiling/composer.json index 69c308a0..a5c0acfc 100644 --- a/vendor-bin/profiling/composer.json +++ b/vendor-bin/profiling/composer.json @@ -7,6 +7,10 @@ }, "config": { "bin-dir": "bin", - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "wikimedia/composer-merge-plugin": true, + "theofidry/composer-inheritance-plugin": true + } } } diff --git a/vendor-bin/symfony/composer.json b/vendor-bin/symfony/composer.json index 0a698a98..5066cb7e 100644 --- a/vendor-bin/symfony/composer.json +++ b/vendor-bin/symfony/composer.json @@ -5,6 +5,10 @@ }, "config": { "bin-dir": "bin", - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "wikimedia/composer-merge-plugin": true, + "theofidry/composer-inheritance-plugin": true + } } } From f96a58a884c8827d32152e7b4c53b6fd13a8c7c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Sun, 3 Jul 2022 14:11:33 +0200 Subject: [PATCH 2/2] Adapt workflows --- .github/workflows/ci.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8f656ad9..ab33b008 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,19 +12,9 @@ jobs: fail-fast: false matrix: php: - - '8.0' - '8.1' symfony-versions: [false] include: - - description: 'Symfony 4.4' - php: '8.0' - symfony-versions: 4.4.* - - description: 'Symfony 5.4' - php: '8.0' - symfony-versions: 5.4.* - - description: 'Symfony 6.0' - php: '8.0' - symfony-versions: 6.0.* - description: 'Symfony 5.4' php: '8.1' symfony-versions: 5.4.*