symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/DependencyInjection/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/ClearableContainerInterface.php
Copy file name to clipboard
+27Lines changed: 27 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/ClearableContainerInterface.php
Copy file name to clipboard
+27Lines changed: 27 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Container.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Container.php
+13-1Lines changed: 13 additions & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Container.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Container.php
+13-1Lines changed: 13 additions & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
+43Lines changed: 43 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
+43Lines changed: 43 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Kernel.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Kernel.php
+5Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Component/HttpKernel/Kernel.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Kernel.php
+5Lines changed: 5 additions & 0 deletions
@@ -7,6 +7,7 @@ CHANGELOG
  * allowed specifying a directory to recursively load all configuration files it contains
  * deprecated the concept of scopes
  * added `Definition::setShared()` and `Definition::isShared()`
+ * added ClearableContainerInterface to be able to clear the container to release memory on shutdown
 
 2.7.0
 -----
 
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection;
+
+/**
+ * ClearableContainerInterface defines additional clearing functionality
+ * for containers, allowing to release shared services when the container is
+ * not needed anymore.
+ *
+ * @author Christophe Coevoet <stof@notk.org>
+ */
+interface ClearableContainerInterface extends ContainerInterface
+{
+    /**
+     * Clears shared services from the container.
+     */
+    public function clear();
+}
@@ -60,7 +60,7 @@
  *
  * @api
  */
-class Container implements IntrospectableContainerInterface
+class Container implements IntrospectableContainerInterface, ClearableContainerInterface
 {
     /**
      * @var ParameterBagInterface
@@ -375,6 +375,18 @@ public function initialized($id)
         return isset($this->services[$id]) || array_key_exists($id, $this->services);
     }
 
+    /**
+     * Clears shared services from the container.
+     */
+    public function clear()
+    {
+        if (!empty($this->scopedServices)) {
+            throw new RuntimeException('Clearing the container is not allowed when a scope is active.');
+        }
+
+        $this->services = array();
+    }
+
     /**
      * Gets all service ids.
      *
 
@@ -320,6 +320,49 @@ public function testInitialized()
         $this->assertTrue($sc->initialized('alias'), '->initialized() returns true for alias if aliased service is initialized');
     }
 
+    public function testClear()
+    {
+        $c = new Container();
+        $c->set('bar', new \stdClass());
+
+        $c->clear();
+
+        $this->assertNull($c->get('bar', ContainerInterface::NULL_ON_INVALID_REFERENCE));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @expectedExceptionMessage Clearing the container is not allowed when a scope is active.
+     * @group legacy
+     */
+    public function testCannotClearInActiveScope()
+    {
+        $c = new Container();
+        $c->addScope(new Scope('foo'));
+        $c->set('bar', new \stdClass());
+
+        $c->enterScope('foo');
+
+        $c->clear();
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testClearAfterLeavingScope()
+    {
+        $c = new Container();
+        $c->addScope(new Scope('foo'));
+        $c->set('bar', new \stdClass());
+
+        $c->enterScope('foo');
+        $c->leaveScope('foo');
+
+        $c->clear();
+
+        $this->assertNull($c->get('bar', ContainerInterface::NULL_ON_INVALID_REFERENCE));
+    }
+
     /**
      * @group legacy
      */
 
@@ -13,6 +13,7 @@
 
 use Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator;
 use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
+use Symfony\Component\DependencyInjection\ClearableContainerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
@@ -180,6 +181,10 @@ public function shutdown()
             $bundle->setContainer(null);
         }
 
+        if ($this->container instanceof ClearableContainerInterface) {
+            $this->container->clear();
+        }
+
         $this->container = null;
     }