Remove bug in autorun management in PHAR.

mageekguy · Oct 8, 2012 · 9694f61 · 9694f61
1 parent bb42327
commit 9694f61
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/classes/scripts/runner.php b/classes/scripts/runner.php
@@ -269,9 +269,9 @@ public function testMethod($class, $method)
 		return $this;
 	}
 
-	public static function autorunIsEnabled()
+	public static function autorunMustBeEnabled()
 	{
-		return (static::$autorunner !== false);
+		return (static::$autorunner !== false && static::$autorunner === true);
 	}
 
 	public static function enableAutorun($name)

diff --git a/scripts/phar/resources/stub.php b/scripts/phar/resources/stub.php
@@ -25,7 +25,7 @@
 	define(__NAMESPACE__ . '\scripts\runner', __FILE__);
 }
 
-if (phar\stub::autorunIsEnabled() === true)
+if (phar\stub::autorunMustBeEnabled() === true)
 {
 	phar\stub::enableAutorun(constant(__NAMESPACE__ . '\scripts\runner'));
 }

diff --git a/scripts/runner.php b/scripts/runner.php
@@ -13,7 +13,7 @@
 	define(__NAMESPACE__ . '\scripts\runner', __FILE__);
 }
 
-if (scripts\runner::autorunIsEnabled() === true)
+if (scripts\runner::autorunMustBeEnabled() === true)
 {
 	scripts\runner::enableAutorun(constant(__NAMESPACE__ . '\scripts\runner'));
 }