psr12 code style compliance

phpcs.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <ruleset name="rules">
 	<description>rules</description>
-	<rule ref="PSR2"/>
+	<rule ref="PSR12"/>
 	<file>tests/</file>
 	<file>src/</file>
 	<arg name="colors"/>

src/Clients/Client.php

@@ -4,7 +4,6 @@
 
 interface Client
 {
-
     /**
      * This method should return an associative array in the following format:
      *
@@ -18,5 +17,5 @@ interface Client
      * @return array
      * @throws ClientException
      */
-    public function fetch() : array;
+    public function fetch(): array;
 }

src/Clients/IbericodeVatRatesClient.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Ibericode\Vat\Clients;
@@ -12,7 +13,7 @@ class IbericodeVatRatesClient implements Client
      *
      * @return array
      */
-    public function fetch() : array
+    public function fetch(): array
     {
         $url = 'https://raw.githubusercontent.com/ibericode/vat-rates/master/vat-rates.json';
 
@@ -33,7 +34,7 @@ public function fetch() : array
         return $this->parseResponse($body);
     }
 
-    private function parseResponse(string $response_body) : array
+    private function parseResponse(string $response_body): array
     {
         $result = json_decode($response_body, false);
 

src/Countries.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Ibericode\Vat;
@@ -274,15 +275,15 @@ class Countries implements \Iterator, \ArrayAccess
      * @param string $code
      * @return bool
      */
-    public function hasCountryCode(string $code) : bool
+    public function hasCountryCode(string $code): bool
     {
         return $this->offsetExists($code);
     }
 
     /**
      * @return array
      */
-    public function getCountryCodesInEU() : array
+    public function getCountryCodesInEU(): array
     {
         return ['AT', 'BE', 'BG', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GR', 'HU', 'HR', 'IE', 'IT', 'LT', 'LU', 'LV', 'MT', 'NL', 'PL', 'PT', 'RO', 'SE', 'SI', 'SK'];
     }
@@ -291,7 +292,7 @@ public function getCountryCodesInEU() : array
      * @param string $code
      * @return bool
      */
-    public function isCountryCodeInEU(string $code) : bool
+    public function isCountryCodeInEU(string $code): bool
     {
         return in_array($code, $this->getCountryCodesInEU(), true);
     }

src/Geolocation/GeolocatorInterface.php

@@ -4,10 +4,9 @@
 
 interface GeolocatorInterface
 {
-
     /**
      * @param string $ipAddress The IP address to geolocate
      * @return string A ISO-3166-1-alpha2 country code or an empty string on failure
      */
-    public function locateIpAddress(string $ipAddress) : string;
+    public function locateIpAddress(string $ipAddress): string;
 }

src/Geolocation/IP2C.php

@@ -11,12 +11,11 @@
  */
 class IP2C implements GeolocatorInterface
 {
-
     /**
      * @param string $ipAddress
      * @return string
      */
-    public function locateIpAddress(string $ipAddress) : string
+    public function locateIpAddress(string $ipAddress): string
     {
         if ($ipAddress === '') {
             return '';

src/Geolocation/IP2Country.php

@@ -15,7 +15,7 @@ class IP2Country implements GeolocatorInterface
      * @param string $ipAddress
      * @return string
      */
-    public function locateIpAddress(string $ipAddress) : string
+    public function locateIpAddress(string $ipAddress): string
     {
         if ($ipAddress === '') {
             return '';

src/Geolocator.php

@@ -28,7 +28,7 @@ public function __construct(string $service = 'ip2c.org')
         $this->service = new $this->services[$service]();
     }
 
-    public function locateIpAddress(string $ipAddress) : string
+    public function locateIpAddress(string $ipAddress): string
     {
         if ($ipAddress === '') {
             return '';

src/Period.php

@@ -24,12 +24,12 @@ public function __construct(DateTimeInterface $effectiveFrom, array $rates)
         $this->rates = $rates;
     }
 
-    public function getEffectiveFrom() : DateTimeInterface
+    public function getEffectiveFrom(): DateTimeInterface
     {
         return $this->effectiveFrom;
     }
 
-    public function getRate(string $level) : float
+    public function getRate(string $level): float
     {
         if (!isset($this->rates[$level])) {
             throw new InvalidArgumentException("Invalid rate level: {$level}");

src/Rates.php

@@ -1,12 +1,12 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Ibericode\Vat;
 
 use DateTime;
 use DateTimeInterface;
 use DateTimeImmutable;
-
 use Ibericode\Vat\Clients\ClientException;
 use Ibericode\Vat\Clients\IbericodeVatRatesClient;
 use Ibericode\Vat\Clients\Client;
@@ -110,7 +110,7 @@ private function loadFromRemote()
         }
     }
 
-    private function resolvePeriod(string $countryCode, DateTimeInterface $datetime) : Period
+    private function resolvePeriod(string $countryCode, DateTimeInterface $datetime): Period
     {
         $this->load();
 
@@ -135,7 +135,7 @@ private function resolvePeriod(string $countryCode, DateTimeInterface $datetime)
      * @return float
      * @throws \Exception
      */
-    public function getRateForCountry(string $countryCode, string $level = self::RATE_STANDARD) : float
+    public function getRateForCountry(string $countryCode, string $level = self::RATE_STANDARD): float
     {
         $todayMidnight = new \DateTimeImmutable('today midnight');
         return $this->getRateForCountryOnDate($countryCode, $todayMidnight, $level);
@@ -148,7 +148,7 @@ public function getRateForCountry(string $countryCode, string $level = self::RAT
      * @return float
      * @throws Exception
      */
-    public function getRateForCountryOnDate(string $countryCode, \DateTimeInterface $datetime, string $level = self::RATE_STANDARD) : float
+    public function getRateForCountryOnDate(string $countryCode, \DateTimeInterface $datetime, string $level = self::RATE_STANDARD): float
     {
         $activePeriod = $this->resolvePeriod($countryCode, $datetime);
         return $activePeriod->getRate($level);

src/Validator.php

@@ -1,11 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Ibericode\Vat;
 
 class Validator
 {
-
     /**
      * Regular expression patterns per country code
      *
@@ -66,7 +66,7 @@ public function __construct(Vies\Client $client = null)
      * @param string $countryCode
      * @return bool
      */
-    public function validateCountryCode(string $countryCode) : bool
+    public function validateCountryCode(string $countryCode): bool
     {
         $countries = new Countries();
         return isset($countries[$countryCode]);
@@ -78,7 +78,7 @@ public function validateCountryCode(string $countryCode) : bool
      * @param string $ipAddress
      * @return bool
      */
-    public function validateIpAddress(string $ipAddress) : bool
+    public function validateIpAddress(string $ipAddress): bool
     {
         if ($ipAddress === '') {
             return false;
@@ -94,7 +94,7 @@ public function validateIpAddress(string $ipAddress) : bool
      *
      * @return boolean
      */
-    public function validateVatNumberFormat(string $vatNumber) : bool
+    public function validateVatNumberFormat(string $vatNumber): bool
     {
         if ($vatNumber === '') {
             return false;
@@ -119,7 +119,7 @@ public function validateVatNumberFormat(string $vatNumber) : bool
      *
      * @throws Vies\ViesException
      */
-    protected function validateVatNumberExistence(string $vatNumber) : bool
+    protected function validateVatNumberExistence(string $vatNumber): bool
     {
         $vatNumber = strtoupper($vatNumber);
         $country = substr($vatNumber, 0, 2);
@@ -136,7 +136,7 @@ protected function validateVatNumberExistence(string $vatNumber) : bool
      *
      * @throws Vies\ViesException
      */
-    public function validateVatNumber(string $vatNumber) : bool
+    public function validateVatNumber(string $vatNumber): bool
     {
         return $this->validateVatNumberFormat($vatNumber) && $this->validateVatNumberExistence($vatNumber);
     }

src/Vies/Client.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Ibericode\Vat\Vies;
@@ -8,7 +9,6 @@
 
 class Client
 {
-
     /**
      * @const string
      */
@@ -42,7 +42,7 @@ public function __construct(int $timeout = 10)
      *
      * @throws ViesException
      */
-    public function checkVat(string $countryCode, string $vatNumber) : bool
+    public function checkVat(string $countryCode, string $vatNumber): bool
     {
         try {
             $response = $this->getClient()->checkVat(
@@ -61,7 +61,7 @@ public function checkVat(string $countryCode, string $vatNumber) : bool
     /**
      * @return SoapClient
      */
-    protected function getClient() : SoapClient
+    protected function getClient(): SoapClient
     {
         if ($this->client === null) {
             $this->client = new SoapClient(self::URL, ['connection_timeout' => $this->timeout]);

src/Vies/ViesException.php

@@ -6,5 +6,4 @@
 
 class ViesException extends Exception
 {
-
 }

tests/Clients/ClientsTest.php

@@ -9,7 +9,6 @@
 
 class ClientsTest extends TestCase
 {
-
     /**
      * @group remote-http
      * @dataProvider clientProvider

tests/RatesTest.php

@@ -12,7 +12,7 @@
 
 class RatesTest extends TestCase
 {
-    protected function setUp() : void
+    protected function setUp(): void
     {
         if (file_exists('vendor/rates')) {
             unlink('vendor/rates');

tests/ValidatorTest.php

@@ -3,7 +3,6 @@
 namespace Ibericode\Vat\Tests;
 
 use Ibericode\Vat\Validator;
-
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -12,7 +11,6 @@
  */
 class ValidatorTest extends TestCase
 {
-
     /**
      * @covers Validator::validateVatNumberFormat
      */