Move to laravel/serializable-closure

Author: filippotoso

composer.json

@@ -8,19 +8,21 @@
         "Chatbot"
     ],
     "homepage": "http://github.com/botman/botman",
-    "authors": [{
-        "name": "Marcel Pociot",
-        "email": "m.pociot@gmail.com"
-    }],
+    "authors": [
+        {
+            "name": "Marcel Pociot",
+            "email": "m.pociot@gmail.com"
+        }
+    ],
     "require": {
         "php": ">=7.1",
         "symfony/http-foundation": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
         "tightenco/collect": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
-        "opis/closure": "^2.3 || ^3.0",
         "mpociot/pipeline": "^1.0.2",
         "react/socket": "~1.0",
         "spatie/macroable": "^1.0",
-        "psr/container": "^1.0 || ^2.0"
+        "psr/container": "^1.0 || ^2.0",
+        "laravel/serializable-closure": "^1.0"
     },
     "require-dev": {
         "codeigniter/framework": "~3.0",

src/BotMan.php

@@ -759,7 +759,7 @@ public function __call($name, $arguments)
             $arguments[] = $this->getMessage();
             $arguments[] = $this;
 
-            return \call_user_func_array([$this->getDriver(), $name], $arguments);
+            return \call_user_func_array([$this->getDriver(), $name], array_values($arguments));
         }
 
         throw new BadMethodCallException('Method [' . $name . '] does not exist.');

src/BotManFactory.php

@@ -33,7 +33,7 @@ public static function extend($methodName, $callable)
     public static function __callStatic($name, $arguments)
     {
         try {
-            return \call_user_func_array(self::$extensions[$name], $arguments);
+            return \call_user_func_array(self::$extensions[$name], array_values($arguments));
         } catch (\Exception $e) {
             throw new \BadMethodCallException("Method [$name] does not exist.");
         }

src/Messages/Incoming/IncomingMessage.php

@@ -93,7 +93,7 @@ public function getText()
      */
     public function getConversationIdentifier()
     {
-        return 'conversation-'.$this->bot_id.sha1($this->getSender()).'-'.sha1($this->getRecipient());
+        return 'conversation-' . $this->bot_id . sha1((string)$this->getSender()) . '-' . sha1((string)$this->getRecipient());
     }
 
     /**
@@ -103,7 +103,7 @@ public function getConversationIdentifier()
      */
     public function getOriginatedConversationIdentifier()
     {
-        return 'conversation-'.$this->bot_id.sha1($this->getSender()).'-'.sha1('');
+        return 'conversation-' . $this->bot_id . sha1((string)$this->getSender()) . '-' . sha1('');
     }
 
     /**
@@ -124,7 +124,7 @@ public function addExtras($key, $value)
      */
     public function getExtras($key = null)
     {
-        if (! is_null($key)) {
+        if (!is_null($key)) {
             return Collection::make($this->extras)->get($key);
         }
 

src/Traits/HandlesConversations.php

@@ -9,7 +9,7 @@
 use BotMan\BotMan\Messages\Outgoing\Question;
 use Closure;
 use Illuminate\Support\Collection;
-use Opis\Closure\SerializableClosure;
+use Laravel\SerializableClosure\SerializableClosure;
 
 trait HandlesConversations
 {
@@ -308,14 +308,14 @@ protected function prepareConversationClosure($next, Conversation $conversation,
 
         $parameters[] = $conversation;
 
-        call_user_func_array($next, $parameters);
+        call_user_func_array($next, array_values($parameters));
 
         /*
         // TODO: Needs more work
         if (class_exists('Illuminate\\Support\\Facades\\App')) {
             \Illuminate\Support\Facades\App::call($next, $parameters);
         } else {
-            call_user_func_array($next, $parameters);
+            call_user_func_array($next, array_values($parameters));
         }
         // */
     }

tests/Messages/QuestionTest.php

@@ -4,10 +4,13 @@
 
 use BotMan\BotMan\Messages\Outgoing\Actions\Button;
 use BotMan\BotMan\Messages\Outgoing\Question;
+use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
 use PHPUnit\Framework\TestCase;
 
 class QuestionTest extends TestCase
 {
+    use ArraySubsetAsserts;
+
     /** @test */
     public function it_can_be_created()
     {
@@ -49,14 +52,14 @@ public function it_can_add_buttons()
     public function it_can_add_a_callback_id()
     {
         $message = Question::create('foo')->callbackId('callback');
-        $this->assertArraySubset(['callback_id' => 'callback'], $message->toArray());
+        self::assertArraySubset(['callback_id' => 'callback'], $message->toArray());
     }
 
     /** @test */
     public function it_can_add_a_fallback()
     {
         $message = Question::create('foo')->fallback('fallback');
-        $this->assertArraySubset(['fallback' => 'fallback'], $message->toArray());
+        self::assertArraySubset(['fallback' => 'fallback'], $message->toArray());
     }
 
     /** @test */