Skip to content
This repository was archived by the owner on Feb 6, 2020. It is now read-only.

Commit 45d573a

Browse files
committed
Revert "Removed $found variable. Reordered service resolution, so that aliases"
This reverts commit e1ee16e.
1 parent 8219cda commit 45d573a

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

src/ServiceManager.php

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -248,27 +248,20 @@ public function build($name, array $options = null)
248248
*/
249249
public function has($name)
250250
{
251-
// Check services and factories first to speedup the most common requests
252-
if (isset($this->services[$name]) || isset($this->factories[$name])) {
253-
return true;
251+
$name = $this->resolvedAliases[$name] ?? $name;
252+
$found = isset($this->services[$name]) || isset($this->factories[$name]);
253+
254+
if ($found) {
255+
return $found;
254256
}
255257

256-
// Check abstract factories next
258+
// Check abstract factories
257259
foreach ($this->abstractFactories as $abstractFactory) {
258260
if ($abstractFactory->canCreate($this->creationContext, $name)) {
259261
return true;
260262
}
261263
}
262264

263-
// If $name is no alias, we are done
264-
if (! isset($this->resolvedAliases[$name])) {
265-
return false;
266-
}
267-
268-
// Finally check aliases
269-
$name = $this->resolvedAliases[$name];
270-
return isset($this->services[$name]) || isset($this->factories[$name]);
271-
272265
return false;
273266
}
274267

0 commit comments

Comments
 (0)