Merge branch 'trunk'

.github/ISSUE_TEMPLATE.md

@@ -1,3 +1,9 @@
+<!--
+Before posting a new issue:
+- Please post general support and questions at https://www.wordpress.org/support/plugin/cmb2/. We will move to GitHub once a confirmed bug.
+- Please check if your issue is addressed in the CMB2 Wiki Troubleshooting page: https://github.com/CMB2/CMB2/wiki/Troubleshooting
+- Please review the contributing guidelines: https://github.com/CMB2/CMB2/blob/trunk/CONTRIBUTING.md.
+-->
 ### Expected Behavior:
 
 
@@ -8,8 +14,8 @@
 
 ### Steps to reproduce (I have confirmed I can reproduce this issue on the trunk branch):
 
-1.  
-2.  
+1.
+2.
 
 ### CMB2 Field Registration Code:
 

.travis.yml

@@ -1,54 +1,61 @@
 language: php
-
 php:
-    - 5.3
-    - 5.4
-    - 5.5
-    - 5.6
-    - 7.0
-    - hhvm
-    - nightly
-
+- 5.3
+- 5.4
+- 5.5
+- 5.6
+- 7.0
+- nightly
 env:
-    - WP_VERSION=latest WP_MULTISITE=0
-    - WP_VERSION=latest WP_MULTISITE=1
-    - WP_VERSION=3.8 WP_MULTISITE=0
-    - WP_VERSION=3.8 WP_MULTISITE=1
-
+- WP_VERSION=latest WP_MULTISITE=0
+- WP_VERSION=latest WP_MULTISITE=1
+- WP_VERSION=3.8 WP_MULTISITE=0
+- WP_VERSION=3.8 WP_MULTISITE=1
 matrix:
   fast_finish: true
   allow_failures:
-    - env: WP_VERSION=3.8 WP_MULTISITE=0
-      php: nightly
-    - env: WP_VERSION=3.8 WP_MULTISITE=1
-      php: nightly
-    - env: WP_VERSION=latest WP_MULTISITE=0
-      php: nightly
-    - env: WP_VERSION=latest WP_MULTISITE=1
-      php: nightly
-    - env: WP_VERSION=3.8 WP_MULTISITE=0
-      php: 7.0
-    - env: WP_VERSION=3.8 WP_MULTISITE=1
-      php: 7.0
-
-before_script:
-    - bash tests/bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
-
+  - env: WP_VERSION=3.8 WP_MULTISITE=0
+    php: nightly
+  - env: WP_VERSION=3.8 WP_MULTISITE=1
+    php: nightly
+  - env: WP_VERSION=latest WP_MULTISITE=0
+    php: nightly
+  - env: WP_VERSION=latest WP_MULTISITE=1
+    php: nightly
+  - env: WP_VERSION=3.8 WP_MULTISITE=0
+    php: 7.0
+  - env: WP_VERSION=3.8 WP_MULTISITE=1
+    php: 7.0
+before_script: # Make PHP 7 test work. https://github.com/CMB2/CMB2/pull/885
+- export PATH="$HOME/.composer/vendor/bin:$PATH"
+- |
+  if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then
+   composer global require "phpunit/phpunit=5.7.*"
+  else
+    composer global require "phpunit/phpunit=4.8.*"
+  fi
+- bash tests/bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
+- phpunit --version
 script: if [[ latest == $WP_VERSION ]]; then phpunit --coverage-clover=coverage.clover; else phpunit --exclude-group cmb2-rest-api --coverage-clover=coverage.clover; fi
-
 after_script:
-  - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
-
+- wget https://scrutinizer-ci.com/ocular.phar
+- php ocular.phar code-coverage:upload --format=php-clover coverage.clover
 branches:
-    only:
-        - master
-        - trunk
-
+  only:
+  - master
+  - trunk
 notifications:
+  slack:
+    rooms:
+      - secure: g3L0XaiaUjUeBoNMLXx4pdz+7JudZhFGPY1mOX1WkC4B0zo+M/tGdhLLz/
+    on_success: never
+    on_failure: change
   webhooks:
     urls:
-      - https://webhooks.gitter.im/e/00b1df026574cdaeb815
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
+    - https://webhooks.gitter.im/e/00b1df026574cdaeb815
+    on_success: never  # options: [always|never|change] default: always
+    on_failure: change  # options: [always|never|change] default: always
     on_start: false     # default: false
+  email:
+    on_success: never # default: change
+    on_failure: always # default: always

CONTRIBUTING.md

@@ -7,8 +7,9 @@ _Support is not offered for this library, and the likelihood that the maintainer
 
 Before reporting a bug
 ---
-1. Search [issues](https://github.com/WebDevStudios/CMB2/issues) to see if the issue has been previously reported.
-2. Install the trunk version of CMB2 and test there.
+1. Please review the [documentation](https://github.com/CMB2/CMB2/wiki). Most questions revolve around the [field types](https://github.com/CMB2/CMB2/wiki/Field-Types), [field parameters](https://github.com/CMB2/CMB2/wiki/Field-Parameters), or are addressed in the [troubleshooting](https://github.com/CMB2/CMB2/wiki/Troubleshooting) section.
+2. Search [issues](https://github.com/CMB2/CMB2/issues) to see if the issue has been previously reported.
+3. Install the trunk version of CMB2 and test there.
 
 
 How to report a bug
@@ -43,9 +44,9 @@ If you are looking to provide language translation files, Please do so via [WP-T
 Additional Resources
 ---
 
-* [CMB2 Documentation Wiki](https://github.com/WebDevStudios/CMB2/wiki)
-* [CMB2 Snippet Library](https://github.com/WebDevStudios/CMB2-Snippet-Library)
+* [CMB2 Documentation Wiki](https://github.com/CMB2/CMB2/wiki)
+* [CMB2 Snippet Library](https://github.com/CMB2/CMB2-Snippet-Library)
 * [CMB2 API Documentation](http://cmb2.io/api/)
 * [General GitHub Documentation](http://help.github.com/)
 * [GitHub Pull Request documentation](http://help.github.com/send-pull-requests/)
-* [PHPUnit Tests Guide](http://phpunit.de/manual/current/en/writing-tests-for-phpunit.html)
+* [PHPUnit Tests Guide](http://phpunit.de/manual/current/en/writing-tests-for-phpunit.html)

Gruntfile.js

@@ -39,8 +39,8 @@ module.exports = function(grunt) {
 					},
 					processPot: function( pot, options ) {
 						pot.headers['report-msgid-bugs-to'] = 'http://wordpress.org/support/plugin/cmb2';
-						pot.headers['last-translator'] = 'WebDevStudios [email protected]';
-						pot.headers['language-team'] = 'WebDevStudios [email protected]';
+						pot.headers['last-translator'] = 'CMB2 Team [email protected]';
+						pot.headers['language-team'] = 'CMB2 Team [email protected]';
 						var today = new Date();
 						pot.headers['po-revision-date'] = today.getFullYear() +'-'+ ( today.getMonth() + 1 ) +'-'+ today.getDate() +' '+ today.getUTCHours() +':'+ today.getUTCMinutes() +'+'+ today.getTimezoneOffset();
 						return pot;
@@ -314,6 +314,7 @@ module.exports = function(grunt) {
 	var tests   = ['jshint', 'phpunit'];
 
 	grunt.registerTask( 'styles', asciify.concat( styles ) );
+	grunt.registerTask( 'css', asciify.concat( styles ) );
 	grunt.registerTask( 'js', asciify.concat( js ) );
 	grunt.registerTask( 'tests', asciify.concat( tests ) );
 	grunt.registerTask( 'default', asciify.concat( styles, js, tests ) );