From 94c9bd6db5858e00683124ecd2b0dc0047693aa6 Mon Sep 17 00:00:00 2001 From: Simon Podlipsky Date: Mon, 3 Apr 2023 19:31:16 +0200 Subject: [PATCH] chore(deps): bump min req php to v8.1 (#49) Run CI also on 8.2 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/coding-standards.yml | 2 +- .github/workflows/static-analysis.yml | 4 ++-- composer.json | 4 ++-- .../TracyBlueScreenExtensionTest.php | 12 +++++++++--- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ce7b06..ddfcaf0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,13 +15,13 @@ jobs: strategy: matrix: php-version: - - "8.0" - "8.1" + - "8.2" dependencies: - "highest" include: - dependencies: "lowest" - php-version: "8.0" + php-version: "8.1" steps: - name: "Checkout" diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 1bdbcd5..9cbeff2 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" steps: - name: "Checkout" diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index aad1875..0308aab 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" steps: - name: "Checkout code" @@ -40,7 +40,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" steps: - name: Checkout code diff --git a/composer.json b/composer.json index 6549104..bb63a5b 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "keywords": ["tracy", "bluescreen", "error", "debug", "debugger", "exceptions", "bundle"], "license": "MIT", "require": { - "php": "^8.0", + "php": "^8.1", "symfony/config": "^6.0", "symfony/console": "^6.0", "symfony/dependency-injection": "^6.0", @@ -15,7 +15,7 @@ "require-dev": { "cdn77/coding-standard": "^6.1", "matthiasnoback/symfony-dependency-injection-test": "^4.2", - "mikey179/vfsstream": "^1.6.8", + "mikey179/vfsstream": "^1.6.11", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.0", "phpstan/phpstan-phpunit": "^1.0", diff --git a/tests/DependencyInjection/TracyBlueScreenExtensionTest.php b/tests/DependencyInjection/TracyBlueScreenExtensionTest.php index 86b5015..3a39b98 100644 --- a/tests/DependencyInjection/TracyBlueScreenExtensionTest.php +++ b/tests/DependencyInjection/TracyBlueScreenExtensionTest.php @@ -32,7 +32,9 @@ public static function loadExtensionsToContainer( foreach ($container->getExtensions() as $extensionAlias => $extension) { $configurations[$extensionAlias] = []; if (array_key_exists($extensionAlias, $minimalConfiguration)) { - $container->loadFromExtension($extensionAlias, $minimalConfiguration[$extensionAlias]); + /** @var array|null $values */ + $values = $minimalConfiguration[$extensionAlias]; + $container->loadFromExtension($extensionAlias, $values); $configurations[$extensionAlias][] = $minimalConfiguration[$extensionAlias]; } @@ -40,7 +42,9 @@ public static function loadExtensionsToContainer( continue; } - $container->loadFromExtension($extensionAlias, $configuration[$extensionAlias]); + /** @var array|null $values */ + $values = $configuration[$extensionAlias]; + $container->loadFromExtension($extensionAlias, $values); $configurations[$extensionAlias][] = $configuration[$extensionAlias]; } @@ -53,7 +57,9 @@ public static function loadExtensionsToContainer( } foreach ($container->getExtensions() as $extensionAlias => $extension) { - $extension->load($configurations[$extensionAlias], $container); + /** @var array> $values */ + $values = $configurations[$extensionAlias]; + $extension->load($values, $container); } }