From: Erik Bernhardson <ebernhardson@wikimedia.org>
Date: Fri, 8 Jun 2018 21:42:27 +0000 (-0700)
Subject: Resolve required parameter after optional in specials
X-Git-Tag: 1.34.0-rc.0~5137^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=4a1a21591b7b0b0118a6ece37971334fe88bb905;p=lhc%2Fweb%2Fwiklou.git

Resolve required parameter after optional in specials

Change-Id: If2c85d97d68b24fc5cb2bec19804034b994b348d
---

diff --git a/includes/specials/SpecialPrefixindex.php b/includes/specials/SpecialPrefixindex.php
index 3ca3a85307..6848d2cbe3 100644
--- a/includes/specials/SpecialPrefixindex.php
+++ b/includes/specials/SpecialPrefixindex.php
@@ -138,11 +138,11 @@ class SpecialPrefixindex extends SpecialAllPages {
 	}
 
 	/**
-	 * @param int $namespace Default NS_MAIN
+	 * @param int $namespace
 	 * @param string $prefix
 	 * @param string $from List all pages from this name (default false)
 	 */
-	protected function showPrefixChunk( $namespace = NS_MAIN, $prefix, $from = null ) {
+	protected function showPrefixChunk( $namespace, $prefix, $from = null ) {
 		global $wgContLang;
 
 		if ( $from === null ) {
diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php
index 26f4da5f46..4b1b344cbf 100644
--- a/includes/specials/SpecialProtectedpages.php
+++ b/includes/specials/SpecialProtectedpages.php
@@ -92,7 +92,7 @@ class SpecialProtectedpages extends SpecialPage {
 	 *   cascadeOnly, noRedirect
 	 * @return string Input form
 	 */
-	protected function showOptions( $namespace, $type = 'edit', $level, $sizetype,
+	protected function showOptions( $namespace, $type, $level, $sizetype,
 		$size, $filters
 	) {
 		$formDescriptor = [
diff --git a/includes/specials/SpecialProtectedtitles.php b/includes/specials/SpecialProtectedtitles.php
index 2770bc5a4b..00bfba946d 100644
--- a/includes/specials/SpecialProtectedtitles.php
+++ b/includes/specials/SpecialProtectedtitles.php
@@ -112,7 +112,7 @@ class SpecialProtectedtitles extends SpecialPage {
 	 * @return string
 	 * @private
 	 */
-	function showOptions( $namespace, $type = 'edit', $level ) {
+	function showOptions( $namespace, $type, $level ) {
 		$formDescriptor = [
 			'namespace' => [
 				'class' => 'HTMLSelectNamespace',
diff --git a/includes/specials/pagers/ProtectedPagesPager.php b/includes/specials/pagers/ProtectedPagesPager.php
index 3b69698fe7..0d4b5ab92b 100644
--- a/includes/specials/pagers/ProtectedPagesPager.php
+++ b/includes/specials/pagers/ProtectedPagesPager.php
@@ -44,8 +44,8 @@ class ProtectedPagesPager extends TablePager {
 	 * @param bool $noredirect
 	 * @param LinkRenderer $linkRenderer
 	 */
-	function __construct( $form, $conds = [], $type, $level, $namespace,
-		$sizetype = '', $size = 0, $indefonly = false, $cascadeonly = false, $noredirect = false,
+	function __construct( $form, $conds, $type, $level, $namespace,
+		$sizetype, $size, $indefonly, $cascadeonly, $noredirect,
 		LinkRenderer $linkRenderer
 	) {
 		$this->mForm = $form;
diff --git a/includes/specials/pagers/ProtectedTitlesPager.php b/includes/specials/pagers/ProtectedTitlesPager.php
index 8f172f8b55..ed437be5ab 100644
--- a/includes/specials/pagers/ProtectedTitlesPager.php
+++ b/includes/specials/pagers/ProtectedTitlesPager.php
@@ -26,7 +26,7 @@ class ProtectedTitlesPager extends AlphabeticPager {
 
 	public $mForm, $mConds;
 
-	function __construct( $form, $conds = [], $type, $level, $namespace,
+	function __construct( $form, $conds, $type, $level, $namespace,
 		$sizetype = '', $size = 0
 	) {
 		$this->mForm = $form;