From 479ed3d0b12d9b3b3e0618af5ea2bf0940136f7c Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Thu, 4 Apr 2024 18:51:40 +1300 Subject: [PATCH] Inline defaults --- app/init.php | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/app/init.php b/app/init.php index a54c993297..e59aeb081d 100644 --- a/app/init.php +++ b/app/init.php @@ -888,7 +888,7 @@ App::setResource('queue', function (Group $pools) { App::setResource('connectionForQueue', function () use ($connection) { return $connection; - }, []); + }); return $connection->getResource(); }, ['pools']); @@ -1134,16 +1134,16 @@ App::setResource('console', function () { App::setResource('connectionForProject', function () { return null; -}, []); +}); App::setResource('connectionForConsole', function () { return null; -}, []); +}); App::setResource('connectionForQueue', function () { return null; -}, []); +}); App::setResource('connectionsForCache', function () { return []; -}, []); +}); App::setResource('dbForProject', function (Group $pools, Database $dbForConsole, Cache $cache, Document $project) { if ($project->isEmpty() || $project->getId() === 'console') { @@ -1152,12 +1152,11 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForConsole, $connection = $pools ->get($project->getAttribute('database')) - ->pop() - ; + ->pop(); App::setResource('connectionForProject', function () use ($connection) { return $connection; - }, []); + }); $dbAdapter = $connection->getResource(); @@ -1179,7 +1178,7 @@ App::setResource('dbForConsole', function (Group $pools, Cache $cache) { App::setResource('connectionForConsole', function () use ($connection) { return $connection; - }, []); + }); $dbAdapter = $connection->getResource(); @@ -1195,7 +1194,7 @@ App::setResource('dbForConsole', function (Group $pools, Cache $cache) { }, ['pools', 'cache']); App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole, $cache) { - $getProjectDB = function (Document $project) use ($pools, $dbForConsole, $cache, &$databases) { + return function (Document $project) use ($pools, $dbForConsole, $cache, &$databases) { if ($project->isEmpty() || $project->getId() === 'console') { return $dbForConsole; } @@ -1234,8 +1233,6 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole, return $database; }; - - return $getProjectDB; }, ['pools', 'dbForConsole', 'cache']); App::setResource('cache', function (Group $pools) {