Skip to content

Issue #179. Fix implicit nullable parameters for 8.4 #185

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
argiepiano merged 1 commit into from
Jul 28, 2025
Merged

Issue #179. Fix implicit nullable parameters for 8.4 #185

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
12 changes: 6 additions & 6 deletions includes/entity_plus.controller.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ class EntityPlusController extends DefaultEntityController implements EntityPlus
/**
* Overrides BackdropDefaultEntityController::resetCache().
*/
public function resetCache(array $ids = NULL) {
public function resetCache(?array $ids = NULL) {
$this->cacheComplete = FALSE;
parent::resetCache($ids);
}
Expand Down Expand Up @@ -414,7 +414,7 @@ class EntityPlusController extends DefaultEntityController implements EntityPlus
* Optionally a DatabaseTransaction object to use. Allows overrides to pass
* in their transaction object.
*/
public function delete($ids, DatabaseTransaction $transaction = NULL) {
public function delete($ids, ?DatabaseTransaction $transaction = NULL) {
$entities = $ids ? $this->load($ids) : FALSE;
if (!$entities) {
// Do nothing, in case invalid or no ids have been passed.
Expand Down Expand Up @@ -486,7 +486,7 @@ class EntityPlusController extends DefaultEntityController implements EntityPlus
* Optionally a DatabaseTransaction object to use. Allows overrides to pass
* in their transaction object.
*/
public function save($entity, DatabaseTransaction $transaction = NULL) {
public function save($entity, ?DatabaseTransaction $transaction = NULL) {
$transaction = isset($transaction) ? $transaction : db_transaction();
try {
// Load the stored entity, if any.
Expand Down Expand Up @@ -931,7 +931,7 @@ class EntityPlusControllerExportable extends EntityPlusController {
/**
* Resets the cache.
*/
public function resetCache(array $ids = NULL) {
public function resetCache(?array $ids = NULL) {
$this->cacheComplete = FALSE;
if (isset($ids)) {
foreach (array_intersect_key($this->entityCache, array_flip($ids)) as $id => $entity) {
Expand All @@ -948,7 +948,7 @@ class EntityPlusControllerExportable extends EntityPlusController {
/**
* Overridden to care about reverted entities.
*/
public function delete($ids, DatabaseTransaction $transaction = NULL) {
public function delete($ids, ?DatabaseTransaction $transaction = NULL) {
$entities = $ids ? $this->load($ids) : FALSE;
if ($entities) {
parent::delete($ids, $transaction);
Expand Down Expand Up @@ -1007,7 +1007,7 @@ class EntityPlusControllerExportable extends EntityPlusController {
/**
* Overridden to care exportables that are overridden.
*/
public function save($entity, DatabaseTransaction $transaction = NULL) {
public function save($entity, ?DatabaseTransaction $transaction = NULL) {
// Preload $entity->original by name key if necessary.
if (!empty($entity->{$this->nameKey}) && empty($entity->{$this->idKey}) && !isset($entity->original)) {
$entity->original = entity_load_unchanged($this->entityType, $entity->{$this->nameKey});
Expand Down