jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398699 )
Change subject: Add minus-x to composer test and fix
..
Add minus-x to composer test and fix
Bug: T175794
Change-Id: I147dd43011820835c8a292a1acac1052912393ee
---
M SpecialUserPageViewTracker.php
M UserPageViewTracker.php
M UserPageViewTracker.sql
M composer.json
4 files changed, 9 insertions(+), 4 deletions(-)
Approvals:
Reedy: Looks good to me, approved
D3r1ck01: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/SpecialUserPageViewTracker.php b/SpecialUserPageViewTracker.php
old mode 100755
new mode 100644
diff --git a/UserPageViewTracker.php b/UserPageViewTracker.php
old mode 100755
new mode 100644
diff --git a/UserPageViewTracker.sql b/UserPageViewTracker.sql
old mode 100755
new mode 100644
index a91d272..be185c6
--- a/UserPageViewTracker.sql
+++ b/UserPageViewTracker.sql
@@ -13,6 +13,6 @@
p.page_title AS page_title,
v.hits AS hits,
v.last AS last
-FROM (/*_*/user u JOIN /*_*/page p) JOIN /*_*/user_page_views v
+FROM (/*_*/user u JOIN /*_*/page p) JOIN /*_*/user_page_views v
WHERE u.user_id = v.user_id AND p.page_id = v.page_id
-ORDER BY u.user_id, v.hits DESC;
\ No newline at end of file
+ORDER BY u.user_id, v.hits DESC;
diff --git a/composer.json b/composer.json
index aebd773..7d306d5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,16 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "jakub-onderka/php-console-highlighter": "0.3.2"
+ "jakub-onderka/php-console-highlighter": "0.3.2",
+ "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
- "parallel-lint . --exclude vendor --exclude
node_modules"
+ "parallel-lint . --exclude vendor --exclude
node_modules",
+ "minus-x check ."
+ ],
+ "fix": [
+ "minus-x fix ."
]
}
}
--
To view, visit https://gerrit.wikimedia.org/r/398699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I147dd43011820835c8a292a1acac1052912393ee
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/UserPageViewTracker
Gerrit-Branch: master
Gerrit-Owner: Albert221
Gerrit-Reviewer: Albert221
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: D3r1ck01
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
