From 215173a08255910b8cbaeb72b8138a0b772e8a15 Mon Sep 17 00:00:00 2001
From: Matthew Grasmick <matthew.grasmick@acquia.com>
Date: Fri, 15 Jul 2016 12:26:50 -0400
Subject: [PATCH] Fixing PHPUnit dirs.

---
 phing/build.yml                         | 3 ++-
 phing/tasks/deploy.xml                  | 2 +-
 phing/tasks/tests.xml                   | 2 +-
 scripts/blt/convert-to-composer.sh      | 2 ++
 template/composer.json                  | 6 +++---
 template/tests/phpunit/src/TestBase.php | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/phing/build.yml b/phing/build.yml
index 749e67abb1..c0699d220f 100644
--- a/phing/build.yml
+++ b/phing/build.yml
@@ -19,7 +19,8 @@ composer:
 
 deploy:
   dir: ${repo.root}/deploy
-  exclude_file: ${repo.root}/build/core/files/deploy-exclude.txt
+  exclude_file: ${blt.root}/phing/files/deploy-exclude.txt
+  gitignore_file: ${blt.root}/phing/files/.gitignore
 
 # File and Directory locations.
 docroot.relative: ${repo.root.relative}/docroot
diff --git a/phing/tasks/deploy.xml b/phing/tasks/deploy.xml
index 80735ae6bc..4d1d431f68 100644
--- a/phing/tasks/deploy.xml
+++ b/phing/tasks/deploy.xml
@@ -105,7 +105,7 @@
     <exec dir="${repo.root}" command="rsync -a --no-g --no-p --delete --delete-excluded --exclude-from=${deploy.exclude_file} ${repo.root}/ ${deploy.dir}/ --filter 'protect /.git/'" logoutput="true" checkreturn="true"/>
 
     <!-- Use our own .gitignore -->
-    <copy file="${repo.root}/build/core/files/.gitignore" tofile="${deploy.dir}/.gitignore" overwrite="true"/>
+    <copy file="${deploy.gitignore_file}" tofile="${deploy.dir}/.gitignore" overwrite="true"/>
 
     <!-- Set sites/default back to 755 permissions. -->
     <!-- @todo Support multisite. -->
diff --git a/phing/tasks/tests.xml b/phing/tasks/tests.xml
index a04544dcc2..6ff38d09c9 100644
--- a/phing/tasks/tests.xml
+++ b/phing/tasks/tests.xml
@@ -3,7 +3,7 @@
   <target name="test" description="Runs all tests." depends="tests:all"></target>
 
   <target name="tests:all" description="Runs all tests, including Behat, PHPUnit, and Security Update check."
-          depends="tests:security-updates, tests:behat, tests:phpunit"/>
+          depends="tests:security-updates, tests:phpunit, tests:behat"/>
 
   <!-- If you experience 'Maximum function nesting level' errors in your PHP
        error log, set 'xdebug.max_nesting_level=1000' in php.ini. -->
diff --git a/scripts/blt/convert-to-composer.sh b/scripts/blt/convert-to-composer.sh
index d871fae556..1761b4f8ea 100644
--- a/scripts/blt/convert-to-composer.sh
+++ b/scripts/blt/convert-to-composer.sh
@@ -11,3 +11,5 @@ rm -rf build bolt.sh tests/phpunit/blt
 ./vendor/acquia/blt/blt.sh install-alias
 blt init
 blt configure
+
+# Move build/custom/files to new locations (e.g., deploy excludes or .gitignores).
diff --git a/template/composer.json b/template/composer.json
index 1a12eb8a08..aacaa742d8 100644
--- a/template/composer.json
+++ b/template/composer.json
@@ -43,8 +43,6 @@
       "Drupal\\Tests\\PHPUnit\\": "tests/phpunit/src/"
     }
   },
-  "minimum-stability": "dev",
-  "prefer-stable":     true,
   "extra": {
     "installer-paths": {
       "docroot/core":                     ["type:drupal-core"],
@@ -67,5 +65,7 @@
     "post-update-cmd": [
       "PhantomInstaller\\Installer::installPhantomJS"
     ]
-  }
+  },
+  "minimum-stability": "dev",
+  "prefer-stable":     true
 }
diff --git a/template/tests/phpunit/src/TestBase.php b/template/tests/phpunit/src/TestBase.php
index 519175ab69..fd0026cac0 100644
--- a/template/tests/phpunit/src/TestBase.php
+++ b/template/tests/phpunit/src/TestBase.php
@@ -21,7 +21,7 @@ abstract class TestBase extends \PHPUnit_Framework_TestCase {
   public function __construct($name = NULL, array $data = array(), $data_name = '') {
 
     parent::__construct($name, $data, $data_name);
-    $this->projectDirectory = dirname(dirname(dirname(__DIR__)));
+    $this->projectDirectory= dirname(dirname(dirname(__DIR__)));
     $this->drupalRoot = $this->projectDirectory . '/docroot';
     $this->config = Yaml::parse(file_get_contents("{$this->projectDirectory}/project.yml"));
   }