fixes #67

lib/GitlabController.php

@@ -22,7 +22,7 @@ abstract class GitlabController extends Controller
         $this->setCache(StudipCacheFactory::getCache(), 'gitlab/');
 
         $this->gitlab_project_id = Config::get()->getValue('TRAC2GITLAB_GITLAB_PROJECT_ID');
-        $this->gitlab = app(Client::class);
+        $this->gitlab = app()->get(Client::class);
     }
 
     protected function fetchAll(AbstractApi $api, string $method, array $parameters = []): array

lib/Plugin.php

@@ -9,17 +9,16 @@ abstract class Plugin extends StudIPPlugin
 {
     protected function setupDiContainer()
     {
-        $builder = new DI\ContainerBuilder();
-        $builder->useAutowiring(false);
-        $builder->addDefinitions(__DIR__ . '/../bootstrap-definitions.php');
-        $container = $builder->build();
+        $container = DIContainer::getInstance();
 
-        $combinedContainer = new CombinedContainer(
-            $container,
-            DIContainer::getInstance()
-        );
+        $definitions = require __DIR__ . '/../bootstrap-definitions.php';
 
-        DIContainer::setInstance($combinedContainer);
+        foreach ($definitions as $name => $value) {
+            if ($value instanceof \Closure) {
+                $value = $value($container);
+            }
+            $container->set($name, $value);
+        }
     }
 
     public function perform($unconsumed_path)