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/4699' into develop
Browse files Browse the repository at this point in the history 
Forward port zendframework/zendframework#4699
  • Loading branch information
@weierophinney
weierophinney committed Jun 28, 2013
192 parents 9675758 + a197876 + 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 + 2a8daeb + 7e876e2 + ed3d22e + 58f4e52 commit 08c425e
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 18 deletions.
6 changes: 3 additions & 3 deletions src/Reader/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

namespace Zend\Feed\Reader;

class Collection extends \ArrayObject
{

use ArrayObject;

class Collection extends ArrayObject
{

}
4 changes: 3 additions & 1 deletion src/Reader/Collection/AbstractCollection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@

namespace Zend\Feed\Reader\Collection;

abstract class AbstractCollection extends \ArrayObject
use ArrayObject;

abstract class AbstractCollection extends ArrayObject
{

/**
Expand Down
6 changes: 3 additions & 3 deletions src/Reader/Collection/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

namespace Zend\Feed\Reader\Collection;

class Collection extends \ArrayObject
{

use ArrayObject;

class Collection extends ArrayObject
{

}
4 changes: 3 additions & 1 deletion src/Reader/Extension/Syndication/Feed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
use Zend\Feed\Reader;
use Zend\Feed\Reader\Extension;

class Feed extends \Zend\Feed\Reader\Extension\AbstractFeed
class Feed extends Extension\AbstractFeed
{
/**
* Get update period
Expand Down Expand Up @@ -46,6 +46,7 @@ public function getUpdatePeriod()

/**
* Get update frequency
*
* @return int
*/
public function getUpdateFrequency()
Expand All @@ -63,6 +64,7 @@ public function getUpdateFrequency()

/**
* Get update frequency as ticks
*
* @return int
*/
public function getUpdateFrequencyAsTicks()
Expand Down
12 changes: 6 additions & 6 deletions src/Writer/Renderer/Entry/Atom/Deleted.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@
use DateTime;
use DOMDocument;
use DOMElement;
use Zend\Feed\Writer;
use Zend\Feed\Writer\Renderer;

class Deleted
extends \Zend\Feed\Writer\Renderer\AbstractRenderer
implements \Zend\Feed\Writer\Renderer\RendererInterface
class Deleted extends Renderer\AbstractRenderer implements Renderer\RendererInterface
{
/**
* Constructor
*
* @param \Zend\Feed\Writer\Deleted $container
* @param Writer\Deleted $container
*/
public function __construct (\Zend\Feed\Writer\Deleted $container)
public function __construct (Writer\Deleted $container)
{
parent::__construct($container);
}

/**
* Render atom entry
*
* @return \Zend\Feed\Writer\Renderer\Entry\Atom
* @return Writer\Renderer\Entry\Atom
*/
public function render()
{
Expand Down
10 changes: 6 additions & 4 deletions src/Writer/Renderer/Feed/Atom/Source.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,26 @@

use DOMDocument;
use DOMElement;
use Zend\Feed\Writer;
use Zend\Feed\Writer\Renderer;

class Source extends AbstractAtom implements \Zend\Feed\Writer\Renderer\RendererInterface
class Source extends AbstractAtom implements Renderer\RendererInterface
{

/**
* Constructor
*
* @param \Zend\Feed\Writer\Source $container
* @param Writer\Source $container
*/
public function __construct (\Zend\Feed\Writer\Source $container)
public function __construct (Writer\Source $container)
{
parent::__construct($container);
}

/**
* Render Atom Feed Metadata (Source element)
*
* @return \Zend\Feed\Writer\Renderer\Feed\Atom
* @return Writer\Renderer\Feed\Atom
*/
public function render()
{
Expand Down

0 comments on commit 08c425e

Please sign in to comment.