1 files changed, 13 insertions, 11 deletions

diff --git a/src/lib.inc.php b/src/lib.inc.php
index 4dd06496..a2417192 100644
--- a/src/lib.inc.php
+++ b/src/lib.inc.php
@@ -69,7 +69,7 @@ if (DEBUGMODE) {
         $conf['register_debuggers']();
     }
 }
-define('ADODB_ASSOC_CASE',ADODB_ASSOC_CASE_NATIVE);
+\define('ADODB_ASSOC_CASE', ADODB_ASSOC_CASE_NATIVE);
 // Fetch App and DI Container
 $app = \PHPPgAdmin\ContainerUtils::createApp($conf);
 $container = $app->getContainer();
@@ -77,19 +77,21 @@ $container = $app->getContainer();
 if (!$container instanceof \Slim\Container) {
     \trigger_error('App Container must be an instance of \\Slim\\Container', \E_USER_ERROR);
 }
-function container():\Slim\Container  {
-return \PHPPgAdmin\ContainerUtils::getContainerInstance();
+function containerInstance(): \Slim\Container
+{
+    return \PHPPgAdmin\ContainerUtils::getContainerInstance();
+}
+
+function requestInstance(): \Slim\Http\Request
+{
+    return  containerInstance()->request;
 }
- 
-function request():\Slim\Http\Request {
-    return  container()->request;
-    }
 
-    function response():\Slim\Http\Response {
-        return container()->response;
-        }
+    function responseInstance(): \Slim\Http\Response
+    {
+        return containerInstance()->response;
+    }
 
-        
 // This should be deprecated once we're sure no php scripts are required directly
 $container->offsetSet('server', $_REQUEST['server'] ?? null);
 $container->offsetSet('database', $_REQUEST['database'] ?? null);