Skip to content

Test if id is integer using intval #211

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
timgws merged 1 commit into from
Jan 24, 2020
Merged

Test if id is integer using intval #211

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 5 additions & 6 deletions src/ElasticquentTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,8 @@ public function newFromHitBuilder($hit = array())
$attributes = $hit['_source'];

if (isset($hit['_id'])) {
$attributes[$key_name] = is_numeric($hit['_id']) ? intval($hit['_id']) : $hit['_id'];
$idAsInteger = intval($hit['_id']);
$attributes[$key_name] = $idAsInteger ? $idAsInteger : $hit['_id'];
}

// Add fields to attributes
Expand Down Expand Up @@ -706,7 +707,7 @@ public static function loadRelationsAttributesRecursive(Model $model)
$reflection_method = new ReflectionMethod($model, $key);

// Check if method class has or inherits Illuminate\Database\Eloquent\Model
if(!static::isClassInClass("Illuminate\Database\Eloquent\Model", $reflection_method->class)) {
if (!static::isClassInClass("Illuminate\Database\Eloquent\Model", $reflection_method->class)) {
$relation = $model->$key();

if ($relation instanceof Relation) {
Expand Down Expand Up @@ -786,7 +787,7 @@ private static function isMultiLevelArray(array $array)
private static function isClassInClass($classNeedle, $classHaystack)
{
// Check for the same
if($classNeedle == $classHaystack) {
if ($classNeedle == $classHaystack) {
return true;
}

Expand All @@ -796,14 +797,12 @@ private static function isClassInClass($classNeedle, $classHaystack)
/**
* @var \ReflectionClass $parent
*/
if($parent->getName() == $classNeedle) {
if ($parent->getName() == $classNeedle) {
return true;
}
$classHaystackReflected = $parent;
}

return false;

}

}