Skip to content

Commit 58a9ca1

Browse files
committed
Merge branch 'platform-health' of github.com:magento/magento2 into platform-health
2 parents 4ef0d08 + 430b417 commit 58a9ca1

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,15 +332,15 @@ private function extractParameterType(
332332

333333
/** @var string|null $typeName */
334334
$typeName = null;
335-
336-
if ($parameter->isArray()) {
335+
$parameterType = $parameter->getType();
336+
if ($parameterType->getName() === 'array') {
337337
$typeName = 'array';
338338
} elseif ($parameterClass = $this->getParameterClass($parameter)) {
339339
$typeName = $this->_getFullyQualifiedClassName($parameterClass->getName());
340-
} elseif ($parameter->isCallable()) {
340+
} elseif ($parameterType->getName() === 'callable') {
341341
$typeName = 'callable';
342342
} else {
343-
$typeName = $parameter->getType()->getName();
343+
$typeName = $parameterType->getName();
344344
}
345345

346346
if ($parameter->allowsNull()) {

lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ public function getConstructorArgumentTypes(
6060
foreach ($params as $param) {
6161
//For the sake of backward compatibility.
6262
$typeName = '';
63-
if ($param->isArray()) {
63+
$parameterType = $param->getType();
64+
if ($parameterType && $parameterType->getName() === 'array') {
6465
//For the sake of backward compatibility.
6566
$typeName = 'array';
6667
} else {
@@ -72,7 +73,7 @@ public function getConstructorArgumentTypes(
7273
} catch (\ReflectionException $exception) {
7374
//If there's a problem loading a class then ignore it and
7475
//just return it's name.
75-
$typeName = '\\' .$param->getType()->getName();
76+
$typeName = '\\' .$parameterType->getName();
7677
}
7778
}
7879
$types[] = $typeName;

lib/internal/Magento/Framework/Interception/Code/InterfaceValidator.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,10 @@ protected function validateMethodsParameters(array $pluginParameters, array $ori
172172
protected function getParametersType(ReflectionParameter $parameter)
173173
{
174174
$parameterClass = $this->getParameterClass($parameter);
175-
return $parameterClass ? '\\' . $parameterClass->getName() : ($parameter->isArray() ? 'array' : null);
175+
$parameterType = $parameter->getType();
176+
return $parameterClass ?
177+
'\\' . $parameterClass->getName() :
178+
($parameterType && $parameterType->getName() === 'array' ? 'array' : null);
176179
}
177180

178181
/**

lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ function ($className, $arguments) {
220220
if (isset($arguments[$parameterName])) {
221221
$args[] = $arguments[$parameterName];
222222
} else {
223-
if ($parameter->isArray()) {
223+
if ($parameter->getType() && $parameter->getType()->getName() === 'array') {
224224
$args[] = [];
225225
} elseif ($parameter->allowsNull()) {
226226
$args[] = null;

0 commit comments

Comments
 (0)