Tidy serve/test scripts for #233

Author: Greg Bowler

bin/serve

@@ -15,12 +15,35 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\ArgvInput;
 
-$cwd = getcwd();
-$vendorAutoLoadFile = realpath(__DIR__ . "/../vendor/autoload.php");
+// PHP.Gt should always be loaded as a Composer dependency. The vendor directory
+// will be in the project's root directory — not PHP.Gt's root directory.
+// We first need to find the root directory by working up the directory tree
+// until the vendor directory is found.
+$vendorDirectory = null;
+while(true) {
+	$cwd = getcwd();
+	if(is_dir("$cwd/vendor")) {
+		$vendorDirectory = "$cwd/vendor";
+		break;
+	}
+	chdir("..");
+
+	if(getcwd() === $cwd) {
+		// We have reached the root directory of the filesystem without finding
+		// the vendor directory.
+		echo "No vendor directory found.\n"
+			. "Have you performed a composer install?\n\n"
+			. "See http://www.php.gt/docs/installation for more information.\n";
+		exit(1);
+	}
+}
+
+$vendorAutoLoadFile = realpath("$vendorDirectory/autoload.php");
 if(!file_exists($vendorAutoLoadFile)) {
-	// If this script exists within the vendor/brightflair/php.gt directory:
-	$vendorAutoLoadFile = realpath(__DIR__ . "/../../../autoload.php");
-	$cwd = realpath(__DIR__ . "/../../../..");
+	echo "No Composer autoloader script found.\n"
+		. "Have you performed a composer install?\n\n"
+		. "See http://www.php.gt/docs/installation for more information.\n";
+	exit(1);
 }
 require($vendorAutoLoadFile);
 
@@ -47,25 +70,10 @@ try {
 	if(!is_null($overrideApproot)) {
 		$approot = "$approot/$overrideApproot";
 	}
-	// Change autoloaders so we are definitely using the current project's
-	// dependencies (rather than the global PHP.Gt dependencies).
-	$projectAutoloader = "$approot/vendor/autoload.php";
-	if(!file_exists($projectAutoloader)) {
-		// We must be running the bin/serve script manually...
-		$projectAutoloader = $vendorAutoLoadFile;
-	}
-
-	if(!file_exists($projectAutoloader)) {
-		echo "\nYour project must require PHP.Gt "
-			. "as a dependency using composer.\n\n"
-			. "See http://www.php.gt/docs/installation for more information.";
-		exit(1);
-	}
-
+	
 	$xdebug = $input->getOption("xdebug");
 	ini_set("xdebug.idekey", $xdebug);
-
-	require($projectAutoloader);
+	
 	new Server($input);
 	exit(0);
 }
@@ -76,4 +84,4 @@ catch(Exception $e) {
 	echo strip_tags($definition->asText());
 	echo "\n";
 	exit(1);
-}
+}

bin/test

@@ -17,12 +17,35 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\ArgvInput;
 
-$cwd = getcwd();
-$vendorAutoLoadFile = realpath(__DIR__ . "/../vendor/autoload.php");
+// PHP.Gt should always be loaded as a Composer dependency. The vendor directory
+// will be in the project's root directory — not PHP.Gt's root directory.
+// We first need to find the root directory by working up the directory tree
+// until the vendor directory is found.
+$vendorDirectory = null;
+while(true) {
+	$cwd = getcwd();
+	if(is_dir("$cwd/vendor")) {
+		$vendorDirectory = "$cwd/vendor";
+		break;
+	}
+	chdir("..");
+
+	if(getcwd() === $cwd) {
+		// We have reached the root directory of the filesystem without finding
+		// the vendor directory.
+		echo "No vendor directory found.\n"
+			. "Have you performed a composer install?\n\n"
+			. "See http://www.php.gt/docs/installation for more information.\n";
+		exit(1);
+	}
+}
+
+$vendorAutoLoadFile = realpath("$vendorDirectory/autoload.php");
 if(!file_exists($vendorAutoLoadFile)) {
-	// If this script exists within the vendor/brightflair/php.gt directory:
-	$vendorAutoLoadFile = realpath(__DIR__ . "/../../../autoload.php");
-	$cwd = realpath(__DIR__ . "/../../..");
+	echo "No Composer autoloader script found.\n"
+		. "Have you performed a composer install?\n\n"
+		. "See http://www.php.gt/docs/installation for more information.\n";
+	exit(1);
 }
 require($vendorAutoLoadFile);
 
@@ -46,21 +69,6 @@ try {
 	$approot = $input->getOption("approot");
 	$type = $input->getOption("type");
 
-	// Change autoloaders so we are definitely using the current project's
-	// dependencies (rather than the global PHP.Gt dependencies).
-	$projectAutoloader = "$approot/vendor/autoload.php";
-	if(!file_exists($projectAutoloader)) {
-		// We must be running the bin/serve script manually...
-		$projectAutoloader = $vendorAutoLoadFile;
-	}
-
-	if(!file_exists($projectAutoloader)) {
-		echo "\nYour project must require PHP.Gt "
-			. "as a dependency using composer.\n\n"
-			. "See http://www.php.gt/docs/installation for more information.";
-		exit(1);
-	}
-	require($projectAutoloader);
 	new TestRunner($approot, $type);
 	exit(0);
 }
@@ -74,4 +82,4 @@ catch(Exception $e) {
 	echo strip_tags($definition->asText());
 	echo "\n";
 	exit(1);
-}
+}

src/Cli/TestRunner.php

@@ -24,8 +24,8 @@ class TestRunner {
 
 private $descriptorSpec = [
 	0 => ["pipe", "r"],
-	1 => ["pipe", "w"],
-	2 => ["pipe", "w"],
+	1 => ["pipe", "r"],
+	2 => ["pipe", "r"],
 ];
 
 public function __construct($approot, $type) {
@@ -115,26 +115,20 @@ private function testUnit() {
  */
 private function testAcceptance() {
 	$result = 0;
-	$baseCwd = getcwd();
-	$gtroot = Path::get(Path::GTROOT);
-	$root = Path::get(Path::ROOT);
-	$testPath = Path::fixCase($root . "/test/Acceptance");
+	$rememberCwd = getcwd();
+
+	$testPath = Path::fixCase(getcwd() . "/test/Acceptance");
 
 	if(!is_dir($testPath)) {
 		return 0;
 	}
 
-	$testWebroot = "$testPath/www";
-	if(!is_dir($testWebroot)) {
-		mkdir($testWebroot, 0775, true);
-	}
-
-	$serverCommand = "$gtroot/bin/serve --approot=$root --port=8089";
+	$serverCommand = "./vendor/bin/serve";
 	$server = proc_open($serverCommand, $this->descriptorSpec, $pipes);
 
+	$testExec = realpath("./vendor/bin/behat");
 	chdir($testPath);
-	$behat = new \Behat\Behat\Console\BehatApplication(null);
-	$behat->run();
+	passthru($testExec, $result);
 
 	// Inbuilt server spawns child processes that need killing.
 	$status = proc_get_status($server);
@@ -152,16 +146,16 @@ private function testAcceptance() {
 		posix_kill($p, SIGKILL);
 	}
 
-	if($exitCode == 0) {
+	if($result === 0) {
 		$this->countAcceptance++;
 	}
 	else {
 		$result = self::ERRORLEVEL_ACCEPTANCE;
 	}
 
 	// Reset the cwd.
-	chdir($baseCwd);
+	chdir($rememberCwd);
 	return $result;
 }
 
-}#
+}#