Merge pull request #2012 from brefphp/remove-deprecated-hooks

Remove the deprecated "hooks" system

Author: mnapoli

src/Bref.php

@@ -12,11 +12,6 @@ class Bref
 {
     private static ?Closure $containerProvider = null;
     private static ?ContainerInterface $container = null;
-    /** @deprecated Use Bref::events()->subscribe() instead */
-    private static array $hooks = [
-        'beforeStartup' => [],
-        'beforeInvoke' => [],
-    ];
     private static EventDispatcher $eventDispatcher;
 
     /**
@@ -37,46 +32,6 @@ public static function events(): EventDispatcher
         return self::$eventDispatcher;
     }
 
-    /**
-     * Register a hook to be executed before the runtime starts.
-     *
-     * Warning: hooks are low-level extension points to be used by framework
-     * integrations. For user code, it is not recommended to use them. Use your
-     * framework's extension points instead.
-     *
-     * @deprecated Use Bref::events()->subscribe() instead.
-     */
-    public static function beforeStartup(Closure $hook): void
-    {
-        self::$hooks['beforeStartup'][] = $hook;
-    }
-
-    /**
-     * Register a hook to be executed before any Lambda invocation.
-     *
-     * Warning: hooks are low-level extension points to be used by framework
-     * integrations. For user code, it is not recommended to use them. Use your
-     * framework's extension points instead.
-     *
-     * @deprecated Use Bref::events()->subscribe() instead.
-     */
-    public static function beforeInvoke(Closure $hook): void
-    {
-        self::$hooks['beforeInvoke'][] = $hook;
-    }
-
-    /**
-     * @param 'beforeStartup'|'beforeInvoke' $hookName
-     *
-     * @internal Used by the Bref runtime
-     */
-    public static function triggerHooks(string $hookName): void
-    {
-        foreach (self::$hooks[$hookName] as $hook) {
-            $hook();
-        }
-    }
-
     /**
      * @internal Used by the Bref runtime
      */
@@ -103,10 +58,6 @@ public static function reset(): void
     {
         self::$containerProvider = null;
         self::$container = null;
-        self::$hooks = [
-            'beforeStartup' => [],
-            'beforeInvoke' => [],
-        ];
         self::$eventDispatcher = new EventDispatcher;
     }
 }

src/ConsoleRuntime/Main.php

@@ -20,7 +20,6 @@ public static function run(): void
 
         LazySecretsLoader::loadSecretEnvironmentVariables();
 
-        Bref::triggerHooks('beforeStartup');
         Bref::events()->beforeStartup();
 
         $lambdaRuntime = LambdaRuntime::fromEnvironmentVariable('console');

src/FpmRuntime/Main.php

@@ -20,7 +20,6 @@ public static function run(): void
 
         LazySecretsLoader::loadSecretEnvironmentVariables();
 
-        Bref::triggerHooks('beforeStartup');
         Bref::events()->beforeStartup();
 
         $lambdaRuntime = LambdaRuntime::fromEnvironmentVariable('fpm');

src/FunctionRuntime/Main.php

@@ -19,7 +19,6 @@ public static function run(): void
 
         LazySecretsLoader::loadSecretEnvironmentVariables();
 
-        Bref::triggerHooks('beforeStartup');
         Bref::events()->beforeStartup();
 
         $lambdaRuntime = LambdaRuntime::fromEnvironmentVariable('function');

src/Runtime/LambdaRuntime.php

@@ -88,7 +88,6 @@ public function processNextEvent(Handler | RequestHandlerInterface | callable $h
         try {
             ColdStartTracker::invocationStarted();
 
-            Bref::triggerHooks('beforeInvoke');
             Bref::events()->beforeInvoke($handler, $event, $context);
 
             $this->ping();

tests/BrefTest.php

@@ -30,34 +30,4 @@ public function test override the container(): void
 
         $this->assertSame($container, Bref::getContainer());
     }
-
-    public function test hooks(): void
-    {
-        $beforeStartup1 = false;
-        $beforeStartup2 = false;
-        $beforeInvoke = false;
-
-        // Check that we can set multiple handlers
-        Bref::beforeStartup(function () use (&$beforeStartup1) {
-            return $beforeStartup1 = true;
-        });
-        Bref::beforeStartup(function () use (&$beforeStartup2) {
-            return $beforeStartup2 = true;
-        });
-        Bref::beforeInvoke(function () use (&$beforeInvoke) {
-            return $beforeInvoke = true;
-        });
-
-        $this->assertFalse($beforeStartup1);
-        $this->assertFalse($beforeStartup2);
-        $this->assertFalse($beforeInvoke);
-
-        Bref::triggerHooks('beforeStartup');
-        $this->assertTrue($beforeStartup1);
-        $this->assertTrue($beforeStartup2);
-        $this->assertFalse($beforeInvoke);
-
-        Bref::triggerHooks('beforeInvoke');
-        $this->assertTrue($beforeInvoke);
-    }
 }

tests/ConsoleRuntime/MainTest.php

@@ -2,12 +2,10 @@
 
 namespace Bref\Test\ConsoleRuntime;
 
-use Bref\Bref;
 use Bref\ConsoleRuntime\CommandFailed;
 use Bref\ConsoleRuntime\Main;
 use Bref\Test\RuntimeTestCase;
 use Bref\Test\Server;
-use Exception;
 
 class MainTest extends RuntimeTestCase
 {
@@ -19,16 +17,6 @@ public function setUp(): void
         putenv('_HANDLER=console.php');
     }
 
-    public function test startup hook is called()
-    {
-        Bref::beforeStartup(function () {
-            throw new Exception('This should be called');
-        });
-
-        $this->expectExceptionMessage('This should be called');
-        Main::run();
-    }
-
     public function test happy path()
     {
         $this->givenAnEvent('');