Merge branch 'master' into wp-path-field

Author: danielbachhuber

.travis.yml

@@ -1,4 +1,5 @@
 sudo: false
+dist: trusty
 
 language: php
 
@@ -32,6 +33,7 @@ matrix:
     - php: 5.6
       env: WP_VERSION=trunk
     - php: 5.3
+      dist: precise
       env: WP_VERSION=latest
 
 before_install:

features/find.feature

@@ -7,7 +7,7 @@ Feature: Find WordPress installs on the filesystem
     When I run `wp eval --skip-wordpress 'echo realpath( getenv( "RUN_DIR" ) );'`
     Then save STDOUT as {TEST_DIR}
 
-    When I run `wp find {TEST_DIR} --field=version_path`
+    When I run `wp find {TEST_DIR} --field=version_path | sort`
     Then STDOUT should be:
       """
       {TEST_DIR}/subdir1/wp-includes/version.php