Fix @param tags

* Use 'callable' instead of 'callback'.
* Remove '$' as part of a type name.
* Add missing type.

Change-Id: Ic1b39a7d8cbbee000d8fb2f3a1f71a621bd01993

diff --git a/includes/http/GuzzleHttpRequest.php b/includes/http/GuzzleHttpRequest.php
index ef70467..e6b2892 100644 (file)
--- a/includes/http/GuzzleHttpRequest.php
+++ b/includes/http/GuzzleHttpRequest.php
@@ -95,7 +95,7 @@ class GuzzleHttpRequest extends MWHttpRequest {
         * If a sink is already specified, this does nothing.  This causes the 'sink' constructor
         * option to override the 'callback' constructor option.
         *
-        * @param $callback|null $callback
+        * @param callable|null $callback
         * @throws InvalidArgumentException
         */
        protected function doSetCallback( $callback ) {

diff --git a/includes/http/MWHttpRequest.php b/includes/http/MWHttpRequest.php
index 3b56f21..065667d 100644 (file)
--- a/includes/http/MWHttpRequest.php
+++ b/includes/http/MWHttpRequest.php
@@ -333,7 +333,7 @@ abstract class MWHttpRequest implements LoggerAwareInterface {
         * Worker function for setting callbacks.  Calls can originate both internally and externally
         * via setCallback).  Defaults to the internal read callback if $callback is null.
         *
-        * @param $callback|null $callback
+        * @param callable|null $callback
         * @throws InvalidArgumentException
         */
        protected function doSetCallback( $callback ) {

diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php
index 00a08a7..7d40d8c 100644 (file)
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -912,7 +912,7 @@ class OutputPageTest extends MediaWikiTestCase {
         * @param array $args Array of form [ category name => sort key ]
         * @param array $fakeResults Array of form [ category name => value to return from mocked
         *   LinkBatch ]
-        * @param callback $variantLinkCallback Callback to replace findVariantLink() call
+        * @param callable $variantLinkCallback Callback to replace findVariantLink() call
         * @param array $expectedNormal Expected return value of getCategoryLinks['normal']
         * @param array $expectedHidden Expected return value of getCategoryLinks['hidden']
         */

diff --git a/tests/phpunit/includes/Revision/MutableRevisionSlotsTest.php b/tests/phpunit/includes/Revision/MutableRevisionSlotsTest.php
index 7279e64..0e565e5 100644 (file)
--- a/tests/phpunit/includes/Revision/MutableRevisionSlotsTest.php
+++ b/tests/phpunit/includes/Revision/MutableRevisionSlotsTest.php
@@ -31,7 +31,7 @@ class MutableRevisionSlotsTest extends RevisionSlotsTest {
 
        /**
         * @dataProvider provideConstructorFailue
-        * @param $slots
+        * @param array $slots
         *
         * @covers \MediaWiki\Revision\RevisionSlots::__construct
         * @covers \MediaWiki\Revision\RevisionSlots::setSlotsInternal

diff --git a/tests/phpunit/includes/Revision/RenderedRevisionTest.php b/tests/phpunit/includes/Revision/RenderedRevisionTest.php
index 43fccee..9665867 100644 (file)
--- a/tests/phpunit/includes/Revision/RenderedRevisionTest.php
+++ b/tests/phpunit/includes/Revision/RenderedRevisionTest.php
@@ -78,8 +78,8 @@ class RenderedRevisionTest extends MediaWikiTestCase {
        }
 
        /**
-        * @param $articleId
-        * @param $revisionId
+        * @param int $articleId
+        * @param int $revisionId
         * @return Title
         */
        private function getMockTitle( $articleId, $revisionId ) {

diff --git a/tests/phpunit/includes/Revision/RevisionRendererTest.php b/tests/phpunit/includes/Revision/RevisionRendererTest.php
index 59b5a2c..071ea68 100644 (file)
--- a/tests/phpunit/includes/Revision/RevisionRendererTest.php
+++ b/tests/phpunit/includes/Revision/RevisionRendererTest.php
@@ -30,8 +30,8 @@ use WikitextContent;
 class RevisionRendererTest extends MediaWikiTestCase {
 
        /**
-        * @param $articleId
-        * @param $revisionId
+        * @param int $articleId
+        * @param int $revisionId
         * @return Title
         */
        private function getMockTitle( $articleId, $revisionId ) {

diff --git a/tests/phpunit/includes/Revision/RevisionSlotsTest.php b/tests/phpunit/includes/Revision/RevisionSlotsTest.php
index d8e7d92..52593ec 100644 (file)
--- a/tests/phpunit/includes/Revision/RevisionSlotsTest.php
+++ b/tests/phpunit/includes/Revision/RevisionSlotsTest.php
@@ -31,7 +31,7 @@ class RevisionSlotsTest extends MediaWikiTestCase {
 
        /**
         * @dataProvider provideConstructorFailue
-        * @param $slots
+        * @param array $slots
         *
         * @covers \MediaWiki\Revision\RevisionSlots::__construct
         * @covers \MediaWiki\Revision\RevisionSlots::setSlotsInternal

diff --git a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
index 3339749..92c6f62 100644 (file)
--- a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
+++ b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
@@ -76,7 +76,7 @@ class DerivedPageDataUpdaterTest extends MediaWikiTestCase {
         * Creates a revision in the database.
         *
         * @param WikiPage $page
-        * @param $summary
+        * @param string|Message|CommentStoreComment $summary
         * @param null|string|Content $content
         *
         * @return RevisionRecord|null

diff --git a/tests/phpunit/includes/Storage/PageUpdaterTest.php b/tests/phpunit/includes/Storage/PageUpdaterTest.php
index 89e1d4e..9d60605 100644 (file)
--- a/tests/phpunit/includes/Storage/PageUpdaterTest.php
+++ b/tests/phpunit/includes/Storage/PageUpdaterTest.php
@@ -241,7 +241,7 @@ class PageUpdaterTest extends MediaWikiTestCase {
         * Creates a revision in the database.
         *
         * @param WikiPage $page
-        * @param $summary
+        * @param string|Message|CommentStoreComment $summary
         * @param null|string|Content $content
         *
         * @return RevisionRecord|null

diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
index d1d1aa3..d739839 100644 (file)
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
@@ -311,8 +311,8 @@ class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
        /**
         * @covers Wikimedia\Rdbms\Subquery
         * @dataProvider provideSelectRowCount
-        * @param $sql
-        * @param $sqlText
+        * @param array $sql
+        * @param string $sqlText
         */
        public function testSelectRowCount( $sql, $sqlText ) {
                $this->database->selectRowCount(

diff --git a/tests/phpunit/includes/media/SvgHandlerTest.php b/tests/phpunit/includes/media/SvgHandlerTest.php
index 9c98ada..bce7ac2 100644 (file)
--- a/tests/phpunit/includes/media/SvgHandlerTest.php
+++ b/tests/phpunit/includes/media/SvgHandlerTest.php
@@ -182,7 +182,7 @@ class SvgHandlerTest extends MediaWikiMediaTestCase {
         * @covers SvgHandler::normaliseParamsInternal()
         * @dataProvider provideNormaliseParamsInternal
         *
-        * @param $message
+        * @param string $message
         * @param int $width
         * @param int $height
         * @param array $params

diff --git a/tests/phpunit/maintenance/categoryChangesAsRdfTest.php b/tests/phpunit/maintenance/categoryChangesAsRdfTest.php
index 2280629..f5a47d5 100644 (file)
--- a/tests/phpunit/maintenance/categoryChangesAsRdfTest.php
+++ b/tests/phpunit/maintenance/categoryChangesAsRdfTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Wikimedia\Rdbms\IDatabase;
+
 /**
  * Tests for CategoryChangesAsRdf recent changes exporter.
  *  @covers CategoryChangesAsRdf
@@ -188,7 +190,7 @@ class CategoryChangesAsRdfTest extends MediaWikiLangTestCase {
 
        /**
         * Mock category links iterator.
-        * @param $dbr
+        * @param IDatabase $dbr
         * @param array $ids
         * @return array
         */