diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /includes/libs/GenericArrayObject.php | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/libs/GenericArrayObject.php')
| -rw-r--r-- | includes/libs/GenericArrayObject.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/libs/GenericArrayObject.php b/includes/libs/GenericArrayObject.php index db8a7ecf..93ae83b2 100644 --- a/includes/libs/GenericArrayObject.php +++ b/includes/libs/GenericArrayObject.php @@ -117,7 +117,7 @@ abstract class GenericArrayObject extends ArrayObject { * * @param mixed $value * - * @return boolean + * @return bool */ protected function hasValidType( $value ) { $class = $this->getObjectType(); @@ -171,7 +171,7 @@ abstract class GenericArrayObject extends ArrayObject { * @param integer|string $index * @param mixed $value * - * @return boolean + * @return bool */ protected function preSetElement( $index, $value ) { return true; @@ -232,7 +232,7 @@ abstract class GenericArrayObject extends ArrayObject { * * @since 1.20 * - * @return boolean + * @return bool */ public function isEmpty() { return $this->count() === 0; |