From f58b407f9a348340c4f9a61a531674de4f5e39ef Mon Sep 17 00:00:00 2001
From: Artem Henvald <genvaldartem@gmail.com>
Date: Wed, 4 Sep 2019 10:35:46 +0300
Subject: [PATCH 1/7] Refactoring

---
 .travis.yml                                   |   6 +-
 Controller/SinchController.php                |   4 +-
 DependencyInjection/Configuration.php         |  14 +-
 ...{SmsEvent.php => AbstractBaseSmsEvent.php} |   6 +-
 Event/PostSmsSendEvent.php                    |  22 +++
 Event/PreSmsSendEvent.php                     |  22 +++
 Event/SinchEvents.php                         |  42 ------
 Event/SmsMessageCallbackEvent.php             |   3 +-
 Resources/config/services.yml                 |   3 +
 Resources/images/sinch-logo.png               | Bin 77140 -> 3129 bytes
 Service/HTTPClientInterface.php               |  39 -----
 Service/HTTPClientService.php                 |  37 -----
 Service/Sinch.php                             | 100 ++++++-------
 Service/SinchExceptionResolver.php            |  14 --
 Tests/Controller/SinchControllerTest.php      | 141 ++++++++++--------
 .../DependencyInjection/ConfigurationTest.php |  22 +--
 .../FreshSinchExtensionTest.php               |  28 ++--
 Tests/Event/PostSmsSendEventTest.php          |  75 ++++++++++
 Tests/Event/PreSmsSendEventTest.php           |  73 +++++++++
 Tests/Event/SmsEventTest.php                  |  73 ---------
 Tests/Event/SmsMessageCallbackEventTest.php   |  15 +-
 ...eTestCase.php => AbstractTypeTestCase.php} |   8 +-
 Tests/Form/Type/CallbackRequestTypeTest.php   |  50 +++----
 Tests/Form/Type/IdentityTypeTest.php          |  40 ++---
 Tests/Helper/SinchSupportedCountriesTest.php  |   8 +-
 Tests/Model/CallbackRequestTest.php           |  38 ++---
 Tests/Model/IdentityTest.php                  |  14 +-
 Tests/Service/SinchExceptionResolverTest.php  |  86 ++++++-----
 Tests/Service/SinchTest.php                   |   2 +-
 composer.json                                 |  22 +--
 phpstan.neon                                  |  11 ++
 phpunit.xml.dist                              |  11 +-
 32 files changed, 521 insertions(+), 508 deletions(-)
 rename Event/{SmsEvent.php => AbstractBaseSmsEvent.php} (95%)
 create mode 100644 Event/PostSmsSendEvent.php
 create mode 100644 Event/PreSmsSendEvent.php
 delete mode 100644 Event/SinchEvents.php
 delete mode 100644 Service/HTTPClientInterface.php
 delete mode 100644 Service/HTTPClientService.php
 create mode 100644 Tests/Event/PostSmsSendEventTest.php
 create mode 100644 Tests/Event/PreSmsSendEventTest.php
 delete mode 100644 Tests/Event/SmsEventTest.php
 rename Tests/Form/Type/{TypeTestCase.php => AbstractTypeTestCase.php} (86%)
 create mode 100644 phpstan.neon

diff --git a/.travis.yml b/.travis.yml
index 6b03519..914ec86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,14 +3,9 @@ language: php
 sudo: false
 
 php:
-  - 7.1
-  - 7.2
   - 7.3
 
 env:
-  - SYMFONY_VERSION=4.0.*
-  - SYMFONY_VERSION=4.1.*
-  - SYMFONY_VERSION=4.2.*
   - SYMFONY_VERSION=4.3.*
 
 before_install:
@@ -23,6 +18,7 @@ install:
 script:
   - ./vendor/bin/phpcs ./ -p --encoding=utf-8 --extensions=php --ignore="vendor|Tests" --standard=./vendor/escapestudios/symfony2-coding-standard/Symfony
   - ./vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover=coverage.xml
+  - ./vendor/bin/phpstan analyse -l 7 --no-progress -c phpstan.neon ./
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/Controller/SinchController.php b/Controller/SinchController.php
index c450f55..81bbaec 100644
--- a/Controller/SinchController.php
+++ b/Controller/SinchController.php
@@ -12,7 +12,6 @@
 
 namespace Fresh\SinchBundle\Controller;
 
-use Fresh\SinchBundle\Event\SinchEvents;
 use Fresh\SinchBundle\Event\SmsMessageCallbackEvent;
 use Fresh\SinchBundle\Form\Type\CallbackRequestType;
 use Fresh\SinchBundle\Model\CallbackRequest;
@@ -57,8 +56,7 @@ public function callbackAction(Request $request): Response
             $form->handleRequest($request);
 
             if ($form->isSubmitted() && $form->isValid()) {
-                $event = new SmsMessageCallbackEvent($callbackRequest);
-                $this->eventDispatcher->dispatch(SinchEvents::CALLBACK_RECEIVED, $event);
+                $this->eventDispatcher->dispatch(new SmsMessageCallbackEvent($callbackRequest));
             } else {
                 return new Response('Bad Request', Response::HTTP_BAD_REQUEST);
             }
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 3c1ef6c..a557021 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -12,13 +12,14 @@
 
 namespace Fresh\SinchBundle\DependencyInjection;
 
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
  * Configuration.
  *
- * @author Artem Henvald  <genvaldartem@gmail.com>
+ * @author Artem Henvald <genvaldartem@gmail.com>
  */
 class Configuration implements ConfigurationInterface
 {
@@ -27,16 +28,19 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder(): TreeBuilder
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('fresh_sinch');
+        $treeBuilder = new TreeBuilder('fresh_sinch');
 
-        $rootNode
+        /** @var ArrayNodeDefinition $root */
+        $root = $treeBuilder->getRootNode();
+
+        $root
             ->children()
                 ->scalarNode('host')->defaultValue('https://messagingapi.sinch.com')->end()
                 ->scalarNode('key')->end()
                 ->scalarNode('secret')->end()
                 ->scalarNode('from')->defaultNull()->end()
-            ->end();
+            ->end()
+        ;
 
         return $treeBuilder;
     }
diff --git a/Event/SmsEvent.php b/Event/AbstractBaseSmsEvent.php
similarity index 95%
rename from Event/SmsEvent.php
rename to Event/AbstractBaseSmsEvent.php
index 8a5cb5d..60052fb 100644
--- a/Event/SmsEvent.php
+++ b/Event/AbstractBaseSmsEvent.php
@@ -12,14 +12,12 @@
 
 namespace Fresh\SinchBundle\Event;
 
-use Symfony\Component\EventDispatcher\Event;
-
 /**
- * SmsEvent.
+ * AbstractBaseSmsEvent.
  *
  * @author Artem Henvald <genvaldartem@gmail.com>
  */
-class SmsEvent extends Event
+abstract class AbstractBaseSmsEvent
 {
     /** @var string */
     private $number;
diff --git a/Event/PostSmsSendEvent.php b/Event/PostSmsSendEvent.php
new file mode 100644
index 0000000..11e8660
--- /dev/null
+++ b/Event/PostSmsSendEvent.php
@@ -0,0 +1,22 @@
+<?php
+/*
+ * This file is part of the FreshSinchBundle
+ *
+ * (c) Artem Henvald <genvaldartem@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Fresh\SinchBundle\Event;
+
+/**
+ * PostSmsSendEvent.
+ *
+ * @author Artem Henvald <genvaldartem@gmail.com>
+ */
+class PostSmsSendEvent extends AbstractBaseSmsEvent
+{
+}
diff --git a/Event/PreSmsSendEvent.php b/Event/PreSmsSendEvent.php
new file mode 100644
index 0000000..72a062a
--- /dev/null
+++ b/Event/PreSmsSendEvent.php
@@ -0,0 +1,22 @@
+<?php
+/*
+ * This file is part of the FreshSinchBundle
+ *
+ * (c) Artem Henvald <genvaldartem@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Fresh\SinchBundle\Event;
+
+/**
+ * PreSmsSendEvent.
+ *
+ * @author Artem Henvald <genvaldartem@gmail.com>
+ */
+class PreSmsSendEvent extends AbstractBaseSmsEvent
+{
+}
diff --git a/Event/SinchEvents.php b/Event/SinchEvents.php
deleted file mode 100644
index ed874ab..0000000
--- a/Event/SinchEvents.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/*
- * This file is part of the FreshSinchBundle
- *
- * (c) Artem Henvald <genvaldartem@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Fresh\SinchBundle\Event;
-
-/**
- * SinchEvents.
- *
- * @author Artem Henvald <genvaldartem@gmail.com>
- */
-final class SinchEvents
-{
-    /**
-     * This event is triggered before the SMS is going to be sent.
-     *
-     * @see \Fresh\SinchBundle\Event\SmsEvent Listeners receive an instance of this class
-     */
-    public const PRE_SMS_SEND = 'sinch.sms.pre_send';
-
-    /**
-     * This event is triggered after the SMS is successfully sent.
-     *
-     * @see \Fresh\SinchBundle\Event\SmsEvent Listeners receive an instance of this class
-     */
-    public const POST_SMS_SEND = 'sinch.sms.post_send';
-
-    /**
-     * This event is triggered callback from Sinch is received.
-     *
-     * @see \Fresh\SinchBundle\Event\SmsMessageCallbackEvent Listeners receive an instance of this class
-     */
-    public const CALLBACK_RECEIVED = 'sinch.callback.received';
-}
diff --git a/Event/SmsMessageCallbackEvent.php b/Event/SmsMessageCallbackEvent.php
index e37a120..3663b9d 100644
--- a/Event/SmsMessageCallbackEvent.php
+++ b/Event/SmsMessageCallbackEvent.php
@@ -14,14 +14,13 @@
 
 use Fresh\SinchBundle\Model\CallbackRequest;
 use Fresh\SinchBundle\Model\Identity;
-use Symfony\Component\EventDispatcher\Event;
 
 /**
  * SmsMessageCallbackEvent.
  *
  * @author Artem Henvald <genvaldartem@gmail.com>
  */
-class SmsMessageCallbackEvent extends Event
+class SmsMessageCallbackEvent
 {
     /** @var CallbackRequest */
     private $callbackRequest;
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index db7c5ae..54f2746 100644
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -16,3 +16,6 @@ services:
 
     Fresh\SinchBundle\Service\Sinch:
         class: Fresh\SinchBundle\Service\Sinch
+
+    Symfony\Contracts\HttpClient\HttpClientInterface:
+        factory: ['Symfony\Component\HttpClient\HttpClient', 'create']
diff --git a/Resources/images/sinch-logo.png b/Resources/images/sinch-logo.png
index 1a597c7cc5963e5cb3161618323aaa6c05e4c517..85a3db2f99f145e205d1e9e21a34385f33e23d14 100644
GIT binary patch
literal 3129
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

literal 77140
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
M4jg>X-Xq5UAI;wyPyhe`

diff --git a/Service/HTTPClientInterface.php b/Service/HTTPClientInterface.php
deleted file mode 100644
index 39a3ab4..0000000
--- a/Service/HTTPClientInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of the FreshSinchBundle
- *
- * (c) Artem Henvald <genvaldartem@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Fresh\SinchBundle\Service;
-
-/**
- * HTTPClientInterface.
- *
- * @author Artem Henvald <genvaldartem@gmail.com>
- */
-interface HTTPClientInterface
-{
-    /**
-     * @param string $uri
-     * @param array  $body
-     * @param array  $headers
-     *
-     * @return mixed
-     */
-    public function post(string $uri, array $body = [], array $headers = []);
-
-    /**
-     * @param string $uri
-     * @param array  $queryParameters
-     * @param array  $headers
-     *
-     * @return mixed
-     */
-    public function get(string $uri, array $queryParameters = [], array $headers = []);
-}
diff --git a/Service/HTTPClientService.php b/Service/HTTPClientService.php
deleted file mode 100644
index 32efa60..0000000
--- a/Service/HTTPClientService.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
- * This file is part of the FreshSinchBundle
- *
- * (c) Artem Henvald <genvaldartem@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Fresh\SinchBundle\Service;
-
-/**
- * HTTPClientInterface.
- *
- * @author Artem Henvald <genvaldartem@gmail.com>
- */
-class HTTPClientService implements HTTPClientInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function post(string $uri, array $body = [], array $headers = [])
-    {
-        // @todo
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get(string $uri, array $queryParameters = [], array $headers = [])
-    {
-        // @todo
-    }
-}
diff --git a/Service/Sinch.php b/Service/Sinch.php
index f565e23..69f8af6 100644
--- a/Service/Sinch.php
+++ b/Service/Sinch.php
@@ -12,17 +12,18 @@
 
 namespace Fresh\SinchBundle\Service;
 
-use Fresh\SinchBundle\Event\SinchEvents;
-use Fresh\SinchBundle\Event\SmsEvent;
+use Fresh\SinchBundle\Event\PostSmsSendEvent;
+use Fresh\SinchBundle\Event\PreSmsSendEvent;
 use Fresh\SinchBundle\Exception\SinchException;
 use Fresh\SinchBundle\Helper\SinchSmsStatus;
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\ClientException;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
- * Sinch Service.
+ * Sinch.
  *
  * @author Artem Henvald <genvaldartem@gmail.com>
  */
@@ -32,12 +33,12 @@ class Sinch
 
     public const URL_FOR_CHECKING_SMS_STATUS = '/v1/message/status/';
 
-    /** @var Client */
-    private $guzzleHTTPClient;
-
     /** @var EventDispatcherInterface */
     private $dispatcher;
 
+    /** @var HttpClientInterface */
+    private $httpClient;
+
     /** @var string */
     private $host;
 
@@ -52,22 +53,20 @@ class Sinch
 
     /**
      * @param EventDispatcherInterface $dispatcher
+     * @param HttpClientInterface      $httpClient
      * @param string                   $host
      * @param string                   $key
      * @param string                   $secret
      * @param string|null              $from
      */
-    public function __construct(EventDispatcherInterface $dispatcher, $host, $key, $secret, $from = null)
+    public function __construct(EventDispatcherInterface $dispatcher, HttpClientInterface $httpClient, $host, $key, $secret, $from = null)
     {
         $this->dispatcher = $dispatcher;
+        $this->httpClient = $httpClient;
         $this->host = $host;
         $this->key = $key;
         $this->secret = $secret;
         $this->from = $from;
-
-        $this->guzzleHTTPClient = new Client([
-            'base_uri' => \rtrim($this->host, '/'),
-        ]);
     }
 
     /**
@@ -84,37 +83,38 @@ public function sendSMS(string $phoneNumber, string $messageText, ?string $from
         // @todo validate phone number
 
         $body = [
-            'auth' => [$this->key, $this->secret],
-            'headers' => ['X-Timestamp' => (new \DateTime('now'))->format('c')], // ISO 8601 date format
-            'json' => ['message' => $messageText],
+            'message' => $messageText,
         ];
 
         if (null !== $from) {
-            $body['json']['from'] = $from;
+            $body['from'] = $from;
         } elseif (null !== $this->from) {
             $from = $this->from;
-            $body['json']['from'] = $from;
+            $body['from'] = $from;
         }
 
-        try {
-            $smsEvent = new SmsEvent($phoneNumber, $messageText, $from);
+        $this->dispatcher->dispatch(new PreSmsSendEvent($phoneNumber, $messageText, $from));
 
-            $this->dispatcher->dispatch(SinchEvents::PRE_SMS_SEND, $smsEvent);
-            $response = $this->guzzleHTTPClient->post(self::URL_FOR_SENDING_SMS.$phoneNumber, $body);
-            $this->dispatcher->dispatch(SinchEvents::POST_SMS_SEND, $smsEvent);
-        } catch (ClientException $e) {
-            throw SinchExceptionResolver::createAppropriateSinchException($e);
-        }
+        $response = $this->httpClient->request(
+            Request::METHOD_POST,
+            self::URL_FOR_SENDING_SMS.$phoneNumber,
+            [
+                'auth_basic' => [$this->key, $this->secret],
+                'headers' => ['X-Timestamp' => (new \DateTime('now'))->format('c')],
+                'json' => $body,
+            ]
+        );
+
+        $this->dispatcher->dispatch(new PostSmsSendEvent($phoneNumber, $messageText, $from));
 
         $messageId = null;
 
-        if (Response::HTTP_OK === $response->getStatusCode() && $response->hasHeader('Content-Type')
-            && 'application/json; charset=utf-8' === $response->getHeaderLine('Content-Type')
+        $headers = $response->getHeaders();
+        if (Response::HTTP_OK === $response->getStatusCode() && isset($headers['Content-Type'])
+            && 'application/json; charset=utf-8' === $headers['Content-Type']
         ) {
-            $content = $response->getBody()->getContents();
-            $content = \json_decode($content, true);
-
-            if (isset($content['messageId']) && \array_key_exists('messageId', $content)) {
+            $content = \json_decode($response->getContent(), true);
+            if (\array_key_exists('messageId', $content)) {
                 $messageId = $content['messageId'];
             }
         }
@@ -132,7 +132,7 @@ public function getStatusOfSMS(int $messageId): string
         $response = $this->sendRequestToCheckStatusOfSMS($messageId);
         $result = '';
 
-        if (isset($response['status']) && \array_key_exists('status', $response)) {
+        if (\array_key_exists('status', $response)) {
             $result = $response['status'];
         }
 
@@ -149,7 +149,7 @@ public function smsIsSentSuccessfully(int $messageId): bool
         $response = $this->sendRequestToCheckStatusOfSMS($messageId);
 
         $result = false;
-        if (isset($response['status']) && SinchSmsStatus::SUCCESSFUL === $response['status']) {
+        if (\array_key_exists('status', $response) && SinchSmsStatus::SUCCESSFUL === $response['status']) {
             $result = true;
         }
 
@@ -166,7 +166,7 @@ public function smsIsPending(int $messageId): bool
         $response = $this->sendRequestToCheckStatusOfSMS($messageId);
 
         $result = false;
-        if (isset($response['status']) && SinchSmsStatus::PENDING === $response['status']) {
+        if (\array_key_exists('status', $response) && SinchSmsStatus::PENDING === $response['status']) {
             $result = true;
         }
 
@@ -183,7 +183,7 @@ public function smsIsFaulted(int $messageId): bool
         $response = $this->sendRequestToCheckStatusOfSMS($messageId);
 
         $result = false;
-        if (isset($response['status']) && SinchSmsStatus::FAULTED === $response['status']) {
+        if (\array_key_exists('status', $response) && SinchSmsStatus::FAULTED === $response['status']) {
             $result = true;
         }
 
@@ -200,7 +200,7 @@ public function smsInUnknownStatus(int $messageId): bool
         $response = $this->sendRequestToCheckStatusOfSMS($messageId);
 
         $result = false;
-        if (isset($response['status']) && SinchSmsStatus::UNKNOWN === $response['status']) {
+        if (\array_key_exists('status', $response) && SinchSmsStatus::UNKNOWN === $response['status']) {
             $result = true;
         }
 
@@ -214,24 +214,22 @@ public function smsInUnknownStatus(int $messageId): bool
      */
     private function sendRequestToCheckStatusOfSMS(int $messageId): ?array
     {
-        $body = [
-            'auth' => [$this->key, $this->secret],
-            'headers' => ['X-Timestamp' => (new \DateTime('now'))->format('c')],
-        ];
-
-        try {
-            $response = $this->guzzleHTTPClient->get(self::URL_FOR_CHECKING_SMS_STATUS.$messageId, $body);
-        } catch (ClientException $e) {
-            throw SinchExceptionResolver::createAppropriateSinchException($e);
-        }
+        $response = $this->httpClient->request(
+            Request::METHOD_GET,
+            self::URL_FOR_CHECKING_SMS_STATUS.$messageId,
+            [
+                'auth_basic' => [$this->key, $this->secret],
+                'headers' => ['X-Timestamp' => (new \DateTime('now'))->format('c')],
+            ]
+        );
 
         $result = null;
 
-        if (Response::HTTP_OK === $response->getStatusCode() && $response->hasHeader('Content-Type')
-            && 'application/json; charset=utf-8' === $response->getHeaderLine('Content-Type')
+        $headers = $response->getHeaders();
+        if (Response::HTTP_OK === $response->getStatusCode() && isset($headers['Content-Type'])
+            && 'application/json; charset=utf-8' === $headers['Content-Type']
         ) {
-            $content = $response->getBody()->getContents();
-            $result = \json_decode($content, true);
+            $result = \json_decode($response->getContent(), true);
         }
 
         return $result;
diff --git a/Service/SinchExceptionResolver.php b/Service/SinchExceptionResolver.php
index 5403af7..97b80f0 100644
--- a/Service/SinchExceptionResolver.php
+++ b/Service/SinchExceptionResolver.php
@@ -23,7 +23,6 @@
 use Fresh\SinchBundle\Exception\SinchException;
 use Fresh\SinchBundle\Exception\Unauthorized\SinchIllegalAuthorizationHeaderException;
 use Fresh\SinchBundle\Helper\SinchErrorCode;
-use GuzzleHttp\Exception\ClientException;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
@@ -51,23 +50,18 @@ public static function createAppropriateSinchException(ClientException $e): \Exc
         switch ($responseStatusCode) {
             case Response::HTTP_BAD_REQUEST:
                 $exception = self::getSinchExceptionForBadRequest($errorCode, $errorMessage);
-
                 break;
             case Response::HTTP_UNAUTHORIZED:
                 $exception = self::getSinchExceptionForUnauthorized($errorCode, $errorMessage);
-
                 break;
             case Response::HTTP_PAYMENT_REQUIRED:
                 $exception = self::getSinchExceptionForPaymentRequired($errorCode, $errorMessage);
-
                 break;
             case Response::HTTP_FORBIDDEN:
                 $exception = self::getSinchExceptionForForbidden($errorCode, $errorMessage);
-
                 break;
             case Response::HTTP_INTERNAL_SERVER_ERROR:
                 $exception = self::getSinchExceptionForInternalServerError($errorCode, $errorMessage);
-
                 break;
         }
 
@@ -91,15 +85,12 @@ private static function getSinchExceptionForBadRequest(int $errorCode, string $e
         switch ($errorCode) {
             case SinchErrorCode::PARAMETER_VALIDATION:
                 $exception = new SinchParameterValidationException($errorMessage);
-
                 break;
             case SinchErrorCode::MISSING_PARAMETER:
                 $exception = new SinchMissingParameterException($errorMessage);
-
                 break;
             case SinchErrorCode::INVALID_REQUEST:
                 $exception = new SinchInvalidRequestException($errorMessage);
-
                 break;
         }
 
@@ -155,16 +146,13 @@ private static function getSinchExceptionForForbidden(int $errorCode, string $er
         switch ($errorCode) {
             case SinchErrorCode::FORBIDDEN_REQUEST:
                 $exception = new SinchForbiddenRequestException($errorMessage);
-
                 break;
             case SinchErrorCode::INVALID_AUTHORIZATION_SCHEME_FOR_CALLING_THE_METHOD:
                 $exception = new SinchInvalidAuthorizationSchemeException($errorMessage);
-
                 break;
             case SinchErrorCode::NO_VERIFIED_PHONE_NUMBER_ON_YOUR_SINCH_ACCOUNT:
             case SinchErrorCode::SANDBOX_SMS_ONLY_ALLOWED_TO_BE_SENT_TO_VERIFIED_NUMBERS:
                 $exception = new SinchNoVerifiedPhoneNumberException($errorMessage);
-
                 break;
         }
 
@@ -187,6 +175,4 @@ private static function getSinchExceptionForInternalServerError(int $errorCode,
 
         return $exception;
     }
-
-    // endregion
 }
diff --git a/Tests/Controller/SinchControllerTest.php b/Tests/Controller/SinchControllerTest.php
index a6747fa..fc13ca4 100644
--- a/Tests/Controller/SinchControllerTest.php
+++ b/Tests/Controller/SinchControllerTest.php
@@ -10,6 +10,7 @@
 
 namespace Fresh\SinchBundle\Tests\Controller;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
 use Symfony\Component\Form\Form;
@@ -27,109 +28,119 @@ class SinchControllerTest extends WebTestCase
 {
     public const DEFAULT_SINCH_CALLBACK_URL = '/sinch/callback';
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|TraceableEventDispatcher */
+    /** @var TraceableEventDispatcher|MockObject */
     private $eventDispatcher;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|FormFactory */
+    /** @var FormFactory|MockObject */
     private $formFactory;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|Form */
+    /** @var Form|MockObject */
     private $form;
 
     /** @var SinchController */
     private $controller;
 
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->eventDispatcher = $this->getMockBuilder(TraceableEventDispatcher::class)
-                                      ->disableOriginalConstructor()
-                                      ->setMethods(['dispatch'])
-                                      ->getMock();
-
-        $this->formFactory = $this->getMockBuilder(FormFactory::class)
-                                  ->disableOriginalConstructor()
-                                  ->setMethods(['create'])
-                                  ->getMock();
-
-        $this->form = $this->getMockBuilder(Form::class)
-                           ->disableOriginalConstructor()
-                           ->setMethods(['isValid', 'isSubmitted', 'handleRequest'])
-                           ->getMock();
-
-        $this->formFactory->expects($this->once())
-                          ->method('create')
-                          ->willReturn($this->form);
+        $this->eventDispatcher = $this->createMock(TraceableEventDispatcher::class);
+        $this->form = $this->createMock(Form::class);
+        $this->formFactory = $this->createMock(FormFactory::class);
+        $this->formFactory
+            ->expects(self::once())
+            ->method('create')
+            ->willReturn($this->form)
+        ;
 
         $this->controller = new SinchController($this->formFactory, $this->eventDispatcher);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
-        unset($this->formFactory);
-        unset($this->eventDispatcher);
-        unset($this->controller);
-        unset($this->form);
+        unset(
+            $this->eventDispatcher,
+            $this->form,
+            $this->formFactory,
+            $this->controller,
+        );
     }
 
-    public function testValidCallback()
+    public function testValidCallback(): void
     {
-        $this->form->expects($this->once())
-                   ->method('isSubmitted')
-                   ->willReturn(true);
-
-        $this->form->expects($this->once())
-                   ->method('isValid')
-                   ->willReturn(true);
+        $this->form
+            ->expects(self::once())
+            ->method('isSubmitted')
+            ->willReturn(true)
+        ;
+
+        $this->form
+            ->expects(self::once())
+            ->method('isValid')
+            ->willReturn(true)
+        ;
 
         $request = Request::create(self::DEFAULT_SINCH_CALLBACK_URL, 'POST');
         $response = $this->controller->callbackAction($request);
-        $this->assertEquals(Response::HTTP_OK, $response->getStatusCode());
+        self::assertEquals(Response::HTTP_OK, $response->getStatusCode());
     }
 
-    public function testNotSubmittedData()
+    public function testNotSubmittedData(): void
     {
-        $this->form->expects($this->once())
-                   ->method('isSubmitted')
-                   ->willReturn(false);
-        $this->form->expects($this->never())
-                   ->method('isValid');
+        $this->form
+            ->expects(self::once())
+            ->method('isSubmitted')
+            ->willReturn(false)
+        ;
+        $this->form
+            ->expects($this->never())
+            ->method('isValid')
+        ;
 
         $request = Request::create(self::DEFAULT_SINCH_CALLBACK_URL, 'POST');
         $response = $this->controller->callbackAction($request);
-        $this->assertEquals(Response::HTTP_BAD_REQUEST, $response->getStatusCode());
+        self::assertEquals(Response::HTTP_BAD_REQUEST, $response->getStatusCode());
     }
 
-    public function testNotValidData()
+    public function testNotValidData(): void
     {
-        $this->form->expects($this->once())
-                   ->method('isSubmitted')
-                   ->willReturn(true);
-
-        $this->form->expects($this->once())
-                   ->method('isValid')
-                   ->willReturn(false);
+        $this->form
+            ->expects(self::once())
+            ->method('isSubmitted')
+            ->willReturn(true)
+        ;
+
+        $this->form
+            ->expects(self::once())
+            ->method('isValid')
+            ->willReturn(false)
+        ;
 
         $request = Request::create(self::DEFAULT_SINCH_CALLBACK_URL, 'POST');
         $response = $this->controller->callbackAction($request);
-        $this->assertEquals(Response::HTTP_BAD_REQUEST, $response->getStatusCode());
+        self::assertEquals(Response::HTTP_BAD_REQUEST, $response->getStatusCode());
     }
 
-    public function testInternalError()
+    public function testInternalError(): void
     {
-        $this->eventDispatcher->expects($this->once())
-                              ->method('dispatch')
-                              ->willThrowException(new \Exception());
-
-        $this->form->expects($this->once())
-                   ->method('isSubmitted')
-                   ->willReturn(true);
-
-        $this->form->expects($this->once())
-                   ->method('isValid')
-                   ->willReturn(true);
+        $this->eventDispatcher
+            ->expects(self::once())
+            ->method('dispatch')
+            ->willThrowException(new \Exception())
+        ;
+
+        $this->form
+            ->expects(self::once())
+            ->method('isSubmitted')
+            ->willReturn(true)
+        ;
+
+        $this->form
+            ->expects(self::once())
+            ->method('isValid')
+            ->willReturn(true)
+        ;
 
         $request = Request::create(self::DEFAULT_SINCH_CALLBACK_URL, 'POST');
         $response = $this->controller->callbackAction($request);
-        $this->assertEquals(Response::HTTP_INTERNAL_SERVER_ERROR, $response->getStatusCode());
+        self::assertEquals(Response::HTTP_INTERNAL_SERVER_ERROR, $response->getStatusCode());
     }
 }
diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
index efe5b41..060016c 100644
--- a/Tests/DependencyInjection/ConfigurationTest.php
+++ b/Tests/DependencyInjection/ConfigurationTest.php
@@ -23,9 +23,9 @@ class ConfigurationTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 
-    public function testInvalidConfiguration()
+    public function testInvalidConfiguration(): void
     {
-        $this->assertConfigurationIsInvalid(
+        self::assertConfigurationIsInvalid(
             [
                 [
                     'invalid_parameter' => 123,
@@ -35,9 +35,9 @@ public function testInvalidConfiguration()
         );
     }
 
-    public function testValidDefaultConfiguration()
+    public function testValidDefaultConfiguration(): void
     {
-        $this->assertProcessedConfigurationEquals(
+        self::assertProcessedConfigurationEquals(
             [],
             [
                 'host' => 'https://messagingapi.sinch.com',
@@ -46,9 +46,9 @@ public function testValidDefaultConfiguration()
         );
     }
 
-    public function testValidConfigurationWithHost()
+    public function testValidConfigurationWithHost(): void
     {
-        $this->assertProcessedConfigurationEquals(
+        self::assertProcessedConfigurationEquals(
             [
                 [
                     'host' => 'https://test.com',
@@ -65,9 +65,9 @@ public function testValidConfigurationWithHost()
         );
     }
 
-    public function testValidConfigurationWithoutFrom()
+    public function testValidConfigurationWithoutFrom(): void
     {
-        $this->assertProcessedConfigurationEquals(
+        self::assertProcessedConfigurationEquals(
             [
                 [
                     'key' => '1234567890',
@@ -83,9 +83,9 @@ public function testValidConfigurationWithoutFrom()
         );
     }
 
-    public function testValidConfigurationWithFrom()
+    public function testValidConfigurationWithFrom(): void
     {
-        $this->assertProcessedConfigurationEquals(
+        self::assertProcessedConfigurationEquals(
             [
                 [
                     'key' => '1234567890',
@@ -102,7 +102,7 @@ public function testValidConfigurationWithFrom()
         );
     }
 
-    protected function getConfiguration()
+    protected function getConfiguration(): Configuration
     {
         return new Configuration();
     }
diff --git a/Tests/DependencyInjection/FreshSinchExtensionTest.php b/Tests/DependencyInjection/FreshSinchExtensionTest.php
index ccc500a..47d612a 100644
--- a/Tests/DependencyInjection/FreshSinchExtensionTest.php
+++ b/Tests/DependencyInjection/FreshSinchExtensionTest.php
@@ -31,20 +31,20 @@ class FreshSinchExtensionTest extends TestCase
     /** @var ContainerBuilder */
     private $container;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->extension = new FreshSinchExtension();
         $this->container = new ContainerBuilder();
         $this->container->registerExtension($this->extension);
     }
 
-    public function testLoadExtension()
+    public function testLoadExtension(): void
     {
         $yaml = <<<'CONFIG'
-fresh_sinch:
-    key: some_dummy_key
-    secret: some_dummy_secret
-CONFIG;
+            fresh_sinch:
+                key: some_dummy_key
+                secret: some_dummy_secret
+        CONFIG;
         $parser = new Parser();
         $config = $parser->parse($yaml);
 
@@ -54,19 +54,19 @@ public function testLoadExtension()
         $this->container->set('form.factory', new \stdClass());
         $this->container->compile();
 
-        $this->assertArrayHasKey(Sinch::class, $this->container->getRemovedIds());
-        $this->assertArrayHasKey(SinchController::class, $this->container->getRemovedIds());
+        self::assertArrayHasKey(Sinch::class, $this->container->getRemovedIds());
+        self::assertArrayHasKey(SinchController::class, $this->container->getRemovedIds());
 
-        $this->assertArrayNotHasKey(Sinch::class, $this->container->getDefinitions());
-        $this->assertArrayNotHasKey(SinchController::class, $this->container->getDefinitions());
+        self::assertArrayNotHasKey(Sinch::class, $this->container->getDefinitions());
+        self::assertArrayNotHasKey(SinchController::class, $this->container->getDefinitions());
 
         $this->expectException(ServiceNotFoundException::class);
         $this->container->get(Sinch::class);
         $this->container->get(SinchController::class);
 
-        $this->assertTrue($this->container->hasParameter('sinch.host'));
-        $this->assertTrue($this->container->hasParameter('sinch.key'));
-        $this->assertTrue($this->container->hasParameter('sinch.secret'));
-        $this->assertTrue($this->container->hasParameter('sinch.from'));
+        self::assertTrue($this->container->hasParameter('sinch.host'));
+        self::assertTrue($this->container->hasParameter('sinch.key'));
+        self::assertTrue($this->container->hasParameter('sinch.secret'));
+        self::assertTrue($this->container->hasParameter('sinch.from'));
     }
 }
diff --git a/Tests/Event/PostSmsSendEventTest.php b/Tests/Event/PostSmsSendEventTest.php
new file mode 100644
index 0000000..3e3dd63
--- /dev/null
+++ b/Tests/Event/PostSmsSendEventTest.php
@@ -0,0 +1,75 @@
+<?php
+/*
+ * This file is part of the FreshSinchBundle
+ *
+ * (c) Artem Henvald <genvaldartem@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Fresh\SinchBundle\Tests\Event;
+
+use Fresh\SinchBundle\Event\AbstractBaseSmsEvent;
+use Fresh\SinchBundle\Event\PostSmsSendEvent;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * PostSmsSendEventTest.
+ *
+ * @author Artem Henvald <genvaldartem@gmail.com>
+ */
+class PostSmsSendEventTest extends TestCase
+{
+    public function testConstructorWithoutFrom(): void
+    {
+        $number = '+46700000000';
+        $message = 'Hello world';
+
+        $postSmsSendEvent = new PostSmsSendEvent($number, $message);
+
+        self::assertEquals($number, $postSmsSendEvent->getNumber());
+        self::assertEquals($message, $postSmsSendEvent->getMessage());
+        self::assertInstanceOf(AbstractBaseSmsEvent::class, $postSmsSendEvent);
+    }
+
+    public function testConstructorWithFrom(): void
+    {
+        $number = '+46700000000';
+        $message = 'Hello world';
+        $from = 'Santa Claus';
+
+        $postSmsSendEvent = new PostSmsSendEvent($number, $message, $from);
+
+        self::assertEquals($number, $postSmsSendEvent->getNumber());
+        self::assertEquals($message, $postSmsSendEvent->getMessage());
+        self::assertEquals($from, $postSmsSendEvent->getFrom());
+    }
+
+    public function testSetGetNumber(): void
+    {
+        $postSmsSendEvent = new PostSmsSendEvent('', '');
+
+        $number = '+46700000000';
+        $postSmsSendEvent->setNumber($number);
+        self::assertEquals($number, $postSmsSendEvent->getNumber());
+    }
+
+    public function testSetGetMessage(): void
+    {
+        $postSmsSendEvent = new PostSmsSendEvent('', '');
+
+        $message = 'Hello world';
+        $postSmsSendEvent->setMessage($message);
+        self::assertEquals($message, $postSmsSendEvent->getMessage());
+    }
+
+    public function testSetGetFrom(): void
+    {
+        $postSmsSendEvent = new PostSmsSendEvent('', '');
+
+        $from = 'Santa Claus';
+        $postSmsSendEvent->setFrom($from);
+        self::assertEquals($from, $postSmsSendEvent->getFrom());
+    }
+}
diff --git a/Tests/Event/PreSmsSendEventTest.php b/Tests/Event/PreSmsSendEventTest.php
new file mode 100644
index 0000000..099f90c
--- /dev/null
+++ b/Tests/Event/PreSmsSendEventTest.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ * This file is part of the FreshSinchBundle
+ *
+ * (c) Artem Henvald <genvaldartem@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Fresh\SinchBundle\Tests\Event;
+
+use Fresh\SinchBundle\Event\PreSmsSendEvent;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * PreSmsSendEventTest.
+ *
+ * @author Artem Henvald <genvaldartem@gmail.com>
+ */
+class PreSmsSendEventTest extends TestCase
+{
+    public function testConstructorWithoutFrom(): void
+    {
+        $number = '+46700000000';
+        $message = 'Hello world';
+
+        $preSmsSendEvent = new PreSmsSendEvent($number, $message);
+
+        self::assertEquals($number, $preSmsSendEvent->getNumber());
+        self::assertEquals($message, $preSmsSendEvent->getMessage());
+    }
+
+    public function testConstructorWithFrom(): void
+    {
+        $number = '+46700000000';
+        $message = 'Hello world';
+        $from = 'Santa Claus';
+
+        $preSmsSendEvent = new PreSmsSendEvent($number, $message, $from);
+
+        self::assertEquals($number, $preSmsSendEvent->getNumber());
+        self::assertEquals($message, $preSmsSendEvent->getMessage());
+        self::assertEquals($from, $preSmsSendEvent->getFrom());
+    }
+
+    public function testSetGetNumber(): void
+    {
+        $preSmsSendEvent = new PreSmsSendEvent('', '');
+
+        $number = '+46700000000';
+        $preSmsSendEvent->setNumber($number);
+        self::assertEquals($number, $preSmsSendEvent->getNumber());
+    }
+
+    public function testSetGetMessage(): void
+    {
+        $preSmsSendEvent = new PreSmsSendEvent('', '');
+
+        $message = 'Hello world';
+        $preSmsSendEvent->setMessage($message);
+        self::assertEquals($message, $preSmsSendEvent->getMessage());
+    }
+
+    public function testSetGetFrom(): void
+    {
+        $preSmsSendEvent = new PreSmsSendEvent('', '');
+
+        $from = 'Santa Claus';
+        $preSmsSendEvent->setFrom($from);
+        self::assertEquals($from, $preSmsSendEvent->getFrom());
+    }
+}
diff --git a/Tests/Event/SmsEventTest.php b/Tests/Event/SmsEventTest.php
deleted file mode 100644
index 2c109b4..0000000
--- a/Tests/Event/SmsEventTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/*
- * This file is part of the FreshSinchBundle
- *
- * (c) Artem Henvald <genvaldartem@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Fresh\SinchBundle\Tests\Event;
-
-use Fresh\SinchBundle\Event\SmsEvent;
-use PHPUnit\Framework\TestCase;
-
-/**
- * SmsEventTest.
- *
- * @author Artem Henvald <genvaldartem@gmail.com>
- */
-class SmsEventTest extends TestCase
-{
-    public function testConstructorWithoutFrom()
-    {
-        $number = '+46700000000';
-        $message = 'Hello world';
-
-        $smsEvent = new SmsEvent($number, $message);
-
-        $this->assertEquals($number, $smsEvent->getNumber());
-        $this->assertEquals($message, $smsEvent->getMessage());
-    }
-
-    public function testConstructorWithFrom()
-    {
-        $number = '+46700000000';
-        $message = 'Hello world';
-        $from = 'Santa Claus';
-
-        $smsEvent = new SmsEvent($number, $message, $from);
-
-        $this->assertEquals($number, $smsEvent->getNumber());
-        $this->assertEquals($message, $smsEvent->getMessage());
-        $this->assertEquals($from, $smsEvent->getFrom());
-    }
-
-    public function testSetGetNumber()
-    {
-        $smsEvent = new SmsEvent('', '');
-
-        $number = '+46700000000';
-        $smsEvent->setNumber($number);
-        $this->assertEquals($number, $smsEvent->getNumber());
-    }
-
-    public function testSetGetMessage()
-    {
-        $smsEvent = new SmsEvent('', '');
-
-        $message = 'Hello world';
-        $smsEvent->setMessage($message);
-        $this->assertEquals($message, $smsEvent->getMessage());
-    }
-
-    public function testSetGetFrom()
-    {
-        $smsEvent = new SmsEvent('', '');
-
-        $from = 'Santa Claus';
-        $smsEvent->setFrom($from);
-        $this->assertEquals($from, $smsEvent->getFrom());
-    }
-}
diff --git a/Tests/Event/SmsMessageCallbackEventTest.php b/Tests/Event/SmsMessageCallbackEventTest.php
index 5e8b430..6923b10 100644
--- a/Tests/Event/SmsMessageCallbackEventTest.php
+++ b/Tests/Event/SmsMessageCallbackEventTest.php
@@ -22,7 +22,7 @@
  */
 class SmsMessageCallbackEventTest extends TestCase
 {
-    public function testConstructor()
+    public function testConstructor(): void
     {
         $event = 'incomingSms';
         $from = new Identity();
@@ -38,13 +38,14 @@ public function testConstructor()
             ->setMessage($message)
             ->setTimestamp($timestamp)
             ->setVersion($version);
+
         $callbackEvent = new SmsMessageCallbackEvent($callbackRequest);
 
-        $this->assertEquals($event, $callbackEvent->getEvent());
-        $this->assertEquals($from, $callbackEvent->getFrom());
-        $this->assertEquals($to, $callbackEvent->getTo());
-        $this->assertEquals($message, $callbackEvent->getMessage());
-        $this->assertEquals($timestamp, $callbackEvent->getTimestamp());
-        $this->assertEquals($version, $callbackEvent->getVersion());
+        self::assertEquals($event, $callbackEvent->getEvent());
+        self::assertEquals($from, $callbackEvent->getFrom());
+        self::assertEquals($to, $callbackEvent->getTo());
+        self::assertEquals($message, $callbackEvent->getMessage());
+        self::assertEquals($timestamp, $callbackEvent->getTimestamp());
+        self::assertEquals($version, $callbackEvent->getVersion());
     }
 }
diff --git a/Tests/Form/Type/TypeTestCase.php b/Tests/Form/Type/AbstractTypeTestCase.php
similarity index 86%
rename from Tests/Form/Type/TypeTestCase.php
rename to Tests/Form/Type/AbstractTypeTestCase.php
index 71c54d7..bf5cdc6 100644
--- a/Tests/Form/Type/TypeTestCase.php
+++ b/Tests/Form/Type/AbstractTypeTestCase.php
@@ -16,11 +16,11 @@
 use Symfony\Component\Form\Test\FormIntegrationTestCase;
 
 /**
- * TypeTestCase
+ * AbstractTypeTestCase.
  *
  * @author Artem Henvald <genvaldartem@gmail.com>
  */
-abstract class TypeTestCase extends FormIntegrationTestCase
+abstract class AbstractTypeTestCase extends FormIntegrationTestCase
 {
     /** @var FormBuilder */
     protected $builder;
@@ -28,7 +28,7 @@ abstract class TypeTestCase extends FormIntegrationTestCase
     /** @var EventDispatcher */
     protected $dispatcher;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -36,7 +36,7 @@ protected function setUp()
         $this->builder = new FormBuilder(null, null, $this->dispatcher, $this->factory);
     }
 
-    public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actual)
+    public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actual): void
     {
         self::assertEquals($expected->format('c'), $actual->format('c'));
     }
diff --git a/Tests/Form/Type/CallbackRequestTypeTest.php b/Tests/Form/Type/CallbackRequestTypeTest.php
index a56e134..82b75b9 100644
--- a/Tests/Form/Type/CallbackRequestTypeTest.php
+++ b/Tests/Form/Type/CallbackRequestTypeTest.php
@@ -21,27 +21,27 @@
  *
  * @author Artem Henvald <genvaldartem@gmail.com>
  */
-class CallbackRequestTypeTest extends TypeTestCase
+class CallbackRequestTypeTest extends AbstractTypeTestCase
 {
-    public function testGetBlockPrefix()
+    public function testGetBlockPrefix(): void
     {
-        $this->assertEmpty((new CallbackRequestType)->getBlockPrefix());
+        self::assertEmpty((new CallbackRequestType)->getBlockPrefix());
     }
 
-    public function testFormBuilder()
+    public function testFormBuilder(): void
     {
         $form = $this->factory->createBuilder(CallbackRequestType::class)->getForm();
 
-        $this->assertEquals(6, $form->count());
-        $this->assertInstanceOf(FormInterface::class, $form->get('event'));
-        $this->assertInstanceOf(FormInterface::class, $form->get('from'));
-        $this->assertInstanceOf(FormInterface::class, $form->get('to'));
-        $this->assertInstanceOf(FormInterface::class, $form->get('message'));
-        $this->assertInstanceOf(FormInterface::class, $form->get('timestamp'));
-        $this->assertInstanceOf(FormInterface::class, $form->get('version'));
+        self::assertEquals(6, $form->count());
+        self::assertInstanceOf(FormInterface::class, $form->get('event'));
+        self::assertInstanceOf(FormInterface::class, $form->get('from'));
+        self::assertInstanceOf(FormInterface::class, $form->get('to'));
+        self::assertInstanceOf(FormInterface::class, $form->get('message'));
+        self::assertInstanceOf(FormInterface::class, $form->get('timestamp'));
+        self::assertInstanceOf(FormInterface::class, $form->get('version'));
     }
 
-    public function testGetDefaultOptions()
+    public function testGetDefaultOptions(): void
     {
         $type = new CallbackRequestType();
 
@@ -51,11 +51,11 @@ public function testGetDefaultOptions()
 
         $options = $optionResolver->resolve();
 
-        $this->assertFalse($options['csrf_protection']);
-        $this->assertEquals(CallbackRequest::class, $options['data_class']);
+        self::assertFalse($options['csrf_protection']);
+        self::assertEquals(CallbackRequest::class, $options['data_class']);
     }
 
-    public function testSubmitValidData()
+    public function testSubmitValidData(): void
     {
         $data = [
             'event' => 'incomingSms',
@@ -85,23 +85,23 @@ public function testSubmitValidData()
         // Submit the data to the form directly
         $form->submit($data);
 
-        $this->assertTrue($form->isSynchronized());
+        self::assertTrue($form->isSynchronized());
 
-        /** @var \Fresh\SinchBundle\Model\CallbackRequest $formData */
+        /** @var CallbackRequest $formData */
         $formData = $form->getData();
-        $this->assertEquals($identity, $formData);
-        $this->assertInternalType('string', $formData->getEvent());
-        $this->assertInternalType('object', $formData->getFrom());
-        $this->assertInternalType('object', $formData->getTo());
-        $this->assertInternalType('string', $formData->getMessage());
-        $this->assertInternalType('object', $formData->getTimestamp());
-        $this->assertInternalType('integer', $formData->getVersion());
+        self::assertEquals($identity, $formData);
+        self::assertIsString($formData->getEvent());
+        self::assertIsObject($formData->getFrom());
+        self::assertIsObject($formData->getTo());
+        self::assertIsString($formData->getMessage());
+        self::assertIsObject($formData->getTimestamp());
+        self::assertIsInt($formData->getVersion());
 
         $view = $form->createView();
         $children = $view->children;
 
         foreach (\array_keys($data) as $key) {
-            $this->assertArrayHasKey($key, $children);
+            self::assertArrayHasKey($key, $children);
         }
     }
 }
diff --git a/Tests/Form/Type/IdentityTypeTest.php b/Tests/Form/Type/IdentityTypeTest.php
index 9bbb480..20018fc 100644
--- a/Tests/Form/Type/IdentityTypeTest.php
+++ b/Tests/Form/Type/IdentityTypeTest.php
@@ -20,23 +20,23 @@
  *
  * @author Artem Henvald <genvaldartem@gmail.com>
  */
-class IdentityTypeTest extends TypeTestCase
+class IdentityTypeTest extends AbstractTypeTestCase
 {
-    public function testGetBlockPrefix()
+    public function testGetBlockPrefix(): void
     {
-        $this->assertEmpty((new IdentityType)->getBlockPrefix());
+        self::assertEmpty((new IdentityType())->getBlockPrefix());
     }
 
-    public function testFormBuilder()
+    public function testFormBuilder(): void
     {
         $form = $this->factory->createBuilder(IdentityType::class)->getForm();
 
-        $this->assertEquals(2, $form->count());
-        $this->assertInstanceOf(FormInterface::class, $form->get('type'));
-        $this->assertInstanceOf(FormInterface::class, $form->get('endpoint'));
+        self::assertEquals(2, $form->count());
+        self::assertInstanceOf(FormInterface::class, $form->get('type'));
+        self::assertInstanceOf(FormInterface::class, $form->get('endpoint'));
     }
 
-    public function testGetDefaultOptions()
+    public function testGetDefaultOptions(): void
     {
         $type = new IdentityType();
 
@@ -46,11 +46,11 @@ public function testGetDefaultOptions()
 
         $options = $optionResolver->resolve();
 
-        $this->assertFalse($options['csrf_protection']);
-        $this->assertEquals(Identity::class, $options['data_class']);
+        self::assertFalse($options['csrf_protection']);
+        self::assertEquals(Identity::class, $options['data_class']);
     }
 
-    public function testSubmitValidData()
+    public function testSubmitValidData(): void
     {
         $data = [
             'type' => 'number',
@@ -59,25 +59,27 @@ public function testSubmitValidData()
 
         $form = $this->factory->create(IdentityType::class);
 
-        $identity = (new Identity())->setType('number')
-                                    ->setEndpoint('+46700000000');
+        $identity = (new Identity())
+            ->setType('number')
+            ->setEndpoint('+46700000000')
+        ;
 
         // Submit the data to the form directly
         $form->submit($data);
 
-        $this->assertTrue($form->isSynchronized());
+        self::assertTrue($form->isSynchronized());
 
-        /** @var \Fresh\SinchBundle\Model\Identity $formData */
+        /** @var Identity $formData */
         $formData = $form->getData();
-        $this->assertEquals($identity, $formData);
-        $this->assertInternalType('string', $formData->getType());
-        $this->assertInternalType('string', $formData->getEndpoint());
+        self::assertEquals($identity, $formData);
+        self::assertIsString($formData->getType());
+        self::assertIsString($formData->getEndpoint());
 
         $view = $form->createView();
         $children = $view->children;
 
         foreach (\array_keys($data) as $key) {
-            $this->assertArrayHasKey($key, $children);
+            self::assertArrayHasKey($key, $children);
         }
     }
 }
diff --git a/Tests/Helper/SinchSupportedCountriesTest.php b/Tests/Helper/SinchSupportedCountriesTest.php
index e60d950..c25b2ef 100644
--- a/Tests/Helper/SinchSupportedCountriesTest.php
+++ b/Tests/Helper/SinchSupportedCountriesTest.php
@@ -20,13 +20,13 @@
  */
 class SinchSupportedCountriesTest extends TestCase
 {
-    public function testSupportedCountry()
+    public function testSupportedCountry(): void
     {
-        $this->assertTrue(SinchSupportedCountries::isCountrySupported('UA'));
+        self::assertTrue(SinchSupportedCountries::isCountrySupported('UA'));
     }
 
-    public function testUnsupportedCountry()
+    public function testUnsupportedCountry(): void
     {
-        $this->assertFalse(SinchSupportedCountries::isCountrySupported('YO'));
+        self::assertFalse(SinchSupportedCountries::isCountrySupported('YO'));
     }
 }
diff --git a/Tests/Model/CallbackRequestTest.php b/Tests/Model/CallbackRequestTest.php
index 48346aa..4dd53d6 100644
--- a/Tests/Model/CallbackRequestTest.php
+++ b/Tests/Model/CallbackRequestTest.php
@@ -21,57 +21,57 @@
  */
 class CallbackRequestTest extends TestCase
 {
-    public function testConstructor()
+    public function testConstructor(): void
     {
         $callbackRequest = new CallbackRequest();
 
-        $this->assertNull($callbackRequest->getEvent());
-        $this->assertNull($callbackRequest->getFrom());
-        $this->assertNull($callbackRequest->getTo());
-        $this->assertNull($callbackRequest->getMessage());
-        $this->assertNull($callbackRequest->getTimestamp());
-        $this->assertNull($callbackRequest->getVersion());
+        self::assertNull($callbackRequest->getEvent());
+        self::assertNull($callbackRequest->getFrom());
+        self::assertNull($callbackRequest->getTo());
+        self::assertNull($callbackRequest->getMessage());
+        self::assertNull($callbackRequest->getTimestamp());
+        self::assertNull($callbackRequest->getVersion());
     }
 
-    public function testSetGetEvent()
+    public function testSetGetEvent(): void
     {
         $event = 'incomingSms';
         $callbackRequest = (new CallbackRequest())->setEvent($event);
-        $this->assertEquals($event, $callbackRequest->getEvent());
+        self::assertEquals($event, $callbackRequest->getEvent());
     }
 
-    public function testSetGetTo()
+    public function testSetGetTo(): void
     {
         $to = new Identity();
         $callbackRequest = (new CallbackRequest())->setTo($to);
-        $this->assertEquals($to, $callbackRequest->getTo());
+        self::assertEquals($to, $callbackRequest->getTo());
     }
 
-    public function testSetGetFrom()
+    public function testSetGetFrom(): void
     {
         $from = new Identity();
         $callbackRequest = (new CallbackRequest())->setFrom($from);
-        $this->assertEquals($from, $callbackRequest->getFrom());
+        self::assertEquals($from, $callbackRequest->getFrom());
     }
 
-    public function testSetGetMessage()
+    public function testSetGetMessage(): void
     {
         $message = 'Hello world';
         $callbackRequest = (new CallbackRequest())->setMessage($message);
-        $this->assertEquals($message, $callbackRequest->getMessage());
+        self::assertEquals($message, $callbackRequest->getMessage());
     }
 
-    public function testSetGetTimestamp()
+    public function testSetGetTimestamp(): void
     {
         $timestamp = new \DateTime('now');
         $callbackRequest = (new CallbackRequest())->setTimestamp($timestamp);
-        $this->assertEquals($timestamp, $callbackRequest->getTimestamp());
+        self::assertEquals($timestamp, $callbackRequest->getTimestamp());
     }
 
-    public function testSetGetVersion()
+    public function testSetGetVersion(): void
     {
         $version = 1;
         $callbackRequest = (new CallbackRequest())->setVersion($version);
-        $this->assertEquals($version, $callbackRequest->getVersion());
+        self::assertEquals($version, $callbackRequest->getVersion());
     }
 }
diff --git a/Tests/Model/IdentityTest.php b/Tests/Model/IdentityTest.php
index 1d5bbbb..3620d86 100644
--- a/Tests/Model/IdentityTest.php
+++ b/Tests/Model/IdentityTest.php
@@ -20,25 +20,25 @@
  */
 class IdentityTest extends TestCase
 {
-    public function testConstructor()
+    public function testConstructor(): void
     {
         $identity = new Identity();
 
-        $this->assertNull($identity->getType());
-        $this->assertNull($identity->getEndpoint());
+        self::assertNull($identity->getType());
+        self::assertNull($identity->getEndpoint());
     }
 
-    public function testSetGetType()
+    public function testSetGetType(): void
     {
         $type = 'number';
         $identity = (new Identity())->setType($type);
-        $this->assertEquals($type, $identity->getType());
+        self::assertEquals($type, $identity->getType());
     }
 
-    public function testSetGetEndpoint()
+    public function testSetGetEndpoint(): void
     {
         $endpoint = '+46700000000';
         $identity = (new Identity())->setEndpoint($endpoint);
-        $this->assertEquals($endpoint, $identity->getEndpoint());
+        self::assertEquals($endpoint, $identity->getEndpoint());
     }
 }
diff --git a/Tests/Service/SinchExceptionResolverTest.php b/Tests/Service/SinchExceptionResolverTest.php
index 07abe15..f8bbb1e 100644
--- a/Tests/Service/SinchExceptionResolverTest.php
+++ b/Tests/Service/SinchExceptionResolverTest.php
@@ -21,7 +21,6 @@
 use Fresh\SinchBundle\Exception\Unauthorized\SinchIllegalAuthorizationHeaderException;
 use Fresh\SinchBundle\Helper\SinchErrorCode;
 use Fresh\SinchBundle\Service\SinchExceptionResolver;
-use GuzzleHttp\Exception\ClientException;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -35,93 +34,102 @@
  */
 class SinchExceptionResolverTest extends TestCase
 {
-    public function testSinchParameterValidationException()
+    public function testSinchParameterValidationException(): void
     {
         $e = $this->getClientException(Response::HTTP_BAD_REQUEST, SinchErrorCode::PARAMETER_VALIDATION);
-        $this->assertInstanceOf(SinchParameterValidationException::class, SinchExceptionResolver::createAppropriateSinchException($e));
+        self::assertInstanceOf(SinchParameterValidationException::class, SinchExceptionResolver::createAppropriateSinchException($e));
     }
 
-    public function testSinchInvalidRequestException()
+    public function testSinchInvalidRequestException(): void
     {
         $e = $this->getClientException(Response::HTTP_BAD_REQUEST, SinchErrorCode::INVALID_REQUEST);
-        $this->assertInstanceOf(SinchInvalidRequestException::class, SinchExceptionResolver::createAppropriateSinchException($e));
+        self::assertInstanceOf(SinchInvalidRequestException::class, SinchExceptionResolver::createAppropriateSinchException($e));
     }
 
-    public function testSinchMissingParameterException()
+    public function testSinchMissingParameterException(): void
     {
         $e = $this->getClientException(Response::HTTP_BAD_REQUEST, SinchErrorCode::MISSING_PARAMETER);
-        $this->assertInstanceOf(SinchMissingParameterException::class, SinchExceptionResolver::createAppropriateSinchException($e));
+        self::assertInstanceOf(SinchMissingParameterException::class, SinchExceptionResolver::createAppropriateSinchException($e));
     }
 
-    public function testSinchIllegalAuthorizationHeaderException()
+    public function testSinchIllegalAuthorizationHeaderException(): void
     {
         $e = $this->getClientException(Response::HTTP_UNAUTHORIZED, SinchErrorCode::ILLEGAL_AUTHORIZATION_HEADER);
-        $this->assertInstanceOf(SinchIllegalAuthorizationHeaderException::class, SinchExceptionResolver::createAppropriateSinchException($e));
+        self::assertInstanceOf(SinchIllegalAuthorizationHeaderException::class, SinchExceptionResolver::createAppropriateSinchException($e));
     }
 
-    public function testSinchPaymentRequiredException()
+    public function testSinchPaymentRequiredException(): void
     {
         $e = $this->getClientException(Response::HTTP_PAYMENT_REQUIRED, SinchErrorCode::THERE_IS_NOT_ENOUGH_FUNDS_TO_SEND_THE_MESSAGE);
-        $this->assertInstanceOf(SinchPaymentRequiredException::class, SinchExceptionResolver::createAppropriateSinchException($e));
+        self::assertInstanceOf(SinchPaymentRequiredException::class, SinchExceptionResolver::createAppropriateSinchException($e));
     }
 
-    public function testSinchForbiddenRequestException()
+    public function testSinchForbiddenRequestException(): void
     {
         $e = $this->getClientException(Response::HTTP_FORBIDDEN, SinchErrorCode::FORBIDDEN_REQUEST);
-        $this->assertInstanceOf(SinchForbiddenRequestException::class, SinchExceptionResolver::createAppropriateSinchException($e));
+        self::assertInstanceOf(SinchForbiddenRequestException::class, SinchExceptionResolver::createAppropriateSinchException($e));
     }
 
-    public function testSinchInvalidAuthorizationSchemeException()
+    public function testSinchInvalidAuthorizationSchemeException(): void
     {
         $e = $this->getClientException(Response::HTTP_FORBIDDEN, SinchErrorCode::INVALID_AUTHORIZATION_SCHEME_FOR_CALLING_THE_METHOD);
-        $this->assertInstanceOf(SinchInvalidAuthorizationSchemeException::class, SinchExceptionResolver::createAppropriateSinchException($e));
+        self::assertInstanceOf(SinchInvalidAuthorizationSchemeException::class, SinchExceptionResolver::createAppropriateSinchException($e));
     }
 
-    public function testSinchNoVerifiedPhoneNumberException()
+    public function testSinchNoVerifiedPhoneNumberException(): void
     {
         $e = $this->getClientException(Response::HTTP_FORBIDDEN, SinchErrorCode::NO_VERIFIED_PHONE_NUMBER_ON_YOUR_SINCH_ACCOUNT);
-        $this->assertInstanceOf(SinchNoVerifiedPhoneNumberException::class, SinchExceptionResolver::createAppropriateSinchException($e));
+        self::assertInstanceOf(SinchNoVerifiedPhoneNumberException::class, SinchExceptionResolver::createAppropriateSinchException($e));
 
         $e = $this->getClientException(Response::HTTP_FORBIDDEN, SinchErrorCode::SANDBOX_SMS_ONLY_ALLOWED_TO_BE_SENT_TO_VERIFIED_NUMBERS);
-        $this->assertInstanceOf(SinchNoVerifiedPhoneNumberException::class, SinchExceptionResolver::createAppropriateSinchException($e));
+        self::assertInstanceOf(SinchNoVerifiedPhoneNumberException::class, SinchExceptionResolver::createAppropriateSinchException($e));
     }
 
-    public function testSinchInternalErrorException()
+    public function testSinchInternalErrorException(): void
     {
         $e = $this->getClientException(Response::HTTP_INTERNAL_SERVER_ERROR, SinchErrorCode::INTERNAL_ERROR);
-        $this->assertInstanceOf(SinchInternalErrorException::class, SinchExceptionResolver::createAppropriateSinchException($e));
+        self::assertInstanceOf(SinchInternalErrorException::class, SinchExceptionResolver::createAppropriateSinchException($e));
     }
 
-    public function testStandardException()
+    public function testStandardException(): void
     {
         $e = $this->getClientException(Response::HTTP_GATEWAY_TIMEOUT, 0);
-        $this->assertInstanceOf(\Exception::class, SinchExceptionResolver::createAppropriateSinchException($e));
+        self::assertInstanceOf(\Exception::class, SinchExceptionResolver::createAppropriateSinchException($e));
     }
 
     /**
-     * Get client exception
-     *
      * @param int $statusCode Status code
      * @param int $errorCode  Error code
      *
      * @return ClientException
      */
-    private function getClientException($statusCode, $errorCode)
+    private function getClientException($statusCode, $errorCode): ClientException
     {
-        $request = $this->getMockBuilder(RequestInterface::class)->disableOriginalConstructor()->getMock();
-        $response = $this->getMockBuilder(ResponseInterface::class)->disableOriginalConstructor()->getMock();
-        $body = $this->getMockBuilder(StreamInterface::class)->disableOriginalConstructor()->getMock();
-
-        $response->expects($this->once())->method('getStatusCode')->willReturn($statusCode);
-        $response->expects($this->once())->method('getBody')->will($this->returnValue($body));
-
-        $body->expects($this->once())->method('getContents')->will($this->returnValue(<<<JSON
-{
-    "errorCode": $errorCode,
-    "message": "Some message"
-}
-JSON
-        ));
+        $request = $this->createMock(RequestInterface::class);
+        $response = $this->createMock(ResponseInterface::class);
+        $body = $this->createMock(StreamInterface::class);
+
+        $response
+            ->expects(self::once())
+            ->method('getStatusCode')
+            ->willReturn($statusCode)
+        ;
+        $response
+            ->expects(self::once())
+            ->method('getBody')
+            ->willReturn($body)
+        ;
+
+        $body
+            ->expects(self::once())
+            ->method('getContents')
+            ->willReturn(<<<JSON
+                {
+                    "errorCode": $errorCode,
+                    "message": "Some message"
+                }
+            JSON)
+        ;
 
         return new ClientException(null, $request, $response);
     }
diff --git a/Tests/Service/SinchTest.php b/Tests/Service/SinchTest.php
index 194acc4..3fd0de4 100644
--- a/Tests/Service/SinchTest.php
+++ b/Tests/Service/SinchTest.php
@@ -19,7 +19,7 @@
  */
 class SinchTest
 {
-    public function testSendSms()
+    public function testSendSms(): void
     {
         // @todo
     }
diff --git a/composer.json b/composer.json
index c86b885..95221fd 100644
--- a/composer.json
+++ b/composer.json
@@ -17,17 +17,21 @@
         "issues": "https://github.com/fre5h/SinchBundle/issues"
     },
     "require": {
-        "php": "^7.1.3",
-        "symfony/config": "^4.0",
-        "symfony/event-dispatcher": "^4.0",
-        "symfony/form": "^4.0",
-        "symfony/framework-bundle": "^4.0",
-        "guzzlehttp/guzzle": "^6.3"
+        "php": "^7.3.0",
+        "symfony/config": "^4.3",
+        "symfony/event-dispatcher": "^4.3",
+        "symfony/http-client": "^4.3",
+        "symfony/form": "^4.3",
+        "symfony/framework-bundle": "^4.3",
+        "symfony/serializer-pack": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5",
-        "escapestudios/symfony2-coding-standard": "^3.0",
-        "matthiasnoback/symfony-config-test": "3.1.*"
+        "escapestudios/symfony2-coding-standard": "^3.9",
+        "matthiasnoback/symfony-config-test": "^4.0",
+        "phpstan/phpstan": "^0.11",
+        "phpstan/phpstan-doctrine":"^0.11",
+        "phpstan/phpstan-phpunit": "^0.11",
+        "phpunit/phpunit": "^8.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 0000000..239d7f8
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,11 @@
+includes:
+    - 'vendor/phpstan/phpstan-phpunit/extension.neon'
+    - 'vendor/phpstan/phpstan-phpunit/rules.neon'
+    - 'vendor/phpstan/phpstan-doctrine/extension.neon'
+parameters:
+    level: 7
+    excludes_analyse:
+        - '%rootDir%/../../../Tests/*'
+        - '%rootDir%/../../../vendor/*'
+    fileExtensions:
+        - 'php'
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a94ca5f..69b72ec 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.3/phpunit.xsd"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="vendor/autoload.php"
 >
-
     <testsuites>
         <testsuite name="SinchBundle Test Suite">
             <directory>./Tests</directory>

From 887b4e70faf8f95da2c302f1796482b4227a9955 Mon Sep 17 00:00:00 2001
From: Artem Henvald <genvaldartem@gmail.com>
Date: Wed, 4 Sep 2019 11:03:03 +0300
Subject: [PATCH 2/7] Update README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 28b757b..92d2a64 100644
--- a/README.md
+++ b/README.md
@@ -20,8 +20,8 @@ Provides integration with **[Sinch.com](https://www.sinch.com)** SMS API.
 
 ## Requirements
 
-* PHP 7.1 *and later*
-* Symfony 4.0 *and later*
+* PHP 7.3 *and later*
+* Symfony 4.3 *and later*
 
 ## Installation
 

From 947090e213510e6957f202a5dda784bbf95fa37e Mon Sep 17 00:00:00 2001
From: Artem Henvald <genvaldartem@gmail.com>
Date: Sun, 27 Dec 2020 10:30:08 +0200
Subject: [PATCH 3/7] Update README.md

---
 README.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 92d2a64..cc9436d 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Provides integration with **[Sinch.com](https://www.sinch.com)** SMS API.
 ![Sinch Logo](/Resources/images/sinch-logo.png)
 
 [![Scrutinizer Quality Score](https://img.shields.io/scrutinizer/g/fre5h/SinchBundle.svg?style=flat-square)](https://scrutinizer-ci.com/g/fre5h/SinchBundle/)
-[![Build Status](https://img.shields.io/travis/fre5h/SinchBundle/master.svg?style=flat-square)](https://travis-ci.org/fre5h/SinchBundle)
+[![Build Status](https://img.shields.io/travis/fre5h/SinchBundle/master.svg?style=flat-square)](https://travis-ci.com/fre5h/SinchBundle)
 [![CodeCov](https://img.shields.io/codecov/c/github/fre5h/SinchBundle.svg?style=flat-square)](https://codecov.io/github/fre5h/SinchBundle)
 [![License](https://img.shields.io/packagist/l/fresh/sinch-bundle.svg?style=flat-square)](https://packagist.org/packages/fresh/sinch-bundle)
 [![Latest Stable Version](https://img.shields.io/packagist/v/fresh/sinch-bundle.svg?style=flat-square)](https://packagist.org/packages/fresh/sinch-bundle)
@@ -15,9 +15,6 @@ Provides integration with **[Sinch.com](https://www.sinch.com)** SMS API.
 [![StyleCI](https://styleci.io/repos/44092074/shield?style=flat-square)](https://styleci.io/repos/44092074)
 [![Gitter](https://img.shields.io/badge/gitter-join%20chat-brightgreen.svg?style=flat-square)](https://gitter.im/fre5h/SinchBundle)
 
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/2303fcfb-2e4b-45b3-8b37-6d1e7598acf4/small.png)](https://insight.sensiolabs.com/projects/2303fcfb-2e4b-45b3-8b37-6d1e7598acf4)
-[![knpbundles.com](http://knpbundles.com/fre5h/SinchBundle/badge-short)](http://knpbundles.com/fre5h/SinchBundle)
-
 ## Requirements
 
 * PHP 7.3 *and later*

From 49592297ce3384e79bfe7c93018d079744563b92 Mon Sep 17 00:00:00 2001
From: Artem Henvald <genvaldartem@gmail.com>
Date: Sun, 27 Dec 2020 10:30:43 +0200
Subject: [PATCH 4/7] Update .travis.yml

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 914ec86..4a621a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,11 @@ sudo: false
 
 php:
   - 7.3
+  - 7.4
+  - 8.0
 
 env:
+  - SYMFONY_VERSION=4.4.*
   - SYMFONY_VERSION=4.3.*
 
 before_install:
@@ -18,7 +21,7 @@ install:
 script:
   - ./vendor/bin/phpcs ./ -p --encoding=utf-8 --extensions=php --ignore="vendor|Tests" --standard=./vendor/escapestudios/symfony2-coding-standard/Symfony
   - ./vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover=coverage.xml
-  - ./vendor/bin/phpstan analyse -l 7 --no-progress -c phpstan.neon ./
+  - ./vendor/bin/phpstan analyse -l 8 --no-progress -c phpstan.neon ./
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

From 8ac7bbb077a4879c3d98a8a539fc60d854209b9a Mon Sep 17 00:00:00 2001
From: Artem Henvald <genvaldartem@gmail.com>
Date: Sun, 27 Dec 2020 10:31:00 +0200
Subject: [PATCH 5/7] Update phpstan.neon

---
 phpstan.neon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpstan.neon b/phpstan.neon
index 239d7f8..b47882e 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -3,7 +3,7 @@ includes:
     - 'vendor/phpstan/phpstan-phpunit/rules.neon'
     - 'vendor/phpstan/phpstan-doctrine/extension.neon'
 parameters:
-    level: 7
+    level: 8
     excludes_analyse:
         - '%rootDir%/../../../Tests/*'
         - '%rootDir%/../../../vendor/*'

From 7d911008065526f16b745cf46741f74f168445d9 Mon Sep 17 00:00:00 2001
From: Artem Henvald <genvaldartem@gmail.com>
Date: Sun, 27 Dec 2020 10:31:41 +0200
Subject: [PATCH 6/7] Update composer.json

---
 composer.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 95221fd..d64c533 100644
--- a/composer.json
+++ b/composer.json
@@ -26,12 +26,12 @@
         "symfony/serializer-pack": "^1.0"
     },
     "require-dev": {
-        "escapestudios/symfony2-coding-standard": "^3.9",
+        "escapestudios/symfony2-coding-standard": "^3.11",
         "matthiasnoback/symfony-config-test": "^4.0",
-        "phpstan/phpstan": "^0.11",
-        "phpstan/phpstan-doctrine":"^0.11",
-        "phpstan/phpstan-phpunit": "^0.11",
-        "phpunit/phpunit": "^8.3"
+        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan-doctrine":"^0.12",
+        "phpstan/phpstan-phpunit": "^0.12",
+        "phpunit/phpunit": "^9.5"
     },
     "autoload": {
         "psr-4": {

From 9091cc2254da73c6028f0f564347f78418cbca84 Mon Sep 17 00:00:00 2001
From: Artem Henvald <genvaldartem@gmail.com>
Date: Sun, 27 Dec 2020 10:32:04 +0200
Subject: [PATCH 7/7] Update phpunit.xml.dist

---
 phpunit.xml.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 69b72ec..e3a9d8f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.5/phpunit.xsd"
          colors="true"
          bootstrap="vendor/autoload.php"
 >