mirrors/barryvdh_laravel-ide-helper
1
0
Fork 0
mirror of https://github.com/barryvdh/laravel-ide-helper.git synced 2026-08-18 18:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken test "GeneratePhpdocWithExternalEloquentBuilder" (#1111)

Browse Source 
* Fix code that was causing the test to break and fix bug with not built in types

* Run cs fixer

* Remove fetching the doc block type and the putting it as a type hint as a php doc block is sufficient

* Revert doc block type hinting

* Enchance doc block type hinting

* Combine replacements
This commit is contained in:
Kaloqn
2020-12-04 14:23:42 +01:00
committed by GitHub
parent ae5d7708b7
commit 9859958cfa
3 changed files with 87 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Console/ModelsCommand.php
+22 -24
View File
@@ -893,26 +893,18 @@ class ModelsCommand extends Command
* Get the parameters and format them correctly
*
* @param $method
* @param bool $withTypeHint
* @return array
* @throws \ReflectionException
*/
public function getParameters($method, bool $withTypeHint = false)
public function getParameters($method)
{
//Loop through the default values for parameters, and make the correct output string
$paramsWithDefault = [];
/** @var \ReflectionParameter $param */
foreach ($method->getParameters() as $param) {
$paramType = $param->getType();
$paramStr = '$' . $param->getName();
if ($paramType) {
$paramTypeStr = $paramType->getName();
if (!$paramType->isBuiltin()) {
$paramTypeStr = '\\' . $paramTypeStr;
}
$paramStr = $paramTypeStr . ' ' . $paramStr;
if ($paramType = $this->getParamType($method, $param)) {
$paramStr = $paramType . ' ' . $paramStr;
}
if ($param->isOptional() && $param->isDefaultValueAvailable()) {
@@ -932,10 +924,6 @@ class ModelsCommand extends Command
$paramStr .= " = $default";
}
if ($withTypeHint && $paramType = $this->getParamType($method, $param)) {
$paramStr = $paramType . ' ' . $paramStr;
}
$paramsWithDefault[] = $paramStr;
}
return $paramsWithDefault;
@@ -1176,7 +1164,7 @@ class ModelsCommand extends Command
foreach ($newMethodsFromNewBuilder as $builderMethod) {
$reflection = new \ReflectionMethod($builder, $builderMethod);
$args = $this->getParameters($reflection, true);
$args = $this->getParameters($reflection);
$this->setMethod(
$builderMethod,
@@ -1189,11 +1177,17 @@ class ModelsCommand extends Command
protected function getParamType(\ReflectionMethod $method, \ReflectionParameter $parameter): ?string
{
if ($paramType = $parameter->getType()) {
if ($paramType->allowsNull()) {
return '?' . $paramType->getName();
$parameterName = $paramType->getName();
if (!$paramType->isBuiltin()) {
$parameterName = '\\' . $parameterName;
}
return $paramType->getName();
if ($paramType->allowsNull()) {
return '?' . $parameterName;
}
return $parameterName;
}
$docComment = $method->getDocComment();
@@ -1239,14 +1233,18 @@ class ModelsCommand extends Command
$type = '?' . $type;
}
$typesThatAreNotAllowed = [
'null',
'mixed',
'nullable',
// convert to proper type hint types in php
$type = str_replace(['boolean', 'integer'], ['bool', 'int'], $type);
$allowedTypes = [
'int',
'bool',
'string',
'float',
];
// we replace the ? with an empty string so we can check the actual type
if (in_array(str_replace('?', '', $type), $typesThatAreNotAllowed)) {
if (!in_array(str_replace('?', '', $type), $allowedTypes)) {
return null;
}