Merge "Don't hard-code Preferences page name"

[lhc/web/wiklou.git] / includes / config / EtcdConfig.php

diff --git a/includes/config/EtcdConfig.php b/includes/config/EtcdConfig.php
index c57eba7..d7dc45a 100644 (file)
--- a/includes/config/EtcdConfig.php
+++ b/includes/config/EtcdConfig.php
@@ -45,11 +45,11 @@ class EtcdConfig implements Config, LoggerAwareInterface {
        private $directory;
        /** @var string */
        private $encoding;
-       /** @var integer */
+       /** @var int */
        private $baseCacheTTL;
-       /** @var integer */
+       /** @var int */
        private $skewCacheTTL;
-       /** @var integer */
+       /** @var int */
        private $timeout;
 
        /**
@@ -243,7 +243,7 @@ class EtcdConfig implements Config, LoggerAwareInterface {
 
                $info = json_decode( $rbody, true );
                if ( $info === null || !isset( $info['node']['nodes'] ) ) {
-                       return [ null, $rcode, "Unexpected JSON response; missing 'nodes' list.", false ];
+                       return [ null, "Unexpected JSON response; missing 'nodes' list.", false ];
                }
 
                $config = [];