Use the same DI container both system-wide and in the JSONAPI.

Closes #2047

Merge request !1327

lib/classes/DIContainer.php

@@ -52,6 +52,12 @@ class DIContainer
         $builder->ignorePhpDocErrors(true);
         $builder->addDefinitions('lib/bootstrap-definitions.php');
 
+        $jsonapiSettings = require 'lib/classes/JsonApi/settings.php';
+        $jsonapiSettings($builder);
+
+        $jsonapiDependencies = require 'lib/classes/JsonApi/dependencies.php';
+        $jsonapiDependencies($builder);
+
         return $builder;
     }
 }

public/jsonapi.php

@@ -18,18 +18,8 @@ page_open([
 // Set base url for URLHelper class
 URLHelper::setBaseUrl($GLOBALS['CANONICAL_RELATIVE_PATH_STUDIP']);
 
-$containerBuilder = new ContainerBuilder();
-
-$settings = require 'lib/classes/JsonApi/settings.php';
-$settings($containerBuilder);
-
-$dependencies = require 'lib/classes/JsonApi/dependencies.php';
-$dependencies($containerBuilder);
-
-// Build PHP_DI Container
-$container = $containerBuilder->build();
-
 // Instantiate the app
+$container = app();
 AppFactory::setContainer($container);
 $app = AppFactory::create();
 $container->set(\Slim\App::class, $app);