Merge "Use MediaWiki\SuppressWarnings around trigger_error('') instead @"

[lhc/web/wiklou.git] / includes / services / ServiceContainer.php

diff --git a/includes/services/ServiceContainer.php b/includes/services/ServiceContainer.php
index 30f8295..d934d27 100644 (file)
--- a/includes/services/ServiceContainer.php
+++ b/includes/services/ServiceContainer.php
@@ -100,6 +100,12 @@ class ServiceContainer implements DestructibleService {
                        }
                }
 
+               // Break circular references due to the $this reference in closures, by
+               // erasing the instantiator array. This allows the ServiceContainer to
+               // be deleted when it goes out of scope.
+               $this->serviceInstantiators = [];
+               // Also remove the services themselves, to avoid confusion.
+               $this->services = [];
                $this->destroyed = true;
        }