Merge branch 'develop'

.gitignore

@@ -24,3 +24,5 @@ wp-test-case
 
 #https://getcomposer.org/doc/faqs/should-i-commit-the-dependencies-in-my-vendor-directory.md
 /vendor/**/.git
+
+!assets/build/

.travis.yml

@@ -3,6 +3,8 @@ sudo: false
 language: php
 
 php:
+  - '7.3'
+  - '7.2'
   - '7.1'
   - '7.0'
   - '5.6'
@@ -22,14 +24,16 @@ env:
 
 matrix:
   include:
-    - php: 7.1
-      env: WP_VERSION=trunk TEST_JS=yes
-    - php: 7.1
+    - php: 7.2
+      env: WP_VERSION=latest TEST_JS=yes
+    - php: 7.2
       env: WP_VERSION=latest WP_MULTISITE=1
-    - php: 7.1
-      env: WP_VERSION=4.8
-    - php: 7.1
-      env: WP_VERSION=4.7.11
+    - php: 7.2
+      env: WP_VERSION=5.1
+    - php: 7.2
+      env: WP_VERSION=5.0
+    - php: 7.2
+      env: WP_VERSION=4.9
 
 before_script:
   - export PATH="$HOME/.composer/vendor/bin:$PATH"
@@ -43,7 +47,26 @@ before_script:
   - |
     if [[ ! -z "$WP_VERSION" ]] ; then
       bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
-      composer global require "phpunit/phpunit=4.8.*|5.7.*"
+      if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
+        case "$TRAVIS_PHP_VERSION" in
+          7.4snapshot|7.3|7.2|7.1|nightly)
+            echo "Using PHPUnit 7.x"
+            travis_retry composer global require "phpunit/phpunit:^7"
+            ;;
+          7.0)
+            echo "Using PHPUnit 6.x"
+            travis_retry composer global require "phpunit/phpunit:^6"
+            ;;
+          5.6)
+            echo "Using PHPUnit 4.x"
+            travis_retry composer global require "phpunit/phpunit:^4"
+            ;;
+          *)
+            echo "No PHPUnit version handling for PHP version $TRAVIS_PHP_VERSION"
+            exit 1
+            ;;
+        esac
+      fi
     fi
   - |
     if [[ "$WP_TRAVISCI" == "phpcs" ]] ; then

Gruntfile.js

@@ -41,7 +41,9 @@ module.exports = function (grunt) {
         '!.env',
         '!db-error.php',
         '!webpack.config.js',
-        '!docker-compose.yml'
+        '!docker-compose.yml',
+        '!wp-content/**',
+        '!wordpress/**'
     ];
 
     //Include webpacked clients
@@ -287,7 +289,8 @@ module.exports = function (grunt) {
 
 
         exec: {
-            composerDist: 'composer clearcache && composer update --prefer-dist --no-dev --optimize-autoloader --ignore-platform-reqs'
+            deleteVendor: 'rm -rf vendor'
+            composerDist: 'composer clearcache && rm -rf vendor && composer update --prefer-dist --no-dev --optimize-autoloader --ignore-platform-reqs'
         }
 
     });
@@ -307,7 +310,12 @@ module.exports = function (grunt) {
 
     grunt.registerTask( 'version_number', [ 'replace' ] );
     grunt.registerTask( 'build', [  'version_number', 'default',  'make' ] );
-    grunt.registerTask( 'make', [   'exec:composerDist', 'mkdir:build', 'copy:build' ] );
+    grunt.registerTask( 'make', [
+        'exec:deleteVendor',
+        'exec:composerDist',
+        'mkdir:build',
+        'copy:build'
+    ] );