Merge pull request #1 from ovr/shared_app

Shared app
ovr · Sep 9, 2014 · 01d463e · 01d463e
2 parents d423d36 + 0c502cb
commit 01d463e
Showing 1 changed file with 23 additions and 7 deletions.
diff --git a/src/Application.php b/src/Application.php
@@ -108,27 +108,43 @@ public function registerServices()
                     $class = $serviceParameters['class'];
 
                     $shared = false;
+                    $service = false;
 
                     if (isset($serviceParameters['shared'])) {
-                        $shared = (boolean)$serviceParameters['shared'];
+                        $shared = (boolean) $serviceParameters['shared'];
                     }
 
                     if (is_callable($class)) {
                         $shared = true;
                         $service = $class($this);
-                    } else if (!is_object($class)) {
-                        if (isset($serviceParameters['__construct'])) {
-                            $shared = true;
-                            $service = new $class($serviceParameters['__construct']);
+                    } else if (is_object($class)) {
+                        $shared = true;
+                        $service = $class;
+                    } else if (isset($serviceParameters['__construct'])) {
+                        $shared = true;
+
+                        if (!is_array($serviceParameters)) {
+                            throw new \Exception('Parameters for service : "' . $serviceName . '" must be array');
+                        }
+
+                        $reflector = new \ReflectionClass($class);
+                        $service = $reflector->newInstanceArgs($serviceParameters['__construct']);
+                    } else {
+                        if ($shared) {
+                            $service = new $class();
                         } else {
                             $service = $class;
                         }
-                    } else {
-                        $service = $class;
                     }
 
                     if (isset($serviceParameters['parameters'])) {
+                        if ($shared === false) {
+                            throw new \Exception('Service: "' . $serviceName . '" with parameters must be shared');
+                        }
+
                         $service = ClassMethods::hydrate($serviceParameters['parameters'], $service);
+
+                        $di->set($serviceName, $service, $shared);
                     }
 
                     $di->set($serviceName, $service, $shared);