From e4d181a4fab77ca5eb8a52546cba1978a1a26a62 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Fri, 11 Nov 2016 22:25:01 +0100 Subject: [PATCH] Rename ObjectSerializer to ModelSerializer (#215) Fix #204 --- src/Mailgun/Mailgun.php | 4 ++-- .../{ObjectSerializer.php => ModelSerializer.php} | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename src/Mailgun/Serializer/{ObjectSerializer.php => ModelSerializer.php} (78%) diff --git a/src/Mailgun/Mailgun.php b/src/Mailgun/Mailgun.php index 69482c5..111fb10 100644 --- a/src/Mailgun/Mailgun.php +++ b/src/Mailgun/Mailgun.php @@ -19,7 +19,7 @@ use Mailgun\Lists\OptInHandler; use Mailgun\Messages\BatchMessage; use Mailgun\Messages\Exceptions; use Mailgun\Messages\MessageBuilder; -use Mailgun\Serializer\ObjectSerializer; +use Mailgun\Serializer\ModelSerializer; use Mailgun\Serializer\ResponseDeserializer; /** @@ -89,7 +89,7 @@ class Mailgun $this->httpClient = $clientConfigurator->createConfiguredClient(); $this->requestFactory = MessageFactoryDiscovery::find(); - $this->serializer = $serializer ?: new ObjectSerializer(); + $this->serializer = $serializer ?: new ModelSerializer(); } /** diff --git a/src/Mailgun/Serializer/ObjectSerializer.php b/src/Mailgun/Serializer/ModelSerializer.php similarity index 78% rename from src/Mailgun/Serializer/ObjectSerializer.php rename to src/Mailgun/Serializer/ModelSerializer.php index bf0064d..7cee2d7 100644 --- a/src/Mailgun/Serializer/ObjectSerializer.php +++ b/src/Mailgun/Serializer/ModelSerializer.php @@ -11,7 +11,7 @@ use Psr\Http\Message\ResponseInterface; * * @author Tobias Nyholm */ -class ObjectSerializer implements ResponseDeserializer +class ModelSerializer implements ResponseDeserializer { /** * @param ResponseInterface $response @@ -23,7 +23,7 @@ class ObjectSerializer implements ResponseDeserializer { $body = $response->getBody()->__toString(); if (strpos($response->getHeaderLine('Content-Type'), 'application/json') !== 0) { - throw new SerializeException('The ObjectSerializer cannot deserialize response with Content-Type:'.$response->getHeaderLine('Content-Type')); + throw new SerializeException('The ModelSerializer cannot deserialize response with Content-Type:'.$response->getHeaderLine('Content-Type')); } $data = json_decode($body, true); @@ -32,7 +32,7 @@ class ObjectSerializer implements ResponseDeserializer } if (is_subclass_of($class, ApiResponse::class)) { - $object = call_user_func($class.'::createFromArray', $data); + $object = call_user_func($class.'::create', $data); } else { $object = new $class($data); }