diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2013-08-12 09:28:15 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2013-08-12 09:28:15 +0200 |
commit | 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 (patch) | |
tree | 577a29fb579188d16003a209ce2a2e9c5b0aa2bd /includes/libs/GenericArrayObject.php | |
parent | cacc939b34e315b85e2d72997811eb6677996cc1 (diff) |
Update to MediaWiki 1.21.1
Diffstat (limited to 'includes/libs/GenericArrayObject.php')
-rw-r--r-- | includes/libs/GenericArrayObject.php | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/includes/libs/GenericArrayObject.php b/includes/libs/GenericArrayObject.php index b4b9d610..d77d8ad6 100644 --- a/includes/libs/GenericArrayObject.php +++ b/includes/libs/GenericArrayObject.php @@ -28,9 +28,8 @@ * @since 1.20 * * @file - * @ingroup Diff * - * @licence GNU GPL v2+ + * @license GNU GPL v2+ * @author Jeroen De Dauw < jeroendedauw@gmail.com > */ abstract class GenericArrayObject extends ArrayObject { @@ -42,7 +41,7 @@ abstract class GenericArrayObject extends ArrayObject { * * @return string */ - public abstract function getObjectType(); + abstract public function getObjectType(); /** * @see SiteList::getNewOffset() @@ -61,13 +60,11 @@ abstract class GenericArrayObject extends ArrayObject { * @return integer */ protected function getNewOffset() { - while ( true ) { - if ( !$this->offsetExists( $this->indexOffset ) ) { - return $this->indexOffset; - } - + while ( $this->offsetExists( $this->indexOffset ) ) { $this->indexOffset++; } + + return $this->indexOffset; } /** @@ -194,7 +191,7 @@ abstract class GenericArrayObject extends ArrayObject { /** * Returns an array holding all the data that should go into serialization calls. * This is intended to allow overloading without having to reimplement the - * behaviour of this base class. + * behavior of this base class. * * @since 1.20 * |