Skip to content
This repository was archived by the owner on Jun 15, 2022. It is now read-only.

Commit b8cb6f3

Browse files
committed
Merge branch 'release/v1.0.0-rc3'
2 parents 74318bd + 0e56eec commit b8cb6f3

16 files changed

+1498
-857
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ indent_style = tab
1515

1616
[{*.json,*.yml}]
1717
indent_style = space
18-
indent_size = 2
18+
indent_size = 4
1919

2020
[{*.txt,wp-config-sample.php}]
2121
end_of_line = crlf

.travis.yml

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,25 @@ cache:
1010
- $HOME/.composer/cache
1111

1212
php:
13+
- 7.4snapshot
1314
- 7.3
1415
- 7.2
1516
- 7.1
1617
- 7.0
1718

19+
# Compatibility policy:
20+
#
21+
# - WordPress: latest -1
22+
# - WooCommerce: latest -2
23+
#
24+
# Note: Since WordPress 5.0+ requires WooCommerce 3.5.1+, we don't need to go back
25+
# to WooCommerce 3.4.x. Once 3.7.x is released,
1826
env:
19-
- WP_VERSION=latest WC_VERSION=latest
20-
- WP_VERSION=4.9.9 WC_VERSION=latest
21-
- WP_VERSION=4.9.9 WC_VERSION=3.4.7
22-
- WP_VERSION=4.9.9 WC_VERSION=3.3.5
23-
- WP_VERSION=4.9.9 WC_VERSION=3.2.6
27+
- WP_VERSION=5.2 WC_VERSION=3.6
28+
- WP_VERSION=5.2 WC_VERSION=3.5
29+
- WP_VERSION=5.1 WC_VERSION=3.6
30+
- WP_VERSION=5.1 WC_VERSION=3.5
2431

25-
# Considerations for the test matrix:
26-
#
27-
# - The "WC Requires At Least" is 3.2.6, so that's the lowest we need to go
28-
# - WordPress < 5.0 doesn't officially support PHP 7.3.
29-
# - WordPress 5.0 requires at least WooCommerce 3.5.1
3032
matrix:
3133
fast_finish: true
3234
include:
@@ -37,23 +39,15 @@ matrix:
3739
php: 7.2
3840
env: WP_VERSION=latest WC_VERSION=latest RUN_CODE_COVERAGE=1
3941
- name: Bleeding Edge
40-
php: 7.3
42+
php: nightly
4143
env: WP_VERSION=trunk WC_VERSION=latest
42-
exclude:
43-
- php: 7.3
44-
env: WP_VERSION=4.9.9 WC_VERSION=latest
45-
- php: 7.3
46-
env: WP_VERSION=4.9.9 WC_VERSION=3.4.7
47-
- php: 7.3
48-
env: WP_VERSION=4.9.9 WC_VERSION=3.3.5
49-
- php: 7.3
50-
env: WP_VERSION=4.9.9 WC_VERSION=3.2.6
5144
allow_failures:
45+
- php: 7.4snapshot
5246
- name: Code Coverage
5347
php: 7.2
5448
env: WP_VERSION=latest WC_VERSION=latest RUN_CODE_COVERAGE=1
5549
- name: Bleeding Edge
56-
php: 7.3
50+
php: nightly
5751
env: WP_VERSION=trunk WC_VERSION=latest
5852

5953
before_script:
@@ -71,7 +65,12 @@ before_script:
7165
fi
7266
- bash tests/bin/install-wp-tests.sh woocommerce_test root '' localhost $WP_VERSION
7367
- bash tests/bin/set-woocommerce-version.sh $WC_VERSION
74-
- composer install --prefer-source
68+
- |
69+
if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then
70+
composer update --prefer-source --prefer-lowest --no-interaction --no-ansi
71+
else
72+
composer install --prefer-source --no-interaction --no-ansi
73+
fi
7574
7675
script:
7776
- |

CHANGELOG.md

Lines changed: 59 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8+
## [Version 1.0.0 (Release Candidate 3)] - 2019-07-24
9+
10+
* Ensure the orders query is adjusted as late as possible ([#126]).
11+
* Update the plugin license to GPLv3+ to match WooCommerce core ([#123]).
12+
* Define the compatibility policy for the plugin with regards to WordPress, WooCommerce, and PHP versions ([#120], [#127]).
13+
* Introduce PHPStan for static code analysis ([#116], [#117], props @szepeviktor).
14+
* Refresh and update Composer configuration and dependencies ([#121], [#124]).
15+
816
## [Version 1.0.0 (Release Candidate 2)] - 2018-12-14
917

1018
* Reduced overhead of PHP autoloader ([#86], props @schlessera).
@@ -57,45 +65,54 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
5765
* Initial public release of the plugin in a beta state.
5866

5967

60-
[Unreleased]: https://github.com/liquidweb/woocommerce-order-tables/compare/master...develop
61-
[Version 1.0.0 (Release Candidate 2)]: https://github.com/liquidweb/woocommerce-order-tables/releases/tag/v1.0.0-rc2
62-
[Version 1.0.0 (Release Candidate)]: https://github.com/liquidweb/woocommerce-order-tables/releases/tag/v1.0.0-rc1
63-
[Version 1.0.0 (Beta 3)]: https://github.com/liquidweb/woocommerce-order-tables/releases/tag/v1.0.0-beta.3
64-
[Version 1.0.0 (Beta 2)]: https://github.com/liquidweb/woocommerce-order-tables/releases/tag/v1.0.0-beta.2
65-
[Version 1.0.0 (Beta 1)]: https://github.com/liquidweb/woocommerce-order-tables/releases/tag/v1.0.0-beta.1
66-
[#2]: https://github.com/liquidweb/woocommerce-order-tables/pull/2
67-
[#5]: https://github.com/liquidweb/woocommerce-order-tables/pull/5
68-
[#8]: https://github.com/liquidweb/woocommerce-order-tables/pull/8
69-
[#9]: https://github.com/liquidweb/woocommerce-order-tables/pull/9
70-
[#12]: https://github.com/liquidweb/woocommerce-order-tables/pull/12
71-
[#15]: https://github.com/liquidweb/woocommerce-order-tables/pull/15
72-
[#26]: https://github.com/liquidweb/woocommerce-order-tables/pull/26
73-
[#28]: https://github.com/liquidweb/woocommerce-order-tables/pull/28
74-
[#35]: https://github.com/liquidweb/woocommerce-order-tables/pull/35
75-
[#36]: https://github.com/liquidweb/woocommerce-order-tables/pull/36
76-
[#38]: https://github.com/liquidweb/woocommerce-order-tables/pull/38
77-
[#43]: https://github.com/liquidweb/woocommerce-order-tables/issues/43
78-
[#46]: https://github.com/liquidweb/woocommerce-order-tables/pull/46
79-
[#50]: https://github.com/liquidweb/woocommerce-order-tables/pull/50
80-
[#51]: https://github.com/liquidweb/woocommerce-order-tables/pull/51
81-
[#52]: https://github.com/liquidweb/woocommerce-order-tables/pull/52
82-
[#53]: https://github.com/liquidweb/woocommerce-order-tables/pull/53
83-
[#60]: https://github.com/liquidweb/woocommerce-order-tables/pull/60
84-
[#61]: https://github.com/liquidweb/woocommerce-order-tables/pull/61
85-
[#64]: https://github.com/liquidweb/woocommerce-order-tables/pull/64
86-
[#65]: https://github.com/liquidweb/woocommerce-order-tables/pull/65
87-
[#72]: https://github.com/liquidweb/woocommerce-order-tables/pull/72
88-
[#78]: https://github.com/liquidweb/woocommerce-order-tables/pull/78
89-
[#79]: https://github.com/liquidweb/woocommerce-order-tables/pull/79
90-
[#80]: https://github.com/liquidweb/woocommerce-order-tables/pull/80
91-
[#81]: https://github.com/liquidweb/woocommerce-order-tables/pull/81
92-
[#82]: https://github.com/liquidweb/woocommerce-order-tables/pull/82
93-
[#84]: https://github.com/liquidweb/woocommerce-order-tables/pull/84
94-
[#86]: https://github.com/liquidweb/woocommerce-order-tables/pull/86
95-
[#87]: https://github.com/liquidweb/woocommerce-order-tables/pull/87
96-
[#88]: https://github.com/liquidweb/woocommerce-order-tables/pull/88
97-
[#91]: https://github.com/liquidweb/woocommerce-order-tables/pull/91
98-
[#94]: https://github.com/liquidweb/woocommerce-order-tables/pull/94
99-
[#101]: https://github.com/liquidweb/woocommerce-order-tables/pull/101
100-
[#103]: https://github.com/liquidweb/woocommerce-order-tables/pull/103
101-
[#104]: https://github.com/liquidweb/woocommerce-order-tables/pull/104
68+
[Unreleased]: https://github.com/liquidweb/woocommerce-custom-orders-table/compare/master...develop
69+
[Version 1.0.0 (Release Candidate 3)]: https://github.com/liquidweb/woocommerce-custom-orders-table/releases/tag/v1.0.0-rc3
70+
[Version 1.0.0 (Release Candidate 2)]: https://github.com/liquidweb/woocommerce-custom-orders-table/releases/tag/v1.0.0-rc2
71+
[Version 1.0.0 (Release Candidate)]: https://github.com/liquidweb/woocommerce-custom-orders-table/releases/tag/v1.0.0-rc1
72+
[Version 1.0.0 (Beta 3)]: https://github.com/liquidweb/woocommerce-custom-orders-table/releases/tag/v1.0.0-beta.3
73+
[Version 1.0.0 (Beta 2)]: https://github.com/liquidweb/woocommerce-custom-orders-table/releases/tag/v1.0.0-beta.2
74+
[Version 1.0.0 (Beta 1)]: https://github.com/liquidweb/woocommerce-custom-orders-table/releases/tag/v1.0.0-beta.1
75+
[#2]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/2
76+
[#5]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/5
77+
[#8]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/8
78+
[#9]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/9
79+
[#12]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/12
80+
[#15]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/15
81+
[#26]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/26
82+
[#28]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/28
83+
[#35]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/35
84+
[#36]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/36
85+
[#38]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/38
86+
[#43]: https://github.com/liquidweb/woocommerce-custom-orders-table/issues/43
87+
[#46]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/46
88+
[#50]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/50
89+
[#51]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/51
90+
[#52]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/52
91+
[#53]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/53
92+
[#60]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/60
93+
[#61]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/61
94+
[#64]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/64
95+
[#65]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/65
96+
[#72]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/72
97+
[#78]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/78
98+
[#79]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/79
99+
[#80]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/80
100+
[#81]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/81
101+
[#82]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/82
102+
[#84]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/84
103+
[#86]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/86
104+
[#87]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/87
105+
[#88]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/88
106+
[#91]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/91
107+
[#94]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/94
108+
[#101]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/101
109+
[#103]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/103
110+
[#104]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/104
111+
[#116]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/116
112+
[#117]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/117
113+
[#120]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/120
114+
[#121]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/121
115+
[#123]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/123
116+
[#124]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/124
117+
[#126]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/126
118+
[#127]: https://github.com/liquidweb/woocommerce-custom-orders-table/pull/127

CONTRIBUTING.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,23 @@ If you're interested in contributing to the plugin by way of code and/or documen
2626

2727
This project adheres to the [WordPress coding standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/), and [an `.editorconfig` file](http://editorconfig.org/) is included in the repository to help most <abbr title="Integrated Development Environment">IDE</abbr>s adjust accordingly. The repository also ships with [the WooCommerce git hooks](https://github.com/woocommerce/woocommerce-git-hooks) to aid in development.
2828

29-
As a general rule, we strive to maintain 100% compatibility with [the latest stable release of WooCommerce](https://github.com/woocommerce/woocommerce/releases/latest):
29+
### Compatibility policy
30+
31+
WooCommerce Custom Orders Table is designed to take advantage of the latest and greatest versions of WordPress and WooCommerce. Keeping both WordPress and WooCommerce up-to-date ensures that stores are able to take advantage of the latest WooCommerce features and security fixes.
3032

3133
[![GitHub release](https://img.shields.io/github/release/woocommerce/woocommerce.svg)](https://github.com/woocommerce/woocommerce/releases/latest)
3234

33-
As part of this commitment to compatibility, WooCommerce Custom Orders Table also targets PHP 5.2 as a minimum PHP version for the core plugin files (with the exception of the `WooCommerce_Custom_Orders_Table_CLI` class, which uses the WP-CLI minimum of PHP 5.3). The `tests/` directory, however, is accepting of modern (7.x) PHP.
35+
As such, the backwards compatibility policy for WooCommerce Custom Orders Table is:
36+
37+
* The plugin must be compatible with two latest **major** versions of WordPress core (e.g. If the current release of WordPress is 5.2.x, the plugin must be compatible with 5.2.x and 5.1.x).
38+
* The plugin must be compatible with the three latest **minor** releases of WooCommerce.
39+
- WooCommerce 3.0 switched to [semantic versioning](https://woocommerce.wordpress.com/2017/03/13/important-update-regarding-the-upcoming-woocommerce-release-2-7-will-be-3-0-0/), so if WooCommerce 3.7.x is current, the plugin must also be compatible with 3.6.x and 3.5.x.
40+
* In the case that a WordPress release requires a specific version of WooCommerce (for example, WordPress 5.0 requires WooCommerce 3.5.1 or higher), the WordPress compatibility will supersede the WooCommerce compatibility requirement.
41+
* Compatibility will be based on the latest **patch** releases of both WordPress and WooCommerce (e.g. if WooCommerce 3.6.2 patches a bug in WooCommerce 3.6.1, our 3.6.x commitment will be 3.6.2 or newer).
42+
43+
As part of this commitment to compatibility, WooCommerce Custom Orders Table will continue to target PHP 5.2 as a minimum PHP version for the core plugin files (with the exception of the `WooCommerce_Custom_Orders_Table_CLI` class, which uses the WP-CLI minimum of PHP 5.3) until WordPress 5.3 is released. At that point, we'll be able to drop support for WordPress 5.1 and, as a result, PHP versions prior to 5.6.
44+
45+
The `tests/` directory, however, is accepting of modern (7.x) PHP.
3446

3547

3648
### Branching strategy
@@ -54,6 +66,8 @@ WooCommerce Custom Orders Table extends WooCommerce's own test suite (which uses
5466

5567
When submitting pull requests, please include relevant tests for your new features and bug-fixes. This helps prevent regressions in future iterations of the plugin, and helps instill confidence in store owners using this to enhance their WooCommerce stores.
5668

69+
Please note that WooCommerce's `master` branch will occasionally include failing tests, which should *not* be treated as a blocker for merging pull requests on this repo as long as the failing tests are within the "core" test suite **and** the same tests are failing against WooCommerce's `master` branch](https://travis-ci.org/woocommerce/woocommerce).
70+
5771
#### Test coverage
5872

5973
[![Coverage Status](https://coveralls.io/repos/github/liquidweb/woocommerce-custom-orders-table/badge.svg?branch=develop)](https://coveralls.io/github/liquidweb/woocommerce-custom-orders-table?branch=develop)

0 commit comments

Comments
 (0)