jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370866 )

Change subject: Composer fix changes
......................................................................


Composer fix changes

Bug: T172933
Change-Id: I6e4688dcf08c4a98ebc71b2940772dfc20a5c139
---
M includes/Sanitizer.php
M includes/filerepo/FileRepo.php
M tests/phpunit/includes/specials/SpecialShortpagesTest.php
3 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  WMDE-Fisch: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 907da16..1562288 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -815,7 +815,7 @@
 
                        # Escape HTML id attributes
                        if ( $attribute === 'id' ) {
-                               $value = self::escapeIdForAttribute( $value, 
Sanitizer::ID_PRIMARY );
+                               $value = self::escapeIdForAttribute( $value, 
self::ID_PRIMARY );
                        }
 
                        # Escape HTML id reference lists
@@ -1331,7 +1331,7 @@
         * @return string
         */
        private static function escapeIdInternal( $id, $mode ) {
-               $id = Sanitizer::decodeCharReferences( $id );
+               $id = self::decodeCharReferences( $id );
 
                switch ( $mode ) {
                        case 'html5':
diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index dc36e50..5005280 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -1603,7 +1603,7 @@
                $params = [ 'src' => $path, 'headers' => $headers, 'options' => 
$optHeaders ];
 
                // T172851: HHVM does not flush the output properly, causing OOM
-               ob_start( NULL, 1048576 );
+               ob_start( null, 1048576 );
                ob_implicit_flush( true );
 
                $status = $this->newGood();
diff --git a/tests/phpunit/includes/specials/SpecialShortpagesTest.php 
b/tests/phpunit/includes/specials/SpecialShortpagesTest.php
index 14c692a..a5fb50e 100644
--- a/tests/phpunit/includes/specials/SpecialShortpagesTest.php
+++ b/tests/phpunit/includes/specials/SpecialShortpagesTest.php
@@ -18,7 +18,7 @@
                        'wgShortPagesNamespaceBlacklist' => $blacklistNS,
                        'wgContentNamespaces' => $contentNS
                ] );
-               $this->setTemporaryHook( 'ShortPagesQuery', function() {
+               $this->setTemporaryHook( 'ShortPagesQuery', function () {
                        // empty hook handler
                } );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/370866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e4688dcf08c4a98ebc71b2940772dfc20a5c139
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mepps <me...@wikimedia.org>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Jackmcbarn <jackmcb...@gmail.com>
Gerrit-Reviewer: WMDE-Fisch <christoph.jau...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to