Adapt tests and Phar

Author: schlessera

composer.json

@@ -16,6 +16,7 @@
         "platform": {
             "php": "5.4"
         },
+        "process-timeout": 7200,
         "sort-packages": true
     },
     "minimum-stability": "dev",

features/make-phar.feature

@@ -22,7 +22,7 @@ Feature: Check `utils/make-phar.php` output
       """
     And STDOUT should be empty
 
-    When I try `grep '/dealerdirect\|[^/]/squizlabs\|/wimg' {PHAR_PATH}`
+    When I try `grep '/dealerdirect\|[^/]/squizlabs(?!/PHP_CodeSniffer/wiki)\|/wimg' {PHAR_PATH}`
     Then the return code should be 1
     And STDOUT should be empty
     And STDERR should be empty

utils/make-phar.php

@@ -163,6 +163,7 @@ function get_composer_versions( $current_version ) {
 	->ignoreVCS(true)
 	->name('*.php')
 	->in(WP_CLI_ROOT . '/php')
+	->in(WP_CLI_BUNDLE_ROOT . '/php')
 	->in(WP_CLI_VENDOR_DIR . '/mustache')
 	->in(WP_CLI_VENDOR_DIR . '/rmccue/requests')
 	->in(WP_CLI_VENDOR_DIR . '/composer')
@@ -191,9 +192,6 @@ function get_composer_versions( $current_version ) {
 } else {
 	$finder
 		->in(WP_CLI_VENDOR_DIR . '/wp-cli')
-		->in(WP_CLI_VENDOR_DIR . '/wp-cli/wp-cli-tests/features/bootstrap') // These are required for scaffold-package-command.
-		->in(WP_CLI_VENDOR_DIR . '/wp-cli/wp-cli-tests/features/steps')
-		->in(WP_CLI_VENDOR_DIR . '/wp-cli/wp-cli-tests/features/extra')
 		->in(WP_CLI_VENDOR_DIR . '/nb/oxymel')
 		->in(WP_CLI_VENDOR_DIR . '/psr')
 		->in(WP_CLI_VENDOR_DIR . '/seld')
@@ -291,7 +289,7 @@ function get_composer_versions( $current_version ) {
 set_file_contents( $phar, WP_CLI_ROOT . '/COMPOSER_VERSIONS', get_composer_versions( $current_version ) );
 set_file_contents( $phar, WP_CLI_ROOT . '/VERSION', $current_version );
 
-$phar_boot = str_replace( WP_CLI_BASE_PATH, '', WP_CLI_ROOT . '/php/boot-phar.php' );
+$phar_boot = str_replace( WP_CLI_BASE_PATH, '', WP_CLI_BUNDLE_ROOT . '/php/boot-phar.php' );
 $phar->setStub( <<<EOB
 #!/usr/bin/env php
 <?php