From dde9b5a97c8eae12089dc141a495f8b39644f17e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Viguier?= Date: Sat, 4 Jan 2025 15:36:45 +0100 Subject: [PATCH] Drop laminas-text, add related source files to Lychee (#2876) * drop laminas, add related source files to Lychee * fix phpstan * we need 9 builds : 3 without legacy v2, 3 with legacy v1, 3 with legacy v2 --- app/Assets/ArrayToTextTable.php | 4 +- app/Contracts/Laminas/DecoratorInterface.php | 93 +++++ app/Metadata/Laminas/Unicode.php | 158 +++++++ codecov.yml | 2 +- composer.json | 1 - composer.lock | 412 +++++-------------- phpstan.neon | 7 +- tests/Feature_v2/Base/BaseApiV2Test.php | 41 +- 8 files changed, 382 insertions(+), 336 deletions(-) create mode 100644 app/Contracts/Laminas/DecoratorInterface.php create mode 100644 app/Metadata/Laminas/Unicode.php diff --git a/app/Assets/ArrayToTextTable.php b/app/Assets/ArrayToTextTable.php index 2ee010240eb..bd750e51188 100644 --- a/app/Assets/ArrayToTextTable.php +++ b/app/Assets/ArrayToTextTable.php @@ -14,8 +14,8 @@ namespace App\Assets; -use Laminas\Text\Table\Decorator\DecoratorInterface; -use Laminas\Text\Table\Decorator\Unicode; +use App\Contracts\Laminas\DecoratorInterface; +use App\Metadata\Laminas\Unicode; use Safe\Exceptions\MbstringException; use Safe\Exceptions\PcreException; use function Safe\mb_internal_encoding; diff --git a/app/Contracts/Laminas/DecoratorInterface.php b/app/Contracts/Laminas/DecoratorInterface.php new file mode 100644 index 00000000000..db147d9d89c --- /dev/null +++ b/app/Contracts/Laminas/DecoratorInterface.php @@ -0,0 +1,93 @@ +_uniChar(0x250C); + } + + /** + * {@inheritDoc} + */ + public function getTopRight(): string + { + return $this->_uniChar(0x2510); + } + + /** + * {@inheritDoc} + */ + public function getBottomLeft(): string + { + return $this->_uniChar(0x2514); + } + + /** + * {@inheritDoc} + */ + public function getBottomRight(): string + { + return $this->_uniChar(0x2518); + } + + /** + * {@inheritDoc} + */ + public function getVertical(): string + { + return $this->_uniChar(0x2502); + } + + /** + * {@inheritDoc} + */ + public function getHorizontal(): string + { + return $this->_uniChar(0x2500); + } + + /** + * {@inheritDoc} + */ + public function getCross(): string + { + return $this->_uniChar(0x253C); + } + + /** + * {@inheritDoc} + */ + public function getVerticalRight(): string + { + return $this->_uniChar(0x251C); + } + + /** + * {@inheritDoc} + */ + public function getVerticalLeft(): string + { + return $this->_uniChar(0x2524); + } + + /** + * {@inheritDoc} + */ + public function getHorizontalDown(): string + { + return $this->_uniChar(0x252C); + } + + /** + * {@inheritDoc} + */ + public function getHorizontalUp(): string + { + return $this->_uniChar(0x2534); + } + + /** + * Convert am unicode character code to a character. + * + * @param int $code + */ + // @codingStandardsIgnoreStart + protected function _uniChar(int $code): string + { + // @codingStandardsIgnoreEnd + if ($code <= 0x7F) { + return \chr($code); + } + if ($code <= 0x7FF) { + return \chr(0xC0 | $code >> 6) + . \chr(0x80 | $code & 0x3F); + } + if ($code <= 0xFFFF) { + return \chr(0xE0 | $code >> 12) + . \chr(0x80 | $code >> 6 & 0x3F) + . \chr(0x80 | $code & 0x3F); + } + if ($code <= 0x10FFFF) { + return \chr(0xF0 | $code >> 18) + . \chr(0x80 | $code >> 12 & 0x3F) + . \chr(0x80 | $code >> 6 & 0x3F) + . \chr(0x80 | $code & 0x3F); + } + + throw new LycheeLogicException('Code point requested outside of Unicode range'); + } +} diff --git a/codecov.yml b/codecov.yml index b6a4ef4f351..d7a7bcf6ca8 100644 --- a/codecov.yml +++ b/codecov.yml @@ -2,7 +2,7 @@ codecov: require_ci_to_pass: true notify: - after_n_builds: 6 + after_n_builds: 9 wait_for_ci: true comment: behavior: default diff --git a/composer.json b/composer.json index 1ae4bc06ae8..4811ea022fc 100644 --- a/composer.json +++ b/composer.json @@ -55,7 +55,6 @@ "geocoder-php/cache-provider": "^4.3", "geocoder-php/nominatim-provider": "^5.5", "graham-campbell/markdown": "^15.0", - "laminas/laminas-text": "^2.9", "laragear/webauthn": "^3.1", "laravel/framework": "^11.0", "laravel/socialite": "^5.11", diff --git a/composer.lock b/composer.lock index c41ee32e08a..bd17732831e 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": "218112bf927607113295b5a4501aef91", + "content-hash": "70ee25bfaf7e2d43950fe8d0b09bb79c", "packages": [ { "name": "amphp/amp", @@ -870,16 +870,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.336.6", + "version": "3.336.8", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "0a99dab427f0a1c082775301141aeac3558691ad" + "reference": "933da0d1b9b1ac9b37d5e32e127d4581b1aabaf6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0a99dab427f0a1c082775301141aeac3558691ad", - "reference": "0a99dab427f0a1c082775301141aeac3558691ad", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/933da0d1b9b1ac9b37d5e32e127d4581b1aabaf6", + "reference": "933da0d1b9b1ac9b37d5e32e127d4581b1aabaf6", "shasum": "" }, "require": { @@ -962,9 +962,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.336.6" + "source": "https://github.com/aws/aws-sdk-php/tree/3.336.8" }, - "time": "2024-12-28T04:16:13+00:00" + "time": "2025-01-03T19:06:11+00:00" }, { "name": "bepsvpt/secure-headers", @@ -3099,216 +3099,6 @@ }, "time": "2023-02-03T21:26:53+00:00" }, - { - "name": "laminas/laminas-servicemanager", - "version": "3.23.0", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-servicemanager.git", - "reference": "a8640182b892b99767d54404d19c5c3b3699f79b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/a8640182b892b99767d54404d19c5c3b3699f79b", - "reference": "a8640182b892b99767d54404d19c5c3b3699f79b", - "shasum": "" - }, - "require": { - "laminas/laminas-stdlib": "^3.19", - "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", - "psr/container": "^1.0" - }, - "conflict": { - "ext-psr": "*", - "laminas/laminas-code": "<4.10.0", - "zendframework/zend-code": "<3.3.1", - "zendframework/zend-servicemanager": "*" - }, - "provide": { - "psr/container-implementation": "^1.0" - }, - "replace": { - "container-interop/container-interop": "^1.2.0" - }, - "require-dev": { - "composer/package-versions-deprecated": "^1.11.99.5", - "friendsofphp/proxy-manager-lts": "^1.0.18", - "laminas/laminas-code": "^4.14.0", - "laminas/laminas-coding-standard": "~2.5.0", - "laminas/laminas-container-config-test": "^0.8", - "mikey179/vfsstream": "^1.6.12", - "phpbench/phpbench": "^1.3.1", - "phpunit/phpunit": "^10.5.36", - "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.26.1" - }, - "suggest": { - "friendsofphp/proxy-manager-lts": "ProxyManager ^2.1.1 to handle lazy initialization of services" - }, - "bin": [ - "bin/generate-deps-for-config-factory", - "bin/generate-factory-for-class" - ], - "type": "library", - "autoload": { - "files": [ - "src/autoload.php" - ], - "psr-4": { - "Laminas\\ServiceManager\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Factory-Driven Dependency Injection Container", - "homepage": "https://laminas.dev", - "keywords": [ - "PSR-11", - "dependency-injection", - "di", - "dic", - "laminas", - "service-manager", - "servicemanager" - ], - "support": { - "chat": "https://laminas.dev/chat", - "docs": "https://docs.laminas.dev/laminas-servicemanager/", - "forum": "https://discourse.laminas.dev", - "issues": "https://github.com/laminas/laminas-servicemanager/issues", - "rss": "https://github.com/laminas/laminas-servicemanager/releases.atom", - "source": "https://github.com/laminas/laminas-servicemanager" - }, - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2024-10-28T21:32:16+00:00" - }, - { - "name": "laminas/laminas-stdlib", - "version": "3.20.0", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "8974a1213be42c3e2f70b2c27b17f910291ab2f4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/8974a1213be42c3e2f70b2c27b17f910291ab2f4", - "reference": "8974a1213be42c3e2f70b2c27b17f910291ab2f4", - "shasum": "" - }, - "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0" - }, - "conflict": { - "zendframework/zend-stdlib": "*" - }, - "require-dev": { - "laminas/laminas-coding-standard": "^3.0", - "phpbench/phpbench": "^1.3.1", - "phpunit/phpunit": "^10.5.38", - "psalm/plugin-phpunit": "^0.19.0", - "vimeo/psalm": "^5.26.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Laminas\\Stdlib\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "SPL extensions, array utilities, error handlers, and more", - "homepage": "https://laminas.dev", - "keywords": [ - "laminas", - "stdlib" - ], - "support": { - "chat": "https://laminas.dev/chat", - "docs": "https://docs.laminas.dev/laminas-stdlib/", - "forum": "https://discourse.laminas.dev", - "issues": "https://github.com/laminas/laminas-stdlib/issues", - "rss": "https://github.com/laminas/laminas-stdlib/releases.atom", - "source": "https://github.com/laminas/laminas-stdlib" - }, - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2024-10-29T13:46:07+00:00" - }, - { - "name": "laminas/laminas-text", - "version": "2.12.1", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-text.git", - "reference": "3f36bbf7517b66448fcbd82c6c03d0110431ba1f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-text/zipball/3f36bbf7517b66448fcbd82c6c03d0110431ba1f", - "reference": "3f36bbf7517b66448fcbd82c6c03d0110431ba1f", - "shasum": "" - }, - "require": { - "laminas/laminas-servicemanager": "^3.22.0", - "laminas/laminas-stdlib": "^3.7.1", - "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0" - }, - "conflict": { - "zendframework/zend-text": "*" - }, - "require-dev": { - "laminas/laminas-coding-standard": "^3.0.1", - "phpunit/phpunit": "^10.5.38", - "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.26.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Laminas\\Text\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Create FIGlets and text-based tables", - "homepage": "https://laminas.dev", - "keywords": [ - "laminas", - "text" - ], - "support": { - "chat": "https://laminas.dev/chat", - "docs": "https://docs.laminas.dev/laminas-text/", - "forum": "https://discourse.laminas.dev", - "issues": "https://github.com/laminas/laminas-text/issues", - "rss": "https://github.com/laminas/laminas-text/releases.atom", - "source": "https://github.com/laminas/laminas-text" - }, - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "abandoned": true, - "time": "2024-12-05T16:44:33+00:00" - }, { "name": "laragear/meta-model", "version": "v1.1.0", @@ -3464,16 +3254,16 @@ }, { "name": "laravel/framework", - "version": "v11.36.1", + "version": "v11.37.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "df06f5163f4550641fdf349ebc04916a61135a64" + "reference": "6cb103d2024b087eae207654b3f4b26646119ba5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/df06f5163f4550641fdf349ebc04916a61135a64", - "reference": "df06f5163f4550641fdf349ebc04916a61135a64", + "url": "https://api.github.com/repos/laravel/framework/zipball/6cb103d2024b087eae207654b3f4b26646119ba5", + "reference": "6cb103d2024b087eae207654b3f4b26646119ba5", "shasum": "" }, "require": { @@ -3523,7 +3313,6 @@ "voku/portable-ascii": "^2.0.2" }, "conflict": { - "mockery/mockery": "1.6.8", "tightenco/collect": "<5.5.33" }, "provide": { @@ -3675,7 +3464,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-12-17T22:32:08+00:00" + "time": "2025-01-02T20:10:21+00:00" }, { "name": "laravel/prompts", @@ -5554,16 +5343,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.3.1", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" + "reference": "447a020a1f875a434d62f2a401f53b82a396e494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", - "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494", + "reference": "447a020a1f875a434d62f2a401f53b82a396e494", "shasum": "" }, "require": { @@ -5606,9 +5395,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0" }, - "time": "2024-10-08T18:51:32+00:00" + "time": "2024-12-30T11:07:19+00:00" }, { "name": "nunomaduro/termwind", @@ -6951,22 +6740,27 @@ }, { "name": "psr/container", - "version": "1.1.2", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", "shasum": "" }, "require": { "php": ">=7.4.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -6993,9 +6787,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.2" + "source": "https://github.com/php-fig/container/tree/2.0.2" }, - "time": "2021-11-05T16:50:12+00:00" + "time": "2021-11-05T16:47:00+00:00" }, { "name": "psr/event-dispatcher", @@ -8001,22 +7795,22 @@ }, { "name": "socialiteproviders/manager", - "version": "v4.7.0", + "version": "v4.8.0", "source": { "type": "git", "url": "https://github.com/SocialiteProviders/Manager.git", - "reference": "ab0691b82cec77efd90154c78f1854903455c82f" + "reference": "e93acc38f8464cc775a2b8bf09df311d1fdfefcb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/ab0691b82cec77efd90154c78f1854903455c82f", - "reference": "ab0691b82cec77efd90154c78f1854903455c82f", + "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/e93acc38f8464cc775a2b8bf09df311d1fdfefcb", + "reference": "e93acc38f8464cc775a2b8bf09df311d1fdfefcb", "shasum": "" }, "require": { "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0", "laravel/socialite": "^5.5", - "php": "^8.0" + "php": "^8.1" }, "require-dev": { "mockery/mockery": "^1.2", @@ -8071,20 +7865,20 @@ "issues": "https://github.com/socialiteproviders/manager/issues", "source": "https://github.com/socialiteproviders/manager" }, - "time": "2024-11-10T01:56:18+00:00" + "time": "2025-01-03T09:40:37+00:00" }, { "name": "socialiteproviders/microsoft", - "version": "4.5.1", + "version": "4.6.0", "source": { "type": "git", "url": "https://github.com/SocialiteProviders/Microsoft.git", - "reference": "9f55e544f183c36096a14b2e61b5d6c9dc23961e" + "reference": "76d51308ef53d1425a5ce3c3b094b0925cd82951" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SocialiteProviders/Microsoft/zipball/9f55e544f183c36096a14b2e61b5d6c9dc23961e", - "reference": "9f55e544f183c36096a14b2e61b5d6c9dc23961e", + "url": "https://api.github.com/repos/SocialiteProviders/Microsoft/zipball/76d51308ef53d1425a5ce3c3b094b0925cd82951", + "reference": "76d51308ef53d1425a5ce3c3b094b0925cd82951", "shasum": "" }, "require": { @@ -8121,7 +7915,7 @@ "issues": "https://github.com/socialiteproviders/providers/issues", "source": "https://github.com/socialiteproviders/providers" }, - "time": "2024-07-12T02:43:55+00:00" + "time": "2024-11-07T21:57:40+00:00" }, { "name": "socialiteproviders/nextcloud", @@ -8593,16 +8387,16 @@ }, { "name": "spatie/laravel-package-tools", - "version": "1.17.0", + "version": "1.18.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-package-tools.git", - "reference": "9ab30fd24f677e5aa370ea4cf6b41c517d16cf85" + "reference": "8332205b90d17164913244f4a8e13ab7e6761d29" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/9ab30fd24f677e5aa370ea4cf6b41c517d16cf85", - "reference": "9ab30fd24f677e5aa370ea4cf6b41c517d16cf85", + "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/8332205b90d17164913244f4a8e13ab7e6761d29", + "reference": "8332205b90d17164913244f4a8e13ab7e6761d29", "shasum": "" }, "require": { @@ -8641,7 +8435,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-package-tools/issues", - "source": "https://github.com/spatie/laravel-package-tools/tree/1.17.0" + "source": "https://github.com/spatie/laravel-package-tools/tree/1.18.0" }, "funding": [ { @@ -8649,7 +8443,7 @@ "type": "github" } ], - "time": "2024-12-09T16:29:14+00:00" + "time": "2024-12-30T13:13:39+00:00" }, { "name": "spatie/laravel-typescript-transformer", @@ -9651,16 +9445,16 @@ }, { "name": "symfony/finder", - "version": "v7.2.0", + "version": "v7.2.2", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49" + "reference": "87a71856f2f56e4100373e92529eed3171695cfb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/6de263e5868b9a137602dd1e33e4d48bfae99c49", - "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49", + "url": "https://api.github.com/repos/symfony/finder/zipball/87a71856f2f56e4100373e92529eed3171695cfb", + "reference": "87a71856f2f56e4100373e92529eed3171695cfb", "shasum": "" }, "require": { @@ -9695,7 +9489,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.2.0" + "source": "https://github.com/symfony/finder/tree/v7.2.2" }, "funding": [ { @@ -9711,20 +9505,20 @@ "type": "tidelift" } ], - "time": "2024-10-23T06:56:12+00:00" + "time": "2024-12-30T19:00:17+00:00" }, { "name": "symfony/http-foundation", - "version": "v7.2.0", + "version": "v7.2.2", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "e88a66c3997859532bc2ddd6dd8f35aba2711744" + "reference": "62d1a43796ca3fea3f83a8470dfe63a4af3bc588" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e88a66c3997859532bc2ddd6dd8f35aba2711744", - "reference": "e88a66c3997859532bc2ddd6dd8f35aba2711744", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/62d1a43796ca3fea3f83a8470dfe63a4af3bc588", + "reference": "62d1a43796ca3fea3f83a8470dfe63a4af3bc588", "shasum": "" }, "require": { @@ -9773,7 +9567,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v7.2.0" + "source": "https://github.com/symfony/http-foundation/tree/v7.2.2" }, "funding": [ { @@ -9789,20 +9583,20 @@ "type": "tidelift" } ], - "time": "2024-11-13T18:58:46+00:00" + "time": "2024-12-30T19:00:17+00:00" }, { "name": "symfony/http-kernel", - "version": "v7.2.1", + "version": "v7.2.2", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "d8ae58eecae44c8e66833e76cc50a4ad3c002d97" + "reference": "3c432966bd8c7ec7429663105f5a02d7e75b4306" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d8ae58eecae44c8e66833e76cc50a4ad3c002d97", - "reference": "d8ae58eecae44c8e66833e76cc50a4ad3c002d97", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3c432966bd8c7ec7429663105f5a02d7e75b4306", + "reference": "3c432966bd8c7ec7429663105f5a02d7e75b4306", "shasum": "" }, "require": { @@ -9887,7 +9681,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/v7.2.1" + "source": "https://github.com/symfony/http-kernel/tree/v7.2.2" }, "funding": [ { @@ -9903,7 +9697,7 @@ "type": "tidelift" } ], - "time": "2024-12-11T12:09:10+00:00" + "time": "2024-12-31T14:59:40+00:00" }, { "name": "symfony/mailer", @@ -11019,16 +10813,16 @@ }, { "name": "symfony/translation", - "version": "v7.2.0", + "version": "v7.2.2", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "dc89e16b44048ceecc879054e5b7f38326ab6cc5" + "reference": "e2674a30132b7cc4d74540d6c2573aa363f05923" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/dc89e16b44048ceecc879054e5b7f38326ab6cc5", - "reference": "dc89e16b44048ceecc879054e5b7f38326ab6cc5", + "url": "https://api.github.com/repos/symfony/translation/zipball/e2674a30132b7cc4d74540d6c2573aa363f05923", + "reference": "e2674a30132b7cc4d74540d6c2573aa363f05923", "shasum": "" }, "require": { @@ -11094,7 +10888,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v7.2.0" + "source": "https://github.com/symfony/translation/tree/v7.2.2" }, "funding": [ { @@ -11110,7 +10904,7 @@ "type": "tidelift" } ], - "time": "2024-11-12T20:47:56+00:00" + "time": "2024-12-07T08:18:10+00:00" }, { "name": "symfony/translation-contracts", @@ -12077,20 +11871,20 @@ }, { "name": "barryvdh/reflection-docblock", - "version": "v2.2.0", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/barryvdh/ReflectionDocBlock.git", - "reference": "db125e8df4329bd45f2da405aab007f502f38531" + "reference": "818be8de6af4d16ef3ad51ea9234b3d37026ee5f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/db125e8df4329bd45f2da405aab007f502f38531", - "reference": "db125e8df4329bd45f2da405aab007f502f38531", + "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/818be8de6af4d16ef3ad51ea9234b3d37026ee5f", + "reference": "818be8de6af4d16ef3ad51ea9234b3d37026ee5f", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "require-dev": { "phpunit/phpunit": "^8.5.14|^9" @@ -12102,7 +11896,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2.x-dev" + "dev-master": "2.3.x-dev" } }, "autoload": { @@ -12123,9 +11917,9 @@ } ], "support": { - "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.2.0" + "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.3.0" }, - "time": "2024-12-28T10:00:03+00:00" + "time": "2024-12-30T10:35:04+00:00" }, { "name": "brianium/paratest", @@ -13725,16 +13519,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.13", + "version": "1.12.14", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "9b469068840cfa031e1deaf2fa1886d00e20680f" + "reference": "e73868f809e68fff33be961ad4946e2e43ec9e38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9b469068840cfa031e1deaf2fa1886d00e20680f", - "reference": "9b469068840cfa031e1deaf2fa1886d00e20680f", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e73868f809e68fff33be961ad4946e2e43ec9e38", + "reference": "e73868f809e68fff33be961ad4946e2e43ec9e38", "shasum": "" }, "require": { @@ -13779,7 +13573,7 @@ "type": "github" } ], - "time": "2024-12-17T17:00:20+00:00" + "time": "2024-12-31T07:26:13+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -14373,33 +14167,33 @@ }, { "name": "react/child-process", - "version": "v0.6.5", + "version": "v0.6.6", "source": { "type": "git", "url": "https://github.com/reactphp/child-process.git", - "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43" + "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/child-process/zipball/e71eb1aa55f057c7a4a0d08d06b0b0a484bead43", - "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43", + "url": "https://api.github.com/repos/reactphp/child-process/zipball/1721e2b93d89b745664353b9cfc8f155ba8a6159", + "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159", "shasum": "" }, "require": { "evenement/evenement": "^3.0 || ^2.0 || ^1.0", "php": ">=5.3.0", "react/event-loop": "^1.2", - "react/stream": "^1.2" + "react/stream": "^1.4" }, "require-dev": { - "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35", - "react/socket": "^1.8", + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", + "react/socket": "^1.16", "sebastian/environment": "^5.0 || ^3.0 || ^2.0 || ^1.0" }, "type": "library", "autoload": { "psr-4": { - "React\\ChildProcess\\": "src" + "React\\ChildProcess\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -14436,19 +14230,15 @@ ], "support": { "issues": "https://github.com/reactphp/child-process/issues", - "source": "https://github.com/reactphp/child-process/tree/v0.6.5" + "source": "https://github.com/reactphp/child-process/tree/v0.6.6" }, "funding": [ { - "url": "https://github.com/WyriHaximus", - "type": "github" - }, - { - "url": "https://github.com/clue", - "type": "github" + "url": "https://opencollective.com/reactphp", + "type": "open_collective" } ], - "time": "2022-09-16T13:41:56+00:00" + "time": "2025-01-01T16:37:48+00:00" }, { "name": "react/dns", @@ -16103,16 +15893,16 @@ }, { "name": "symfony/stopwatch", - "version": "v7.2.0", + "version": "v7.2.2", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "696f418b0d722a4225e1c3d95489d262971ca924" + "reference": "e46690d5b9d7164a6d061cab1e8d46141b9f49df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/696f418b0d722a4225e1c3d95489d262971ca924", - "reference": "696f418b0d722a4225e1c3d95489d262971ca924", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/e46690d5b9d7164a6d061cab1e8d46141b9f49df", + "reference": "e46690d5b9d7164a6d061cab1e8d46141b9f49df", "shasum": "" }, "require": { @@ -16145,7 +15935,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v7.2.0" + "source": "https://github.com/symfony/stopwatch/tree/v7.2.2" }, "funding": [ { @@ -16161,7 +15951,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:21:43+00:00" + "time": "2024-12-18T14:28:33+00:00" }, { "name": "symplify/phpstan-rules", diff --git a/phpstan.neon b/phpstan.neon index 61da8eac1f3..6f5bceed5da 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -168,4 +168,9 @@ parameters: message: '#Dynamic call to static method Illuminate\\Session\\Store::(has|get|now|forget)\(\).#' - - message: '#Dynamic call to static method Kalnoy\\Nestedset\\QueryBuilder<.*>::(join|select|orderBy)\(\)#' \ No newline at end of file + message: '#Dynamic call to static method Kalnoy\\Nestedset\\QueryBuilder<.*>::(join|select|orderBy)\(\)#' + + - + message: '#Dynamic call to static method Illuminate\\Http\\Response::getContent\(\)#' + paths: + - tests \ No newline at end of file diff --git a/tests/Feature_v2/Base/BaseApiV2Test.php b/tests/Feature_v2/Base/BaseApiV2Test.php index 651ac325c47..ebcaedeafe2 100644 --- a/tests/Feature_v2/Base/BaseApiV2Test.php +++ b/tests/Feature_v2/Base/BaseApiV2Test.php @@ -12,6 +12,7 @@ namespace Tests\Feature_v2\Base; +use Illuminate\Support\Uri; use Illuminate\Testing\TestResponse; abstract class BaseApiV2Test extends BaseV2Test @@ -21,8 +22,8 @@ abstract class BaseApiV2Test extends BaseV2Test /** * Visit the given URI with a GET request. * - * @param string $uri - * @param array $headers + * @param Uri|string $uri + * @param array $headers * * @return TestResponse<\Illuminate\Http\JsonResponse> */ @@ -34,9 +35,9 @@ public function get($uri, array $headers = []) /** * Visit the given URI with a POST request. * - * @param string $uri - * @param array $data - * @param array $headers + * @param Uri|string $uri + * @param array $data + * @param array $headers * * @return TestResponse<\Illuminate\Http\JsonResponse> */ @@ -66,9 +67,9 @@ public function getJsonWithData($uri, array $data = [], array $headers = [], $op /** * Visit the given URI with a GET request, expecting a JSON response. * - * @param string $uri - * @param array $headers - * @param int $options + * @param Uri|string $uri + * @param array $headers + * @param int $options * * @return TestResponse<\Illuminate\Http\JsonResponse> */ @@ -80,10 +81,10 @@ public function getJson($uri, array $headers = [], $options = 0) /** * Visit the given URI with a POST request, expecting a JSON response. * - * @param string $uri - * @param array $data - * @param array $headers - * @param int $options + * @param Uri|string $uri + * @param array $data + * @param array $headers + * @param int $options * * @return TestResponse<\Illuminate\Http\JsonResponse> */ @@ -95,10 +96,10 @@ public function postJson($uri, array $data = [], array $headers = [], $options = /** * Visit the given URI with a PATCH request, expecting a JSON response. * - * @param string $uri - * @param array $data - * @param array $headers - * @param int $options + * @param Uri|string $uri + * @param array $data + * @param array $headers + * @param int $options * * @return TestResponse<\Illuminate\Http\JsonResponse> */ @@ -110,10 +111,10 @@ public function patchJson($uri, array $data = [], array $headers = [], $options /** * Visit the given URI with a DELETE request, expecting a JSON response. * - * @param string $uri - * @param array $data - * @param array $headers - * @param int $options + * @param Uri|string $uri + * @param array $data + * @param array $headers + * @param int $options * * @return TestResponse<\Illuminate\Http\JsonResponse> */