From cdac268f87ce48e6238b299cb45707e13136c8a1 Mon Sep 17 00:00:00 2001
From: Matthew Grasmick <matt.grasmick@gmail.com>
Date: Tue, 13 Jun 2017 13:35:27 -0400
Subject: [PATCH 1/3] Fixes #1657: PHP shebang echoed during commit message
 validation.

---
 bin/blt                      | 80 +++---------------------------------
 bin/blt-robo                 | 11 -----
 bin/blt-robo.php             | 80 ++++++++++++++++++++++++++++++++++++
 scripts/git-hooks/commit-msg |  5 ++-
 scripts/git-hooks/pre-commit |  1 +
 src/Robo/BltTasks.php        |  2 +-
 6 files changed, 90 insertions(+), 89 deletions(-)
 delete mode 100755 bin/blt-robo
 create mode 100755 bin/blt-robo.php

diff --git a/bin/blt b/bin/blt
index 0c5d43c0b..9c587fa73 100755
--- a/bin/blt
+++ b/bin/blt
@@ -1,81 +1,11 @@
 #!/usr/bin/env php
 <?php
 /**
- * @file
- */
-
-$repo_root = find_repo_root();
-$autoload = require_once $repo_root . '/vendor/autoload.php';
-if (!isset($autoload)) {
-  print "Unable to find autoloader for BLT\n";
-  exit(1);
-}
-
-require_once __DIR__ . '/blt-robo-run.php';
-
-/**
- * Finds the root directory for the repository.
- *
- * @return bool|string
- */
-function find_repo_root() {
-  $possible_repo_roots = [
-    $_SERVER['PWD'],
-    getcwd(),
-    realpath(__DIR__ . '/../'),
-    realpath(__DIR__ . '/../../../'),
-  ];
-  foreach ($possible_repo_roots as $possible_repo_root) {
-    if ($repo_root = find_directory_containing_files($possible_repo_root, ['vendor/bin/blt', 'vendor/autoload.php'])) {
-      return $repo_root;
-    }
-  }
-}
-
-/**
- * Traverses file system upwards in search of a given file.
- *
- * Begins searching for $file in $working_directory and climbs up directories
- * $max_height times, repeating search.
+ * @file This file is a simply shell wrapper for running BLT Robo commands.
  *
- * @param string $working_directory
- * @param array $files
- * @param int $max_height
- *
- * @return bool|string
- *   FALSE if file was not found. Otherwise, the directory path containing the
- *   file.
+ * Having a wrapper permits other non-shell files to directly require
+ * blt-robo.php.
  */
-function find_directory_containing_files($working_directory, $files, $max_height = 10) {
-  // Find the root directory of the git repository containing BLT.
-  // We traverse the file tree upwards $max_height times until we find
-  // vendor/bin/blt.
-  $file_path = $working_directory;
-  for ($i = 0; $i <= $max_height; $i++) {
-    if (files_exist($file_path, $files)) {
-      return $file_path;
-    }
-    else {
-      $file_path = realpath($file_path . '/..');
-    }
-  }
-
-  return FALSE;
-}
 
-/**
- * Determines if an array of files exist in a particular directory.
- *
- * @param string $dir
- * @param array $files
- *
- * @return bool
- */
-function files_exist($dir, $files) {
-  foreach ($files as $file) {
-    if (!file_exists($dir . '/' . $file)) {
-      return FALSE;
-    }
-  }
-  return TRUE;
-}
+// Shell wrapper for BLT robo app.
+require_once __DIR__ . '/blt-robo.php';
diff --git a/bin/blt-robo b/bin/blt-robo
deleted file mode 100755
index 78ad24c53..000000000
--- a/bin/blt-robo
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
- * @file This file is a simply shell wrapper for running BLT Robo commands.
- *
- * Having a wrapper permits other non-shell files to directly require
- * blt-robo-run.php.
- */
-
-// Shell wrapper for BLT robo app.
-require_once __DIR__ . '/blt-robo-run.php';
diff --git a/bin/blt-robo.php b/bin/blt-robo.php
new file mode 100755
index 000000000..935446f9e
--- /dev/null
+++ b/bin/blt-robo.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @file
+ */
+
+$repo_root = find_repo_root();
+$autoload = require_once $repo_root . '/vendor/autoload.php';
+if (!isset($autoload)) {
+  print "Unable to find autoloader for BLT\n";
+  exit(1);
+}
+
+require_once __DIR__ . '/blt-robo-run.php';
+
+/**
+ * Finds the root directory for the repository.
+ *
+ * @return bool|string
+ */
+function find_repo_root() {
+  $possible_repo_roots = [
+    $_SERVER['PWD'],
+    getcwd(),
+    realpath(__DIR__ . '/../'),
+    realpath(__DIR__ . '/../../../'),
+  ];
+  foreach ($possible_repo_roots as $possible_repo_root) {
+    if ($repo_root = find_directory_containing_files($possible_repo_root, ['vendor/bin/blt', 'vendor/autoload.php'])) {
+      return $repo_root;
+    }
+  }
+}
+
+/**
+ * Traverses file system upwards in search of a given file.
+ *
+ * Begins searching for $file in $working_directory and climbs up directories
+ * $max_height times, repeating search.
+ *
+ * @param string $working_directory
+ * @param array $files
+ * @param int $max_height
+ *
+ * @return bool|string
+ *   FALSE if file was not found. Otherwise, the directory path containing the
+ *   file.
+ */
+function find_directory_containing_files($working_directory, $files, $max_height = 10) {
+  // Find the root directory of the git repository containing BLT.
+  // We traverse the file tree upwards $max_height times until we find
+  // vendor/bin/blt.
+  $file_path = $working_directory;
+  for ($i = 0; $i <= $max_height; $i++) {
+    if (files_exist($file_path, $files)) {
+      return $file_path;
+    }
+    else {
+      $file_path = realpath($file_path . '/..');
+    }
+  }
+
+  return FALSE;
+}
+
+/**
+ * Determines if an array of files exist in a particular directory.
+ *
+ * @param string $dir
+ * @param array $files
+ *
+ * @return bool
+ */
+function files_exist($dir, $files) {
+  foreach ($files as $file) {
+    if (!file_exists($dir . '/' . $file)) {
+      return FALSE;
+    }
+  }
+  return TRUE;
+}
diff --git a/scripts/git-hooks/commit-msg b/scripts/git-hooks/commit-msg
index 47fc7c373..847797cdd 100755
--- a/scripts/git-hooks/commit-msg
+++ b/scripts/git-hooks/commit-msg
@@ -1,5 +1,6 @@
 #!/usr/bin/env php
 <?php
+echo "Executing .git/hooks/commit-msg...\n";
 $repo_root = getcwd();
 
 $original_argv = $_SERVER['argv'];
@@ -7,10 +8,10 @@ $commit_msg = rtrim(file_get_contents($original_argv[1]), "\n");
 
 // Construct pseudo `blt commit-msg $commit_msg` call.
 $_SERVER['argv'] = [
-  $repo_root . '/bin/blt-robo',
+  $repo_root . '/bin/blt',
   'git:commit-msg',
   $commit_msg,
 ];
 $_SERVER['argc'] = count($_SERVER['argv']);
 
-require __DIR__ . '/../../bin/blt';
+require __DIR__ . '/../../bin/blt-robo.php';
diff --git a/scripts/git-hooks/pre-commit b/scripts/git-hooks/pre-commit
index e8cbef04c..e44ced1b6 100755
--- a/scripts/git-hooks/pre-commit
+++ b/scripts/git-hooks/pre-commit
@@ -4,6 +4,7 @@ ROOT_DIR="$(pwd)/"
 LIST=$( git diff --name-only --cached --diff-filter=ACM )
 PHPCS_BIN=vendor/bin/phpcs
 
+echo "Executing .git/hooks/pre-commit..."
 ${ROOT_DIR}/vendor/bin/blt git:pre-commit "$LIST"
 
 # Return the status of the last run command.
diff --git a/src/Robo/BltTasks.php b/src/Robo/BltTasks.php
index 485e9455c..cc01e9cf1 100644
--- a/src/Robo/BltTasks.php
+++ b/src/Robo/BltTasks.php
@@ -168,7 +168,7 @@ protected function invokeHook($hook) {
       }
     }
     else {
-      $this->say("Skipped $hook target hook. No hook is defined.");
+      $this->logger->info("Skipped $hook target hook. No hook is defined.");
 
       return 0;
     }

From f30a536a7a61630a1065a59281cf2d66aee0769d Mon Sep 17 00:00:00 2001
From: Matthew Grasmick <matt.grasmick@gmail.com>
Date: Tue, 13 Jun 2017 13:49:51 -0400
Subject: [PATCH 2/3] Remove scan on blt-robo file.

---
 RoboFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RoboFile.php b/RoboFile.php
index fb4cf3209..1e6c86385 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -31,7 +31,7 @@ public function initialize() {
     $this->drupalPhpcsStandard = $this->bltRoot . '/vendor/drupal/coder/coder_sniffer/Drupal/ruleset.xml';
     $this->phpcsPaths = [
       $this->bltRoot . '/bin/blt',
-      $this->bltRoot . '/bin/blt-robo',
+      $this->bltRoot . '/bin/blt-robo.php',
       $this->bltRoot . '/bin/blt-robo-run.php',
       $this->bltRoot . '/RoboFile.php',
       $this->bltRoot . '/src/Robo',

From a5c590c5a914a1a0ec35c21d3b1bdd761bff2641 Mon Sep 17 00:00:00 2001
From: Matthew Grasmick <matt.grasmick@gmail.com>
Date: Tue, 13 Jun 2017 14:12:06 -0400
Subject: [PATCH 3/3] PHPCS fixes.

---
 bin/blt-robo.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/blt-robo.php b/bin/blt-robo.php
index 935446f9e..f7eafab45 100755
--- a/bin/blt-robo.php
+++ b/bin/blt-robo.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  */