Merge branch 'hotfix/4246' into develop

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

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Object/AbstractObject.php b/src/Object/AbstractObject.php
@@ -208,7 +208,7 @@ public function __construct($options = null)
         if (is_array($options)) {
             $this->setOptions($options);
         }
-        $this->type = strtolower(substr(get_called_class(), strlen($this->barcodeNamespace) + 1));
+        $this->type = strtolower(substr(get_class($this), strlen($this->barcodeNamespace) + 1));
         if ($this->mandatoryChecksum) {
             $this->withChecksum = true;
             $this->withChecksumInText = true;

diff --git a/src/Object/Ean13.php b/src/Object/Ean13.php
@@ -155,7 +155,7 @@ public function getChecksum($text)
      */
     protected function drawText()
     {
-        if (get_called_class() == 'Zend\Barcode\Object\Ean13') {
+        if (get_class($this) == 'Zend\Barcode\Object\Ean13') {
             $this->drawEan13Text();
         } else {
             parent::drawText();

diff --git a/src/Renderer/AbstractRenderer.php b/src/Renderer/AbstractRenderer.php
@@ -92,7 +92,7 @@ public function __construct($options = null)
             $this->setOptions($options);
         }
         $this->type = strtolower(substr(
-            get_called_class(),
+            get_class($this),
             strlen($this->rendererNamespace) + 1
         ));
     }