Merge remote-tracking branch 'prolic/feed'

zendframework · May 27, 2012 · 619d24d · 619d24d
3 parents 8e7172b + ddfa8f2 + d86e372
commit 619d24d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/PubSubHubbub/Model/AbstractModel.php b/src/PubSubHubbub/Model/AbstractModel.php
@@ -20,7 +20,7 @@
 
 namespace Zend\Feed\PubSubHubbub\Model;
 
-use \Zend\Db\TableGateway;
+use Zend\Db\TableGateway;
 
 /**
  * @category   Zend
@@ -33,21 +33,21 @@ class AbstractModel
     /**
      * Zend_Db_Table instance to host database methods
      *
-     * @var \Zend\Db\Table\Table
+     * @var TableGateway\TableGatewayInterface
      */
     protected $_db = null;
 
     /**
      * Constructor
      * 
      * @param  array $data 
-     * @param  \Zend\Db\Table\AbstractTable $tableGateway 
+     * @param  TableGateway\TableGatewayInterface $tableGateway
      * @return void
      */
     public function __construct(TableGateway\TableGatewayInterface $tableGateway = null)
     {
         if ($tableGateway === null) {
-            $parts = explode('\\', get_class($this));
+            $parts = explode('\\', get_called_class());
             $table = strtolower(array_pop($parts));
             $this->_db = new TableGateway\TableGateway($table);
         } else {

diff --git a/src/Writer/Renderer/AbstractRenderer.php b/src/Writer/Renderer/AbstractRenderer.php
@@ -20,9 +20,9 @@
 
 namespace Zend\Feed\Writer\Renderer;
 
-use Zend\Feed\Writer,
-    DOMDocument,
-    DOMElement;
+use DOMDocument;
+use DOMElement;
+use Zend\Feed\Writer;
 
 /**
 * @category Zend
@@ -233,7 +233,7 @@ protected function _loadExtensions()
     {
         Writer\Writer::registerCoreExtensions();
         $all = Writer\Writer::getExtensions();
-        if (stripos(get_class($this), 'entry')) {
+        if (stripos(get_called_class(), 'entry')) {
             $exts = $all['entryRenderer'];
         } else {
             $exts = $all['feedRenderer'];