Merge branch 'master' into fix/update-settings-controller

ehabfahmi · Dec 6, 2018 · dc39d26 · dc39d26
2 parents 379f257 + 164758a
commit dc39d26
Show file tree

Hide file tree

Showing 70 changed files with 18 additions and 83 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -44,7 +44,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
 

diff --git a/includes/admin/settings/views/html-keys-edit.php b/includes/admin/settings/views/html-keys-edit.php
@@ -47,7 +47,7 @@
 					);
 					?>
 					<select class="wc-customer-search" id="key_user" data-placeholder="<?php esc_attr_e( 'Search for a user&hellip;', 'woocommerce' ); ?>" data-allow_clear="true">
-						<option value="<?php echo esc_attr( $user_id ); ?>" selected="selected"><?php echo esc_html( $user_string ); ?><option>
+						<option value="<?php echo esc_attr( $user_id ); ?>" selected="selected"><?php echo esc_html( $user_string ); ?></option>
 					</select>
 				</td>
 			</tr>

diff --git a/includes/class-wc-product-factory.php b/includes/class-wc-product-factory.php
@@ -20,7 +20,7 @@ class WC_Product_Factory {
 	 *
 	 * @param mixed $product_id WC_Product|WP_Post|int|bool $product Product instance, post instance, numeric or false to use global $post.
 	 * @param array $deprecated Previously used to pass arguments to the factory, e.g. to force a type.
-	 * @return WC_Product|bool Product object or null if the product cannot be loaded.
+	 * @return WC_Product|bool Product object or false if the product cannot be loaded.
 	 */
 	public function get_product( $product_id = false, $deprecated = array() ) {
 		$product_id = $this->get_product_id( $product_id );

diff --git a/templates/auth/footer.php b/templates/auth/footer.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates/Auth
  * @version 2.4.0
  */

diff --git a/templates/auth/form-grant-access.php b/templates/auth/form-grant-access.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates/Auth
  * @version 2.4.0
  */

diff --git a/templates/auth/header.php b/templates/auth/header.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates/Auth
  * @version 2.4.0
  */

diff --git a/templates/cart/cart-item-data.php b/templates/cart/cart-item-data.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version 	2.4.0
  */

diff --git a/templates/cart/cart-totals.php b/templates/cart/cart-totals.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.3.6
  */

diff --git a/templates/cart/cross-sells.php b/templates/cart/cross-sells.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     3.0.0
  */

diff --git a/templates/cart/mini-cart.php b/templates/cart/mini-cart.php
@@ -13,7 +13,6 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 3.5.0
  */

diff --git a/templates/cart/proceed-to-checkout-button.php b/templates/cart/proceed-to-checkout-button.php
@@ -13,7 +13,6 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 2.4.0
  */

diff --git a/templates/checkout/form-billing.php b/templates/checkout/form-billing.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 3.0.9
  */

diff --git a/templates/checkout/form-shipping.php b/templates/checkout/form-shipping.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 3.0.9
  */

diff --git a/templates/checkout/order-receipt.php b/templates/checkout/order-receipt.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 3.2.0
  */

diff --git a/templates/checkout/review-order.php b/templates/checkout/review-order.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     3.3.0
  */

diff --git a/templates/checkout/thankyou.php b/templates/checkout/thankyou.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     3.2.0
  */

diff --git a/templates/content-product_cat.php b/templates/content-product_cat.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 2.6.1
  */

diff --git a/templates/emails/admin-cancelled-order.php b/templates/emails/admin-cancelled-order.php
@@ -24,7 +24,7 @@
 */
 do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
 
-<?php /* translators: %1$s: Customer full name. %2$s: Order numer */ ?>
+<?php /* translators: %1$s: Customer full name. %2$s: Order number */ ?>
 <p><?php printf( esc_html__( 'Alas. Just to let you know &mdash; %1$s has cancelled order #%2$s:', 'woocommerce' ), esc_html( $order->get_formatted_billing_full_name() ), esc_html( $order->get_order_number() ) ); ?></p>
 
 <?php

diff --git a/templates/emails/email-addresses.php b/templates/emails/email-addresses.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails
  * @version     3.2.1
  */

diff --git a/templates/emails/email-customer-details.php b/templates/emails/email-customer-details.php
@@ -13,7 +13,6 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates/Emails
  * @version 2.5.0
  */

diff --git a/templates/emails/email-footer.php b/templates/emails/email-footer.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails
  * @version     2.3.0
  */

diff --git a/templates/emails/email-header.php b/templates/emails/email-header.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates/Emails
  * @version 2.4.0
  */

diff --git a/templates/emails/plain/email-order-items.php b/templates/emails/plain/email-order-items.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates/Emails/Plain
  * @version     3.2.0
  */

diff --git a/templates/global/breadcrumb.php b/templates/global/breadcrumb.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.3.0
  * @see         woocommerce_breadcrumb()

diff --git a/templates/global/form-login.php b/templates/global/form-login.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     3.3.0
  */

diff --git a/templates/global/sidebar.php b/templates/global/sidebar.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     1.6.4
  */

diff --git a/templates/global/wrapper-end.php b/templates/global/wrapper-end.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     3.3.0
  */

diff --git a/templates/global/wrapper-start.php b/templates/global/wrapper-start.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     3.3.0
  */

diff --git a/templates/loop/add-to-cart.php b/templates/loop/add-to-cart.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     3.3.0
  */

diff --git a/templates/loop/loop-end.php b/templates/loop/loop-end.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.0.0
  */

diff --git a/templates/loop/loop-start.php b/templates/loop/loop-start.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     3.3.0
  */

diff --git a/templates/loop/no-products-found.php b/templates/loop/no-products-found.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     2.0.0
  */

diff --git a/templates/loop/orderby.php b/templates/loop/orderby.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     3.3.0
  */

diff --git a/templates/loop/price.php b/templates/loop/price.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     1.6.4
  */

diff --git a/templates/loop/rating.php b/templates/loop/rating.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     3.0.0
  */

diff --git a/templates/loop/result-count.php b/templates/loop/result-count.php
@@ -13,7 +13,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     3.3.0
  */

diff --git a/templates/loop/sale-flash.php b/templates/loop/sale-flash.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @author 		WooThemes
  * @package 	WooCommerce/Templates
  * @version     1.6.4
  */

diff --git a/templates/myaccount/dashboard.php b/templates/myaccount/dashboard.php
@@ -13,7 +13,6 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @author      WooThemes
  * @package     WooCommerce/Templates
  * @version     2.6.0
  */

diff --git a/templates/myaccount/downloads.php b/templates/myaccount/downloads.php
@@ -13,7 +13,6 @@
  * the readme will list any important changes.
  *
  * @see 	https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 3.2.0
  */

diff --git a/templates/myaccount/my-address.php b/templates/myaccount/my-address.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 2.6.0
  */

diff --git a/templates/myaccount/my-downloads.php b/templates/myaccount/my-downloads.php
@@ -13,7 +13,6 @@
  * the readme will list any important changes.
  *
  * @see         https://docs.woocommerce.com/document/template-structure/
- * @author      WooThemes
  * @package     WooCommerce/Templates
  * @version     2.0.0
  * @deprecated  2.6.0

diff --git a/templates/myaccount/navigation.php b/templates/myaccount/navigation.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 2.6.0
  */

diff --git a/templates/myaccount/orders.php b/templates/myaccount/orders.php
@@ -13,7 +13,6 @@
  * the readme will list any important changes.
  *
  * @see 	https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 3.2.0
  */

diff --git a/templates/myaccount/payment-methods.php b/templates/myaccount/payment-methods.php
@@ -13,7 +13,6 @@
  * the readme will list any important changes.
  *
  * @see 	https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 2.6.0
  */

diff --git a/templates/myaccount/view-order.php b/templates/myaccount/view-order.php
@@ -13,7 +13,6 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 3.0.0
  */

diff --git a/templates/order/order-details-item.php b/templates/order/order-details-item.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 3.0.0
  */

diff --git a/templates/order/order-details.php b/templates/order/order-details.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 3.5.2
  */

diff --git a/templates/order/order-downloads.php b/templates/order/order-downloads.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
- * @author  Automattic
  * @package WooCommerce/Templates
  * @version 3.3.0
  */

diff --git a/templates/order/tracking.php b/templates/order/tracking.php
@@ -11,7 +11,6 @@
  * the readme will list any important changes.
  *
  * @see 	https://docs.woocommerce.com/document/template-structure/
- * @author  WooThemes
  * @package WooCommerce/Templates
  * @version 2.2.0
  */