Skip to content

Commit e1e25c9

Browse files
JDGrimesJDGrimes
authored
Merge pull request #21 from WordPoints/develop
1.0.2
2 parents e5c771a + bf9ad0b commit e1e25c9

40 files changed

+702
-523
lines changed

‎.travis.yml‎

Lines changed: 45 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,74 @@
1-
# Travis CI configuration file for a WordPoints module.
1+
# Travis CI configuration file for a WordPoints extension.
22

33
language: php
44

5-
# 5.3 runs first so that we can fail fast on the codesniff pass (see below).
65
php:
7-
- 5.3
8-
- 5.2
9-
- 5.4
10-
- 5.5
11-
- 5.6
12-
- 7.0
6+
- 7.2
137
- 7.1
8+
- 7.0
9+
- 5.6
10+
- 5.5
11+
- 5.4
1412

1513
env:
1614
- TRAVISCI_RUN=codesniff
1715
- TRAVISCI_RUN=phpunit WP_VERSION=develop WORDPOINTS_VERSION=develop
18-
- TRAVISCI_RUN=phpunit WP_VERSION=develop WORDPOINTS_VERSION=master
16+
- TRAVISCI_RUN=phpunit WP_VERSION=4.8 WORDPOINTS_VERSION=develop
1917
- TRAVISCI_RUN=phpunit WP_VERSION=4.7 WORDPOINTS_VERSION=develop
20-
- TRAVISCI_RUN=phpunit WP_VERSION=4.7 WORDPOINTS_VERSION=master
21-
- TRAVISCI_RUN=phpunit WP_VERSION=4.6 WORDPOINTS_VERSION=master
18+
19+
dist: trusty
2220

2321
sudo: false
2422

23+
addons:
24+
apt:
25+
packages:
26+
# Needed for `xmllint`.
27+
- libxml2-utils
28+
2529
matrix:
2630
include:
31+
# Use Ubuntu Precise because Trusty doesn't support PHP 5.2 or 5.3.
32+
- php: 5.3
33+
dist: precise
34+
env: TRAVISCI_RUN=phpunit WP_VERSION=develop WORDPOINTS_VERSION=develop
35+
- php: 5.3
36+
dist: precise
37+
env: TRAVISCI_RUN=phpunit WP_VERSION=4.8 WORDPOINTS_VERSION=develop
38+
- php: 5.3
39+
dist: precise
40+
env: TRAVISCI_RUN=phpunit WP_VERSION=4.7 WORDPOINTS_VERSION=develop
41+
- php: 5.2
42+
dist: precise
43+
env: TRAVISCI_RUN=phpunit WP_VERSION=develop WORDPOINTS_VERSION=develop
44+
- php: 5.2
45+
dist: precise
46+
env: TRAVISCI_RUN=phpunit WP_VERSION=4.8 WORDPOINTS_VERSION=develop
47+
- php: 5.2
48+
dist: precise
49+
env: TRAVISCI_RUN=phpunit WP_VERSION=4.7 WORDPOINTS_VERSION=develop
2750
# Only run nightly against trunk.
2851
- php: nightly
2952
env: TRAVISCI_RUN=phpunit WP_VERSION=develop
3053
exclude:
31-
# The codesniff pass only needs to be run once, I chose PHP 5.3, since WPCS requires it.
32-
- php: 5.2
33-
env: TRAVISCI_RUN=codesniff
34-
- php: 5.4
54+
# The codesniff pass only needs to be run once.
55+
- php: 7.2
3556
env: TRAVISCI_RUN=codesniff
36-
- php: 5.5
57+
- php: 7.0
3758
env: TRAVISCI_RUN=codesniff
3859
- php: 5.6
3960
env: TRAVISCI_RUN=codesniff
40-
- php: 7.0
61+
- php: 5.5
4162
env: TRAVISCI_RUN=codesniff
42-
- php: 7.1
63+
- php: 5.4
4364
env: TRAVISCI_RUN=codesniff
44-
- php: 7.1
45-
env: TRAVISCI_RUN=phpunit WP_VERSION=4.6 WORDPOINTS_VERSION=master
4665
allow_failures:
4766
- php: nightly
67+
- php: 7.2
4868
fast_finish: true
4969

5070
before_script:
51-
- export WORDPOINTS_PROJECT_TYPE=module
71+
- export WORDPOINTS_PROJECT_TYPE=extension
5272
- export DEV_LIB_PATH=dev-lib
5373
- if [ -e .wordpoints-dev-lib-config.sh ]; then source .wordpoints-dev-lib-config.sh; fi
5474
- source $DEV_LIB_PATH/travis/before_script.sh
@@ -58,6 +78,7 @@ script:
5878
- codesniff-php-autoloaders
5979
- codesniff-phpcs
6080
- codesniff-strings
81+
- codesniff-dittography
6182
- codesniff-jshint
6283
- codesniff-l10n
6384
- codesniff-xmllint
@@ -69,9 +90,9 @@ script:
6990
- phpunit-uninstall
7091
- phpunit-ms-uninstall
7192
- phpunit-ms-network-uninstall
72-
- WORDPOINTS_ONLY_UNINSTALL_MODULE=1 phpunit-uninstall
73-
- WORDPOINTS_ONLY_UNINSTALL_MODULE=1 phpunit-ms-uninstall
74-
- WORDPOINTS_ONLY_UNINSTALL_MODULE=1 phpunit-ms-network-uninstall
93+
- WORDPOINTS_ONLY_UNINSTALL_EXTENSION=1 phpunit-uninstall
94+
- WORDPOINTS_ONLY_UNINSTALL_EXTENSION=1 phpunit-ms-uninstall
95+
- WORDPOINTS_ONLY_UNINSTALL_EXTENSION=1 phpunit-ms-network-uninstall
7596
- phpunit-ajax
7697
- phpunit-ms-ajax
7798
- phpunit-ms-network-ajax

‎.wp-l10n-validator-cache.json‎

Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"files": {
33
"\/classes\/admin\/screen.php": {
4-
"size": 5339,
5-
"hash": "0a9f21a2910458413471562654d0d147",
4+
"size": 5342,
5+
"hash": "f526425d0285629b40882ba391ce8297",
66
"errors": false
77
},
88
"\/classes\/block\/logs\/query.php": {
9-
"size": 5437,
10-
"hash": "68e5962b273393c272bc4c520a8fc97b",
9+
"size": 5450,
10+
"hash": "c44b087804d3fe6acfb5399476099e19",
1111
"errors": false
1212
},
1313
"\/classes\/block\/type\/week\/in\/seconds.php": {
@@ -21,23 +21,28 @@
2121
"errors": false
2222
},
2323
"\/classes\/blocks\/query.php": {
24-
"size": 4793,
25-
"hash": "a23271db968f8f57fc5f679a3eddfb48",
24+
"size": 4881,
25+
"hash": "447c01ee0543b8bcd22a8b140b3cbc66",
2626
"errors": false
2727
},
2828
"\/classes\/index.php": {
29-
"size": 1483,
30-
"hash": "a1d4189c31597e0a76312177e59347cd",
29+
"size": 1551,
30+
"hash": "28409102dc4ffa6631b37349ddf919d8",
31+
"errors": false
32+
},
33+
"\/classes\/installable.php": {
34+
"size": 2639,
35+
"hash": "f357d7e1a7edc05e06a33809967c9081",
3136
"errors": false
3237
},
3338
"\/classes\/points\/logs\/query.php": {
34-
"size": 3126,
35-
"hash": "1dc22d253765cd7a08c27321b0901f76",
39+
"size": 3127,
40+
"hash": "7eb6595dcb59caeee58319e9a6435c06",
3641
"errors": false
3742
},
3843
"\/classes\/query\/cache\/flusher.php": {
39-
"size": 6119,
40-
"hash": "a550434c3134f607e406b900b0c47a40",
44+
"size": 6122,
45+
"hash": "d1e4c60cb6fa96644240e222fbb642fe",
4146
"errors": false
4247
},
4348
"\/classes\/query\/cache\/index.php": {
@@ -56,13 +61,13 @@
5661
"errors": false
5762
},
5863
"\/classes\/query\/signatures\/query.php": {
59-
"size": 2838,
60-
"hash": "0f1f46a130d11cc656f3ccc7b638bb1b",
64+
"size": 2841,
65+
"hash": "0db29541c22f71c4a803c4015b8a0006",
6166
"errors": false
6267
},
6368
"\/classes\/query.php": {
64-
"size": 28413,
65-
"hash": "42585b5f899b5f9bb1d7aa7e380711d9",
69+
"size": 28416,
70+
"hash": "2049cd4f23afadc2739eb7961806a386",
6671
"errors": false
6772
},
6873
"\/classes\/shortcode\/dynamic.php": {
@@ -76,50 +81,50 @@
7681
"errors": false
7782
},
7883
"\/classes\/table.php": {
79-
"size": 6921,
80-
"hash": "f59df6c3b260f81bbcdebdb0713b57e7",
84+
"size": 7389,
85+
"hash": "1e5b5a0d6738d3b44567645d318e15ce",
8186
"errors": false
8287
},
8388
"\/classes\/widget\/dynamic.php": {
84-
"size": 8059,
85-
"hash": "df0bd3b5357fa57020808175bb308ce2",
89+
"size": 8068,
90+
"hash": "b8753472fbfb9619dcbc6560cce4c53d",
8691
"errors": false
8792
},
8893
"\/classes\/widget\/fixed.php": {
89-
"size": 6108,
90-
"hash": "bce74c643d9a6596dcd6b3e7e13bd347",
94+
"size": 6117,
95+
"hash": "6ac00e97bac2393e02d6f24ba48eaae7",
9196
"errors": false
9297
},
9398
"\/includes\/actions.php": {
94-
"size": 1458,
95-
"hash": "91de7f1b00a5100a607b473c2f502c30",
99+
"size": 1994,
100+
"hash": "7595278eb64818f9cbc70acb8b021078",
96101
"errors": false
97102
},
98103
"\/includes\/admin\/actions.php": {
99-
"size": 358,
100-
"hash": "655592b33fb498686ecbe3420dba9cd7",
104+
"size": 361,
105+
"hash": "628d634b34beb5829115dc676c30bea1",
101106
"errors": false
102107
},
103108
"\/includes\/admin\/functions.php": {
104-
"size": 951,
105-
"hash": "572df6255c9c059000990983113b1acf",
109+
"size": 954,
110+
"hash": "11167f3e9114e797414e3956cceba344",
106111
"errors": false
107112
},
108113
"\/includes\/class-un-installer.php": {
109-
"size": 3202,
110-
"hash": "c5832dc39fe0c96d3298d245016db828",
114+
"size": 1400,
115+
"hash": "c0cad65c2bf0526b038eed4df5f5ac6d",
111116
"errors": false
112117
},
113118
"\/includes\/functions.php": {
114-
"size": 9612,
115-
"hash": "81dee6d8b58b389a918203e266fe805f",
119+
"size": 10597,
120+
"hash": "140f9d0b665a1fa7b14d139a5308654f",
116121
"errors": false
117122
},
118123
"\/top-users-in-period.php": {
119-
"size": 2294,
120-
"hash": "71e35bfe71d90b653c4899db99790ba3",
124+
"size": 2328,
125+
"hash": "ca1cac4ca3d2f2f67fe82fef3cec68c7",
121126
"errors": false
122127
}
123128
},
124-
"config_signature": "d93b426b7dd4c1f5fb79a589f4764256"
129+
"config_signature": "b7a75c2cff2b0da49d61ef47b3882db1"
125130
}

‎.wp-l10n-validator-ignores-cache.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"limit": {
121121
"831": false
122122
},
123-
"start": {
123+
"offset": {
124124
"832": false
125125
},
126126
"order": {
@@ -147,7 +147,7 @@
147147
},
148148
"\/classes\/table.php": {
149149
"striped": {
150-
"278": false
150+
"296": false
151151
}
152152
},
153153
"\/includes\/admin\/functions.php": {
@@ -168,7 +168,7 @@
168168
},
169169
"\/includes\/functions.php": {
170170
"widget-settings": {
171-
"56": {
171+
"55": {
172172
"name": "array",
173173
"type": "unknown",
174174
"args_started": true,
@@ -177,10 +177,10 @@
177177
}
178178
},
179179
"wordpoints-top-users-in-period-": {
180-
"60": false
180+
"59": false
181181
},
182182
"rtl": {
183-
"62": {
183+
"61": {
184184
"name": "$styles->add_data",
185185
"type": "unknown",
186186
"args_started": true,
@@ -189,7 +189,7 @@
189189
}
190190
},
191191
"replace": {
192-
"62": {
192+
"61": {
193193
"name": "$styles->add_data",
194194
"type": "unknown",
195195
"args_started": true,
@@ -198,7 +198,7 @@
198198
}
199199
},
200200
"suffix": {
201-
"65": {
201+
"64": {
202202
"name": "$styles->add_data",
203203
"type": "unknown",
204204
"args_started": true,
@@ -207,8 +207,8 @@
207207
}
208208
},
209209
"UTC": {
210-
"109": false,
211-
"123": {
210+
"108": false,
211+
"122": {
212212
"name": "DateTimeZone::__construct",
213213
"type": "unknown",
214214
"args_started": true,
@@ -217,7 +217,7 @@
217217
}
218218
},
219219
"%+03d:%02d": {
220-
"115": {
220+
"114": {
221221
"name": "sprintf",
222222
"type": "unknown",
223223
"args_started": true,
@@ -226,7 +226,7 @@
226226
}
227227
},
228228
"id": {
229-
"341": {
229+
"366": {
230230
"name": "array",
231231
"type": "unknown",
232232
"args_started": true,

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,26 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a CH
88

99
Nothing documented at this time.
1010

11+
## [1.0.2] - 2017-10-20
12+
13+
### Requires
14+
15+
- WordPoints: 2.4+
16+
17+
### Added
18+
19+
- `wordpoints_top_users_in_period_table_avatar_size` to filter the size of the user avatars in the top users in period table.
20+
21+
### Changed
22+
23+
- Query class to use the `wordpoints_prevent_interruptions()` function rather than duplicating its code.
24+
25+
### Fixed
26+
27+
- Deprecated notices from `Channel`, `Module Name`, and `Module URI` extension headers.
28+
- Deprecated notices during uninstall, by using the new installables API.
29+
- Deprecated notices from queries involving the `start` arg, by using the `offset` arg instead.
30+
1131
## [1.0.1] - 2017-06-01
1232

1333
### Fixed
@@ -46,5 +66,6 @@ Nothing documented at this time.
4666
- Shortcode that displays totals from a dynamic period.
4767

4868
[unreleased]: https://github.com/WordPoints/top-users-in-period/compare/master...HEAD
69+
[1.0.2]: https://github.com/WordPoints/top-users-in-period/compare/1.0.1...1.0.2
4970
[1.0.1]: https://github.com/WordPoints/top-users-in-period/compare/1.0.0...1.0.1
5071
[1.0.0]: https://github.com/WordPoints/top-users-in-period/compare/...1.0.0

0 commit comments

Comments
 (0)