Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/366764 )
Change subject: Enable Generic.Formatting.DisallowMultipleStatements.SameLine ...................................................................... Enable Generic.Formatting.DisallowMultipleStatements.SameLine Change-Id: Ie122e9c0c512bb1d1b1ac54853b60e9d57ba1d12 --- M docroot/noc/db.php M phpcs.xml 2 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/64/366764/1 diff --git a/docroot/noc/db.php b/docroot/noc/db.php index 67e546b..b4509b2 100644 --- a/docroot/noc/db.php +++ b/docroot/noc/db.php @@ -11,8 +11,13 @@ } // Mock vars from CommonSettings.php for db-eqiad.php -$wgDBname = $wgDBuser = $wgDBpassword = null; $wmfMasterDatacenter = 'eqiad'; +$wgDBname = null; +$wgDBuser = null; +$wgDBpassword = null; +$wmfMasterDatacenter = 'eqiad'; + define( 'DBO_DEFAULT', 'uniq' ); + require_once '../../wmf-config/db-eqiad.php'; class WmfClusters { diff --git a/phpcs.xml b/phpcs.xml index 5cdcd13..3fdd8a8 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -36,9 +36,6 @@ <rule ref="Generic.Files.LineLength.TooLong"> <severity>0</severity> </rule> - <rule ref="Generic.Formatting.DisallowMultipleStatements.SameLine"> - <severity>0</severity> - </rule> <rule ref="Generic.Formatting.MultipleStatementAlignment.IncorrectWarning"> <severity>0</severity> </rule> -- To view, visit https://gerrit.wikimedia.org/r/366764 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie122e9c0c512bb1d1b1ac54853b60e9d57ba1d12 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy <re...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits