Skip to content

If $ids is an empty array, don't load everything, short circuit and r… #5

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

Open
jonbasebl5 wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −4
Open

If $ids is an empty array, don't load everything, short circuit and r… #5

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
18 changes: 14 additions & 4 deletions src/Entity_Abstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,11 +247,21 @@ public static function __callStatic($name, $arguments) {
}

public static function load($ids) {
$ids = (array) $ids;
if (empty($ids)) {
return [];
}

$ds = static::getDataSource();
return $ds->getEntities(get_called_class(), (array) $ids);
return $ds->getEntities(get_called_class(), $ids);
}

public static function loadProgressive($ids, $eagerFetchProperties = [], $context = null, $contextData = []) {
$ids = (array) $ids;
if (empty($ids)) {
return [];
}

# Eager load in progressive selects
$ds = static::getDataSource();

Expand All @@ -261,13 +271,13 @@ public static function loadProgressive($ids, $eagerFetchProperties = [], $contex

// Add additional contextData if present
$where = $contextData + $where;
$entities = call_user_func_array([$ds, 'getDependents'], [get_called_class(), (array) $ids, 'Entity_' . $type, $where, $order, $limit, $count]);
$entities = call_user_func_array([$ds, 'getDependents'], [get_called_class(), $ids, 'Entity_' . $type, $where, $order, $limit, $count]);

// Need to make sure this is an array of objects or just null
$entities = is_object($entities) ? [$entities] : $entities;
}
else {
$entities = $ds->getEntities(get_called_class(), (array) $ids);
$entities = $ds->getEntities(get_called_class(), $ids);
}

// Eager load properties relying on good old recursion to traverse
Expand Down Expand Up @@ -563,4 +573,4 @@ function($config, $dependent) use ($thisClass) {
false
);
}
}
}