Prepare for Laravel Octane

Author: hdj

composer.json

@@ -19,6 +19,9 @@
         "illuminate/console": "^8.0|^9.0",
         "krowinski/php-mysql-replication": "^7.0"
     },
+    "require-dev": {
+        "orchestra/testbench": "^6.0"
+    },
     "autoload": {
         "files": [],
         "psr-4": {

routes/trigger.php

@@ -1,5 +1,7 @@
 <?php
 
+/** @var \Huangdijia\Trigger\Trigger $trigger */
+
 $trigger->on('*', 'heartbeat', function($event) use ($trigger) {
     $trigger->heartbeat($event);
 });

src/Manager.php

@@ -26,14 +26,13 @@ public function __construct(array $config = [])
      * Create new replication
      *
      * @param string|null $name
-     * @return \Huangdijia\Trigger\Trigger
+     * @return Trigger
      */
     public function replication(?string $name = null)
     {
         $name = $name ?? $this->config['default'] ?? 'default';
 
         if (!isset($this->replications[$name])) {
-
             throw_if(
                 !isset($this->config['replications'][$name]),
                 new InvalidArgumentException("Config 'trigger.replications.{$name}' is undefined", 1)
@@ -42,6 +41,7 @@ public function replication(?string $name = null)
             $config = $this->config['replications'][$name];
 
             $this->replications[$name] = tap(new Trigger($name, $config), function ($trigger) {
+                /** @var Trigger $trigger */
                 $trigger->loadRoutes();
 
                 if ($trigger->getConfig('detect')) {

src/Trigger.php

@@ -2,6 +2,7 @@
 
 namespace Huangdijia\Trigger;
 
+use Illuminate\Container\Container;
 use Exception;
 use Huangdijia\Trigger\EventSubscriber;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -413,7 +414,7 @@ private function parseAction($action, $event)
         }
 
         return [
-            [app($class), $method],
+            [Container::getInstance()->make($class), $method],
             [$event],
         ];
     }

src/TriggerServiceProvider.php

@@ -16,8 +16,8 @@ public function register()
         $this->configure();
         $this->registerCommands();
 
-        $this->app->singleton('trigger.manager', function ($app) {
-            return new Manager(config('trigger'));
+        $this->app->bind('trigger.manager', function ($app) {
+            return new Manager($app->make('config')->get('trigger'));
         });
     }