Composer fix changes

Bug: T172933
Change-Id: I6e4688dcf08c4a98ebc71b2940772dfc20a5c139

diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 907da16..1562288 100644 (file)
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -815,7 +815,7 @@ class Sanitizer {
 
                        # 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 @@ class Sanitizer {
         * @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 (file)
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -1603,7 +1603,7 @@ class FileRepo {
                $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 (file)
--- a/tests/phpunit/includes/specials/SpecialShortpagesTest.php
+++ b/tests/phpunit/includes/specials/SpecialShortpagesTest.php
@@ -18,7 +18,7 @@ class SpecialShortpagesTest extends MediaWikiTestCase {
                        'wgShortPagesNamespaceBlacklist' => $blacklistNS,
                        'wgContentNamespaces' => $contentNS
                ] );
-               $this->setTemporaryHook( 'ShortPagesQuery', function() {
+               $this->setTemporaryHook( 'ShortPagesQuery', function () {
                        // empty hook handler
                } );