Merge branch 'hotfix/4246' into develop

Forward port zendframework/zendframework#4246
zendframework · Apr 17, 2013 · c7ba6af · c7ba6af
commit c7ba6af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/View.php b/src/View.php
@@ -89,7 +89,7 @@ public function setEventManager(EventManagerInterface $events)
     {
         $events->setIdentifiers(array(
             __CLASS__,
-            get_called_class(),
+            get_class($this),
         ));
         $this->events = $events;
         return $this;

diff --git a/test/Helper/TestAsset/Stringified.php b/test/Helper/TestAsset/Stringified.php
@@ -14,6 +14,6 @@ class Stringified
 {
     public function __toString()
     {
-        return get_called_class();
+        return get_class($this);
     }
 }