Merge pull request #15 from dereuromark/master-fix

Fix reusability for looped loadService() call.

Author: burzum

src/Service/ServiceAwareTrait.php

@@ -50,20 +50,20 @@ trait ServiceAwareTrait
      */
     public function loadService($service, array $constructorArgs = [], $assignProperty = true)
     {
-        $serviceInstance = $this->getServiceLocator()->load($service, $constructorArgs);
-
-        if (!$assignProperty) {
-            return $serviceInstance;
-        }
-
         list(, $name) = pluginSplit($service);
 
         if (strpos($name, '/') !== false) {
             $name = substr($name, strrpos($name, '/') + 1);
         }
 
-        if (isset($this->{$name})) {
-            trigger_error(__CLASS__ . '::$%s is already in use.', E_USER_WARNING);
+        if ($assignProperty && isset($this->{$name})) {
+            return $this->{$name};
+        }
+
+        $serviceInstance = $this->getServiceLocator()->load($service, $constructorArgs);
+
+        if (!$assignProperty) {
+            return $serviceInstance;
         }
 
         $this->{$name} = $serviceInstance;

tests/TestCase/Service/ServiceLocatorTest.php

@@ -36,6 +36,20 @@ public function testLocate()
         $this->assertInstanceOf(TestService::class, $service);
     }
 
+    /**
+     * testLocate multiple
+     *
+     * @return void
+     */
+    public function testLocateMultiple()
+    {
+        $locator = new ServiceLocator();
+        $service = $locator->load('Test');
+        $service = $locator->load('Test');
+
+        $this->assertInstanceOf(TestService::class, $service);
+    }
+
     /**
      * testLocate
      *