Merge branch 'hotfix/3156'

Close zendframework/zendframework#3156
zendframework · Dec 11, 2012 · 53107b1 · 53107b1
commit 53107b1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/PubSubHubbub/Subscriber/Callback.php b/src/PubSubHubbub/Subscriber/Callback.php
@@ -30,7 +30,7 @@ class Callback extends PubSubHubbub\AbstractCallback
      * Holds a manually set subscription key (i.e. identifies a unique
      * subscription) which is typical when it is not passed in the query string
      * but is part of the Callback URL path, requiring manual retrieval e.g.
-     * using a route and the Zend_Controller_Action::_getParam() method.
+     * using a route and the \Zend\Mvc\Router\RouteMatch::getParam() method.
      *
      * @var string
      */

diff --git a/src/Reader/FeedSet.php b/src/Reader/FeedSet.php
@@ -109,7 +109,7 @@ protected function canonicalizePath($path)
     }
 
     /**
-     * Supports lazy loading of feeds using Zend_Feed_Reader::import() but
+     * Supports lazy loading of feeds using Reader::import() but
      * delegates any other operations to the parent class.
      *
      * @param string $offset