diff options
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/Metapackage/CoreRecommended/composer.json | 1 | ||||
| -rw-r--r-- | composer/Metapackage/DevDependencies/composer.json | 6 | ||||
| -rw-r--r-- | composer/Plugin/RecipeUnpack/Plugin.php | 4 | ||||
| -rw-r--r-- | composer/Plugin/RecipeUnpack/UnpackCommand.php | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json index 069bed420fc6..0986f1cb8a9f 100644 --- a/composer/Metapackage/CoreRecommended/composer.json +++ b/composer/Metapackage/CoreRecommended/composer.json @@ -52,6 +52,7 @@ "symfony/polyfill-intl-normalizer": "~v1.32.0", "symfony/polyfill-mbstring": "~v1.32.0", "symfony/polyfill-php84": "~v1.32.0", + "symfony/polyfill-php85": "~v1.32.0", "symfony/process": "~v7.3.0", "symfony/psr-http-message-bridge": "~v7.3.0", "symfony/routing": "~v7.3.0", diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json index 6e2436f30377..56eb4f756244 100644 --- a/composer/Metapackage/DevDependencies/composer.json +++ b/composer/Metapackage/DevDependencies/composer.json @@ -15,7 +15,7 @@ "justinrainbow/json-schema": "^5.2 || ^6.3", "lullabot/mink-selenium2-driver": "^1.7.3", "lullabot/php-webdriver": "^2.0.5", - "mglaman/phpstan-drupal": "^2.0.7", + "mglaman/phpstan-drupal": "^1.3.9 || ^2.0.7", "micheh/phpcs-gitlab": "^1.1 || ^2.0", "mikey179/vfsstream": "^1.6.11", "open-telemetry/exporter-otlp": "^1", @@ -23,8 +23,8 @@ "php-http/guzzle7-adapter": "^1.0", "phpspec/prophecy-phpunit": "^2", "phpstan/extension-installer": "^1.4.3", - "phpstan/phpstan": "^2.1.17", - "phpstan/phpstan-phpunit": "^2.0.6", + "phpstan/phpstan": "^1.12.27 || ^2.1.17", + "phpstan/phpstan-phpunit": "^1.4.2 || ^2.0.6", "phpunit/phpunit": "^10.5.19 || ^11.5.3", "symfony/browser-kit": "^7.3", "symfony/css-selector": "^7.3", diff --git a/composer/Plugin/RecipeUnpack/Plugin.php b/composer/Plugin/RecipeUnpack/Plugin.php index e3738aeae2c4..fe294ecb8b78 100644 --- a/composer/Plugin/RecipeUnpack/Plugin.php +++ b/composer/Plugin/RecipeUnpack/Plugin.php @@ -7,7 +7,7 @@ use Composer\Composer; use Composer\EventDispatcher\EventSubscriberInterface; use Composer\Installer; use Composer\IO\IOInterface; -use Composer\Package\Package; +use Composer\Package\PackageInterface; use Composer\Plugin\Capability\CommandProvider; use Composer\Plugin\Capable; use Composer\Plugin\PluginInterface; @@ -107,7 +107,7 @@ final class Plugin implements PluginInterface, EventSubscriberInterface, Capable $packages = $composer->getRepositoryManager()->getLocalRepository()->findPackages($package_name); $package = reset($packages); - if (!$package instanceof Package) { + if (!$package instanceof PackageInterface) { if (!$isInstalling) { $event->getIO()->write('Recipes are not unpacked when the --no-install option is used.', verbosity: IOInterface::VERBOSE); return; diff --git a/composer/Plugin/RecipeUnpack/UnpackCommand.php b/composer/Plugin/RecipeUnpack/UnpackCommand.php index be87544677c7..60bd86f08c17 100644 --- a/composer/Plugin/RecipeUnpack/UnpackCommand.php +++ b/composer/Plugin/RecipeUnpack/UnpackCommand.php @@ -3,7 +3,7 @@ namespace Drupal\Composer\Plugin\RecipeUnpack; use Composer\Command\BaseCommand; -use Composer\Package\Package; +use Composer\Package\PackageInterface; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -75,7 +75,7 @@ EOT $packages = $local_repo->findPackages($package_name); $package = reset($packages); - if (!$package instanceof Package) { + if (!$package instanceof PackageInterface) { $io->error(sprintf('<info>%s</info> does not resolve to a package.', $package_name)); return 1; } |