diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 2252962..a1a7b78 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -179,7 +179,7 @@ jobs: with: # Should be the highest supported version, so we can use the newest tools php-version: '8.5' - tools: composer, composer-require-checker, composer-unused, phpcs + tools: composer, composer-dependency-analyser extensions: ctype, date, dom, filter, hash, mbstring, openssl, pcre, soap, spl, xml coverage: none @@ -204,11 +204,8 @@ jobs: - name: Install Composer dependencies run: composer install --no-progress --prefer-dist --optimize-autoloader - - name: Check code for hard dependencies missing in composer.json - run: composer-require-checker check --config-file=tools/composer-require-checker.json composer.json - - - name: Check code for unused dependencies in composer.json - run: composer-unused + - name: Check code for missing or unused dependencies + run: composer-dependency-analyser --verbose --config=tools/composer-dependency-analyser.php - name: PHP Code Sniffer run: vendor/bin/phpcs diff --git a/composer.json b/composer.json index 4a4aac3..8e9a60b 100644 --- a/composer.json +++ b/composer.json @@ -29,8 +29,8 @@ "ext-zlib": "*", "guzzlehttp/guzzle": "^7.8 || ^8.0", + "guzzlehttp/promises": "^2.5 || ^3.0", "guzzlehttp/psr7": "^2.7 || ^3.0", - "psr/http-client": "^1", "psr/http-message": "^2", "psr/log": "^3", "psr/simple-cache": "^3", diff --git a/tools/composer-dependency-analyser.php b/tools/composer-dependency-analyser.php new file mode 100644 index 0000000..67d4216 --- /dev/null +++ b/tools/composer-dependency-analyser.php @@ -0,0 +1,11 @@ +ignoreErrorsOnExtension('ext-curl', [ErrorType::SHADOW_DEPENDENCY]); + diff --git a/tools/composer-require-checker.json b/tools/composer-require-checker.json deleted file mode 100644 index 97b1397..0000000 --- a/tools/composer-require-checker.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "symbol-whitelist": [ - "CURLOPT_CONNECT_TO", - "CURLOPT_FOLLOWLOCATION", - "CURLOPT_PORT", - "CURLOPT_PRE_PROXY", - "CURLOPT_PROXY", - "CURLOPT_RESOLVE", - "CURLOPT_UNIX_SOCKET_PATH", - "CURLOPT_URL", - "curl_version" - ] -}