Merge "Updating docs for UserMailer::sendWithPear() which calls $mailer->send()"

diff --git a/includes/LinkTarget.php b/includes/LinkTarget.php
index 1ce5f32..175a839 100644 (file)
--- a/includes/LinkTarget.php
+++ b/includes/LinkTarget.php
@@ -8,29 +8,28 @@
 interface LinkTarget {
 
        /**
-        * Get the namespace index
+        * Get the namespace index.
         *
         * @return int Namespace index
         */
        public function getNamespace();
 
        /**
-        * Get the link fragment (i.e.\ the bit after the #) in text form
+        * Get the link fragment (i.e. the bit after the #) in text form.
         *
         * @return string link fragment
         */
        public function getFragment();
 
        /**
-        * Get the main part with underscores
+        * Get the main part with underscores.
         *
-        * @return string Main part of the link, with underscores (for use in hrf attributes)
+        * @return string Main part of the link, with underscores (for use in href attributes)
         */
        public function getDBkey();
 
        /**
-        * Returns the link in text form,
-        * without namespace prefix or fragment.
+        * Returns the link in text form, without namespace prefix or fragment.
         *
         * This is computed from the DB key by replacing any underscores with spaces.
         *

diff --git a/includes/ListToggle.php b/includes/ListToggle.php
index dfa1763..4733dfb 100644 (file)
--- a/includes/ListToggle.php
+++ b/includes/ListToggle.php
@@ -51,10 +51,11 @@ class ListToggle {
         */
        public function getHTML() {
                // Select: All, None, Invert
-               $links = [];
-               $links[] = $this->checkboxLink( 'all' );
-               $links[] = $this->checkboxLink( 'none' );
-               $links[] = $this->checkboxLink( 'invert' );
+               $links = [
+                       $this->checkboxLink( 'all' ),
+                       $this->checkboxLink( 'none' ),
+                       $this->checkboxLink( 'invert' ),
+               ];
 
                return Html::rawElement( 'div',
                        [

diff --git a/tests/phpunit/includes/utils/UIDGeneratorTest.php b/tests/phpunit/includes/utils/UIDGeneratorTest.php
index 5e99d69..6d7325d 100644 (file)
--- a/tests/phpunit/includes/utils/UIDGeneratorTest.php
+++ b/tests/phpunit/includes/utils/UIDGeneratorTest.php
@@ -79,7 +79,7 @@ class UIDGeneratorTest extends PHPUnit_Framework_TestCase {
                                preg_match( '!^[0-9a-f]{12}1[0-9a-f]{3}[89ab][0-9a-f]{15}$!', $id ),
                                "UID $id has the right format" );
 
-                       $id = UIDGenerator::newRawUUIDv1( UIDGenerator::QUICK_RAND );
+                       $id = UIDGenerator::newRawUUIDv1();
                        $this->assertEquals( true,
                                preg_match( '!^[0-9a-f]{12}1[0-9a-f]{3}[89ab][0-9a-f]{15}$!', $id ),
                                "UID $id has the right format" );