Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'hotfix/4421'
Browse files Browse the repository at this point in the history
weierophinney committed May 23, 2013
187 parents dc04d82 + e296dd4 + 8cd607e + 758e5c3 + 59f3ba8 + 63d873e + a320b87 + 911d7bc + 5b99e49 + 916ccaf + 363002c + de6a155 + 81d4652 + 8677f66 + bea2340 + 53107b1 + e575de9 + c8a932b + d08629f + a04474f + 3fef53d + 1f4b9ed + d263f1c + c790aed + 412585a + b5e6b02 + 9ac81f3 + 9f28eab + 2e7e2e2 + 7c64770 + b82fa59 + 4190868 + 3a6b7ad + 8e745f6 + bab7086 + c5a5d19 + b468bc1 + d79794c + 508b344 + d16deed + f38e96a + c4a3687 + 54465f7 + 4ad15e4 + 9aa47da + 619d24d + ddfa8f2 + 8e7172b + e5fc69f + 284a721 + 6d3db4c + b99e8c3 + a52dcef + 1d21066 + cccc24c + 81bd699 + dfb38ed + b796f3d + d49dbc2 + 547433c + 0c9ce04 + a76e26a + 2914396 + 7ca3746 + f1b292d + 406112f + 5a9edd3 + f65c9f6 + c54156c + 5e55e82 + 352e42b + fa459f5 + 3eff137 + 3648ab6 + 4096125 + 0037391 + 9bdfcd9 + 6cd1498 + ecac99d + 199ed75 + b8507f7 + ef400bd + decb6ae + 860b39d + 243eca6 + d56af72 + 1aaf7f9 + 26b27a9 + 40cd50e + 986898b + d2780b7 + 49abb1d + cb5a738 + 21d3bef + 4748875 + 3331086 + bfed36c + b56e9b8 + 765b017 + b2cddce + 1c63803 + dd490e0 + c0425c2 + 128ed7f + 4d88940 + 94b3f1e + 9a0d8cf + 12135ad + 1169a58 + 6cdb5dc + 15950e5 + 7e68fb2 + 4bda4a9 + 537893f + 4cf10f8 + dd5b294 + 3ac5190 + 63d8503 + de5ff9e + f8868a0 + e3f8a27 + 634cf99 + c2cd236 + 189672f + d50054c + 8fb183a + 81a21d6 + ba78039 + 2cc9607 + bbd31f7 + aff5dfd + 3daad46 + a2bd1ba + cddc550 + eadb29a + 339c074 + 543ff20 + 732e048 + 8ec7eaf + 25fde7d + 5215c37 + a31404d + 1328e20 + 33a507b + 012928d + 379d601 + b7d4bbd + c1c633c + 6a72de0 + 7968e2e + 51d3d2a + 7e58137 + abedf39 + 896ef54 + cf89f92 + 0df0d18 + 3d7cc47 + 8abd6e8 + e20a954 + 2f039d3 + 88c06cc + 3e03422 + 096a05e + 6c7650a + a4c7b54 + ef5460e + 898d44f + c554ea2 + ffcf7bc + 2adc6bf + 4179b4d + 5907ce0 + fc664b1 + 2ee9d9a + 7fb5cbc + acda3d1 + 6db0d22 + 2bbd38f + 3144a5b + 7efb048 + 3d18a84 + 93a97aa + f98796f + 853fff2 + 149db66 + 2416664 + f3389b3 commit a197876
Showing 9 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/PubSubHubbub/AbstractCallback.php
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ public function setOptions($options)

/**
* Send the response, including all headers.
* If you wish to handle this via Zend_Http, use the getter methods
* If you wish to handle this via Zend\Http, use the getter methods
* to retrieve any data needed to be set on your HTTP Response object, or
* simply give this object the HTTP Response instance to work with for you!
*
10 changes: 5 additions & 5 deletions src/PubSubHubbub/CallbackInterface.php
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ public function handle(array $httpData = null, $sendResponseNow = false);

/**
* Send the response, including all headers.
* If you wish to handle this via Zend_Controller, use the getter methods
* If you wish to handle this via Zend\Mvc\Controller, use the getter methods
* to retrieve any data needed to be set on your HTTP Response object, or
* simply give this object the HTTP Response instance to work with for you!
*
@@ -33,17 +33,17 @@ public function sendResponse();

/**
* An instance of a class handling Http Responses. This is implemented in
* Zend_Feed_Pubsubhubbub_HttpResponse which shares an unenforced interface with
* (i.e. not inherited from) Zend_Controller_Response_Http.
* Zend\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
* (i.e. not inherited from) Zend\Feed\Pubsubhubbub\AbstractCallback.
*
* @param HttpResponse|\Zend\Http\PhpEnvironment\Response $httpResponse
*/
public function setHttpResponse($httpResponse);

/**
* An instance of a class handling Http Responses. This is implemented in
* Zend_Feed_Pubsubhubbub_HttpResponse which shares an unenforced interface with
* (i.e. not inherited from) Zend_Controller_Response_Http.
* Zend\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
* (i.e. not inherited from) Zend\Feed\Pubsubhubbub\AbstractCallback.
*
* @return HttpResponse|\Zend\Http\PhpEnvironment\Response
*/
4 changes: 2 additions & 2 deletions src/PubSubHubbub/PubSubHubbub.php
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ class PubSubHubbub
/**
* Simple utility function which imports any feed URL and
* determines the existence of Hub Server endpoints. This works
* best if directly given an instance of Zend_Feed_Reader_Atom|Rss
* best if directly given an instance of Zend\Feed\Reader\Atom|Rss
* to leverage off.
*
* @param \Zend\Feed\Reader\Feed\AbstractFeed|string $source
@@ -65,7 +65,7 @@ public static function detectHubs($source)
}

/**
* Allows the external environment to make Zend_Oauth use a specific
* Allows the external environment to make ZendOAuth use a specific
* Client instance.
*
* @param Http\Client $httpClient
8 changes: 4 additions & 4 deletions src/PubSubHubbub/Publisher.php
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ class Publisher

/**
* An array of any errors including keys for 'response', 'hubUrl'.
* The response is the actual Zend_Http_Response object.
* The response is the actual Zend\Http\Response object.
*
* @var array
*/
@@ -49,7 +49,7 @@ class Publisher
protected $parameters = array();

/**
* Constructor; accepts an array or Zend_Config instance to preset
* Constructor; accepts an array or Zend\Config\Config instance to preset
* options for the Publisher without calling all supported setter
* methods in turn.
*
@@ -241,7 +241,7 @@ public function notifyHub($url)
* If a Hub notification fails, certain data will be retained in an
* an array retrieved using getErrors(), if a failure occurs for any Hubs
* the isSuccess() check will return FALSE. This method is designed not
* to needlessly fail with an Exception/Error unless from Zend_Http_Client.
* to needlessly fail with an Exception/Error unless from Zend\Http\Client.
*
* @return void
* @throws Exception\RuntimeException
@@ -353,7 +353,7 @@ public function isSuccess()

/**
* Return an array of errors met from any failures, including keys:
* 'response' => the Zend_Http_Response object from the failure
* 'response' => the Zend\Http\Response object from the failure
* 'hubUrl' => the URL of the Hub Server whose notification failed
*
* @return array
2 changes: 1 addition & 1 deletion src/Reader/AbstractEntry.php
Original file line number Diff line number Diff line change
@@ -203,7 +203,7 @@ public function __call($method, $args)
}

/**
* Load extensions from Zend_Feed_Reader
* Load extensions from Zend\Feed\Reader\Reader
*
* @return void
*/
2 changes: 1 addition & 1 deletion src/Reader/Entry/AbstractEntry.php
Original file line number Diff line number Diff line change
@@ -207,7 +207,7 @@ public function __call($method, $args)
}

/**
* Load extensions from Zend_Feed_Reader
* Load extensions from Zend\Feed\Reader\Reader
*
* @return void
*/
2 changes: 1 addition & 1 deletion src/Writer/AbstractFeed.php
Original file line number Diff line number Diff line change
@@ -827,7 +827,7 @@ public function __call($method, $args)
}

/**
* Load extensions from Zend_Feed_Writer
* Load extensions from Zend\Feed\Writer\Writer
*
* @throws Exception\RuntimeException
* @return void
6 changes: 3 additions & 3 deletions src/Writer/Entry.php
Original file line number Diff line number Diff line change
@@ -709,7 +709,7 @@ public function __call($method, $args)
}

/**
* Creates a new Zend_Feed_Writer_Source data container for use. This is NOT
* Creates a new Zend\Feed\Writer\Source data container for use. This is NOT
* added to the current feed automatically, but is necessary to create a
* container with some initial values preset based on the current feed data.
*
@@ -726,7 +726,7 @@ public function createSource()
}

/**
* Appends a Zend_Feed_Writer_Entry object representing a new entry/item
* Appends a Zend\Feed\Writer\Entry object representing a new entry/item
* the feed data container's internal group of entries.
*
* @param Source $source
@@ -750,7 +750,7 @@ public function getSource()
}

/**
* Load extensions from Zend_Feed_Writer
* Load extensions from Zend\Feed\Writer\Writer
*
* @return void
*/
2 changes: 1 addition & 1 deletion src/Writer/Renderer/AbstractRenderer.php
Original file line number Diff line number Diff line change
@@ -209,7 +209,7 @@ public function getRootElement()
}

/**
* Load extensions from Zend_Feed_Writer
* Load extensions from Zend\Feed\Writer\Writer
*
* @return void
*/

0 comments on commit a197876

Please sign in to comment.