From fdacb21814decc0fc8d67fa75253fb6d00080e90 Mon Sep 17 00:00:00 2001
From: Joseph Bielawski <stloyd@gmail.com>
Date: Mon, 1 Jul 2013 10:12:06 +0200
Subject: [PATCH] Return BC compatibility for DI Container When setting service
 to `null` it's considered as existing instead of removed/reset state. This PR
 returns BC compatibility and provides test to ensure that BC is hold.

---
 .../Component/DependencyInjection/Container.php |  8 ++++----
 .../DependencyInjection/Tests/ContainerTest.php | 17 +++++++++++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index b97f8a2c038ce..a056e6d0575f6 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -229,8 +229,8 @@ public function has($id)
     {
         $id = strtolower($id);
 
-        return array_key_exists($id, $this->services)
-            || array_key_exists($id, $this->aliases)
+        return isset($this->services[$id])
+            || isset($this->aliases[$id])
             || method_exists($this, 'get'.strtr($id, array('_' => '', '.' => '_')).'Service')
         ;
     }
@@ -303,7 +303,7 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
         } catch (\Exception $e) {
             unset($this->loading[$id]);
 
-            if (array_key_exists($id, $this->services)) {
+            if (isset($this->services[$id])) {
                 unset($this->services[$id]);
             }
 
@@ -328,7 +328,7 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
      */
     public function initialized($id)
     {
-        return array_key_exists(strtolower($id), $this->services);
+        return isset($this->services[strtolower($id)]);
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
index c87f2c2b9ad5d..cdb544c3f790a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
@@ -193,7 +193,6 @@ public function testGetThrowServiceNotFoundException()
 
     public function testGetCircularReference()
     {
-
         $sc = new ProjectServiceContainer();
         try {
             $sc->get('circular');
@@ -210,7 +209,13 @@ public function testGetCircularReference()
     public function testGetReturnsNullOnInactiveScope()
     {
         $sc = new ProjectServiceContainer();
-        $this->assertNull($sc->get('inactive', ContainerInterface::NULL_ON_INVALID_REFERENCE));
+        $this->assertNull($sc->get('inactive', ContainerInterface::NULL_ON_INVALID_REFERENCE), '->get() returns null if service not exists and ContainerInterface::NULL_ON_INVALID_REFERENCE is used');
+
+        $sc->set('foo', $foo = new \stdClass());
+        $this->assertEquals($foo, $sc->get('foo'), '->get() returns the service for the given id if it exists');
+
+        $sc->set('foo', null);
+        $this->assertNull($sc->get('foo', ContainerInterface::NULL_ON_INVALID_REFERENCE), '->get() returns null if service is null and ContainerInterface::NULL_ON_INVALID_REFERENCE is used');
     }
 
     /**
@@ -220,11 +225,16 @@ public function testHas()
     {
         $sc = new ProjectServiceContainer();
         $sc->set('foo', new \stdClass());
+        $sc->set('foo2', new \stdClass());
         $this->assertFalse($sc->has('foo1'), '->has() returns false if the service does not exist');
+        $this->assertTrue($sc->has('foo2'), '->has() returns true if the service exists');
         $this->assertTrue($sc->has('foo'), '->has() returns true if the service exists');
         $this->assertTrue($sc->has('bar'), '->has() returns true if a get*Method() is defined');
         $this->assertTrue($sc->has('foo_bar'), '->has() returns true if a get*Method() is defined');
         $this->assertTrue($sc->has('foo.baz'), '->has() returns true if a get*Method() is defined');
+
+        $sc->set('foo', null);
+        $this->assertFalse($sc->has('foo'), '->has() returns false if the service was set to null');
     }
 
     /**
@@ -237,6 +247,9 @@ public function testInitialized()
         $this->assertTrue($sc->initialized('foo'), '->initialized() returns true if service is loaded');
         $this->assertFalse($sc->initialized('foo1'), '->initialized() returns false if service is not loaded');
         $this->assertFalse($sc->initialized('bar'), '->initialized() returns false if a service is defined, but not currently loaded');
+
+        $sc->set('foo', null);
+        $this->assertFalse($sc->initialized('foo'), '->initialized() returns false if the service was set to null');
     }
 
     public function testEnterLeaveCurrentScope()