Merge "Fix issues identified by SpaceBeforeSingleLineComment sniff"

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 194adb0..10dfa77 100644 (file)
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -375,6 +375,8 @@ abstract class Installer {
                        CACHE_DB => $emptyCache,
                        CACHE_ANYTHING => $emptyCache,
                        CACHE_MEMCACHED => $emptyCache,
+                       // Set hash object cache (e.g. used in ResourceLoader LESS caching) - bug T113843
+                       'hash' => array( 'class' => 'HashBagOStuff' ),
                );
 
                // Load the installer's i18n.

diff --git a/phpcs.xml b/phpcs.xml
index f76e0e4..0d44426 100644 (file)
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -7,6 +7,8 @@
                <exclude name="MediaWiki.NamingConventions.PrefixedGlobalFunctions.wfPrefix"/>
                <exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
                <exclude name="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed"/>
+               <exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment"/>
+               <exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.EmptyComment"/>
        </rule>
        <rule ref="MediaWiki.NamingConventions.PrefixedGlobalFunctions">
                <properties>