Merge "maintenance: Deprecate Maintenance::hasArg/getArg with no param"

diff --combined RELEASE-NOTES-1.33
index 2b514af,ed8b5f8..7513334
--- 1/RELEASE-NOTES-1.33
--- 2/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@@ -109,7 -109,6 +109,7 @@@ For notes on 1.32.x and older releases
    Content::getNativeData() for text-based content models.
  * (T214706) LinksUpdate::getAddedExternalLinks() and
    LinksUpdate::getRemovedExternalLinks() were introduced.
 +* (T213893) Added 'MaintenanceUpdateAddParams' hook
  
  === External library changes in 1.33 ===
  ==== New external libraries ====
@@@ -346,8 -345,6 +346,8 @@@ because of Phabricator reports
    to "Pàgina printzipale". Existing wikis using this content language need to
    move the main page or change the name through MediaWiki:Mainpage page.
  * wfSplitWikiID(), deprecated in 1.32, has been removed.
 +* MessageBlobStore::getBlob(), deprecated in 1.27, has been removed.
 +  Use ::getBlobs() instead.
  
  === Deprecations in 1.33 ===
  * The configuration option $wgUseESI has been deprecated, and is expected
@@@ -412,6 -409,8 +412,8 @@@
    instead. The setTags() method was overriding the tags, addTags() doesn't
    override, only adds new tags.
  * Block::isValid is deprecated, since it is no longer needed in core.
+ * Calling Maintenance::hasArg() as well as Maintenance::getArg() with no
+   parameter has been deprecated. Please pass the argument number 0.
  
  === Other changes in 1.33 ===
  * (T201747) Html::openElement() warns if given an element name with a space

diff --combined maintenance/Maintenance.php
index b3e958f,7430e1e..6e545a6
--- 1/maintenance/Maintenance.php
--- 2/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@@ -54,18 -54,6 +54,18 @@@ use Wikimedia\Rdbms\IMaintainableDataba
   * is the execute() method. See docs/maintenance.txt for more info
   * and a quick demo of how to use it.
   *
 + * Terminology:
 + *   params: registry of named values that may be passed to the script
 + *   arg list: registry of positional values that may be passed to the script
 + *   options: passed param values
 + *   args: passed positional values
 + *
 + * In the command:
 + *   mwscript somescript.php --foo=bar baz
 + * foo is a param
 + * bar is the option value of the option for param foo
 + * baz is the arg value at index 0 in the arg list
 + *
   * @since 1.16
   * @ingroup Maintenance
   */
@@@ -81,13 -69,13 +81,13 @@@ abstract class Maintenance 
        // Const for getStdin()
        const STDIN_ALL = 'all';
  
 -      // This is the desired params
 +      // Array of desired/allowed params
        protected $mParams = [];
  
        // Array of mapping short parameters to long ones
        protected $mShortParamsMap = [];
  
 -      // Array of desired args
 +      // Array of desired/allowed args
        protected $mArgList = [];
  
        // This is the list of options that were actually passed
@@@ -336,6 -324,10 +336,10 @@@
         * @return bool
         */
        protected function hasArg( $argId = 0 ) {
+               if ( func_num_args() === 0 ) {
+                       wfDeprecated( __METHOD__ . ' without an $argId', '1.33' );
+               }
+ 
                return isset( $this->mArgs[$argId] );
        }
  
@@@ -346,6 -338,10 +350,10 @@@
         * @return mixed
         */
        protected function getArg( $argId = 0, $default = null ) {
+               if ( func_num_args() === 0 ) {
+                       wfDeprecated( __METHOD__ . ' without an $argId', '1.33' );
+               }
+ 
                return $this->hasArg( $argId ) ? $this->mArgs[$argId] : $default;
        }
  
@@@ -750,6 -746,7 +758,6 @@@
                }
  
                $this->loadParamsAndArgs();
 -              $this->maybeHelp();
  
                # Set the memory limit
                # Note we need to set it again later in cache LocalSettings changed it
@@@ -769,6 -766,8 +777,6 @@@
                while ( ob_get_level() > 0 ) {
                        ob_end_flush();
                }
 -
 -              $this->validateParamsAndArgs();
        }
  
        /**
@@@ -981,7 -980,7 +989,7 @@@
        /**
         * Run some validation checks on the params, etc
         */
 -      protected function validateParamsAndArgs() {
 +      public function validateParamsAndArgs() {
                $die = false;
                # Check to make sure we've got all the required options
                foreach ( $this->mParams as $opt => $info ) {
@@@ -1007,7 -1006,9 +1015,7 @@@
                        }
                }
  
 -              if ( $die ) {
 -                      $this->maybeHelp( true );
 -              }
 +              $this->maybeHelp( $die );
        }
  
        /**