public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

fix deprecations in PHP 8

pull/8921/head
azjezz 2020-05-21 18:08:26 +01:00
parent 541692bbfe
commit 30f994e424
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Composer/EventDispatcher/EventDispatcher.php
View File

@ -326,13 +326,22 @@ class EventDispatcher
return $event;
}
$typehint = $reflected->getClass();
if (!$typehint instanceof \ReflectionClass) {
return $event;
$expected = null;
$isClass = false;
if (\PHP_VERSION_ID >= 70000) {
$reflectionType = $reflected->getType();
if ($reflectionType) {
$expected = $reflectionType instanceof \ReflectionNamedType ? $reflectionType->getName() : (string)$reflectionType;
$isClass = !$reflectionType->isBuiltin();
}
} else {
$expected = $reflected->getClass() ? $reflected->getClass()->getName() : null;
$isClass = null !== $expected;
}
$expected = $typehint->getName();
if (!$isClass) {
return $event;
}
// BC support
if (!$event instanceof $expected && $expected === 'Composer\Script\CommandEvent') {

16
src/Composer/Repository/RepositoryManager.php
View File

@ -127,8 +127,20 @@ class RepositoryManager
$reflMethod = new \ReflectionMethod($class, '__construct');
$params = $reflMethod->getParameters();
if (isset($params[4]) && $params[4]->getClass() && $params[4]->getClass()->getName() === 'Composer\Util\RemoteFilesystem') {
return new $class($config, $this->io, $this->config, $this->eventDispatcher, $this->rfs);
if (isset($params[4])) {
$paramType = null;
if (\PHP_VERSION_ID >= 70000) {
$reflectionType = $params[4]->getType();
if ($reflectionType) {
$paramType = $reflectionType instanceof \ReflectionNamedType ? $reflectionType->getName() : (string)$reflectionType;
}
} else {
$paramType = $params[4]->getClass() ? $params[4]->getClass()->getName() : null;
}
if ($paramType === 'Composer\Util\RemoteFilesystem') {
return new $class($config, $this->io, $this->config, $this->eventDispatcher, $this->rfs);
}
}
return new $class($config, $this->io, $this->config, $this->eventDispatcher);