minor #19689 [DI] Cleanup array_key_exists (ro0NL)

fabpot · fabpot · commit c89f80a9cd3f · 2016-08-22T08:32:53.000-07:00
This PR was squashed before being merged into the 2.7 branch (closes #19689). Discussion ---------- [DI] Cleanup array_key_exists | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | comma-separated list of tickets fixed by the PR, if any | License | MIT | Doc PR | reference to the documentation PR, if any Investigated this a bit, and to me it looks like left-over code. `null` doesnt end up in `$this->services` by design (this was done in #8582) so it seems. The test added then for regression still passes :) I cant believe we guarantee BC for users doing `$this->services['id'] = null` (due protected), allowing them to break the design of `has`, `get` and `initialized` right now. This also happens for `$this->definitions` in `ContainerBuilder`, maybe because `Container` did it alteady.. but im not sure. Then again, there's this comment: #14470 (comment) Commits ------- 3306c70 [DI] Cleanup array_key_exists
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -223,7 +223,6 @@ public function has($id)
             if ('service_container' === $id
                 || isset($this->aliases[$id])
                 || isset($this->services[$id])
-                || array_key_exists($id, $this->services)
             ) {
                 return true;
             }
@@ -266,7 +265,7 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
                 $id = $this->aliases[$id];
             }
             // Re-use shared service instance if it exists.
-            if (isset($this->services[$id]) || array_key_exists($id, $this->services)) {
+            if (isset($this->services[$id])) {
                 return $this->services[$id];
             }
 
@@ -348,7 +347,7 @@ public function initialized($id)
             $id = $this->aliases[$id];
         }
 
-        return isset($this->services[$id]) || array_key_exists($id, $this->services);
+        return isset($this->services[$id]);
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -436,7 +436,7 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV
             return $service;
         }
 
-        if (!array_key_exists($id, $this->definitions) && isset($this->aliasDefinitions[$id])) {
+        if (!isset($this->definitions[$id]) && isset($this->aliasDefinitions[$id])) {
             return $this->get($this->aliasDefinitions[$id]);
         }
 
@@ -784,7 +784,7 @@ public function setDefinition($id, Definition $definition)
      */
     public function hasDefinition($id)
     {
-        return array_key_exists(strtolower($id), $this->definitions);
+        return isset($this->definitions[strtolower($id)]);
     }
 
     /**
@@ -800,7 +800,7 @@ public function getDefinition($id)
     {
         $id = strtolower($id);
 
-        if (!array_key_exists($id, $this->definitions)) {
+        if (!isset($this->definitions[$id])) {
             throw new ServiceNotFoundException($id);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,6 @@ public function has($id)`
`223`	`223`	`if ('service_container' === $id`
`224`	`224`	`\|\| isset($this->aliases[$id])`
`225`	`225`	`\|\| isset($this->services[$id])`
`226`		`- \|\| array_key_exists($id, $this->services)`
`227`	`226`	`) {`
`228`	`227`	`return true;`
`229`	`228`	`}`
`@@ -266,7 +265,7 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE`
`266`	`265`	`$id = $this->aliases[$id];`
`267`	`266`	`}`
`268`	`267`	`// Re-use shared service instance if it exists.`
`269`		`- if (isset($this->services[$id]) \|\| array_key_exists($id, $this->services)) {`
	`268`	`+ if (isset($this->services[$id])) {`
`270`	`269`	`return $this->services[$id];`
`271`	`270`	`}`
`272`	`271`
`@@ -348,7 +347,7 @@ public function initialized($id)`
`348`	`347`	`$id = $this->aliases[$id];`
`349`	`348`	`}`
`350`	`349`
`351`		`- return isset($this->services[$id]) \|\| array_key_exists($id, $this->services);`
	`350`	`+ return isset($this->services[$id]);`
`352`	`351`	`}`
`353`	`352`
`354`	`353`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV`
`436`	`436`	`return $service;`
`437`	`437`	`}`
`438`	`438`
`439`		`- if (!array_key_exists($id, $this->definitions) && isset($this->aliasDefinitions[$id])) {`
	`439`	`+ if (!isset($this->definitions[$id]) && isset($this->aliasDefinitions[$id])) {`
`440`	`440`	`return $this->get($this->aliasDefinitions[$id]);`
`441`	`441`	`}`
`442`	`442`
`@@ -784,7 +784,7 @@ public function setDefinition($id, Definition $definition)`
`784`	`784`	`*/`
`785`	`785`	`public function hasDefinition($id)`
`786`	`786`	`{`
`787`		`- return array_key_exists(strtolower($id), $this->definitions);`
	`787`	`+ return isset($this->definitions[strtolower($id)]);`
`788`	`788`	`}`
`789`	`789`
`790`	`790`	`/**`
`@@ -800,7 +800,7 @@ public function getDefinition($id)`
`800`	`800`	`{`
`801`	`801`	`$id = strtolower($id);`
`802`	`802`
`803`		`- if (!array_key_exists($id, $this->definitions)) {`
	`803`	`+ if (!isset($this->definitions[$id])) {`
`804`	`804`	`throw new ServiceNotFoundException($id);`
`805`	`805`	`}`
`806`	`806`