Further attempts to fix HHVM issues (11)

Patchwork.php

@@ -71,15 +71,10 @@ function blacklist($path)
     Preprocessor\exclude($path);
 }
 
-function deployQueue()
-{
-    Interceptor\State::$queueDeployedManually = true;
-    Interceptor\deployQueue();
-}
-
 if (Utils\runningOnHHVM()) {
     # no preprocessor needed on HHVM;
     # just let Patchwork become a wrapper for fb_intercept()
+    spl_autoload_register('Patchwork\Interceptor\deployQueue');
     register_shutdown_function('Patchwork\undoAll');
     return;
 }

src/Interceptor.php

@@ -134,7 +134,6 @@ function patchMethod($function, $patch, PatchHandle $handle = null)
 
 function unpatchAll()
 {
-    checkForMissedDeployments();
     foreach (State::$patches as $class => $patchesByClass) {
         foreach ($patchesByClass as $method => $patches) {
             foreach ($patches as $patch) {
@@ -237,25 +236,9 @@ function getHHVMExpirationHandler($function)
         if ($empty) {
             fb_intercept($function, null);
         }
-        checkForMissedDeployments();
     };
 }
 
-function checkForMissedDeployments()
-{
-    if (State::$queueDeployedManually) {
-        return;
-    }
-    foreach (State::$queuedPatches as $queuedPatch) {
-        list($target) = $queuedPatch;
-        list($class) = Utils\interpretCallback($target);
-        if (class_exists($class, false)) {
-            $message = 'Please invoke Patchwork\deployQueue() from your autoloader to make %s redefinable';
-            trigger_error(sprintf($message, Utils\callbackToString($target)), E_USER_WARNING);
-        }
-    }
-}
-
 function getPatchesFor($class, $method)
 {
     if (!isset(State::$patches[$class][$method])) {
@@ -268,7 +251,6 @@ class State
 {
     static $patches = array();
     static $queuedPatches = array();
-    static $queueDeployedManually = false;
     static $preprocessedFiles = array();
     static $patchStack = array();
 }

src/Stack.php

@@ -72,7 +72,7 @@ function topArgsOverride()
         throw new Exceptions\StackEmpty;
     }
     list($offset, $calledClass, $argsOverride) = end(State::$items);
-    return $argsOverride;   
+    return $argsOverride;
 }
 
 function all()

tests/includes/InheritanceWithAssertions.php

@@ -34,6 +34,8 @@ function getBar()
     }
 }
 
+Patchwork\Interceptor\deployQueue();
+
 $foo = new FooObject;
 $bar = new BarObject;
 $baz = new BazObject;

tests/inheritance-delayed-redefinition.phpt

@@ -20,8 +20,6 @@ Patchwork\replace("BarObject::getBar", function() {
 
 require __DIR__ . "/includes/InheritanceWithAssertions.php";
 
-Patchwork\undoAll();
-
 ?>
 ===DONE===