Added return type hint for resolver methods

ClanCats · Oct 15, 2020 · 659bea1 · 659bea1
1 parent f2103b7
commit 659bea1
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/ContainerBuilder.php b/src/ContainerBuilder.php
@@ -524,18 +524,16 @@ private function generateResolverMethods() : string
         foreach($this->services as $serviceName => $serviceDefinition)
         {
             $isSharedService = in_array($serviceName, $this->shared);
+            $serviceClassName = $serviceDefinition->getClassName();
 
-            $buffer .= "public function " . $this->getResolverMethodName($serviceName) . "() {\n";
-
-            if ($isSharedService) {
-                $buffer .= "\tif (isset(\$this->resolvedSharedServices[" . var_export($serviceName, true) . "])) return \$this->resolvedSharedServices[" . var_export($serviceName, true) . "];\n";
+            if ($serviceClassName[0] !== "\\") {
+                $serviceClassName = "\\" . $serviceClassName;
             }
 
-            $serviceClassName = $serviceDefinition->getClassName();
+            $buffer .= "public function " . $this->getResolverMethodName($serviceName) . "() : {$serviceClassName} {\n";
 
-            if ($serviceClassName[0] !== "\\")
-            {
-                $serviceClassName = "\\" . $serviceClassName;
+            if ($isSharedService) {
+                $buffer .= "\tif (isset(\$this->resolvedSharedServices[" . var_export($serviceName, true) . "])) return \$this->resolvedSharedServices[" . var_export($serviceName, true) . "];\n";
             }
 
             $buffer .= "\t\$instance = new " . $serviceClassName . "(". $this->generateArgumentsCode($serviceDefinition->getArguments()) .");\n";