diff --git a/composer.json b/composer.json index 61310ac0b..a9d08e99c 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,18 @@ }, { "type": "vcs", "url": "https://github.com/Ayesh/safe" + }, + { + "type": "vcs", "url": "https://github.com/valzargaming/Pawl" + }, + { + "type": "vcs", "url": "https://github.com/danepowell/phplint" + }, + { + "type": "vcs", "url": "https://github.com/danepowell/Client" + }, + { + "type": "vcs", "url": "https://github.com/danepowell/dns-zone-configurator" } ], "minimum-stability": "dev", @@ -30,16 +42,19 @@ "grasmash/expander": "^3.0.1", "guzzlehttp/guzzle": "^7.4", "http-interop/http-factory-guzzle": "^1.0", + "kevinrob/guzzle-cache-middleware": "dev-master as 5.1.0", "laminas/laminas-validator": "^2.20.0", "league/csv": "^9.8", "league/oauth2-client": "dev-patch-1 as 2.7.0", "loophp/phposinfo": "^1.7.2", - "ltd-beget/dns-zone-configurator": "^1.3.0", - "m4tthumphrey/php-gitlab-api": "^11.5", + "ltd-beget/dns-zone-configurator": "dev-php84", + "m4tthumphrey/php-gitlab-api": "dev-fix/84", "php-http/cache-plugin": "^2.0", "psr/log": "^3", "ramsey/uuid": "^4.1", + "ratchet/pawl": "dev-patch-1 as 0.4.1", "react/event-loop": "^1.1", + "sanmai/pipeline": "dev-main", "symfony/cache": "^6.3", "symfony/config": "^6.3", "symfony/console": "^6.3", @@ -56,7 +71,7 @@ "symfony/yaml": "^6.3", "thecodingmachine/safe": "dev-php84/nullability as 2.5.0", "typhonius/acquia-logstream": "^0.0.14", - "typhonius/acquia-php-sdk-v2": "^3.4.1", + "typhonius/acquia-php-sdk-v2": "^3.4.2", "vlucas/phpdotenv": "^5.5", "zumba/amplitude-php": "^1.0.4" }, @@ -68,8 +83,8 @@ "infection/infection": "^0.27.7", "jangregor/phpstan-prophecy": "^1.0", "mikey179/vfsstream": "^1.6", - "overtrue/phplint": "^9.0", - "phpro/grumphp": "^2.2.0", + "overtrue/phplint": "9.4.x-dev", + "phpro/grumphp": "2.x-dev", "phpspec/prophecy": "^1.17", "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "^1.1", diff --git a/composer.lock b/composer.lock index 7b6dea3a7..4db11d366 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": "71b2dc1d9fc88eee892361edecfd0add", + "content-hash": "67e29456aa1ad9493edd27e9fbcca50c", "packages": [ { "name": "acquia/drupal-environment-detector", @@ -1083,23 +1083,23 @@ }, { "name": "kevinrob/guzzle-cache-middleware", - "version": "v5.1.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/Kevinrob/guzzle-cache-middleware.git", - "reference": "6bd64dbbe5155107d84a0f67140a8822a709c6d0" + "reference": "61305ed694e763e887a04f61e71e2292bb4fbad1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Kevinrob/guzzle-cache-middleware/zipball/6bd64dbbe5155107d84a0f67140a8822a709c6d0", - "reference": "6bd64dbbe5155107d84a0f67140a8822a709c6d0", + "url": "https://api.github.com/repos/Kevinrob/guzzle-cache-middleware/zipball/61305ed694e763e887a04f61e71e2292bb4fbad1", + "reference": "61305ed694e763e887a04f61e71e2292bb4fbad1", "shasum": "" }, "require": { - "guzzlehttp/guzzle": "^6.0 || ^7.0", - "guzzlehttp/promises": "^1.4 || ^2.0", - "guzzlehttp/psr7": "^1.7.0 || ^2.0.0", - "php": ">=7.2.0" + "guzzlehttp/guzzle": "^7.9.2", + "guzzlehttp/promises": "^2.0.3", + "guzzlehttp/psr7": "^2.7.0", + "php": ">=8.1" }, "require-dev": { "cache/array-adapter": "^0.4 || ^0.5 || ^1.0", @@ -1107,10 +1107,10 @@ "doctrine/cache": "^1.10", "illuminate/cache": "^5.0", "league/flysystem": "^2.5", - "phpunit/phpunit": "^8.5.15 || ^9.5", + "phpunit/phpunit": "^9.6.21", "psr/cache": "^1.0", "symfony/cache": "^4.4 || ^5.0", - "symfony/phpunit-bridge": "^4.4 || ^5.0" + "symfony/phpunit-bridge": "^7.1.4" }, "suggest": { "doctrine/cache": "This library has a lot of ready-to-use cache storage (to be used with Kevinrob\\GuzzleCache\\Storage\\DoctrineCacheStorage). Use only versions >=1.4.0 < 2.0.0", @@ -1120,6 +1120,7 @@ "psr/cache": "To be used with Kevinrob\\GuzzleCache\\Storage\\Psr6CacheStorage", "psr/simple-cache": "To be used with Kevinrob\\GuzzleCache\\Storage\\Psr16CacheStorage" }, + "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -1162,9 +1163,9 @@ ], "support": { "issues": "https://github.com/Kevinrob/guzzle-cache-middleware/issues", - "source": "https://github.com/Kevinrob/guzzle-cache-middleware/tree/v5.1.0" + "source": "https://github.com/Kevinrob/guzzle-cache-middleware/tree/master" }, - "time": "2023-11-09T06:53:45+00:00" + "time": "2024-10-17T09:11:54+00:00" }, { "name": "laminas/laminas-servicemanager", @@ -1654,16 +1655,16 @@ }, { "name": "ltd-beget/dns-zone-configurator", - "version": "v1.3.0", + "version": "dev-php84", "source": { "type": "git", - "url": "https://github.com/LTD-Beget/dns-zone-configurator.git", - "reference": "6fae81d140be8594b4752474d7ccf251bcd5e64f" + "url": "https://github.com/danepowell/dns-zone-configurator.git", + "reference": "4a52ba1ad16e3c11e26bc551811e93e1dc34ea30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LTD-Beget/dns-zone-configurator/zipball/6fae81d140be8594b4752474d7ccf251bcd5e64f", - "reference": "6fae81d140be8594b4752474d7ccf251bcd5e64f", + "url": "https://api.github.com/repos/danepowell/dns-zone-configurator/zipball/4a52ba1ad16e3c11e26bc551811e93e1dc34ea30", + "reference": "4a52ba1ad16e3c11e26bc551811e93e1dc34ea30", "shasum": "" }, "require": { @@ -1682,7 +1683,11 @@ "LTDBeget\\dns": "src" } }, - "notification-url": "https://packagist.org/downloads/", + "autoload-dev": { + "psr-0": { + "LTDBeget\\dev": "src" + } + }, "license": [ "MIT" ], @@ -1698,10 +1703,9 @@ "zone file" ], "support": { - "issues": "https://github.com/LTD-Beget/dns-zone-configurator/issues", - "source": "https://github.com/LTD-Beget/dns-zone-configurator/tree/v1.3.0" + "source": "https://github.com/danepowell/dns-zone-configurator/tree/php84" }, - "time": "2023-05-15T15:34:16+00:00" + "time": "2024-11-26T20:14:48+00:00" }, { "name": "ltd-beget/dns-zone-tokenizer", @@ -1804,16 +1808,16 @@ }, { "name": "m4tthumphrey/php-gitlab-api", - "version": "11.14.0", + "version": "dev-fix/84", "source": { "type": "git", - "url": "https://github.com/GitLabPHP/Client.git", - "reference": "6b805882e1478873cc89ee62d2decf74eee2d5f2" + "url": "https://github.com/danepowell/Client.git", + "reference": "69ec4e557a837281fca484899447f4b09e410f11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GitLabPHP/Client/zipball/6b805882e1478873cc89ee62d2decf74eee2d5f2", - "reference": "6b805882e1478873cc89ee62d2decf74eee2d5f2", + "url": "https://api.github.com/repos/danepowell/Client/zipball/69ec4e557a837281fca484899447f4b09e410f11", + "reference": "69ec4e557a837281fca484899447f4b09e410f11", "shasum": "" }, "require": { @@ -1849,7 +1853,11 @@ "Gitlab\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "autoload-dev": { + "psr-4": { + "Gitlab\\Tests\\": "tests/" + } + }, "license": [ "MIT" ], @@ -1881,16 +1889,15 @@ "gitlab" ], "support": { - "issues": "https://github.com/GitLabPHP/Client/issues", - "source": "https://github.com/GitLabPHP/Client/tree/11.14.0" + "source": "https://github.com/danepowell/Client/tree/fix/84" }, "funding": [ { - "url": "https://github.com/GrahamCampbell", - "type": "github" + "type": "github", + "url": "https://github.com/GrahamCampbell" } ], - "time": "2024-03-17T21:35:56+00:00" + "time": "2024-11-26T20:22:05+00:00" }, { "name": "marc-mabe/php-enum", @@ -3111,16 +3118,16 @@ }, { "name": "ratchet/pawl", - "version": "v0.4.1", + "version": "dev-patch-1", "source": { "type": "git", - "url": "https://github.com/ratchetphp/Pawl.git", - "reference": "af70198bab77a582b31169d3cc3982bed25c161f" + "url": "https://github.com/valzargaming/Pawl.git", + "reference": "06faa033fd8f210f90b57a7dfc4e772ad4d411ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ratchetphp/Pawl/zipball/af70198bab77a582b31169d3cc3982bed25c161f", - "reference": "af70198bab77a582b31169d3cc3982bed25c161f", + "url": "https://api.github.com/repos/valzargaming/Pawl/zipball/06faa033fd8f210f90b57a7dfc4e772ad4d411ba", + "reference": "06faa033fd8f210f90b57a7dfc4e772ad4d411ba", "shasum": "" }, "require": { @@ -3138,30 +3145,28 @@ }, "type": "library", "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "Ratchet\\Client\\": "src" - } + }, + "files": [ + "src/functions_include.php" + ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "description": "Asynchronous WebSocket client", "keywords": [ "Ratchet", + "WebSocket", "async", "client", - "websocket", "websocket client" ], "support": { - "issues": "https://github.com/ratchetphp/Pawl/issues", - "source": "https://github.com/ratchetphp/Pawl/tree/v0.4.1" + "source": "https://github.com/valzargaming/Pawl/tree/patch-1" }, - "time": "2021-12-10T14:32:34+00:00" + "time": "2024-11-21T19:08:01+00:00" }, { "name": "ratchet/rfc6455", @@ -3671,6 +3676,72 @@ ], "time": "2024-06-11T12:45:25+00:00" }, + { + "name": "sanmai/pipeline", + "version": "dev-main", + "source": { + "type": "git", + "url": "https://github.com/sanmai/pipeline.git", + "reference": "ad7dbc3f773eeafb90d5459522fbd8f188532e25" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sanmai/pipeline/zipball/ad7dbc3f773eeafb90d5459522fbd8f188532e25", + "reference": "ad7dbc3f773eeafb90d5459522fbd8f188532e25", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "ergebnis/composer-normalize": "^2.8", + "friendsofphp/php-cs-fixer": "^3.17", + "infection/infection": ">=0.10.5", + "league/pipeline": "^0.3 || ^1.0", + "phan/phan": ">=1.1", + "php-coveralls/php-coveralls": "^2.4.1", + "phpstan/phpstan": ">=0.10", + "phpunit/phpunit": ">=9.4", + "vimeo/psalm": ">=2" + }, + "default-branch": true, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "v6.x-dev" + } + }, + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-4": { + "Pipeline\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Alexey Kopytko", + "email": "alexey@kopytko.com" + } + ], + "description": "General-purpose collections pipeline", + "support": { + "issues": "https://github.com/sanmai/pipeline/issues", + "source": "https://github.com/sanmai/pipeline/tree/main" + }, + "funding": [ + { + "url": "https://github.com/sanmai", + "type": "github" + } + ], + "time": "2024-10-17T02:22:57+00:00" + }, { "name": "symfony/cache", "version": "v6.4.14", @@ -6304,16 +6375,16 @@ }, { "name": "typhonius/acquia-php-sdk-v2", - "version": "3.4.1", + "version": "3.4.2", "source": { "type": "git", "url": "https://github.com/typhonius/acquia-php-sdk-v2.git", - "reference": "c3acefe27f4abd39111c43b96e9c35d672df6f4e" + "reference": "52dd11bb04ed1bdcbb4c7b2316d1f3f7a999da6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/typhonius/acquia-php-sdk-v2/zipball/c3acefe27f4abd39111c43b96e9c35d672df6f4e", - "reference": "c3acefe27f4abd39111c43b96e9c35d672df6f4e", + "url": "https://api.github.com/repos/typhonius/acquia-php-sdk-v2/zipball/52dd11bb04ed1bdcbb4c7b2316d1f3f7a999da6b", + "reference": "52dd11bb04ed1bdcbb4c7b2316d1f3f7a999da6b", "shasum": "" }, "require": { @@ -6357,7 +6428,7 @@ "description": "A PHP SDK for Acquia CloudAPI v2", "support": { "issues": "https://github.com/typhonius/acquia-php-sdk-v2/issues", - "source": "https://github.com/typhonius/acquia-php-sdk-v2/tree/3.4.1" + "source": "https://github.com/typhonius/acquia-php-sdk-v2/tree/3.4.2" }, "funding": [ { @@ -6365,7 +6436,7 @@ "type": "github" } ], - "time": "2024-11-25T23:17:17+00:00" + "time": "2024-11-26T20:04:52+00:00" }, { "name": "vlucas/phpdotenv", @@ -9874,16 +9945,16 @@ }, { "name": "overtrue/phplint", - "version": "9.4.2", + "version": "9.4.x-dev", "source": { "type": "git", - "url": "https://github.com/overtrue/phplint.git", - "reference": "bb849f012fa44839f5ba4a079dda6d2ef29d6fce" + "url": "https://github.com/danepowell/phplint.git", + "reference": "ef023610ba6d53d4e855155fe2e977730645fc51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/overtrue/phplint/zipball/bb849f012fa44839f5ba4a079dda6d2ef29d6fce", - "reference": "bb849f012fa44839f5ba4a079dda6d2ef29d6fce", + "url": "https://api.github.com/repos/danepowell/phplint/zipball/ef023610ba6d53d4e855155fe2e977730645fc51", + "reference": "ef023610ba6d53d4e855155fe2e977730645fc51", "shasum": "" }, "require": { @@ -9933,7 +10004,58 @@ "Overtrue\\PHPLint\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "autoload-dev": { + "psr-4": { + "Overtrue\\PHPLint\\Tests\\": "tests/" + } + }, + "scripts": { + "bin": [ + "echo 'bin not installed'" + ], + "post-update-cmd": [ + "cghooks update", + "@composer bin all update --ansi" + ], + "post-merge": [ + "composer install" + ], + "post-install-cmd": [ + "cghooks add --ignore-lock", + "cghooks update", + "@composer bin all install --ansi" + ], + "cghooks": [ + "vendor/bin/cghooks" + ], + "qa:check": [ + "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.release.php --using-cache=no --verbose --ansi --diff --dry-run" + ], + "qa:fix": [ + "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.release.php --using-cache=no --verbose --ansi" + ], + "style:check": [ + "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php --using-cache=no --verbose --ansi --diff --dry-run" + ], + "style:fix": [ + "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php --using-cache=no --verbose --ansi" + ], + "tests:unit": [ + "vendor/bin/phpunit --testsuite=cache,configuration,finder" + ], + "tests:e2e": [ + "vendor/bin/phpunit --testsuite=e2e" + ], + "tests:all": [ + "vendor/bin/phpunit" + ], + "lint:syntax": [ + "./bin/phplint --ansi" + ], + "code:check": [ + "vendor/bin/phpstan analyse --configuration phpstan.neon.dist" + ] + }, "license": [ "MIT" ], @@ -9956,16 +10078,15 @@ "syntax" ], "support": { - "issues": "https://github.com/overtrue/phplint/issues", - "source": "https://github.com/overtrue/phplint/tree/9.4.2" + "source": "https://github.com/danepowell/phplint/tree/9.4" }, "funding": [ { - "url": "https://github.com/overtrue", - "type": "github" + "type": "github", + "url": "https://github.com/overtrue" } ], - "time": "2024-10-11T07:44:07+00:00" + "time": "2024-11-26T19:50:06+00:00" }, { "name": "phar-io/manifest", @@ -10324,16 +10445,16 @@ }, { "name": "phpro/grumphp", - "version": "v2.9.0", + "version": "v2.x-dev", "source": { "type": "git", "url": "https://github.com/phpro/grumphp.git", - "reference": "14117189d0c1ce622eabec52b51edab56f1715fc" + "reference": "d84698882accd3fd0a807fb48a8838b0f53aa732" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpro/grumphp/zipball/14117189d0c1ce622eabec52b51edab56f1715fc", - "reference": "14117189d0c1ce622eabec52b51edab56f1715fc", + "url": "https://api.github.com/repos/phpro/grumphp/zipball/d84698882accd3fd0a807fb48a8838b0f53aa732", + "reference": "d84698882accd3fd0a807fb48a8838b0f53aa732", "shasum": "" }, "require": { @@ -10407,6 +10528,7 @@ "vimeo/psalm": "Lets GrumPHP discover errors in your code without running it.", "vincentlanglet/twig-cs-fixer": "Lets GrumPHP check and fix twig coding standard." }, + "default-branch": true, "bin": [ "bin/grumphp" ], @@ -10436,9 +10558,9 @@ "description": "A composer plugin that enables source code quality checks.", "support": { "issues": "https://github.com/phpro/grumphp/issues", - "source": "https://github.com/phpro/grumphp/tree/v2.9.0" + "source": "https://github.com/phpro/grumphp/tree/v2.x" }, - "time": "2024-10-25T10:11:05+00:00" + "time": "2024-11-26T14:22:31+00:00" }, { "name": "phpspec/prophecy", @@ -11374,71 +11496,6 @@ ], "time": "2023-10-24T00:25:28+00:00" }, - { - "name": "sanmai/pipeline", - "version": "v6.11", - "source": { - "type": "git", - "url": "https://github.com/sanmai/pipeline.git", - "reference": "a5fa2a6c6ca93efa37e7c24aab72f47448a6b110" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sanmai/pipeline/zipball/a5fa2a6c6ca93efa37e7c24aab72f47448a6b110", - "reference": "a5fa2a6c6ca93efa37e7c24aab72f47448a6b110", - "shasum": "" - }, - "require": { - "php": "^7.4 || ^8.0" - }, - "require-dev": { - "ergebnis/composer-normalize": "^2.8", - "friendsofphp/php-cs-fixer": "^3.17", - "infection/infection": ">=0.10.5", - "league/pipeline": "^0.3 || ^1.0", - "phan/phan": ">=1.1", - "php-coveralls/php-coveralls": "^2.4.1", - "phpstan/phpstan": ">=0.10", - "phpunit/phpunit": ">=9.4", - "vimeo/psalm": ">=2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "v6.x-dev" - } - }, - "autoload": { - "files": [ - "src/functions.php" - ], - "psr-4": { - "Pipeline\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Alexey Kopytko", - "email": "alexey@kopytko.com" - } - ], - "description": "General-purpose collections pipeline", - "support": { - "issues": "https://github.com/sanmai/pipeline/issues", - "source": "https://github.com/sanmai/pipeline/tree/v6.11" - }, - "funding": [ - { - "url": "https://github.com/sanmai", - "type": "github" - } - ], - "time": "2024-06-15T03:11:19+00:00" - }, { "name": "sebastian/cli-parser", "version": "2.0.1", @@ -13204,12 +13261,24 @@ } ], "aliases": [ + { + "package": "kevinrob/guzzle-cache-middleware", + "version": "9999999-dev", + "alias": "5.1.0", + "alias_normalized": "5.1.0.0" + }, { "package": "league/oauth2-client", "version": "dev-patch-1", "alias": "2.7.0", "alias_normalized": "2.7.0.0" }, + { + "package": "ratchet/pawl", + "version": "dev-patch-1", + "alias": "0.4.1", + "alias_normalized": "0.4.1.0" + }, { "package": "thecodingmachine/safe", "version": "dev-php84/nullability", @@ -13219,7 +13288,14 @@ ], "minimum-stability": "dev", "stability-flags": { + "kevinrob/guzzle-cache-middleware": 20, "league/oauth2-client": 20, + "ltd-beget/dns-zone-configurator": 20, + "m4tthumphrey/php-gitlab-api": 20, + "overtrue/phplint": 20, + "phpro/grumphp": 20, + "ratchet/pawl": 20, + "sanmai/pipeline": 20, "thecodingmachine/safe": 20 }, "prefer-stable": true, diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 0ad593200..2f5d6be9c 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,6 +1,6 @@ - + diff --git a/src/Helpers/AliasCache.php b/src/Helpers/AliasCache.php index c507d910f..a3f64256b 100644 --- a/src/Helpers/AliasCache.php +++ b/src/Helpers/AliasCache.php @@ -8,7 +8,7 @@ class AliasCache extends FilesystemAdapter { - public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed + public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed { // Aliases format is `realm:name.env`, but `:` is not a legal character. $key = str_replace(':', '.', $key); diff --git a/tests/phpunit/src/Commands/Ide/IdeDeleteCommandTest.php b/tests/phpunit/src/Commands/Ide/IdeDeleteCommandTest.php index 7ecf81839..30c2c0255 100644 --- a/tests/phpunit/src/Commands/Ide/IdeDeleteCommandTest.php +++ b/tests/phpunit/src/Commands/Ide/IdeDeleteCommandTest.php @@ -18,7 +18,7 @@ class IdeDeleteCommandTest extends CommandTestBase /** * This method is called before each test. */ - public function setUp(OutputInterface $output = null): void + public function setUp(?OutputInterface $output = null): void { parent::setUp(); $this->getCommandTester(); diff --git a/tests/phpunit/src/Commands/Ide/IdeShareCommandTest.php b/tests/phpunit/src/Commands/Ide/IdeShareCommandTest.php index 09f76aa57..062fba839 100644 --- a/tests/phpunit/src/Commands/Ide/IdeShareCommandTest.php +++ b/tests/phpunit/src/Commands/Ide/IdeShareCommandTest.php @@ -26,7 +26,7 @@ class IdeShareCommandTest extends CommandTestBase /** * This method is called before each test. */ - public function setUp(OutputInterface $output = null): void + public function setUp(?OutputInterface $output = null): void { parent::setUp(); $this->shareCode = 'a47ac10b-58cc-4372-a567-0e02b2c3d470'; diff --git a/tests/phpunit/src/Commands/Pull/PullCommandTestBase.php b/tests/phpunit/src/Commands/Pull/PullCommandTestBase.php index 77f334c3c..7800f7915 100644 --- a/tests/phpunit/src/Commands/Pull/PullCommandTestBase.php +++ b/tests/phpunit/src/Commands/Pull/PullCommandTestBase.php @@ -56,7 +56,7 @@ protected function mockExecuteDrushExists( protected function mockExecuteDrushStatus( ObjectProphecy $localMachineHelper, - string $dir = null + ?string $dir = null ): void { $drushStatusProcess = $this->prophet->prophesize(Process::class); $drushStatusProcess->isSuccessful()->willReturn(true); diff --git a/tests/phpunit/src/Commands/Remote/AliasesDownloadCommandTest.php b/tests/phpunit/src/Commands/Remote/AliasesDownloadCommandTest.php index 282480466..d3c4780a1 100644 --- a/tests/phpunit/src/Commands/Remote/AliasesDownloadCommandTest.php +++ b/tests/phpunit/src/Commands/Remote/AliasesDownloadCommandTest.php @@ -46,11 +46,10 @@ public static function providerTestRemoteAliasesDownloadCommand(): array } /** - * @param string|null $destinationDir * @param bool $all Download aliases for all applications. * @dataProvider providerTestRemoteAliasesDownloadCommand */ - public function testRemoteAliasesDownloadCommand(array $inputs, array $args, string $destinationDir = null, bool $all = false): void + public function testRemoteAliasesDownloadCommand(array $inputs, array $args, ?string $destinationDir = null, bool $all = false): void { $aliasVersion = $inputs[0]; diff --git a/tests/phpunit/src/TestBase.php b/tests/phpunit/src/TestBase.php index c110a18ba..afeb79221 100644 --- a/tests/phpunit/src/TestBase.php +++ b/tests/phpunit/src/TestBase.php @@ -478,7 +478,7 @@ protected function createMockAcliConfigFile(mixed $cloudAppUuid = null): void * @throws \JsonException * @throws \Exception */ - protected function mockRequest(string $operationId, string|array|null $params = null, ?array $body = null, ?string $exampleResponse = null, Closure $tamper = null): object|array + protected function mockRequest(string $operationId, string|array|null $params = null, ?array $body = null, ?string $exampleResponse = null, ?Closure $tamper = null): object|array { if (is_string($params)) { $params = [$params];