Fix xml encoding (#10)

* Fix xml encoding
alamirault · Nov 28, 2022 · 7a772f5 · 7a772f5
1 parent 087ea2b
commit 7a772f5
Show file tree

Hide file tree

Showing 22 changed files with 192 additions and 161 deletions.
diff --git a/src/Exception/ClubNotFoundException.php b/src/Exception/ClubNotFoundException.php
@@ -2,9 +2,7 @@
 
 namespace Alamirault\FFTTApi\Exception;
 
-use Exception;
-
-final class ClubNotFoundException extends Exception
+final class ClubNotFoundException extends \Exception
 {
     public function __construct(string $clubId)
     {

diff --git a/src/Exception/InvalidLienRencontreException.php b/src/Exception/InvalidLienRencontreException.php
@@ -2,9 +2,7 @@
 
 namespace Alamirault\FFTTApi\Exception;
 
-use Exception;
-
-final class InvalidLienRencontreException extends Exception
+final class InvalidLienRencontreException extends \Exception
 {
     public function __construct(string $lienRencontre)
     {

diff --git a/src/Exception/InvalidRequestException.php b/src/Exception/InvalidRequestException.php
@@ -2,9 +2,7 @@
 
 namespace Alamirault\FFTTApi\Exception;
 
-use Exception;
-
-final class InvalidRequestException extends Exception
+final class InvalidRequestException extends \Exception
 {
     public function __construct(string $uri, int $statusCode, string $content)
     {

diff --git a/src/Exception/InvalidResponseException.php b/src/Exception/InvalidResponseException.php
@@ -2,9 +2,7 @@
 
 namespace Alamirault\FFTTApi\Exception;
 
-use Exception;
-
-final class InvalidResponseException extends Exception
+final class InvalidResponseException extends \Exception
 {
     /**
      * @param array<mixed> $content

diff --git a/src/Exception/JoueurNotFoundException.php b/src/Exception/JoueurNotFoundException.php
@@ -2,9 +2,7 @@
 
 namespace Alamirault\FFTTApi\Exception;
 
-use Exception;
-
-final class JoueurNotFoundException extends Exception
+final class JoueurNotFoundException extends \Exception
 {
     public function __construct(string $clubId)
     {

diff --git a/src/Model/Club.php b/src/Model/Club.php
@@ -2,14 +2,12 @@
 
 namespace Alamirault\FFTTApi\Model;
 
-use DateTime;
-
 final class Club
 {
     public function __construct(
         private readonly string $numero,
         private readonly string $nom,
-        private readonly ?DateTime $dateValidation,
+        private readonly ?\DateTime $dateValidation,
     ) {}
 
     public function getNumero(): string
@@ -22,7 +20,7 @@ public function getNom(): string
         return $this->nom;
     }
 
-    public function getDateValidation(): ?DateTime
+    public function getDateValidation(): ?\DateTime
     {
         return $this->dateValidation;
     }

diff --git a/src/Model/Factory/ClubFactory.php b/src/Model/Factory/ClubFactory.php
@@ -3,7 +3,6 @@
 namespace Alamirault\FFTTApi\Model\Factory;
 
 use Alamirault\FFTTApi\Model\Club;
-use DateTime;
 
 final class ClubFactory
 {
@@ -16,8 +15,8 @@ public function createFromArray(array $data): array
     {
         $result = [];
         foreach ($data as $clubData) {
-            /** @var DateTime|null $dateValidation */
-            $dateValidation = is_array($clubData['validation']) ? null : DateTime::createFromFormat('!d/m/Y', $clubData['validation']);
+            /** @var \DateTime|null $dateValidation */
+            $dateValidation = is_array($clubData['validation']) ? null : \DateTime::createFromFormat('!d/m/Y', $clubData['validation']);
             $result[] = new Club(
                 $clubData['numero'],
                 $clubData['nom'],

diff --git a/src/Model/Factory/RencontreDetailsFactory.php b/src/Model/Factory/RencontreDetailsFactory.php
@@ -170,7 +170,7 @@ private function formatJoueur(string $prenom, string $nom, string $points, array
                     $joueurClub->getNom(),
                     $joueurClub->getPrenom(),
                     $joueurClub->getLicence(),
-                    $playerPoints,
+                    (int) $playerPoints,
                     $sexe
                 );
             }

diff --git a/src/Model/Rencontre/Rencontre.php b/src/Model/Rencontre/Rencontre.php
@@ -2,8 +2,6 @@
 
 namespace Alamirault\FFTTApi\Model\Rencontre;
 
-use DateTime;
-
 final class Rencontre
 {
     public function __construct(
@@ -13,8 +11,8 @@ public function __construct(
         private readonly int $scoreEquipeA,
         private readonly int $scoreEquipeB,
         private readonly string $lien,
-        private readonly DateTime $datePrevue,
-        private readonly ?DateTime $dateReelle,
+        private readonly \DateTime $datePrevue,
+        private readonly ?\DateTime $dateReelle,
     ) {}
 
     public function getLibelle(): string
@@ -47,12 +45,12 @@ public function getLien(): string
         return $this->lien;
     }
 
-    public function getDatePrevue(): DateTime
+    public function getDatePrevue(): \DateTime
     {
         return $this->datePrevue;
     }
 
-    public function getDateReelle(): ?DateTime
+    public function getDateReelle(): ?\DateTime
     {
         return $this->dateReelle;
     }

diff --git a/src/Service/FFTTClient.php b/src/Service/FFTTClient.php
@@ -4,7 +4,6 @@
 
 use Alamirault\FFTTApi\Exception\InvalidRequestException;
 use Alamirault\FFTTApi\Exception\InvalidResponseException;
-use DomainException;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ClientException;
 use Psr\Http\Message\ResponseInterface;
@@ -42,15 +41,14 @@ private function send(string $uri): array
         $response = $this->client->request('GET', $uri);
 
         if (200 !== $response->getStatusCode()) {
-            throw new DomainException(sprintf('Request "%s" returns an error', $uri));
+            throw new \DomainException(sprintf('Request "%s" returns an error', $uri));
         }
 
         $content = $response->getBody()->getContents();
 
         // Lot of hacks due to ugly/buggy FFTT Api response format
         /** @var string $content */
         $content = preg_replace('/&(?!#?[a-z0-9]+;)/', '&amp;', $content);
-        $content = mb_convert_encoding($content, 'ISO-8859-1', 'UTF-8');
         $content = html_entity_decode($content);
 
         $xml = simplexml_load_string($content, 'SimpleXMLElement', LIBXML_NOCDATA);

diff --git a/src/Service/Operation/ListActualiteOperation.php b/src/Service/Operation/ListActualiteOperation.php
@@ -4,7 +4,6 @@
 
 use Alamirault\FFTTApi\Model\Actualite;
 use Alamirault\FFTTApi\Service\FFTTClientInterface;
-use DateTime;
 
 final class ListActualiteOperation
 {
@@ -25,8 +24,8 @@ public function listActualites(): array
         $result = [];
         /** @var array{date: string, titre: string, description: string, url: string, photo: string, categorie: string} $dataActualite */
         foreach ($data as $dataActualite) {
-            /** @var DateTime $date */
-            $date = DateTime::createFromFormat('!Y-m-d', $dataActualite['date']);
+            /** @var \DateTime $date */
+            $date = \DateTime::createFromFormat('!Y-m-d', $dataActualite['date']);
             $result[] = new Actualite(
                 $date,
                 $dataActualite['titre'],

diff --git a/src/Service/Operation/ListClubOperation.php b/src/Service/Operation/ListClubOperation.php
@@ -5,7 +5,6 @@
 use Alamirault\FFTTApi\Model\Club;
 use Alamirault\FFTTApi\Model\Factory\ClubFactory;
 use Alamirault\FFTTApi\Service\FFTTClientInterface;
-use Exception;
 
 final class ListClubOperation
 {
@@ -43,7 +42,7 @@ public function listClubsByName(string $name): array
             $rawClubs = $this->arrayWrapper->wrapArrayIfUnique($rawClubs);
 
             return $this->clubFactory->createFromArray($rawClubs);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return [];
         }
     }

diff --git a/src/Service/Operation/ListPartieOperation.php b/src/Service/Operation/ListPartieOperation.php
@@ -8,7 +8,6 @@
 use Alamirault\FFTTApi\Service\FFTTClientInterface;
 use Alamirault\FFTTApi\Service\NomPrenomExtractorInterface;
 use DateTime;
-use Transliterator;
 
 final class ListPartieOperation
 {
@@ -36,8 +35,8 @@ public function listPartiesJoueurByLicence(string $licenceId): array
         /** @var array{advnompre: string, date: string, vd: string, numjourn: string, pointres: string, coefchamp: string, advlic: string, advsexe: string, advclaof: string} $partie */
         foreach ($parties as $partie) {
             [$nom, $prenom] = $this->nomPrenomExtractor->extractNomPrenom($partie['advnompre']);
-            /** @var DateTime $date */
-            $date = DateTime::createFromFormat('d/m/Y', $partie['date']);
+            /** @var \DateTime $date */
+            $date = \DateTime::createFromFormat('d/m/Y', $partie['date']);
 
             $realPartie = new Partie(
                 'V' === $partie['vd'],
@@ -82,8 +81,8 @@ public function listUnvalidatedPartiesJoueurByLicence(string $joueurId): array
                         );
                 }));
 
-                /** @var DateTime $date */
-                $date = DateTime::createFromFormat('d/m/Y', $partie['date']);
+                /** @var \DateTime $date */
+                $date = \DateTime::createFromFormat('d/m/Y', $partie['date']);
 
                 if (!$found && 'Absent Absent' !== $prenom
                     && $this->isInCurrentSaison($date)
@@ -110,8 +109,8 @@ public function listUnvalidatedPartiesJoueurByLicence(string $joueurId): array
 
     private function removeAccentLowerCaseRegex(string $string): string
     {
-        /** @var Transliterator $transliterator */
-        $transliterator = Transliterator::create('NFD; [:Nonspacing Mark:] Remove;');
+        /** @var \Transliterator $transliterator */
+        $transliterator = \Transliterator::create('NFD; [:Nonspacing Mark:] Remove;');
 
         /** @var string $transliterated */
         $transliterated = $transliterator->transliterate($string);
@@ -122,15 +121,15 @@ private function removeAccentLowerCaseRegex(string $string): string
     /**
      * Détermine si la date d'une rencontre passée en paramètre correspond à la saison en cours.
      */
-    private function isInCurrentSaison(Datetime $dateRencontre): bool
+    private function isInCurrentSaison(\DateTime $dateRencontre): bool
     {
-        $today = new DateTime();
+        $today = new \DateTime();
 
         $actualMonth = (int) $today->format('n');
         $actualYear = (int) $today->format('Y');
 
-        $dateDebutSaison = new DateTime($actualYear + ($actualMonth >= 7 ? 0 : -1).'-07-01');
-        $dateFinSaison = new DateTime($actualYear + ($actualMonth >= 7 ? 1 : 0).'-07-01');
+        $dateDebutSaison = new \DateTime($actualYear + ($actualMonth >= 7 ? 0 : -1).'-07-01');
+        $dateFinSaison = new \DateTime($actualYear + ($actualMonth >= 7 ? 1 : 0).'-07-01');
 
         return $dateRencontre >= $dateDebutSaison && $dateRencontre <= $dateFinSaison;
     }
@@ -141,9 +140,9 @@ private function isInCurrentSaison(Datetime $dateRencontre): bool
      * Exemple : si nous sommes le 6 Octobre, nous prenons les rencontre du 1er Septembre à aujourd'hui.
      * Exemple : si nous sommes le 15 Octobre, nous prenons les rencontre du 1er Octobre (les points virtuels sont connus à partir du 5 et les rencontres sont comptabilisées du 1er au 31 du mois) à aujourd'hui.
      */
-    private function isInCurrentVirtualMonth(Datetime $dateRencontre): bool
+    private function isInCurrentVirtualMonth(\DateTime $dateRencontre): bool
     {
-        $today = new DateTime();
+        $today = new \DateTime();
 
         $actualMonth = $today->format('n');
         $actualYear = $today->format('Y');
@@ -159,8 +158,8 @@ private function isInCurrentVirtualMonth(Datetime $dateRencontre): bool
             }
         }
 
-        $dateDebutMoisVirtuel = new DateTime($actualYear.'-'.$debutMoisVirtuel.'-01');
-        $dateFinMoisVirtuel = new DateTime();
+        $dateDebutMoisVirtuel = new \DateTime($actualYear.'-'.$debutMoisVirtuel.'-01');
+        $dateFinMoisVirtuel = new \DateTime();
 
         return $dateRencontre >= $dateDebutMoisVirtuel && $dateRencontre <= $dateFinMoisVirtuel;
     }

diff --git a/src/Service/Operation/ListRencontreOperation.php b/src/Service/Operation/ListRencontreOperation.php
@@ -5,7 +5,6 @@
 use Alamirault\FFTTApi\Model\Equipe;
 use Alamirault\FFTTApi\Model\Rencontre\Rencontre;
 use Alamirault\FFTTApi\Service\FFTTClientInterface;
-use DateTime;
 
 final class ListRencontreOperation
 {
@@ -32,11 +31,11 @@ public function listRencontrePouleByLienDivision(string $lienDivision): array
             /** @var string $nomEquipeB */
             $nomEquipeB = is_array($equipeB) ? '' : $equipeB;
 
-            /** @var DateTime $datePrevue */
-            $datePrevue = DateTime::createFromFormat('d/m/Y', $dataRencontre['dateprevue']);
+            /** @var \DateTime $datePrevue */
+            $datePrevue = \DateTime::createFromFormat('d/m/Y', $dataRencontre['dateprevue']);
 
-            /** @var DateTime|null $dateReelle */
-            $dateReelle = empty($dataRencontre['datereelle']) ? null : DateTime::createFromFormat('d/m/Y', $dataRencontre['datereelle']);
+            /** @var \DateTime|null $dateReelle */
+            $dateReelle = empty($dataRencontre['datereelle']) ? null : \DateTime::createFromFormat('d/m/Y', $dataRencontre['datereelle']);
 
             $result[] = new Rencontre(
                 $dataRencontre['libelle'],

diff --git a/tests/Unit/Service/FFTTClientTest.php b/tests/Unit/Service/FFTTClientTest.php
@@ -0,0 +1,40 @@
+<?php declare(strict_types=1);
+
+namespace Alamirault\FFTTApi\Tests\Unit\Service;
+
+use Alamirault\FFTTApi\Service\FFTTClient;
+use Alamirault\FFTTApi\Service\UriGenerator;
+use Alamirault\FFTTApi\Tests\Unit\Service\Operation\MockHandlerStub;
+use GuzzleHttp\Client;
+use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Psr7\Response;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @coversDefaultClass \Alamirault\FFTTApi\Service\FFTTClient
+ */
+final class FFTTClientTest extends TestCase
+{
+    /**
+     * @covers ::get
+     * @covers ::send
+     */
+    public function testGetWithAccent(): void
+    {
+        /** @var string $content */
+        $content = file_get_contents(__DIR__.'/fixtures/joueur_with_accent.xml');
+
+        $mock = new MockHandlerStub([
+            new Response(200, [], $content),
+        ]);
+
+        $handlerStack = HandlerStack::create($mock);
+        $clientStub = new Client(['handler' => $handlerStack]);
+        $client = new FFTTClient($clientStub, new UriGenerator('foo', 'bar'));
+
+        /** @var array{licence: array<mixed>} $response */
+        $response = $client->get('bar');
+
+        $this->assertSame('Côme', $response['licence']['prenom']);
+    }
+}
diff --git a/tests/Unit/Service/NomPrenomExtractorTest.php b/tests/Unit/Service/NomPrenomExtractorTest.php
@@ -3,7 +3,6 @@
 namespace Alamirault\FFTTApi\Tests\Unit\Service;
 
 use Alamirault\FFTTApi\Service\NomPrenomExtractor;
-use Generator;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -27,9 +26,9 @@ public function testExtractNomPrenom(string $raw, string $expectedNom, string $e
     }
 
     /**
-     * @return Generator<array<string>>
+     * @return \Generator<array<string>>
      */
-    public function getData(): Generator
+    public function getData(): \Generator
     {
         yield [
             'MOREAU Véronique',

diff --git a/tests/Unit/Service/Operation/ArrayWrapperTest.php b/tests/Unit/Service/Operation/ArrayWrapperTest.php
@@ -3,7 +3,6 @@
 namespace Alamirault\FFTTApi\Tests\Unit\Service\Operation;
 
 use Alamirault\FFTTApi\Service\Operation\ArrayWrapper;
-use Generator;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -28,9 +27,9 @@ public function testWrapArrayIfUnique(array $raw, array $expected): void
     }
 
     /**
-     * @return Generator<array<mixed>>
+     * @return \Generator<array<mixed>>
      */
-    public function getData(): Generator
+    public function getData(): \Generator
     {
         yield 'Unique element' => [
             [