Ensure update-history can find the root directory when installed via composer

cscott · cscott · commit 47c4e509c0c2 · 2021-08-05T23:54:26.000-04:00
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,7 @@
 # Release History
 
 ## update-history x.x.x (not yet released)
+* Bug fixes
 
 ## update-history 1.0.0
 
diff --git a/bin/update-history b/bin/update-history
@@ -2,15 +2,18 @@
 <?php declare(strict_types=1);
 
 if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
-    require __DIR__ . '/../vendor/autoload.php';
-} elseif (file_exists(__DIR__ . '/../../../autoload.php')) {
-    require __DIR__ . '/../../../autoload.php';
+    # Running from own package
+    $root = __DIR__ . '/../';
+} elseif (file_exists(__DIR__ . '/../../../../vendor/autoload.php')) {
+    # Running from vendor/wikimedia/update-history
+    $root = __DIR__ . '/../../../../';
 } else {
-    echo 'Project dependencies need to be installed using composer.';
+    error_log('Project dependencies need to be installed using composer.');
     exit(1);
 }
+require "$root/vendor/autoload.php";
 
 global $argv;
 
 $which = $argv[1] ?? 'patch';
-\Wikimedia\UpdateHistory\UpdateHistory::main( $which );
+\Wikimedia\UpdateHistory\UpdateHistory::main( $root, $which );
diff --git a/src/UpdateHistory.php b/src/UpdateHistory.php
@@ -9,11 +9,12 @@
 class UpdateHistory {
 	/**
 	 * Main entry point.
+	 * @param string $root Package root (where the HISTORY.md file is found)
 	 * @param string $which One of 'patch', 'minor', or 'major'.
 	 * @return int Exit code: zero on success, non-zero on failure.
 	 */
-	public static function main( string $which = 'patch' ): int {
-		$changeLogPath = __DIR__ . '/../HISTORY.md';
+	public static function main( string $root, string $which = 'patch' ): int {
+		$changeLogPath = "$root/HISTORY.md";
 		$changeLog = file_get_contents( $changeLogPath );
 		$changeLog = preg_replace_callback(
 			'/^(#+)( \S+)? (x\.x\.x|\d+\.\d+\.\d+)(.*)$/m',
