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

Commit

Permalink
Merge branch 'hotfix/2694' into develop
Browse files Browse the repository at this point in the history 
Forward port zendframework/zendframework#2694
  • Loading branch information
@weierophinney
weierophinney committed Oct 16, 2012
130 parents ef5460e + 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 + fb34b30 + 9c0c17c + 8e7fa2d commit 4179b4d
Show file tree
Hide file tree
Showing 8 changed files with 233 additions and 9 deletions.
69 changes: 65 additions & 4 deletions src/Writer/AbstractFeed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function __construct()
*
* @param array $author
* @throws Exception\InvalidArgumentException If any value of $author not follow the format.
* @return void
* @return AbstractFeed
*/
public function addAuthor(array $author)
{
Expand Down Expand Up @@ -90,41 +90,49 @@ public function addAuthor(array $author)
}

$this->data['authors'][] = $author;

return $this;
}

/**
* Set an array with feed authors
*
* @see addAuthor
* @param array $authors
* @return void
* @return AbstractFeed
*/
public function addAuthors(array $authors)
{
foreach ($authors as $author) {
$this->addAuthor($author);
}

return $this;
}

/**
* Set the copyright entry
*
* @param string $copyright
* @param string $copyright
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
public function setCopyright($copyright)
{
if (empty($copyright) || !is_string($copyright)) {
throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
}
$this->data['copyright'] = $copyright;

return $this;
}

/**
* Set the feed creation date
*
* @param null|integer|DateTime
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
public function setDateCreated($date = null)
{
Expand All @@ -137,13 +145,16 @@ public function setDateCreated($date = null)
. ' passed as parameter');
}
$this->data['dateCreated'] = $date;

return $this;
}

/**
* Set the feed modification date
*
* @param null|integer|DateTime
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
public function setDateModified($date = null)
{
Expand All @@ -156,13 +167,16 @@ public function setDateModified($date = null)
. ' passed as parameter');
}
$this->data['dateModified'] = $date;

return $this;
}

/**
* Set the feed last-build date. Ignored for Atom 1.0.
*
* @param null|integer|DateTime
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
public function setLastBuildDate($date = null)
{
Expand All @@ -175,20 +189,25 @@ public function setLastBuildDate($date = null)
. ' passed as parameter');
}
$this->data['lastBuildDate'] = $date;

return $this;
}

/**
* Set the feed description
*
* @param string $description
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
public function setDescription($description)
{
if (empty($description) || !is_string($description)) {
throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
}
$this->data['description'] = $description;

return $this;
}

/**
Expand All @@ -198,7 +217,7 @@ public function setDescription($description)
* @param null|string $version
* @param null|string $uri
* @throws Exception\InvalidArgumentException
* @return string|null
* @return AbstractFeed
*/
public function setGenerator($name, $version = null, $uri = null)
{
Expand Down Expand Up @@ -239,13 +258,16 @@ public function setGenerator($name, $version = null, $uri = null)
}
}
$this->data['generator'] = $generator;

return $this;
}

/**
* Set the feed ID - URI or URN (via PCRE pattern) supported
*
* @param string $id
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
public function setId($id)
{
Expand All @@ -256,6 +278,8 @@ public function setId($id)
throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string and valid URI/IRI');
}
$this->data['id'] = $id;

return $this;
}

/**
Expand Down Expand Up @@ -298,6 +322,7 @@ protected function _validateTagUri($id)
*
* @param array $data
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
public function setImage(array $data)
{
Expand All @@ -308,34 +333,42 @@ public function setImage(array $data)
. ' must be a non-empty string and valid URI/IRI');
}
$this->data['image'] = $data;

return $this;
}

/**
* Set the feed language
*
* @param string $language
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
public function setLanguage($language)
{
if (empty($language) || !is_string($language)) {
throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
}
$this->data['language'] = $language;

return $this;
}

/**
* Set a link to the HTML source
*
* @param string $link
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
public function setLink($link)
{
if (empty($link) || !is_string($link) || !Uri\UriFactory::factory($link)->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string and valid URI/IRI');
}
$this->data['link'] = $link;

return $this;
}

/**
Expand All @@ -344,6 +377,7 @@ public function setLink($link)
* @param string $link
* @param string $type
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
public function setFeedLink($link, $type)
{
Expand All @@ -354,41 +388,50 @@ public function setFeedLink($link, $type)
throw new Exception\InvalidArgumentException('Invalid parameter: "type"; You must declare the type of feed the link points to, i.e. RSS, RDF or Atom');
}
$this->data['feedLinks'][strtolower($type)] = $link;

return $this;
}

/**
* Set the feed title
*
* @param string $title
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
public function setTitle($title)
{
if (empty($title) || !is_string($title)) {
throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
}
$this->data['title'] = $title;

return $this;
}

/**
* Set the feed character encoding
*
* @param string $encoding
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
public function setEncoding($encoding)
{
if (empty($encoding) || !is_string($encoding)) {
throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
}
$this->data['encoding'] = $encoding;

return $this;
}

/**
* Set the feed's base URL
*
* @param string $url
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
public function setBaseUrl($url)
{
Expand All @@ -397,13 +440,16 @@ public function setBaseUrl($url)
. ' must be a non-empty string and valid URI/IRI');
}
$this->data['baseUrl'] = $url;

return $this;
}

/**
* Add a Pubsubhubbub hub endpoint URL
*
* @param string $url
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
public function addHub($url)
{
Expand All @@ -415,25 +461,31 @@ public function addHub($url)
$this->data['hubs'] = array();
}
$this->data['hubs'][] = $url;

return $this;
}

/**
* Add Pubsubhubbub hub endpoint URLs
*
* @param array $urls
* @return AbstractFeed
*/
public function addHubs(array $urls)
{
foreach ($urls as $url) {
$this->addHub($url);
}

return $this;
}

/**
* Add a feed category
*
* @param array $category
* @throws Exception\InvalidArgumentException
* @return AbstractFeed
*/
public function addCategory(array $category)
{
Expand All @@ -455,18 +507,23 @@ public function addCategory(array $category)
$this->data['categories'] = array();
}
$this->data['categories'][] = $category;

return $this;
}

/**
* Set an array of feed categories
*
* @param array $categories
* @return AbstractFeed
*/
public function addCategories(array $categories)
{
foreach ($categories as $category) {
$this->addCategory($category);
}

return $this;
}

/**
Expand Down Expand Up @@ -721,10 +778,12 @@ public function reset()
* on their appropriateness for the current type, e.g. renderers.
*
* @param string $type
* @return AbstractFeed
*/
public function setType($type)
{
$this->type = $type;
return $this;
}

/**
Expand All @@ -741,12 +800,14 @@ public function getType()
* Unset a specific data point
*
* @param string $name
* @return AbstractFeed
*/
public function remove($name)
{
if (isset($this->data[$name])) {
unset($this->data[$name]);
}
return $this;
}

/**
Expand Down
Loading

0 comments on commit 4179b4d

Please sign in to comment.