beautify code

Cette révision appartient à :
Daniel Seifert 2022-07-14 12:07:18 +02:00
Parent aa88f09e16
révision 7e67bc1818
Signé par: DanielS
ID de la clé GPG: 8A7C4C6ED1915C6F
8 fichiers modifiés avec 14 ajouts et 17 suppressions

Voir le fichier

@ -70,10 +70,10 @@ class LoggerHandlerTest extends ApiTestCase
->onlyMethods(['debug', 'error', 'log']) ->onlyMethods(['debug', 'error', 'log'])
->getMock(); ->getMock();
$this->callMethod( $this->loggerHandler, 'setLogger', [ $loggerMock]); $this->callMethod($this->loggerHandler, 'setLogger', [ $loggerMock]);
$this->assertSame( $this->assertSame(
$loggerMock, $loggerMock,
$this->callMethod( $this->loggerHandler, 'getLogger') $this->callMethod($this->loggerHandler, 'getLogger')
); );
} }
} }

Voir le fichier

@ -477,7 +477,7 @@ abstract class AbstractRequest extends ApiTestCase
if ($hasSender) { if ($hasSender) {
/** @var Sender|MockObject $senderMock */ /** @var Sender|MockObject $senderMock */
$senderMock = $this->getMockBuilder( Sender::class ) $senderMock = $this->getMockBuilder(Sender::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->onlyMethods(['get']) ->onlyMethods(['get'])
->getMock(); ->getMock();

Voir le fichier

@ -24,7 +24,6 @@ use GuzzleHttp\ClientInterface;
use GuzzleHttp\Exception\GuzzleException; use GuzzleHttp\Exception\GuzzleException;
use InvalidArgumentException; use InvalidArgumentException;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Log\LoggerInterface;
class Client class Client
{ {

Voir le fichier

@ -17,5 +17,4 @@ namespace D3\LinkmobilityClient\Exceptions;
class NoSenderDefinedException extends LinkmobilityException class NoSenderDefinedException extends LinkmobilityException
{ {
}
}

Voir le fichier

@ -48,8 +48,8 @@ class LoggerHandler
/** /**
* @return LoggerInterface * @return LoggerInterface
*/ */
public function getLogger() : LoggerInterface public function getLogger(): LoggerInterface
{ {
return $this->logger; return $this->logger;
} }
} }

Voir le fichier

@ -18,7 +18,6 @@ namespace D3\LinkmobilityClient\RecipientsList;
use D3\LinkmobilityClient\Client; use D3\LinkmobilityClient\Client;
use D3\LinkmobilityClient\Exceptions\ExceptionMessages; use D3\LinkmobilityClient\Exceptions\ExceptionMessages;
use D3\LinkmobilityClient\Exceptions\RecipientException; use D3\LinkmobilityClient\Exceptions\RecipientException;
use D3\LinkmobilityClient\LoggerHandler;
use D3\LinkmobilityClient\ValueObject\Recipient; use D3\LinkmobilityClient\ValueObject\Recipient;
use Iterator; use Iterator;
use libphonenumber\NumberParseException; use libphonenumber\NumberParseException;

Voir le fichier

@ -126,7 +126,7 @@ abstract class Request implements RequestInterface
/** /**
* @return string * @return string
*/ */
public abstract function getUri(): string; abstract public function getUri(): string;
/** /**
* @throws InvalidArgumentException * @throws InvalidArgumentException

Voir le fichier

@ -36,22 +36,22 @@ class Sender extends StringValueObject
public function __construct(string $number = null, string $iso2CountryCode = null) public function __construct(string $number = null, string $iso2CountryCode = null)
{ {
try { try {
if ( is_null( $number ) || is_null( $iso2CountryCode ) ) { if (is_null($number) || is_null($iso2CountryCode)) {
throw new NoSenderDefinedException(); throw new NoSenderDefinedException();
} }
Assert::that( $iso2CountryCode )->string()->length( 2 ); Assert::that($iso2CountryCode)->string()->length(2);
$phoneUtil = $this->getPhoneNumberUtil(); $phoneUtil = $this->getPhoneNumberUtil();
$phoneNumber = $phoneUtil->parse( $number, strtoupper( $iso2CountryCode ) ); $phoneNumber = $phoneUtil->parse($number, strtoupper($iso2CountryCode));
$number = ltrim( $phoneUtil->format( $phoneNumber, PhoneNumberFormat::E164 ), '+' ); $number = ltrim($phoneUtil->format($phoneNumber, PhoneNumberFormat::E164), '+');
if ( false === $phoneUtil->isValidNumber( $phoneNumber ) ) { if (false === $phoneUtil->isValidNumber($phoneNumber)) {
throw new RecipientException( ExceptionMessages::INVALID_SENDER ); throw new RecipientException(ExceptionMessages::INVALID_SENDER);
} }
parent::__construct( $number ); parent::__construct($number);
} catch (NoSenderDefinedException $e) { } catch (NoSenderDefinedException $e) {
LoggerHandler::getInstance()->getLogger()->debug( LoggerHandler::getInstance()->getLogger()->debug(
ExceptionMessages::DEBUG_NOSENDERORCOUNTRYCODE ExceptionMessages::DEBUG_NOSENDERORCOUNTRYCODE