[DependencyInjection] Removed useless else

symfony · Feb 27, 2011 · Feb 27, 2011 · Feb 27, 2011 · Feb 27, 2011 · Feb 27, 2011
commit 66f4d8bf6d8c74263def15967ba855fd52c8dfec
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
@@ -79,9 +79,9 @@ protected function resolveValue($value)
             return $resolved;
         } else if (is_string($value)) {
             return $this->resolveString($value);
-        } else {
-            return $value;
         }
+
+        return $value;
     }
 
     /**

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -466,12 +466,12 @@ protected function addServiceConfigurator($id, $definition, $variableName = 'ins
         if (is_array($callable)) {
             if (is_object($callable[0]) && $callable[0] instanceof Reference) {
                 return sprintf("        %s->%s(\$%s);\n", $this->getServiceCall((string) $callable[0]), $callable[1], $variableName);
-            } else {
-                return sprintf("        call_user_func(array(%s, '%s'), \$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
             }
-        } else {
-            return sprintf("        %s(\$%s);\n", $callable, $variableName);
+
+            return sprintf("        call_user_func(array(%s, '%s'), \$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
         }
+
+        return sprintf("        %s(\$%s);\n", $callable, $variableName);
     }
 
     /**

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -206,9 +206,9 @@ protected function dumpValue($value)
             return $this->getParameterCall((string) $value);
         } elseif (is_object($value) || is_resource($value)) {
             throw new \RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
-        } else {
-            return $value;
         }
+
+        return $value;
     }
 
     /**
@@ -222,9 +222,9 @@ protected function getServiceCall($id, Reference $reference = null)
     {
         if (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {
             return sprintf('@?%s', $id);
-        } else {
-            return sprintf('@%s', $id);
         }
+
+        return sprintf('@%s', $id);
     }
 
     /**