Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'hotfix/4699' into develop

Forward port #4699
  • Loading branch information...
commit edbe24a9fb578fe2971885639b89a50bc21612f8 2 parents 7ce36d2 + b23952b
@weierophinney weierophinney authored
View
5 library/Zend/Db/ResultSet/ResultSetInterface.php
@@ -9,7 +9,10 @@
namespace Zend\Db\ResultSet;
-interface ResultSetInterface extends \Traversable, \Countable
+use Countable;
+use Traversable;
+
+interface ResultSetInterface extends Traversable, Countable
{
/**
* Can be anything traversable|array
View
6 library/Zend/Feed/Reader/Collection.php
@@ -9,9 +9,9 @@
namespace Zend\Feed\Reader;
-class Collection extends \ArrayObject
-{
-
+use ArrayObject;
+class Collection extends ArrayObject
+{
}
View
4 library/Zend/Feed/Reader/Collection/AbstractCollection.php
@@ -9,7 +9,9 @@
namespace Zend\Feed\Reader\Collection;
-abstract class AbstractCollection extends \ArrayObject
+use ArrayObject;
+
+abstract class AbstractCollection extends ArrayObject
{
/**
View
6 library/Zend/Feed/Reader/Collection/Collection.php
@@ -9,9 +9,9 @@
namespace Zend\Feed\Reader\Collection;
-class Collection extends \ArrayObject
-{
-
+use ArrayObject;
+class Collection extends ArrayObject
+{
}
View
4 library/Zend/Feed/Reader/Extension/Syndication/Feed.php
@@ -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
@@ -46,6 +46,7 @@ public function getUpdatePeriod()
/**
* Get update frequency
+ *
* @return int
*/
public function getUpdateFrequency()
@@ -63,6 +64,7 @@ public function getUpdateFrequency()
/**
* Get update frequency as ticks
+ *
* @return int
*/
public function getUpdateFrequencyAsTicks()
View
12 library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
@@ -12,17 +12,17 @@
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);
}
@@ -30,7 +30,7 @@ public function __construct (\Zend\Feed\Writer\Deleted $container)
/**
* Render atom entry
*
- * @return \Zend\Feed\Writer\Renderer\Entry\Atom
+ * @return Writer\Renderer\Entry\Atom
*/
public function render()
{
View
10 library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
@@ -11,16 +11,18 @@
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);
}
@@ -28,7 +30,7 @@ public function __construct (\Zend\Feed\Writer\Source $container)
/**
* Render Atom Feed Metadata (Source element)
*
- * @return \Zend\Feed\Writer\Renderer\Feed\Atom
+ * @return Writer\Renderer\Feed\Atom
*/
public function render()
{
View
4 library/Zend/Ldap/Dn.php
@@ -9,10 +9,12 @@
namespace Zend\Ldap;
+use ArrayAccess;
+
/**
* Zend\Ldap\Dn provides an API for DN manipulation
*/
-class Dn implements \ArrayAccess
+class Dn implements ArrayAccess
{
const ATTR_CASEFOLD_NONE = 'none';
const ATTR_CASEFOLD_UPPER = 'upper';
View
3  library/Zend/Loader/PluginClassLocator.php
@@ -9,12 +9,13 @@
namespace Zend\Loader;
+use IteratorAggregate;
use Traversable;
/**
* Plugin class locator interface
*/
-interface PluginClassLocator extends ShortNameLocator, \IteratorAggregate
+interface PluginClassLocator extends ShortNameLocator, IteratorAggregate
{
/**
* Register a class to a given short name
View
3  library/Zend/Mail/Storage/Writable/Maildir.php
@@ -9,6 +9,7 @@
namespace Zend\Mail\Storage\Writable;
+use RecursiveIteratorIterator;
use Zend\Mail\Exception as MailException;
use Zend\Mail\Storage;
use Zend\Mail\Storage\Exception as StorageException;
@@ -754,7 +755,7 @@ protected function _calculateMaildirsize()
}
}
- $folders = new \RecursiveIteratorIterator($this->getFolders(), \RecursiveIteratorIterator::SELF_FIRST);
+ $folders = new RecursiveIteratorIterator($this->getFolders(), RecursiveIteratorIterator::SELF_FIRST);
foreach ($folders as $folder) {
$subdir = $folder->getGlobalName();
if ($subdir == 'INBOX') {
View
4 library/Zend/Permissions/Rbac/RoleInterface.php
@@ -9,7 +9,9 @@
namespace Zend\Permissions\Rbac;
-interface RoleInterface extends \RecursiveIterator
+use RecursiveIterator;
+
+interface RoleInterface extends RecursiveIterator
{
/**
* Get the name of the role.
View
9 library/Zend/View/Helper/Cycle.php
@@ -9,13 +9,16 @@
namespace Zend\View\Helper;
+use Iterator;
+
/**
* Helper for alternating between set of values
*/
-class Cycle extends AbstractHelper implements \Iterator
+class Cycle extends AbstractHelper implements Iterator
{
/**
* Default name
+ *
* @var string
*/
const DEFAULT_NAME = 'default';
@@ -180,9 +183,9 @@ public function key()
{
if ($this->pointers[$this->name] < 0) {
return 0;
- } else {
- return $this->pointers[$this->name];
}
+
+ return $this->pointers[$this->name];
}
/**
View
3  library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
@@ -9,12 +9,13 @@
namespace Zend\View\Helper\Placeholder\Container;
+use ArrayObject;
use Zend\View\Exception;
/**
* Abstract class representing container for placeholder values
*/
-abstract class AbstractContainer extends \ArrayObject
+abstract class AbstractContainer extends ArrayObject
{
/**
* Whether or not to override all contents of placeholder
Please sign in to comment.
Something went wrong with that request. Please try again.