Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Implement call_user_func() DynamicFunctionReturnTypeExtension #2479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ondrejmirtes merged 17 commits into from
Jun 29, 2023
Merged

Implement call_user_func() DynamicFunctionReturnTypeExtension #2479

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2376f16
Implement call_user_func() DynamicFunctionReturnTypeExtension
staabm Jun 22, 2023
f4b9f3f
simplify
staabm Jun 23, 2023
afc3ba2
added test
staabm Jun 23, 2023
ff9943c
CallUserFuncRule
ondrejmirtes Jun 23, 2023
457e64b
Fix for a bit better behaviour
ondrejmirtes Jun 23, 2023
1df8d35
support named "callback" arg
staabm Jun 23, 2023
f13d181
Validate call_user_func() arguments
staabm Jun 24, 2023
4a36c5c
use feature flag also in CallToFunctionParametersRule
staabm Jun 26, 2023
c08cf22
test more cases
staabm Jun 28, 2023
abed01a
one last test
staabm Jun 28, 2023
47fd56b
test bug 7057
staabm Jun 29, 2023
980f343
Revert what I disagree with
ondrejmirtes Jun 29, 2023
06897aa
Move tests where they should be
ondrejmirtes Jun 29, 2023
3ebea17
reorderCallUserFuncArguments does not need to get rid of named arguments
ondrejmirtes Jun 29, 2023
b11808a
Fix tests
ondrejmirtes Jun 29, 2023
8a8e7f9
Simplify
ondrejmirtes Jun 29, 2023
7ad5bd5
Revert more changes
ondrejmirtes Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
support named "callback" arg
  • Loading branch information
@staabm @ondrejmirtes
staabm authored and ondrejmirtes committed Jun 29, 2023
commit 1df8d35aadf5cadf33d41cdadff97a786f28ac32
31 changes: 18 additions & 13 deletions src/Analyser/ArgumentsNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,28 @@ public static function reorderCallUserFuncArguments(
return null;
}

$calledOnType = $scope->getType($args[0]->value);
if (!$calledOnType->isCallable()->yes()) {
return null;
}

$passThruArgs = [];
foreach ($args as $i => $arg) {
// skip call_user_func() first arg
if ($i === 0) {
$callbackArg = null;
foreach ($args as $arg) {
if ($arg->name === "callback") {
$callbackArg = $arg;
continue;
}

if ($arg->hasAttribute(self::ORIGINAL_ARG_ATTRIBUTE)) {
$passThruArgs[] = $arg->getAttribute(self::ORIGINAL_ARG_ATTRIBUTE);
} else {
$passThruArgs[] = $arg;
$passThruArgs[] = $arg;
}
if ($callbackArg === null ) {
if (!isset($args[0])) {
return null;
}

$callbackArg = $args[0];
$passThruArgs = array_slice($passThruArgs, 1);
}

$calledOnType = $scope->getType($callbackArg->value);
if (!$calledOnType->isCallable()->yes()) {
return null;
}

$parametersAcceptor = ParametersAcceptorSelector::selectFromArgs(
Expand All @@ -68,7 +73,7 @@ public static function reorderCallUserFuncArguments(
}

return [$parametersAcceptor, new FuncCall(
$args[0]->value,
$callbackArg->value,
$reorderedArgs,
$callUserFuncCall->getAttributes(),
)];
Expand Down