Merge pull request #12 from roelvanduijnhoven/lazy-initialization

Lazy instantiate VIES SOAP client. Thanks @roelvanduijnhoven
ibericode · Dec 4, 2017 · 1d1d533 · 1d1d533
2 parents ffc5cd5 + 37cbe08
commit 1d1d533
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/Validator.php b/src/Validator.php
@@ -99,6 +99,8 @@ public function validateExistence($vatNumber) {
      * @param string $vatNumber Either the full VAT number (incl. country) or just the part after the country code.
      *
      * @return boolean
+     *
+     * @throws Vies\ViesException
      */
     public function validate( $vatNumber ) {
        return $this->validateFormat( $vatNumber ) && $this->validateExistence( $vatNumber );

diff --git a/src/Vies/Client.php b/src/Vies/Client.php
@@ -15,15 +15,20 @@ class Client {
     /**
      * @var SoapClient
      */
-    protected $client;
+    private $client;
+
+    /**
+     * @var int
+     */
+    protected $timeout;
 
     /**
      * Client constructor.
      * 
      * @param int $timeout How long should we wait before aborting the request to VIES?
      */
     public function __construct($timeout = 10) {
-        $this->client = new SoapClient( self::URL, [ 'connection_timeout' => $timeout ]);
+        $this->timeout = $timeout;
     }
 
     /**
@@ -36,7 +41,7 @@ public function __construct($timeout = 10) {
      */
     public function checkVat( $countryCode, $vatNumber ) {
         try {
-            $response = $this->client->checkVat(
+            $response = $this->getClient()->checkVat(
                 array(
                     'countryCode' => $countryCode,
                     'vatNumber' => $vatNumber
@@ -48,4 +53,16 @@ public function checkVat( $countryCode, $vatNumber ) {
 
         return (bool) $response->valid;
     }
+
+    /**
+     * @return SoapClient
+     */
+    protected function getClient()
+    {
+        if ($this->client === null) {
+            $this->client = new SoapClient(self::URL, ['connection_timeout' => $this->timeout]);
+        }
+
+        return $this->client;
+    }
 }