From 799bdcec005b9074dfbb56e5263a2c89cd0b84b0 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Mon, 24 Apr 2017 00:38:35 +0000
Subject: [PATCH] Build/Test Tools: Backport various recent changes to the 4.7
 branch.

* Add support for PHPUnit 6+.
* Add Composer files to the cache on Travis.
* Remove HHVM from the test infrastructure on Travis.

Merges [40536], [40538], [40539], and [40546] to the 4.7 branch.

See #40539
Fixes #39822, #40548

Built from https://develop.svn.wordpress.org/branches/4.7@40547


git-svn-id: http://core.svn.wordpress.org/branches/4.7@40423 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/version.php b/wp-includes/version.php
index 64e39ee553..33004d9bc8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7.5-alpha-40514';
+$wp_version = '4.7.5-alpha-40547';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.