From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 13 Apr 2019 23:49:50 +0000 (+0000)
Subject: Merge "Fix a couple of Generic.Files.OneObjectStructurePerFile.MultipleFound in api"
X-Git-Tag: 1.34.0-rc.0~2008
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27user%27%2C%20userid=session.user.id%29%20%7D%7D?a=commitdiff_plain;h=7cb562ce7963eed39ac262d407574e190debcb30;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix a couple of Generic.Files.OneObjectStructurePerFile.MultipleFound in api"
---

7cb562ce7963eed39ac262d407574e190debcb30
diff --cc .phpcs.xml
index df80740725,3a5b95c3f5..501f438c58
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@@ -207,10 -208,9 +207,8 @@@
  		<exclude-pattern>*/includes/api/ApiErrorFormatter\.php</exclude-pattern>
  		<exclude-pattern>*/includes/api/ApiImport\.php</exclude-pattern>
  		<exclude-pattern>*/includes/api/ApiMessage\.php</exclude-pattern>
- 		<exclude-pattern>*/includes/api/ApiOpenSearch\.php</exclude-pattern>
- 		<exclude-pattern>*/includes/api/ApiRsd\.php</exclude-pattern>
  		<exclude-pattern>*/includes/compat/XMPReader\.php</exclude-pattern>
  		<exclude-pattern>*/includes/diff/DairikiDiff\.php</exclude-pattern>
 -		<exclude-pattern>*/includes/Feed\.php</exclude-pattern>
  		<exclude-pattern>*/includes/filerepo/file/LocalFile\.php</exclude-pattern>
  		<exclude-pattern>*/includes/htmlform/HTMLFormElement\.php</exclude-pattern>
  		<exclude-pattern>*/includes/libs/filebackend/FileBackendStore\.php</exclude-pattern>