introduced Service interface to ServiceLocator

Dominik Liebler · Dominik Liebler · commit be1be3ab6462 · 2019-08-26T06:40:18.000+02:00
diff --git a/More/ServiceLocator/LogService.php b/More/ServiceLocator/LogService.php
@@ -2,6 +2,7 @@
 
 namespace DesignPatterns\More\ServiceLocator;
 
-class LogService
+class LogService implements Service
 {
+
 }
diff --git a/More/ServiceLocator/Service.php b/More/ServiceLocator/Service.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace DesignPatterns\More\ServiceLocator;
+
+interface Service
+{
+
+}
diff --git a/More/ServiceLocator/ServiceLocator.php b/More/ServiceLocator/ServiceLocator.php
@@ -5,60 +5,34 @@
 class ServiceLocator
 {
     /**
-     * @var array
+     * @var array|Service[]
      */
     private $services = [];
 
     /**
-     * @var array
+     * @var array|Service[]
      */
     private $instantiated = [];
 
-    /**
-     * @var array
-     */
-    private $shared = [];
-
-    /**
-     * instead of supplying a class here, you could also store a service for an interface
-     *
-     * @param string $class
-     * @param object $service
-     * @param bool $share
-     */
-    public function addInstance(string $class, $service, bool $share = true)
+    public function addInstance(string $class, Service $service)
     {
         $this->services[$class] = $service;
         $this->instantiated[$class] = $service;
-        $this->shared[$class] = $share;
     }
 
-    /**
-     * instead of supplying a class here, you could also store a service for an interface
-     *
-     * @param string $class
-     * @param array $params
-     * @param bool $share
-     */
-    public function addClass(string $class, array $params, bool $share = true)
+    public function addClass(string $class, array $params)
     {
         $this->services[$class] = $params;
-        $this->shared[$class] = $share;
     }
 
     public function has(string $interface): bool
     {
         return isset($this->services[$interface]) || isset($this->instantiated[$interface]);
     }
 
-    /**
-     * @param string $class
-     *
-     * @return object
-     */
-    public function get(string $class)
+    public function get(string $class): Service
     {
-        if (isset($this->instantiated[$class]) && $this->shared[$class]) {
+        if (isset($this->instantiated[$class])) {
             return $this->instantiated[$class];
         }
 
@@ -81,9 +55,7 @@ public function get(string $class)
                 throw new \OutOfRangeException('Too many arguments given');
         }
 
-        if ($this->shared[$class]) {
-            $this->instantiated[$class] = $object;
-        }
+        $this->instantiated[$class] = $object;
 
         return $object;
     }
diff --git a/More/ServiceLocator/uml/uml.png b/More/ServiceLocator/uml/uml.png

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace DesignPatterns\More\ServiceLocator;`
`4`	`4`
`5`		`-class LogService`
	`5`	`+class LogService implements Service`
`6`	`6`	`{`
	`7`	`+`
`7`	`8`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,8 @@ @@
 +<?php
++
 +namespace DesignPatterns\More\ServiceLocator;
++
 +interface Service
 +{
++
 +}