diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index a54757e1..a78884fb 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -104,12 +104,17 @@ jobs: uses: shivammathur/setup-php@v2 with: coverage: "none" - php-version: "8.0" + php-version: "7.1" tools: composer:v2.2 env: fail-fast: true + - name: "Replace guzzlehttp/guzzle with php-http/guzzle6-adapter (PHP 7.1)" + if: ${{ matrix.php-version == '7.1' }} + run: | + composer remove --dev guzzlehttp/guzzle --no-update --no-interaction + composer require --dev php-http/guzzle6-adapter --no-update --no-interaction - name: "Install dependencies" - run: "composer install" + run: "composer update --no-interaction --prefer-dist --prefer-stable" - name: "Run Psalm" run: "vendor/bin/psalm" diff --git a/composer.json b/composer.json index 0b28b48b..278643a3 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "psr/http-client": "^1.0", "psr/http-factory": "^1.0", "psr/http-message": "^1.0", - "psr/log": "^1.0", + "psr/log": "^1.0|^2.0|^3.0", "psr/simple-cache": "^1.0", "ralouphie/getallheaders": "^2.0.5|^3.0", "ramsey/uuid": "^3.0|^4.2.2", diff --git a/composer.lock b/composer.lock index dbf60238..6752a1f0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "970c2881c7a9358b1824345db45c9fbf", + "content-hash": "5b97cea925b4f77879f6c334f43f0a05", "packages": [ { "name": "brick/math", @@ -296,30 +296,30 @@ }, { "name": "psr/log", - "version": "1.1.4", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", + "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "3.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "Psr\\Log\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -340,9 +340,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" + "source": "https://github.com/php-fig/log/tree/3.0.0" }, - "time": "2021-05-03T11:20:27+00:00" + "time": "2021-07-14T16:46:02+00:00" }, { "name": "psr/simple-cache", @@ -583,12 +583,12 @@ } }, "autoload": { - "psr-4": { - "Ramsey\\Uuid\\": "src/" - }, "files": [ "src/functions.php" - ] + ], + "psr-4": { + "Ramsey\\Uuid\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -650,12 +650,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1421,30 +1421,30 @@ }, { "name": "composer/pcre", - "version": "1.0.1", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560" + "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560", - "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560", + "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd", + "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "phpstan/phpstan": "^1.3", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^4.2 || ^5" + "symfony/phpunit-bridge": "^5" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.x-dev" + "dev-main": "3.x-dev" } }, "autoload": { @@ -1472,7 +1472,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/1.0.1" + "source": "https://github.com/composer/pcre/tree/3.0.0" }, "funding": [ { @@ -1488,7 +1488,7 @@ "type": "tidelift" } ], - "time": "2022-01-21T20:24:37+00:00" + "time": "2022-02-25T20:21:48+00:00" }, { "name": "composer/semver", @@ -1573,20 +1573,20 @@ }, { "name": "composer/xdebug-handler", - "version": "3.0.1", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "12f1b79476638a5615ed00ea6adbb269cec96fd8" + "reference": "ced299686f41dce890debac69273b47ffe98a40c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/12f1b79476638a5615ed00ea6adbb269cec96fd8", - "reference": "12f1b79476638a5615ed00ea6adbb269cec96fd8", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", + "reference": "ced299686f41dce890debac69273b47ffe98a40c", "shasum": "" }, "require": { - "composer/pcre": "^1", + "composer/pcre": "^1 || ^2 || ^3", "php": "^7.2.5 || ^8.0", "psr/log": "^1 || ^2 || ^3" }, @@ -1619,7 +1619,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.1" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" }, "funding": [ { @@ -1635,7 +1635,7 @@ "type": "tidelift" } ], - "time": "2022-01-04T18:29:42+00:00" + "time": "2022-02-25T21:32:43+00:00" }, { "name": "dealerdirect/phpcodesniffer-composer-installer", @@ -2817,16 +2817,16 @@ }, { "name": "doctrine/lexer", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c" + "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c", - "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229", + "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229", "shasum": "" }, "require": { @@ -2834,7 +2834,7 @@ }, "require-dev": { "doctrine/coding-standard": "^9.0", - "phpstan/phpstan": "1.3", + "phpstan/phpstan": "^1.3", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", "vimeo/psalm": "^4.11" }, @@ -2873,7 +2873,7 @@ ], "support": { "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.2" + "source": "https://github.com/doctrine/lexer/tree/1.2.3" }, "funding": [ { @@ -2889,7 +2889,7 @@ "type": "tidelift" } ], - "time": "2022-01-12T08:27:12+00:00" + "time": "2022-02-28T11:07:21+00:00" }, { "name": "doctrine/migrations", @@ -3468,16 +3468,16 @@ }, { "name": "friendsofphp/proxy-manager-lts", - "version": "v1.0.5", + "version": "v1.0.6", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/proxy-manager-lts.git", - "reference": "006aa5d32f887a4db4353b13b5b5095613e0611f" + "reference": "7a3d6121bb5e93014dfbb354d48538e75e9a47d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/006aa5d32f887a4db4353b13b5b5095613e0611f", - "reference": "006aa5d32f887a4db4353b13b5b5095613e0611f", + "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/7a3d6121bb5e93014dfbb354d48538e75e9a47d6", + "reference": "7a3d6121bb5e93014dfbb354d48538e75e9a47d6", "shasum": "" }, "require": { @@ -3516,7 +3516,7 @@ { "name": "Marco Pivetta", "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.io/" + "homepage": "https://ocramius.github.io/" }, { "name": "Nicolas Grekas", @@ -3534,7 +3534,7 @@ ], "support": { "issues": "https://github.com/FriendsOfPHP/proxy-manager-lts/issues", - "source": "https://github.com/FriendsOfPHP/proxy-manager-lts/tree/v1.0.5" + "source": "https://github.com/FriendsOfPHP/proxy-manager-lts/tree/v1.0.6" }, "funding": [ { @@ -3546,7 +3546,7 @@ "type": "tidelift" } ], - "time": "2021-05-22T16:11:15+00:00" + "time": "2022-02-28T14:50:27+00:00" }, { "name": "fruitcake/php-cors", @@ -4407,16 +4407,16 @@ }, { "name": "league/commonmark", - "version": "2.2.2", + "version": "2.2.3", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "13d7751377732637814f0cda0e3f6d3243f9f769" + "reference": "47b015bc4e50fd4438c1ffef6139a1fb65d2ab71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/13d7751377732637814f0cda0e3f6d3243f9f769", - "reference": "13d7751377732637814f0cda0e3f6d3243f9f769", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/47b015bc4e50fd4438c1ffef6139a1fb65d2ab71", + "reference": "47b015bc4e50fd4438c1ffef6139a1fb65d2ab71", "shasum": "" }, "require": { @@ -4507,7 +4507,7 @@ "type": "tidelift" } ], - "time": "2022-02-13T15:00:57+00:00" + "time": "2022-02-26T21:24:45+00:00" }, { "name": "league/config", @@ -4593,16 +4593,16 @@ }, { "name": "league/flysystem", - "version": "3.0.9", + "version": "3.0.10", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "fb0801a60b7f9ea4188f01c25cb48aed26db7fb6" + "reference": "bbc5026adb5a423dfcdcecec74c7e15943ff6115" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/fb0801a60b7f9ea4188f01c25cb48aed26db7fb6", - "reference": "fb0801a60b7f9ea4188f01c25cb48aed26db7fb6", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/bbc5026adb5a423dfcdcecec74c7e15943ff6115", + "reference": "bbc5026adb5a423dfcdcecec74c7e15943ff6115", "shasum": "" }, "require": { @@ -4610,6 +4610,7 @@ "php": "^8.0.2" }, "conflict": { + "aws/aws-sdk-php": "3.209.31 || 3.210.0", "guzzlehttp/guzzle": "<7.0", "guzzlehttp/ringphp": "<1.1.1", "symfony/http-client": "<5.2" @@ -4662,7 +4663,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.0.9" + "source": "https://github.com/thephpleague/flysystem/tree/3.0.10" }, "funding": [ { @@ -4678,7 +4679,7 @@ "type": "tidelift" } ], - "time": "2022-02-22T07:37:40+00:00" + "time": "2022-02-26T11:09:13+00:00" }, { "name": "league/mime-type-detection", @@ -5938,16 +5939,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.13", + "version": "9.2.14", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "deac8540cb7bd40b2b8cfa679b76202834fd04e8" + "reference": "9f4d60b6afe5546421462b76cd4e633ebc364ab4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/deac8540cb7bd40b2b8cfa679b76202834fd04e8", - "reference": "deac8540cb7bd40b2b8cfa679b76202834fd04e8", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f4d60b6afe5546421462b76cd4e633ebc364ab4", + "reference": "9f4d60b6afe5546421462b76cd4e633ebc364ab4", "shasum": "" }, "require": { @@ -6003,7 +6004,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.13" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.14" }, "funding": [ { @@ -6011,7 +6012,7 @@ "type": "github" } ], - "time": "2022-02-23T17:02:38+00:00" + "time": "2022-02-28T12:38:02+00:00" }, { "name": "phpunit/php-file-iterator", @@ -7652,16 +7653,16 @@ }, { "name": "symfony/cache", - "version": "v6.0.3", + "version": "v6.0.5", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "4d2edb87334c1fb2fade9382c70e2284204f0b8b" + "reference": "ac6859b9216350046fa3f00d9f0b51e0f3de28fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/4d2edb87334c1fb2fade9382c70e2284204f0b8b", - "reference": "4d2edb87334c1fb2fade9382c70e2284204f0b8b", + "url": "https://api.github.com/repos/symfony/cache/zipball/ac6859b9216350046fa3f00d9f0b51e0f3de28fd", + "reference": "ac6859b9216350046fa3f00d9f0b51e0f3de28fd", "shasum": "" }, "require": { @@ -7725,7 +7726,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.0.3" + "source": "https://github.com/symfony/cache/tree/v6.0.5" }, "funding": [ { @@ -7741,7 +7742,7 @@ "type": "tidelift" } ], - "time": "2022-01-26T17:32:35+00:00" + "time": "2022-02-21T17:15:17+00:00" }, { "name": "symfony/cache-contracts", @@ -7902,16 +7903,16 @@ }, { "name": "symfony/console", - "version": "v6.0.3", + "version": "v6.0.5", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "22e8efd019c3270c4f79376234a3f8752cd25490" + "reference": "3bebf4108b9e07492a2a4057d207aa5a77d146b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/22e8efd019c3270c4f79376234a3f8752cd25490", - "reference": "22e8efd019c3270c4f79376234a3f8752cd25490", + "url": "https://api.github.com/repos/symfony/console/zipball/3bebf4108b9e07492a2a4057d207aa5a77d146b1", + "reference": "3bebf4108b9e07492a2a4057d207aa5a77d146b1", "shasum": "" }, "require": { @@ -7977,7 +7978,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.0.3" + "source": "https://github.com/symfony/console/tree/v6.0.5" }, "funding": [ { @@ -7993,7 +7994,7 @@ "type": "tidelift" } ], - "time": "2022-01-26T17:23:29+00:00" + "time": "2022-02-25T10:48:52+00:00" }, { "name": "symfony/css-selector", @@ -8062,16 +8063,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v6.0.3", + "version": "v6.0.5", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "bf53dbf6e8f3eec14f44c53fa4c3b4905ab19ee4" + "reference": "481846cbd2441cf3444340ee53486fc24da525bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/bf53dbf6e8f3eec14f44c53fa4c3b4905ab19ee4", - "reference": "bf53dbf6e8f3eec14f44c53fa4c3b4905ab19ee4", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/481846cbd2441cf3444340ee53486fc24da525bd", + "reference": "481846cbd2441cf3444340ee53486fc24da525bd", "shasum": "" }, "require": { @@ -8130,7 +8131,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.0.3" + "source": "https://github.com/symfony/dependency-injection/tree/v6.0.5" }, "funding": [ { @@ -8146,7 +8147,7 @@ "type": "tidelift" } ], - "time": "2022-01-26T17:23:29+00:00" + "time": "2022-02-24T10:01:27+00:00" }, { "name": "symfony/deprecation-contracts", @@ -8217,16 +8218,16 @@ }, { "name": "symfony/doctrine-bridge", - "version": "v6.0.3", + "version": "v6.0.5", "source": { "type": "git", "url": "https://github.com/symfony/doctrine-bridge.git", - "reference": "d1d9d54717d3125119e09c9c34b337364e47960e" + "reference": "4bd2980cf73477f32e5cfa974ce38dc80f7eaaa1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/d1d9d54717d3125119e09c9c34b337364e47960e", - "reference": "d1d9d54717d3125119e09c9c34b337364e47960e", + "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/4bd2980cf73477f32e5cfa974ce38dc80f7eaaa1", + "reference": "4bd2980cf73477f32e5cfa974ce38dc80f7eaaa1", "shasum": "" }, "require": { @@ -8312,7 +8313,7 @@ "description": "Provides integration for Doctrine with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/doctrine-bridge/tree/v6.0.3" + "source": "https://github.com/symfony/doctrine-bridge/tree/v6.0.5" }, "funding": [ { @@ -8328,7 +8329,7 @@ "type": "tidelift" } ], - "time": "2022-01-27T10:11:24+00:00" + "time": "2022-02-09T09:00:20+00:00" }, { "name": "symfony/error-handler", @@ -8565,16 +8566,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.0.3", + "version": "v6.0.5", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "6ae49c4fda17322171a2b8dc5f70bc6edbc498e1" + "reference": "6646c13f787057d64701a3a0235cf9567c6ccbbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/6ae49c4fda17322171a2b8dc5f70bc6edbc498e1", - "reference": "6ae49c4fda17322171a2b8dc5f70bc6edbc498e1", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/6646c13f787057d64701a3a0235cf9567c6ccbbd", + "reference": "6646c13f787057d64701a3a0235cf9567c6ccbbd", "shasum": "" }, "require": { @@ -8608,7 +8609,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.0.3" + "source": "https://github.com/symfony/filesystem/tree/v6.0.5" }, "funding": [ { @@ -8624,7 +8625,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2022-02-28T07:42:30+00:00" }, { "name": "symfony/finder", @@ -8689,16 +8690,16 @@ }, { "name": "symfony/framework-bundle", - "version": "v6.0.4", + "version": "v6.0.5", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "12d8bfaa3dec658da80125d37633221ce1e40f8f" + "reference": "3cc3095415d4a62bd7f6479b68920d1415da0621" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/12d8bfaa3dec658da80125d37633221ce1e40f8f", - "reference": "12d8bfaa3dec658da80125d37633221ce1e40f8f", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/3cc3095415d4a62bd7f6479b68920d1415da0621", + "reference": "3cc3095415d4a62bd7f6479b68920d1415da0621", "shasum": "" }, "require": { @@ -8707,7 +8708,7 @@ "php": ">=8.0.2", "symfony/cache": "^5.4|^6.0", "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", + "symfony/dependency-injection": "^5.4.5|^6.0.5", "symfony/error-handler": "^5.4|^6.0", "symfony/event-dispatcher": "^5.4|^6.0", "symfony/filesystem": "^5.4|^6.0", @@ -8819,7 +8820,7 @@ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v6.0.4" + "source": "https://github.com/symfony/framework-bundle/tree/v6.0.5" }, "funding": [ { @@ -8835,20 +8836,20 @@ "type": "tidelift" } ], - "time": "2022-01-29T17:50:53+00:00" + "time": "2022-02-21T17:15:17+00:00" }, { "name": "symfony/http-foundation", - "version": "v6.0.3", + "version": "v6.0.5", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "ad157299ced81a637fade1efcadd688d6deba5c1" + "reference": "b460fb15905eef449c4c43a4f0c113eccee103b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ad157299ced81a637fade1efcadd688d6deba5c1", - "reference": "ad157299ced81a637fade1efcadd688d6deba5c1", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b460fb15905eef449c4c43a4f0c113eccee103b9", + "reference": "b460fb15905eef449c4c43a4f0c113eccee103b9", "shasum": "" }, "require": { @@ -8891,7 +8892,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.0.3" + "source": "https://github.com/symfony/http-foundation/tree/v6.0.5" }, "funding": [ { @@ -8907,20 +8908,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2022-02-21T17:15:17+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.0.4", + "version": "v6.0.5", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "9dce179ce52b0f4f669c07fd5e465e5d809a5d3b" + "reference": "5ad3f5e5fa772a8b5c6bb217f8379b533afac2ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9dce179ce52b0f4f669c07fd5e465e5d809a5d3b", - "reference": "9dce179ce52b0f4f669c07fd5e465e5d809a5d3b", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5ad3f5e5fa772a8b5c6bb217f8379b533afac2ba", + "reference": "5ad3f5e5fa772a8b5c6bb217f8379b533afac2ba", "shasum": "" }, "require": { @@ -9000,7 +9001,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.0.4" + "source": "https://github.com/symfony/http-kernel/tree/v6.0.5" }, "funding": [ { @@ -9016,20 +9017,20 @@ "type": "tidelift" } ], - "time": "2022-01-29T18:12:46+00:00" + "time": "2022-02-28T08:05:03+00:00" }, { "name": "symfony/mailer", - "version": "v6.0.3", + "version": "v6.0.5", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "d958befe7dbee9d2b2157ef6dfa9b103efa94f82" + "reference": "0f4772db6521a1beb44529aa2c0c1e56f671be8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/d958befe7dbee9d2b2157ef6dfa9b103efa94f82", - "reference": "d958befe7dbee9d2b2157ef6dfa9b103efa94f82", + "url": "https://api.github.com/repos/symfony/mailer/zipball/0f4772db6521a1beb44529aa2c0c1e56f671be8f", + "reference": "0f4772db6521a1beb44529aa2c0c1e56f671be8f", "shasum": "" }, "require": { @@ -9074,7 +9075,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v6.0.3" + "source": "https://github.com/symfony/mailer/tree/v6.0.5" }, "funding": [ { @@ -9090,7 +9091,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2022-02-25T10:48:52+00:00" }, { "name": "symfony/mime", @@ -9632,16 +9633,16 @@ }, { "name": "symfony/process", - "version": "v6.0.3", + "version": "v6.0.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "298ed357274c1868c20a0061df256a1250a6c4af" + "reference": "1ccceccc6497e96f4f646218f04b97ae7d9fa7a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/298ed357274c1868c20a0061df256a1250a6c4af", - "reference": "298ed357274c1868c20a0061df256a1250a6c4af", + "url": "https://api.github.com/repos/symfony/process/zipball/1ccceccc6497e96f4f646218f04b97ae7d9fa7a1", + "reference": "1ccceccc6497e96f4f646218f04b97ae7d9fa7a1", "shasum": "" }, "require": { @@ -9673,7 +9674,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.0.3" + "source": "https://github.com/symfony/process/tree/v6.0.5" }, "funding": [ { @@ -9689,7 +9690,7 @@ "type": "tidelift" } ], - "time": "2022-01-26T17:23:29+00:00" + "time": "2022-01-30T18:19:12+00:00" }, { "name": "symfony/proxy-manager-bridge", @@ -9759,16 +9760,16 @@ }, { "name": "symfony/routing", - "version": "v6.0.3", + "version": "v6.0.5", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "b1debdf7a40e6bc7eee0f363ab9dd667fe04f099" + "reference": "a738b152426ac7fcb94bdab8188264652238bef1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/b1debdf7a40e6bc7eee0f363ab9dd667fe04f099", - "reference": "b1debdf7a40e6bc7eee0f363ab9dd667fe04f099", + "url": "https://api.github.com/repos/symfony/routing/zipball/a738b152426ac7fcb94bdab8188264652238bef1", + "reference": "a738b152426ac7fcb94bdab8188264652238bef1", "shasum": "" }, "require": { @@ -9827,7 +9828,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.0.3" + "source": "https://github.com/symfony/routing/tree/v6.0.5" }, "funding": [ { @@ -9843,7 +9844,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2022-01-31T19:46:53+00:00" }, { "name": "symfony/service-contracts", @@ -9929,16 +9930,16 @@ }, { "name": "symfony/stopwatch", - "version": "v6.0.3", + "version": "v6.0.5", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "6835045bb9f00fa4486ea4f1bcaf623be761556f" + "reference": "f2c1780607ec6502f2121d9729fd8150a655d337" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6835045bb9f00fa4486ea4f1bcaf623be761556f", - "reference": "6835045bb9f00fa4486ea4f1bcaf623be761556f", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f2c1780607ec6502f2121d9729fd8150a655d337", + "reference": "f2c1780607ec6502f2121d9729fd8150a655d337", "shasum": "" }, "require": { @@ -9971,7 +9972,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v6.0.3" + "source": "https://github.com/symfony/stopwatch/tree/v6.0.5" }, "funding": [ { @@ -9987,7 +9988,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2022-02-21T17:15:17+00:00" }, { "name": "symfony/string", @@ -10021,12 +10022,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "Symfony\\Component\\String\\": "" - }, "files": [ "Resources/functions.php" ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, "exclude-from-classmap": [ "/Tests/" ] @@ -10076,16 +10077,16 @@ }, { "name": "symfony/translation", - "version": "v6.0.3", + "version": "v6.0.5", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "71bb15335798f8c4da110911bcf2d2fead7a430d" + "reference": "e69501c71107cc3146b32aaa45f4edd0c3427875" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/71bb15335798f8c4da110911bcf2d2fead7a430d", - "reference": "71bb15335798f8c4da110911bcf2d2fead7a430d", + "url": "https://api.github.com/repos/symfony/translation/zipball/e69501c71107cc3146b32aaa45f4edd0c3427875", + "reference": "e69501c71107cc3146b32aaa45f4edd0c3427875", "shasum": "" }, "require": { @@ -10151,7 +10152,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.0.3" + "source": "https://github.com/symfony/translation/tree/v6.0.5" }, "funding": [ { @@ -10167,7 +10168,7 @@ "type": "tidelift" } ], - "time": "2022-01-07T00:29:03+00:00" + "time": "2022-02-09T15:52:48+00:00" }, { "name": "symfony/translation-contracts", @@ -10249,16 +10250,16 @@ }, { "name": "symfony/twig-bridge", - "version": "v6.0.3", + "version": "v6.0.5", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "31a4ec953c20299cc828eb6a1ccdf86d7ecbe22c" + "reference": "a0f84e65d5e0c6b26d0b5185ae7b97f1688a8fa4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/31a4ec953c20299cc828eb6a1ccdf86d7ecbe22c", - "reference": "31a4ec953c20299cc828eb6a1ccdf86d7ecbe22c", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/a0f84e65d5e0c6b26d0b5185ae7b97f1688a8fa4", + "reference": "a0f84e65d5e0c6b26d0b5185ae7b97f1688a8fa4", "shasum": "" }, "require": { @@ -10349,7 +10350,7 @@ "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bridge/tree/v6.0.3" + "source": "https://github.com/symfony/twig-bridge/tree/v6.0.5" }, "funding": [ { @@ -10365,7 +10366,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2022-02-09T09:00:20+00:00" }, { "name": "symfony/twig-bundle", @@ -10501,16 +10502,16 @@ }, { "name": "symfony/var-dumper", - "version": "v6.0.3", + "version": "v6.0.5", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "7b701676fc64f9ef11f9b4870f16b48f66be4834" + "reference": "60d6a756d5f485df5e6e40b337334848f79f61ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7b701676fc64f9ef11f9b4870f16b48f66be4834", - "reference": "7b701676fc64f9ef11f9b4870f16b48f66be4834", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/60d6a756d5f485df5e6e40b337334848f79f61ce", + "reference": "60d6a756d5f485df5e6e40b337334848f79f61ce", "shasum": "" }, "require": { @@ -10569,7 +10570,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.0.3" + "source": "https://github.com/symfony/var-dumper/tree/v6.0.5" }, "funding": [ { @@ -10585,7 +10586,7 @@ "type": "tidelift" } ], - "time": "2022-01-17T16:30:44+00:00" + "time": "2022-02-21T17:15:17+00:00" }, { "name": "symfony/var-exporter", @@ -10919,16 +10920,16 @@ }, { "name": "vimeo/psalm", - "version": "4.21.0", + "version": "4.22.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "d8bec4c7aaee111a532daec32fb09de5687053d1" + "reference": "fc2c6ab4d5fa5d644d8617089f012f3bb84b8703" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/d8bec4c7aaee111a532daec32fb09de5687053d1", - "reference": "d8bec4c7aaee111a532daec32fb09de5687053d1", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/fc2c6ab4d5fa5d644d8617089f012f3bb84b8703", + "reference": "fc2c6ab4d5fa5d644d8617089f012f3bb84b8703", "shasum": "" }, "require": { @@ -11019,9 +11020,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.21.0" + "source": "https://github.com/vimeo/psalm/tree/4.22.0" }, - "time": "2022-02-18T04:34:15+00:00" + "time": "2022-02-24T20:34:05+00:00" }, { "name": "vlucas/phpdotenv", diff --git a/known-issues.xml b/known-issues.xml index 6a182e2e..4954e949 100644 --- a/known-issues.xml +++ b/known-issues.xml @@ -1,5 +1,5 @@ - + $config->get(ConfigKey::MONITORING_ENABLED) @@ -158,9 +158,6 @@ $children $children - - NodeDefinition|ArrayNodeDefinition - arrayNode children @@ -171,9 +168,6 @@ end scalarNode - - $treeBuilder->root(self::ROOT_NODE_NAME) - @@ -181,13 +175,10 @@ - - - CheckScoutApmKeyListener - - - TestListenerDefaultImplementation - + + + FilterControllerEvent::class + @@ -201,70 +192,6 @@ - - self::at(0) - self::at(0) - self::at(1) - self::at(1) - self::at(1) - self::at(1) - self::at(1) - self::at(1) - self::at(2) - self::at(2) - self::at(2) - self::at(2) - self::at(2) - self::at(2) - self::at(2) - self::at(2) - self::at(3) - self::at(3) - self::at(3) - self::at(3) - self::at(3) - self::at(3) - self::at(3) - self::at(3) - self::at(4) - self::at(4) - self::at(4) - self::at(5) - self::at(5) - self::at(6) - - - self::at(0) - self::at(0) - self::at(1) - self::at(1) - self::at(1) - self::at(1) - self::at(1) - self::at(1) - self::at(2) - self::at(2) - self::at(2) - self::at(2) - self::at(2) - self::at(2) - self::at(2) - self::at(2) - self::at(3) - self::at(3) - self::at(3) - self::at(3) - self::at(3) - self::at(3) - self::at(3) - self::at(3) - self::at(4) - self::at(4) - self::at(4) - self::at(5) - self::at(5) - self::at(6) - $commands[(self::EXPECTED_SPAN_LIMIT * 2) + 1] $commands[(self::EXPECTED_SPAN_LIMIT * 2) + 2] @@ -355,12 +282,6 @@ $block - - - self::assertRegExp(self::DATE_FORMAT_VALIDATION_REGEX, (string) $timer->getStart()) - self::assertRegExp(self::DATE_FORMAT_VALIDATION_REGEX, (string) $timer->getStop()) - - testFacadeProxiesMethodsToRealAgent @@ -405,15 +326,7 @@ $whichViews - - - setMethods - - - - setMethods - $loadedConfigurations['cache'] @@ -439,12 +352,6 @@ - - self::at(3) - - - self::at(3) - $flattenedMetadata $flattenedMetadata @@ -470,4 +377,10 @@ $type + + + $children + Command[] + + diff --git a/src/Logger/FilteredLogLevelDecorator.php b/src/Logger/FilteredLogLevelDecorator.php index 1af805e0..1521c282 100644 --- a/src/Logger/FilteredLogLevelDecorator.php +++ b/src/Logger/FilteredLogLevelDecorator.php @@ -18,6 +18,8 @@ /** * This log decorator is used to squelch log messages below a configured threshold. + * + * @internal This class extends a third party vendor, so we mark as internal to not expose upstream BC breaks */ final class FilteredLogLevelDecorator implements LoggerInterface { @@ -72,7 +74,7 @@ public function __construct(LoggerInterface $realLogger, string $minimumLogLevel } /** {@inheritDoc} */ - public function log($level, $message, array $context = []) + public function log($level, $message, array $context = []): void { if ($this->minimumLogLevel > self::LOG_LEVEL_ORDER[$level]) { return; diff --git a/tests/Unit/TestLogger.php b/tests/Unit/TestLogger.php index d5ed3086..ce2515e8 100644 --- a/tests/Unit/TestLogger.php +++ b/tests/Unit/TestLogger.php @@ -72,11 +72,12 @@ class TestLogger extends AbstractLogger /** * @inheritdoc */ - public function log($level, $message, array $context = []) + public function log($level, $message, array $context = []): void { + /** @psalm-suppress RedundantCastGivenDocblockType */ $record = [ 'level' => (string) $level, - 'message' => $message, + 'message' => (string) $message, 'context' => $context, ];