Merge branch 'master' into feature/variation-search

# Conflicts:
#	includes/class-wc-install.php
#	includes/wc-update-functions.php

.codeclimate.yml

@@ -24,7 +24,6 @@ exclude_paths:
 - "includes/api/legacy/"
 - "includes/libraries/"
 - "includes/updates/"
-- "includes/gateways/simplify-commerce/"
 - "includes/shipping/legacy-*"
 - "includes/wc-deprecated-functions.php"
 - "assets/js/accounting/"

.eslintrc

@@ -7,12 +7,16 @@
 	"globals": {
 		"wp": true,
 		"wpApiSettings": true,
-		"wcSettings": true
+		"wcSettings": true,
+		"es6": true
 	},
 	"rules": {
 		"camelcase": 0,
 		"indent": 0,
 		"max-len": [ 2, { "code": 140 } ],
 		"no-console": 1
+	},
+	"parserOptions": {
+		"ecmaVersion": 6
 	}
 }

.scrutinizer.yml

@@ -27,7 +27,6 @@ filter:
     - sample-data/
     - i18n/
     - includes/api/legacy/
-    - includes/gateways/simplify-commerce/includes/
     - includes/legacy/
     - includes/libraries/
     - includes/shipping/legacy-*

.stylelintrc

@@ -1,60 +1,3 @@
 {
-  "rules": {
-    "indentation": "tab",
-    "color-hex-case": "lower",
-    "color-no-invalid-hex": true,
-
-    "function-calc-no-unspaced-operator": true,
-    "function-comma-space-after": "always-single-line",
-    "function-comma-space-before": "never",
-    "function-name-case": "lower",
-    "function-url-quotes": "always",
-    "function-whitespace-after": "always",
-
-    "number-leading-zero": "always",
-    "number-no-trailing-zeros": true,
-    "length-zero-no-unit": true,
-
-    "string-no-newline": true,
-    "string-quotes": "single",
-
-    "unit-case": "lower",
-    "unit-no-unknown": true,
-    "unit-whitelist": ["px", "%", "deg", "ms", "em", "vh", "vw", "rem", "s", "ex", "pt", "cm"],
-
-    "value-list-comma-space-after": "always-single-line",
-    "value-list-comma-space-before": "never",
-
-    "shorthand-property-no-redundant-values": true,
-
-    "property-case": "lower",
-
-    "declaration-block-no-duplicate-properties": [true, { "severity": "warning" } ],
-    "declaration-block-no-ignored-properties": [true, { "severity": "warning" } ],
-    "declaration-block-trailing-semicolon": "always",
-    "declaration-block-single-line-max-declarations": 0,
-    "declaration-block-semicolon-space-before": "never",
-    "declaration-block-semicolon-space-after": "always-single-line",
-    "declaration-block-semicolon-newline-before": "never-multi-line",
-    "declaration-block-semicolon-newline-after": "always-multi-line",
-
-    "block-closing-brace-newline-after": "always",
-    "block-closing-brace-newline-before": "always-multi-line",
-    "block-no-empty": true,
-    "block-opening-brace-newline-after": "always-multi-line",
-    "block-opening-brace-space-before": "always",
-
-    "selector-attribute-brackets-space-inside": "never",
-    "selector-attribute-operator-space-after": "never",
-    "selector-attribute-operator-space-before": "never",
-    "selector-combinator-space-after": "always",
-    "selector-combinator-space-before": "always",
-    "selector-pseudo-class-case": "lower",
-    "selector-pseudo-class-parentheses-space-inside": "always",
-    "selector-pseudo-element-case": "lower",
-    "selector-pseudo-element-colon-notation": "double",
-    "selector-pseudo-element-no-unknown": true,
-    "selector-type-case": "lower",
-    "selector-no-id": [true, { "severity": "warning" } ]
-  }
+  "extends": "stylelint-config-wordpress",
 }

.travis.yml

@@ -13,6 +13,8 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
+  - 7.3
 
 env:
   - WP_VERSION=latest WP_MULTISITE=0
@@ -26,12 +28,18 @@ matrix:
     dist: precise
   - php: 5.2
     dist: precise
-  - php: 7.2
-    env: WP_VERSION=latest WP_MULTISITE=0 RUN_PHPCS=1 RUN_E2E=1
-  - php: 7.1
+  - name: "Coding standard check"
+    php: 7.2
+    env: WP_VERSION=latest WP_MULTISITE=0 RUN_PHPCS=1
+  - name: "e2e tests"
+    php: 7.2
+    env: WP_VERSION=latest WP_MULTISITE=0 RUN_E2E=1
+  - name: "Unit tests code coverage"
+    php: 7.1
     env: WP_VERSION=latest WP_MULTISITE=0 RUN_CODE_COVERAGE=1
-  - php: 7.3
-    env: WP_VERSION=5.0-beta5 WP_MULTISITE=0
+  - name: "WooCommerce unit tests using WordPress nightly"
+    php: 7.3
+    env: WP_VERSION=nightly WP_MULTISITE=0
   allow_failures:
   - php: 7.1
     env: WP_VERSION=latest WP_MULTISITE=0 RUN_CODE_COVERAGE=1
@@ -44,7 +52,7 @@ before_script:
     else
       echo "xdebug.ini does not exist"
     fi
-  - export PATH="$HOME/.composer/vendor/bin:$PATH"
+  - export PATH="$HOME/.config/composer/vendor/bin:$PATH"
   - bash tests/bin/install.sh woocommerce_test root '' localhost $WP_VERSION
   - bash tests/bin/travis.sh before
 

CHANGELOG.txt

@@ -1,5 +1,73 @@
 == Changelog ==
 
+= 3.5.3 - 2018-12-20 =
+* Fix - Fix orders list in the admin after a change introduced in WordPress 5.0.2. #22273
+
+= 3.5.2 - 2018-11-29 =
+* Enhancement - Added compatibility for Twenty Nineteen theme. #21970
+* Update - Prepare WooCommerce for PHP 7.3. #22009
+* Tweak - Updates the signature field type to "password" in PayPal settings for increased security. #21715
+* Tweak - Change the filter name in the /myaccount/lost-password-confirmation.php template to differentiate between other filter with same name and different message. #21829
+* Tweak - Reintroduce Preview button by popular demand with the understanding that the Preview will only work on some product fields. It was removed from pubished products in 3.5.0 to prevent confusion. #21838
+* Tweak - Add tool to systems status tools for running the DB update routine. #21923
+* Tweak - Revert default behavior for `woocommerce_formatted_address_force_country_display` filter to maintain backwards compatibility. #21865
+* Tweak - Update products block notice for WP 5.0. #21930
+* Tweak - Use wp_kses_post instead of esc_html for sanitizing product titles to allow minimal HTML in product titles. #21936
+* Tweak - Use dedicated woocommerce_add_order_again_cart_item to filter cart item data when ordering again. Prevents issues with applying woocommerce_add_cart_item out of context. #21947
+* Tweak - Remove postal code for Angola, São Tomé and Príncipe since they don't use postal codes and update locale info. #21984 #21985 #21987
+* Fix - Metadata with array key of 0 can save properly. #21641
+* Fix - Prevent deleting the default product category via REST API. #21696
+* Fix - Fix 'Table does not exist' messages on System Status Report in multisite. #21706
+* Fix - Add dynamic SSL check to dashboard SSL notice to prevent misdiagnosing that sites aren't set up with SSL. #21738
+* Fix - Don't show escaped HTML in admin order item details for fees. #21769
+* Fix - Don't include draft variable products in on sale product results. #21778
+* Fix - Add woocommerce_hold_stock_minutes check back to stock check in cart/checkout. #21797 #22050
+* Fix - Fix potential undefined index notice on checkout fields when comparing the sort order. #21801
+* Fix - Throw an error when trying to set a variation as the parent of a variation in the CSV importer. #21810
+* Fix - Make "account erasure request" text translatable. #21812
+* Fix - Display notices on Order Pay page. #21821
+* Fix - Fix tax rate uploading by file path. #21831
+* Fix - Make wc_download_log_permission_id constraint creation work better on multisites and multiple sites using the same DB. #21836 #21940
+* Fix - Don't render undecoded HTML entities in variations dimensions. #21844
+* Fix - Do not check for stock when not managing stock or have backorders enabled when paying through the order-pay page. #21849
+* Fix - Apply priority field sorting on additional filters to make it apply on the edit address pages as well. #21856
+* Fix - Fix export and edit of attribute labels with html encoded special characters in product CSV exporter. #21864
+* Fix - Prevent fatal error when rendering plaintext customer invoice email. #21879
+* Fix - Prevent fatal error when delivering webhooks using v3 API. #21921
+* Fix - Prevent undefined variable notice in wc_increase_stock_levels. #21928
+* Fix - Fix overescaping image output on product widget. #21929
+* Fix - Croatian Kuna symbol should be lowercase. #21934
+* Fix - Fixed an error when deleting logged entries when using the 'WC_Log_Handler_DB' handler. #21949
+* Fix - Update ShipStation plugin info so install works through setup wizard. #21953
+* Fix - Use dynamic DB table name in product list table shipping class query. #21954
+* Fix - Log file date/time should be in UTC and not site timezone as per the +00:00:00 string appended to it. #21981
+* Fix - Set customer's country to selling country when only selling to one country and default customer location is 'none'. #21995
+* Fix - Change new account email copy to be compatible with auto-generated accounts. #21999
+* Fix - Correct Aria-Labelledby attribute for quantity selectors. #22000
+* Fix - Show notices on lost password page. #22001
+* Fix - Fix authentication errors when using the REST API with 3rd-party authentication. #22013
+* Fix - Fix issues where potentially not all active plugins were included on the system status report. #22057
+* Fix - Make PDT validation use the same rounding as the IPN validation to prevent erroneous totals mismatch. #21729
+
+= 3.5.1 - 2018-10-31 =
+* Fix - Use CRUD method to get product images to fix custom tables missing images. #21608
+* Fix - Use HTML entity for times sign when outputting dimensions to fix RTL support. #21633
+* Fix - Fix India address format to look nice in the shipping calculator. #21647
+* Fix - Don't default gallery variation images to gallery thumbnail size if flexslider is disabled. #21655
+* Fix - Revert show shipping behavior change to prevent missing shipping line on Cart page. #21658
+* Fix - Removed non-existing WC_Product_Simple->set_date_created_gmt method. #21675
+* Fix - Use correct comment_type when fetching recent reviews for widget. #21689
+* Fix - Do not include strong tags as part of translation string on subscriptions disconnect message. #21690
+* Fix - Make it possible to send webhooks with the v3 API. #21745
+* Fix - Fix get_cart_from_session infinite loop when filters used. #21749
+* Fix - Use array instead of string to define class for address line 2 input on checkout. #21757
+* Fix - Make checkout fields priority work correctly again. #21763
+* Tweak - Remove mentions of deprecated live shipping rates from setup wizard. #21645
+* Tweak- Update product block editor hook for WP 5.0. #21703
+* Tweak - Merged similar strings to reduce number of translateable strings. #21704
+* Tweak - Remove hated "Over to you" text from emails. #21709
+* Tweak - Revert problematiic customer as post author change. #21740
+
 = 3.5.0 - 2018-10-17 =
 * Feature - REST API v3. #20111
 * Feature - Option has been added on the inventory tab of the edit product page to set a low stock threshold for individual products. #20260

Gruntfile.js

@@ -1,6 +1,7 @@
 /* jshint node:true */
 module.exports = function( grunt ) {
 	'use strict';
+	const sass = require( 'node-sass' );
 
 	grunt.initConfig({
 
@@ -22,9 +23,7 @@ module.exports = function( grunt ) {
 				'<%= dirs.js %>/admin/*.js',
 				'!<%= dirs.js %>/admin/*.min.js',
 				'<%= dirs.js %>/frontend/*.js',
-				'!<%= dirs.js %>/frontend/*.min.js',
-				'includes/gateways/simplify-commerce/assets/js/*.js',
-				'!includes/gateways/simplify-commerce/assets/js/*.min.js'
+				'!<%= dirs.js %>/frontend/*.min.js'
 			]
 		},
 
@@ -75,9 +74,13 @@ module.exports = function( grunt ) {
 					'<%= dirs.js %>/jquery-flot/jquery.flot.time.min.js': ['<%= dirs.js %>/jquery-flot/jquery.flot.time.js'],
 					'<%= dirs.js %>/jquery-payment/jquery.payment.min.js': ['<%= dirs.js %>/jquery-payment/jquery.payment.js'],
 					'<%= dirs.js %>/jquery-qrcode/jquery.qrcode.min.js': ['<%= dirs.js %>/jquery-qrcode/jquery.qrcode.js'],
-					'<%= dirs.js %>/jquery-serializejson/jquery.serializejson.min.js': ['<%= dirs.js %>/jquery-serializejson/jquery.serializejson.js'],
+					'<%= dirs.js %>/jquery-serializejson/jquery.serializejson.min.js': [
+						'<%= dirs.js %>/jquery-serializejson/jquery.serializejson.js'
+					],
 					'<%= dirs.js %>/jquery-tiptip/jquery.tipTip.min.js': ['<%= dirs.js %>/jquery-tiptip/jquery.tipTip.js'],
-					'<%= dirs.js %>/jquery-ui-touch-punch/jquery-ui-touch-punch.min.js': ['<%= dirs.js %>/jquery-ui-touch-punch/jquery-ui-touch-punch.js'],
+					'<%= dirs.js %>/jquery-ui-touch-punch/jquery-ui-touch-punch.min.js': [
+						'<%= dirs.js %>/jquery-ui-touch-punch/jquery-ui-touch-punch.js'
+					],
 					'<%= dirs.js %>/prettyPhoto/jquery.prettyPhoto.init.min.js': ['<%= dirs.js %>/prettyPhoto/jquery.prettyPhoto.init.js'],
 					'<%= dirs.js %>/prettyPhoto/jquery.prettyPhoto.min.js': ['<%= dirs.js %>/prettyPhoto/jquery.prettyPhoto.js'],
 					'<%= dirs.js %>/flexslider/jquery.flexslider.min.js': ['<%= dirs.js %>/flexslider/jquery.flexslider.js'],
@@ -112,6 +115,7 @@ module.exports = function( grunt ) {
 		sass: {
 			compile: {
 				options: {
+					implementation: sass,
 					sourceMap: 'none'
 				},
 				files: [{
@@ -260,7 +264,9 @@ module.exports = function( grunt ) {
 			contributors: {
 				command: [
 					'echo "Generating contributor list since <%= fromDate %>"',
-					'./node_modules/.bin/githubcontrib --owner woocommerce --repo woocommerce --fromDate <%= fromDate %> --authToken <%= authToken %> --cols 6 --sortBy contributions --format md --sortOrder desc --showlogin true > contributors.md'
+					'./node_modules/.bin/githubcontrib --owner woocommerce --repo woocommerce --fromDate <%= fromDate %>' +
+					' --authToken <%= authToken %> --cols 6 --sortBy contributions --format md --sortOrder desc' +
+					' --showlogin true > contributors.md'
 				].join( '&&' )
 			}
 		},
@@ -277,7 +283,8 @@ module.exports = function( grunt ) {
 						{
 							config: 'authToken',
 							type: 'input',
-							message: '(optional) Provide a personal access token. This will allow 5000 requests per hour rather than 60 - use if nothing is generated.'
+							message: '(optional) Provide a personal access token.' +
+							' This will allow 5000 requests per hour rather than 60 - use if nothing is generated.'
 						}
 					]
 				}
@@ -298,15 +305,14 @@ module.exports = function( grunt ) {
 			},
 			dist: {
 				src:  [
-					'**/*.php',                                                  // Include all files
-					'!apigen/**',                                                // Exclude apigen/
-					'!includes/api/legacy/**',                                   // Exclude legacy REST API
-					'!includes/gateways/simplify-commerce/includes/Simplify/**', // Exclude simplify commerce SDK
-					'!includes/libraries/**',                                    // Exclude libraries/
-					'!node_modules/**',                                          // Exclude node_modules/
-					'!tests/cli/**',                                             // Exclude tests/cli/
-					'!tmp/**',                                                   // Exclude tmp/
-					'!vendor/**'                                                 // Exclude vendor/
+					'**/*.php', // Include all php files.
+					'!apigen/**',
+					'!includes/api/legacy/**',
+					'!includes/libraries/**',
+					'!node_modules/**',
+					'!tests/cli/**',
+					'!tmp/**',
+					'!vendor/**'
 				]
 			}
 		},

assets/css/activation.scss

@@ -10,12 +10,6 @@ div.woocommerce-message {
 	overflow: hidden;
 	position: relative;
 	border-left-color: #cc99c2 !important;
-	p {
-		max-width: 700px;
-	}
-	p:last-child {
-		max-width: inherit;
-	}
 }
 
 p.woocommerce-actions,
@@ -76,7 +70,6 @@ div.woocommerce-no-shipping-methods-notice {
 	p {
 		position: relative;
 		z-index: 1;
-		max-width: 700px;
 		line-height: 1.5em;
 		margin: 12px 0;