From 7a952d6f8802a19392751d7441e9c0c4f9277090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 10 Mar 2020 09:48:59 +0100
Subject: [PATCH] [phonenumber validation & format] format and validation does
 not make the app fail when network is not available

---
 CHANGELOG.md                      |  2 +-
 Phonenumber/PhonenumberHelper.php | 17 +++++++++++++++++
 Phonenumber/Templating.php        |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03d8b2d6e..209261093 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -104,4 +104,4 @@ Branch CRUD-Init
 - module `show_hide`: add the possibility to launch a show hide manually and not on page loading. Useful when show/hide occurs in collection.
 - module `show_hide`: add events to module
 - [phonenumber validation] allow to validate against mobile **or** landline/voip phonenumbers;
-
+- [phonenumber validation & format] format and validation does not make the app fail when network is not available;
diff --git a/Phonenumber/PhonenumberHelper.php b/Phonenumber/PhonenumberHelper.php
index 5bb362e15..8b3df2894 100644
--- a/Phonenumber/PhonenumberHelper.php
+++ b/Phonenumber/PhonenumberHelper.php
@@ -20,6 +20,7 @@ namespace Chill\MainBundle\Phonenumber;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Exception\ServerException;
+use GuzzleHttp\Exception\ConnectException;
 use Psr\Log\LoggerInterface;
 use Psr\Cache\CacheItemPoolInterface;
 
@@ -182,6 +183,14 @@ class PhonenumberHelper
                 "phonenumber" => $phonenumber
             ]);
             
+            return null;
+        } catch (ConnectException $e) {
+            $this->logger->error("[phonenumber helper] Could not format number "
+                . "due to connect error", [
+                "message" => $e->getMessage(),
+                "phonenumber" => $phonenumber
+            ]);
+            
             return null;
         }
         
@@ -230,6 +239,14 @@ class PhonenumberHelper
                 "phonenumber" => $phonenumber
             ]);
             
+            return null;
+        } catch (ConnectException $e) {
+            $this->logger->error("[phonenumber helper] Could not format number "
+                . "due to connect error", [
+                "message" => $e->getMessage(),
+                "phonenumber" => $phonenumber
+            ]);
+            
             return null;
         }
         
diff --git a/Phonenumber/Templating.php b/Phonenumber/Templating.php
index daaee8956..45bfceae0 100644
--- a/Phonenumber/Templating.php
+++ b/Phonenumber/Templating.php
@@ -47,6 +47,6 @@ class Templating extends AbstractExtension
     
     public function formatPhonenumber($phonenumber)
     {
-        return $this->phonenumberHelper->format($phonenumber);
+        return $this->phonenumberHelper->format($phonenumber) ?? $phonenumber;
     }
 }