Merge branch 'master' into stdin

Author: schlessera

.github/move.yml

@@ -0,0 +1,19 @@
+# Configuration for move-issues - https://github.com/dessant/move-issues
+
+# Repository to extend settings from
+_extends: wp-cli/wp-cli
+
+# Delete the command comment when it contains no other content
+# deleteCommand: true
+
+# Close the source issue after moving
+# closeSourceIssue: true
+
+# Lock the source issue after moving
+# lockSourceIssue: false
+
+# Mention issue and comment authors
+# mentionAuthors: true
+
+# Preserve mentions in the issue content
+# keepContentMentions: true

.github/settings.yml

@@ -1,6 +1,6 @@
 # Used by Probot Settings: https://probot.github.io/apps/settings/
 repository:
-  description: Manage WordPress core entities.
+  description: Manage WordPress comments, menus, options, posts, sites, terms, and users.
 labels:
   - name: bug
     color: fc2929

.gitignore

@@ -5,3 +5,4 @@ vendor/
 *.zip
 *.tar.gz
 composer.lock
+*.log

.travis.yml

@@ -2,6 +2,7 @@ sudo: false
 dist: trusty
 
 language: php
+php: 7.2
 
 notifications:
   email:
@@ -21,24 +22,6 @@ env:
     - PATH="$TRAVIS_BUILD_DIR/vendor/bin:$PATH"
     - WP_CLI_BIN_DIR="$TRAVIS_BUILD_DIR/vendor/bin"
 
-matrix:
-  include:
-    - php: 7.2
-      env: WP_VERSION=latest
-    - php: 7.1
-      env: WP_VERSION=latest
-    - php: 7.0
-      env: WP_VERSION=latest
-    - php: 5.6
-      env: WP_VERSION=latest
-    - php: 5.6
-      env: WP_VERSION=3.7.11
-    - php: 5.6
-      env: WP_VERSION=trunk
-    - php: 5.3
-      dist: precise
-      env: WP_VERSION=latest
-
 before_install:
   - |
     # Remove Xdebug for a huge performance increase:
@@ -50,14 +33,42 @@ before_install:
   - |
     # Raise PHP memory limit to 2048MB
     echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  - composer validate
 
 install:
-  - composer require wp-cli/wp-cli:dev-master
   - composer install
-  - bash bin/install-package-tests.sh
-
-before_script:
-  - composer validate
+  - composer prepare-tests
 
 script:
-  - bash bin/test.sh
+  - composer phpunit
+  - composer behat || composer behat-rerun
+
+jobs:
+  include:
+    - stage: sniff
+      script:
+        - composer lint
+        - composer phpcs
+      env: BUILD=sniff
+    - stage: test
+      php: 7.2
+      env: WP_VERSION=latest
+    - stage: test
+      php: 7.1
+      env: WP_VERSION=latest
+    - stage: test
+      php: 7.0
+      env: WP_VERSION=latest
+    - stage: test
+      php: 5.6
+      env: WP_VERSION=latest
+    - stage: test
+      php: 5.6
+      env: WP_VERSION=3.7.11
+    - stage: test
+      php: 5.6
+      env: WP_VERSION=trunk
+    - stage: test
+      php: 5.4
+      dist: precise
+      env: WP_VERSION=latest

README.md

@@ -1,7 +1,7 @@
 wp-cli/entity-command
 =====================
 
-Manage WordPress core entities.
+Manage WordPress comments, menus, options, posts, sites, terms, and users.
 
 [![Build Status](https://travis-ci.org/wp-cli/entity-command.svg?branch=master)](https://travis-ci.org/wp-cli/entity-command)
 
@@ -2182,7 +2182,7 @@ wp post edit <id>
 Generates some posts.
 
 ~~~
-wp post generate [--count=<number>] [--post_type=<type>] [--post_status=<status>] [--post_title=<post_title>] [--post_author=<login>] [--post_date=<yyyy-mm-dd-hh-ii-ss>] [--post_content] [--max_depth=<number>] [--format=<format>]
+wp post generate [--count=<number>] [--post_type=<type>] [--post_status=<status>] [--post_title=<post_title>] [--post_author=<login>] [--post_date=<yyyy-mm-dd-hh-ii-ss>] [--post_date_gmt=<yyyy-mm-dd-hh-ii-ss>] [--post_content] [--max_depth=<number>] [--format=<format>]
 ~~~
 
 Creates a specified number of new posts with dummy data.
@@ -2222,6 +2222,9 @@ Creates a specified number of new posts with dummy data.
 	[--post_date=<yyyy-mm-dd-hh-ii-ss>]
 		The date of the generated posts. Default: current date
 
+	[--post_date_gmt=<yyyy-mm-dd-hh-ii-ss>]
+		The GMT date of the generated posts. Default: value of post_date (or current date if it's not set)
+
 	[--post_content]
 		If set, the command reads the post_content from STDIN.
 
@@ -5469,7 +5472,7 @@ wp user unspam <id>...
 Updates an existing user.
 
 ~~~
-wp user update <user>... [--user_pass=<password>] [--user_nicename=<nice_name>] [--user_url=<url>] [--user_email=<email>] [--display_name=<display_name>] [--nickname=<nickname>] [--first_name=<first_name>] [--last_name=<last_name>] [--description=<description>] [--rich_editing=<rich_editing>] [--user_registered=<yyyy-mm-dd-hh-ii-ss>] [--role=<role>] --<field>=<value>
+wp user update <user>... [--user_pass=<password>] [--user_nicename=<nice_name>] [--user_url=<url>] [--user_email=<email>] [--display_name=<display_name>] [--nickname=<nickname>] [--first_name=<first_name>] [--last_name=<last_name>] [--description=<description>] [--rich_editing=<rich_editing>] [--user_registered=<yyyy-mm-dd-hh-ii-ss>] [--role=<role>] --<field>=<value> [--skip-email]
 ~~~
 
 **OPTIONS**
@@ -5516,6 +5519,9 @@ wp user update <user>... [--user_pass=<password>] [--user_nicename=<nice_name>]
 	--<field>=<value>
 		One or more fields to update. For accepted fields, see wp_update_user().
 
+	[--skip-email]
+		Don't send an email notification to the user.
+
 **EXAMPLES**
 
     # Update user

behat.yml

@@ -0,0 +1,4 @@
+default:
+  paths:
+    features: features
+    bootstrap: vendor/wp-cli/wp-cli-tests/features/bootstrap

bin/install-package-tests.sh

@@ -1,11 +1,8 @@
 {
     "name": "wp-cli/entity-command",
-    "description": "Manage WordPress core entities.",
     "type": "wp-cli-package",
+    "description": "Manage WordPress comments, menus, options, posts, sites, terms, and users.",
     "homepage": "https://github.com/wp-cli/entity-command",
-    "support": {
-        "issues": "https://github.com/wp-cli/entity-command/issues"
-    },
     "license": "MIT",
     "authors": [
         {
@@ -14,24 +11,23 @@
             "homepage": "https://runcommand.io"
         }
     ],
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "autoload": {
-        "psr-4": {
-            "": "src/",
-            "WP_CLI\\": "src/WP_CLI"
-        },
-        "files": [ "entity-command.php" ]
+    "require": {
+        "wp-cli/wp-cli": "^2"
     },
-    "require": {},
     "require-dev": {
-        "behat/behat": "~2.5",
-        "wp-cli/wp-cli": "^1.5",
-        "phpunit/phpunit": "^4.8"
+        "wp-cli/cache-command": "^1 || ^2",
+        "wp-cli/db-command": "^1.3 || ^2",
+        "wp-cli/extension-command": "^1.2 || ^2",
+        "wp-cli/media-command": "^1.1 || ^2",
+        "wp-cli/wp-cli-tests": "^2.0.7"
+    },
+    "config": {
+        "process-timeout": 7200,
+        "sort-packages": true
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.x-dev"
+            "dev-master": "2.x-dev"
         },
         "bundled": true,
         "commands": [
@@ -184,5 +180,33 @@
             "user unspam",
             "user update"
         ]
+    },
+    "autoload": {
+        "psr-4": {
+            "": "src/",
+            "WP_CLI\\": "src/WP_CLI"
+        },
+        "files": [
+            "entity-command.php"
+        ]
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "scripts": {
+        "behat": "run-behat-tests",
+        "behat-rerun": "rerun-behat-tests",
+        "lint": "run-linter-tests",
+        "phpcs": "run-phpcs-tests",
+        "phpunit": "run-php-unit-tests",
+        "prepare-tests": "install-package-tests",
+        "test": [
+            "@lint",
+            "@phpcs",
+            "@phpunit",
+            "@behat"
+        ]
+    },
+    "support": {
+        "issues": "https://github.com/wp-cli/entity-command/issues"
     }
 }

bin/test.sh

@@ -17,7 +17,7 @@
 WP_CLI::add_command( 'network meta', 'Network_Meta_Command', array(
 	'before_invoke' => function () {
 		if ( !is_multisite() ) {
-			WP_CLI::error( 'This is not a multisite install.' );
+			WP_CLI::error( 'This is not a multisite installation.' );
 		}
 	}
 ) );