From 7e67bc18183b9a0ec63fce790df1655eeb71c50c Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Thu, 14 Jul 2022 12:07:18 +0200 Subject: [PATCH] beautify code --- Tests/LoggerHandlerTest.php | 4 ++-- Tests/Request/AbstractRequest.php | 2 +- src/Client.php | 1 - src/Exceptions/NoSenderDefinedException.php | 3 +-- src/LoggerHandler.php | 4 ++-- src/RecipientsList/RecipientsList.php | 1 - src/Request/Request.php | 2 +- src/ValueObject/Sender.php | 14 +++++++------- 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/Tests/LoggerHandlerTest.php b/Tests/LoggerHandlerTest.php index 0f24503..9b56315 100644 --- a/Tests/LoggerHandlerTest.php +++ b/Tests/LoggerHandlerTest.php @@ -70,10 +70,10 @@ class LoggerHandlerTest extends ApiTestCase ->onlyMethods(['debug', 'error', 'log']) ->getMock(); - $this->callMethod( $this->loggerHandler, 'setLogger', [ $loggerMock]); + $this->callMethod($this->loggerHandler, 'setLogger', [ $loggerMock]); $this->assertSame( $loggerMock, - $this->callMethod( $this->loggerHandler, 'getLogger') + $this->callMethod($this->loggerHandler, 'getLogger') ); } } diff --git a/Tests/Request/AbstractRequest.php b/Tests/Request/AbstractRequest.php index 2e79b64..8c3d097 100644 --- a/Tests/Request/AbstractRequest.php +++ b/Tests/Request/AbstractRequest.php @@ -477,7 +477,7 @@ abstract class AbstractRequest extends ApiTestCase if ($hasSender) { /** @var Sender|MockObject $senderMock */ - $senderMock = $this->getMockBuilder( Sender::class ) + $senderMock = $this->getMockBuilder(Sender::class) ->disableOriginalConstructor() ->onlyMethods(['get']) ->getMock(); diff --git a/src/Client.php b/src/Client.php index 90c8894..6e9055b 100644 --- a/src/Client.php +++ b/src/Client.php @@ -24,7 +24,6 @@ use GuzzleHttp\ClientInterface; use GuzzleHttp\Exception\GuzzleException; use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; -use Psr\Log\LoggerInterface; class Client { diff --git a/src/Exceptions/NoSenderDefinedException.php b/src/Exceptions/NoSenderDefinedException.php index e79d27c..91c357e 100644 --- a/src/Exceptions/NoSenderDefinedException.php +++ b/src/Exceptions/NoSenderDefinedException.php @@ -17,5 +17,4 @@ namespace D3\LinkmobilityClient\Exceptions; class NoSenderDefinedException extends LinkmobilityException { - -} \ No newline at end of file +} diff --git a/src/LoggerHandler.php b/src/LoggerHandler.php index 13db761..a79794c 100644 --- a/src/LoggerHandler.php +++ b/src/LoggerHandler.php @@ -48,8 +48,8 @@ class LoggerHandler /** * @return LoggerInterface */ - public function getLogger() : LoggerInterface + public function getLogger(): LoggerInterface { return $this->logger; } -} \ No newline at end of file +} diff --git a/src/RecipientsList/RecipientsList.php b/src/RecipientsList/RecipientsList.php index 9ddb808..afa31c3 100644 --- a/src/RecipientsList/RecipientsList.php +++ b/src/RecipientsList/RecipientsList.php @@ -18,7 +18,6 @@ namespace D3\LinkmobilityClient\RecipientsList; use D3\LinkmobilityClient\Client; use D3\LinkmobilityClient\Exceptions\ExceptionMessages; use D3\LinkmobilityClient\Exceptions\RecipientException; -use D3\LinkmobilityClient\LoggerHandler; use D3\LinkmobilityClient\ValueObject\Recipient; use Iterator; use libphonenumber\NumberParseException; diff --git a/src/Request/Request.php b/src/Request/Request.php index 5278007..aef637f 100644 --- a/src/Request/Request.php +++ b/src/Request/Request.php @@ -126,7 +126,7 @@ abstract class Request implements RequestInterface /** * @return string */ - public abstract function getUri(): string; + abstract public function getUri(): string; /** * @throws InvalidArgumentException diff --git a/src/ValueObject/Sender.php b/src/ValueObject/Sender.php index 72b06f9..1d95635 100644 --- a/src/ValueObject/Sender.php +++ b/src/ValueObject/Sender.php @@ -36,22 +36,22 @@ class Sender extends StringValueObject public function __construct(string $number = null, string $iso2CountryCode = null) { try { - if ( is_null( $number ) || is_null( $iso2CountryCode ) ) { + if (is_null($number) || is_null($iso2CountryCode)) { throw new NoSenderDefinedException(); } - Assert::that( $iso2CountryCode )->string()->length( 2 ); + Assert::that($iso2CountryCode)->string()->length(2); $phoneUtil = $this->getPhoneNumberUtil(); - $phoneNumber = $phoneUtil->parse( $number, strtoupper( $iso2CountryCode ) ); - $number = ltrim( $phoneUtil->format( $phoneNumber, PhoneNumberFormat::E164 ), '+' ); + $phoneNumber = $phoneUtil->parse($number, strtoupper($iso2CountryCode)); + $number = ltrim($phoneUtil->format($phoneNumber, PhoneNumberFormat::E164), '+'); - if ( false === $phoneUtil->isValidNumber( $phoneNumber ) ) { - throw new RecipientException( ExceptionMessages::INVALID_SENDER ); + if (false === $phoneUtil->isValidNumber($phoneNumber)) { + throw new RecipientException(ExceptionMessages::INVALID_SENDER); } - parent::__construct( $number ); + parent::__construct($number); } catch (NoSenderDefinedException $e) { LoggerHandler::getInstance()->getLogger()->debug( ExceptionMessages::DEBUG_NOSENDERORCOUNTRYCODE