Merge "Installer: properly override default $wgLogo value"

[lhc/web/wiklou.git] / includes / libs / GenericArrayObject.php

diff --git a/includes/libs/GenericArrayObject.php b/includes/libs/GenericArrayObject.php
index ef7587d..db8a7ec 100644 (file)
--- a/includes/libs/GenericArrayObject.php
+++ b/includes/libs/GenericArrayObject.php
@@ -33,7 +33,6 @@
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
 abstract class GenericArrayObject extends ArrayObject {
-
        /**
         * Returns the name of an interface/class that the element should implement/extend.
         *
@@ -144,7 +143,8 @@ abstract class GenericArrayObject extends ArrayObject {
        protected function setElement( $index, $value ) {
                if ( !$this->hasValidType( $value ) ) {
                        throw new InvalidArgumentException(
-                               'Can only add ' . $this->getObjectType() . ' implementing objects to ' . get_called_class() . '.'
+                               'Can only add ' . $this->getObjectType() . ' implementing objects to '
+                               . get_called_class() . '.'
                        );
                }
 
@@ -191,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
         *
@@ -237,5 +237,4 @@ abstract class GenericArrayObject extends ArrayObject {
        public function isEmpty() {
                return $this->count() === 0;
        }
-
 }