Some services may not be mapped by MVC, like Mezzio ones (Slamdunk#22)

internalsystemerror · May 18, 2021 · 6903299 · 6903299
1 parent 6d815cb
commit 6903299
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "phpstan/phpstan": "^0.12.86"
+        "phpstan/phpstan": "^0.12.88"
     },
     "conflict": {
         "laminas/laminas-cache": "<2.11",

diff --git a/src/UnmappedAliasServiceLocatorProxy.php b/src/UnmappedAliasServiceLocatorProxy.php
@@ -36,12 +36,17 @@ public function __construct(ServiceLocatorInterface $serviceLocator)
 
     public function get($id)
     {
+        if ($this->serviceLocator->has($id)) {
+            return $this->serviceLocator->get($id);
+        }
+
         return $this->serviceLocator->get($this->knownUnmappedAliasToClassServices[$id] ?? $id);
     }
 
     public function has($id)
     {
-        return $this->serviceLocator->has($this->knownUnmappedAliasToClassServices[$id] ?? $id);
+        return $this->serviceLocator->has($id)
+            || $this->serviceLocator->has($this->knownUnmappedAliasToClassServices[$id] ?? $id);
     }
 
     /**