Merge branch 'master' into tests/reports

This commit is contained in:
Steve Grunwell 2018-01-15 15:57:40 +00:00
commit 02f4ed19f4
3 changed files with 14 additions and 14 deletions

View File

@ -14,7 +14,7 @@ if ( ! defined( 'ABSPATH' ) ) {
}
$states['JP'] = array(
'JP01' => __( 'Hokkaido', 'woocommerce' ),
'JP01' => __( 'Hokkai-do', 'woocommerce' ),
'JP02' => __( 'Aomori-ken', 'woocommerce' ),
'JP03' => __( 'Iwate-ken', 'woocommerce' ),
'JP04' => __( 'Miyagi-ken', 'woocommerce' ),

View File

@ -1,14 +1,17 @@
<?php
/**
* Enables WooCommerce, via the the command line.
*
* @package WooCommerce\CLI
* @version 3.0.0
*/
if ( ! defined( 'ABSPATH' ) ) {
exit;
}
/**
* Enables WooCommerce, via the the command line.
*
* @version 3.0.0
* @package WooCommerce
* @author WooCommerce
* CLI class.
*/
class WC_CLI {
/**
@ -23,10 +26,10 @@ class WC_CLI {
* Load command files.
*/
private function includes() {
require_once __DIR__ . '/cli/class-wc-cli-runner.php';
require_once __DIR__ . '/cli/class-wc-cli-rest-command.php';
require_once __DIR__ . '/cli/class-wc-cli-tool-command.php';
require_once __DIR__ . '/cli/class-wc-cli-update-command.php';
require_once dirname( __FILE__ ) . '/cli/class-wc-cli-runner.php';
require_once dirname( __FILE__ ) . '/cli/class-wc-cli-rest-command.php';
require_once dirname( __FILE__ ) . '/cli/class-wc-cli-tool-command.php';
require_once dirname( __FILE__ ) . '/cli/class-wc-cli-update-command.php';
}
/**
@ -39,4 +42,4 @@ class WC_CLI {
}
}
new WC_CLI;
new WC_CLI();

View File

@ -6,13 +6,10 @@
* Version: 3.3.0-rc.1
* Author: Automattic
* Author URI: https://woocommerce.com
*
* Text Domain: woocommerce
* Domain Path: /i18n/languages/
*
* @package WooCommerce
* @category Core
* @author Automattic
*/
if ( ! defined( 'ABSPATH' ) ) {