Merge branch 'hotfix/4246'

Close zendframework/zendframework#4246

src/ServiceManager.php

@@ -148,7 +148,7 @@ public function setShareByDefault($shareByDefault)
         if ($this->allowOverride === false) {
             throw new Exception\RuntimeException(sprintf(
                 '%s: cannot alter default shared service setting; container is marked immutable (allow_override is false)',
-                get_called_class() . '::' . __FUNCTION__
+                get_class($this) . '::' . __FUNCTION__
             ));
         }
         $this->shareByDefault = (bool) $shareByDefault;
@@ -362,7 +362,7 @@ public function setService($name, $service)
             if ($this->allowOverride === false) {
                 throw new Exception\InvalidServiceNameException(sprintf(
                     '%s: A service by the name "%s" or alias already exists and cannot be overridden, please use an alternate name.',
-                    get_called_class() . '::' . __FUNCTION__,
+                    get_class($this) . '::' . __FUNCTION__,
                     $name
                 ));
             }
@@ -391,7 +391,7 @@ public function setShared($name, $isShared)
         ) {
             throw new Exception\ServiceNotFoundException(sprintf(
                 '%s: A service by the name "%s" was not found and could not be marked as shared',
-                get_called_class() . '::' . __FUNCTION__,
+                get_class($this) . '::' . __FUNCTION__,
                 $name
             ));
         }
@@ -455,7 +455,7 @@ public function get($name, $usePeeringServiceManagers = true)
 
             throw new Exception\ServiceNotFoundException(sprintf(
                 '%s was unable to fetch or create an instance for %s',
-                get_called_class() . '::' . __FUNCTION__,
+                get_class($this) . '::' . __FUNCTION__,
                 $name
             ));
         }
@@ -838,7 +838,7 @@ protected function createFromInvokable($canonicalName, $requestedName)
         if (!class_exists($invokable)) {
             throw new Exception\ServiceNotFoundException(sprintf(
                 '%s: failed retrieving "%s%s" via invokable class "%s"; class does not exist',
-                get_called_class() . '::' . __FUNCTION__,
+                get_class($this) . '::' . __FUNCTION__,
                 $canonicalName,
                 ($requestedName ? '(alias: ' . $requestedName . ')' : ''),
                 $invokable