Merge pull request #3 from arlina-espinoza/closure-serialization

Fix closure serialization issue on request matcher.

Author: arlina-espinoza

composer.json

@@ -14,6 +14,7 @@
     "license": "Apache-2.0",
     "require": {
         "guzzlehttp/psr7": "~1.0",
+        "jeremeamia/superclosure": "^2.4",
         "php-http/client-common": "^1.9",
         "php-http/httplug": "^1.1",
         "psr/http-message": "^1.0"

src/MockStoragePropertyTrait.php

@@ -21,6 +21,7 @@
 use Apigee\MockClient\Psr7\SerializableMessageWrapper;
 use Http\Message\RequestMatcher;
 use Psr\Http\Message\ResponseInterface;
+use SuperClosure\SerializableClosure;
 
 /**
  * A trait for dealing with the mock storage property.
@@ -50,14 +51,15 @@ public function on(RequestMatcher $requestMatcher, $result) {
     if ($result instanceof \Exception || $result instanceof ResponseInterface || is_callable($result)) {
       // Some storage provides will try to serialize the result.
       $result = $result instanceof ResponseInterface ? new SerializableMessageWrapper($result) : $result;
+
       // Normalize to a callable result.
-      $callable = is_callable($result) ? $result : function () use ($result) {
+      $callable = is_callable($result) ? $result : new SerializableClosure(function () use ($result) {
         if ($result instanceof \Exception) {
           throw $result;
         }
         // The only other available type for $result is `SerializableMessageWrapper`.
         return $result->getMessage();
-      };
+      });
 
       $this->storage->addMatchableResult(new MatchableResult($requestMatcher, $callable));
     } else {