Merge "jsduck: Add @inheritable to static methods from jQuery plugins"

[lhc/web/wiklou.git] / includes / site / SiteList.php

diff --git a/includes/site/SiteList.php b/includes/site/SiteList.php
index 1dd6b16..6992450 100644 (file)
--- a/includes/site/SiteList.php
+++ b/includes/site/SiteList.php
@@ -33,7 +33,7 @@ class SiteList extends GenericArrayObject {
         *
         * @since 1.21
         *
-        * @var array of integer
+        * @var array Array of integer
         */
        protected $byInternalId = array();
 
@@ -42,7 +42,7 @@ class SiteList extends GenericArrayObject {
         *
         * @since 1.21
         *
-        * @var array of string
+        * @var array Array of string
         */
        protected $byGlobalId = array();
 
@@ -52,7 +52,7 @@ class SiteList extends GenericArrayObject {
         *
         * @since 1.23
         *
-        * @var array of string
+        * @var array Array of string
         */
        protected $byNavigationId = array();
 
@@ -75,7 +75,7 @@ class SiteList extends GenericArrayObject {
         * @param int|string $index
         * @param Site $site
         *
-        * @return boolean
+        * @return bool
         */
        protected function preSetElement( $index, $site ) {
                if ( $this->hasSite( $site->getGlobalId() ) ) {
@@ -136,7 +136,7 @@ class SiteList extends GenericArrayObject {
         *
         * @param string $globalSiteId
         *
-        * @return boolean
+        * @return bool
         */
        public function hasSite( $globalSiteId ) {
                return array_key_exists( $globalSiteId, $this->byGlobalId );
@@ -173,7 +173,7 @@ class SiteList extends GenericArrayObject {
         *
         * @since 1.21
         *
-        * @return boolean
+        * @return bool
         */
        public function isEmpty() {
                return $this->byGlobalId === array();
@@ -182,9 +182,9 @@ class SiteList extends GenericArrayObject {
        /**
         * Returns if the list contains the site with the provided site id.
         *
-        * @param integer $id
+        * @param int $id
         *
-        * @return boolean
+        * @return bool
         */
        public function hasInternalId( $id ) {
                return array_key_exists( $id, $this->byInternalId );
@@ -196,7 +196,7 @@ class SiteList extends GenericArrayObject {
         *
         * @since 1.21
         *
-        * @param integer $id
+        * @param int $id
         *
         * @return Site
         */
@@ -210,7 +210,7 @@ class SiteList extends GenericArrayObject {
         *
         * @since 1.21
         *
-        * @param integer $id
+        * @param int $id
         */
        public function removeSiteByInternalId( $id ) {
                $this->offsetUnset( $this->byInternalId[$id] );
@@ -221,7 +221,7 @@ class SiteList extends GenericArrayObject {
         *
         * @param string $id
         *
-        * @return boolean
+        * @return bool
         */
        public function hasNavigationId( $id ) {
                return array_key_exists( $id, $this->byNavigationId );
@@ -297,7 +297,7 @@ class SiteList extends GenericArrayObject {
         * @var string A string uniquely identifying the version of the serialization structure,
         *             not including any sub-structures.
         */
-       const SERIAL_VERSION_ID = '2013-02-07';
+       const SERIAL_VERSION_ID = '2014-03-17';
 
        /**
         * Returns the version ID that identifies the serialization structure used by
@@ -327,6 +327,7 @@ class SiteList extends GenericArrayObject {
                        array(
                                'internalIds' => $this->byInternalId,
                                'globalIds' => $this->byGlobalId,
+                               'navigationIds' => $this->byNavigationId
                        )
                );
        }
@@ -345,6 +346,7 @@ class SiteList extends GenericArrayObject {
 
                $this->byInternalId = $serializationData['internalIds'];
                $this->byGlobalId = $serializationData['globalIds'];
+               $this->byNavigationId = $serializationData['navigationIds'];
 
                return $serializationData;
        }