Exception management

Add internal dependency
scopen-coop · Oct 25, 2022 · 5c56bab · 5c56bab
1 parent 59db1db
commit 5c56bab
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 6 deletions.
diff --git a/src/quickcost.php b/src/quickcost.php
@@ -11,6 +11,7 @@
 namespace ladromelaboratoire\chronopostws;
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
 use ladromelaboratoire\chronopostws\wsdata\wsdata;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 // use ladromelaboratoire\chronopostws\wsdata\wsquickcostvalue;
 
 

diff --git a/src/shipment.php b/src/shipment.php
@@ -20,6 +20,7 @@
 use ladromelaboratoire\chronopostws\wsdata\wsesdvalue;
 use ladromelaboratoire\chronopostws\wsdata\wscustomsvalue;
 use ladromelaboratoire\chronopostws\wsdata\wsscheduledvalue;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 class shipment extends wsdata {
 

diff --git a/src/tracking.php b/src/tracking.php
@@ -12,6 +12,7 @@
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
 use ladromelaboratoire\chronopostws\wsdata\wsdata;
 use ladromelaboratoire\chronopostws\wsdata\wscancelskybillvalue;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 
 class tracking {

diff --git a/src/wsdata/wsappointmentvalue.php b/src/wsdata/wsappointmentvalue.php
@@ -10,6 +10,7 @@
 namespace ladromelaboratoire\chronopostws\wsdata;
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
 use ladromelaboratoire\chronopostws\wsdata\wsdata;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 class wsappointmentvalue extends wsdata {
 

diff --git a/src/wsdata/wsarticlesvalue.php b/src/wsdata/wsarticlesvalue.php
@@ -10,6 +10,7 @@
 namespace ladromelaboratoire\chronopostws\wsdata;
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
 use ladromelaboratoire\chronopostws\wsdata\wsdata;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 class wsarticlesvalue extends wsdata {
 

diff --git a/src/wsdata/wscancelskybillvalue.php b/src/wsdata/wscancelskybillvalue.php
@@ -10,6 +10,7 @@
 namespace ladromelaboratoire\chronopostws\wsdata;
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
 use ladromelaboratoire\chronopostws\wsdata\wsdata;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 class wscancelskybillvalue extends wsdata {
 

diff --git a/src/wsdata/wscustomervalue.php b/src/wsdata/wscustomervalue.php
@@ -10,6 +10,7 @@
 namespace ladromelaboratoire\chronopostws\wsdata;
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
 use ladromelaboratoire\chronopostws\wsdata\wsdata;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 class wscustomervalue extends wsdata {
 

diff --git a/src/wsdata/wscustomsvalue.php b/src/wsdata/wscustomsvalue.php
@@ -11,6 +11,7 @@
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
 use ladromelaboratoire\chronopostws\wsdata\wsdata;
 use ladromelaboratoire\chronopostws\wsdata\wsarticlesvalue;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 class wscustomsvalue extends wsdata {
 

diff --git a/src/wsdata/wsdata.php b/src/wsdata/wsdata.php
@@ -9,6 +9,7 @@
 
 namespace ladromelaboratoire\chronopostws\wsdata;
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 abstract class wsdata {
 
@@ -20,7 +21,7 @@ public function __construct ($useExceptions = false) {
 	protected function setVariableReg (&$variable, $data, $reg) {
 		$check = preg_match($reg, $data);
 		if ($check === false || $check === 0) {
-			if ($this->useExceptions) throw new Exception(__METHOD__ . " - $data does not match webservice requirement according to regex $reg");
+			if ($this->useExceptions) throw new wsdataexception(__METHOD__ . " - $data does not match webservice requirement according to regex $reg");
 			//echo ("<pre>souci avec la valeur $data et la règle $reg</pre>\r\n");
 			return false;
 		}
@@ -35,7 +36,7 @@ protected function setVariableInt (&$variable, $data) {
 			return true;
 		}
 		else {
-			if ($this->useExceptions) throw new Exception(__METHOD__ . " - $data does not match webservice requirement as int");
+			if ($this->useExceptions) throw new wsdataexception(__METHOD__ . " - $data does not match webservice requirement as int");
 			// echo ("<pre>$data n'est pas un entier</pre>\r\n");
 			return false;
 		}
@@ -46,7 +47,7 @@ protected function setVariableFloat (&$variable, $data) {
 			return true;
 		}
 		else {
-			if ($this->useExceptions) throw new Exception(__METHOD__ . " - $data does not match webservice requirement as float");
+			if ($this->useExceptions) throw new wsdataexception(__METHOD__ . " - $data does not match webservice requirement as float");
 			// echo ("<pre>$data n'est pas un float</pre>\r\n");
 			return false;
 		}
@@ -57,7 +58,7 @@ protected function setVariableBool (&$variable, $data) {
 			return true;
 		}
 		else {
-			if ($this->useExceptions) throw new Exception(__METHOD__ . " - $data does not match webservice requirement as boolean");
+			if ($this->useExceptions) throw new wsdataexception(__METHOD__ . " - $data does not match webservice requirement as boolean");
 			// echo ("<pre>$data n'est pas un booleen</pre>\r\n");
 			return false;
 		}
@@ -70,12 +71,12 @@ public function loadArray($array) {
 					$this->$func($value);
 				}
 				else {
-					if ($this->useExceptions) throw new Exception(__METHOD__ . " - Property and/or setter method $key does not exist in object");
+					if ($this->useExceptions) throw new wsdataexception(__METHOD__ . " - Property and/or setter method $key does not exist in object");
 				}
 			}
 		}
 		else {
-			if ($this->useExceptions) throw new Exception(__METHOD__ . " - not an associative array passed as parameter");
+			if ($this->useExceptions) throw new wsdataexception(__METHOD__ . " - not an associative array passed as parameter");
 		}
 	}
 

diff --git a/src/wsdata/wsheadervalue.php b/src/wsdata/wsheadervalue.php
@@ -10,6 +10,7 @@
 namespace ladromelaboratoire\chronopostws\wsdata;
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
 use ladromelaboratoire\chronopostws\wsdata\wsdata;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 class wsheadervalue extends wsdata {
 

diff --git a/src/wsdata/wslabelrecoveryvalue.php b/src/wsdata/wslabelrecoveryvalue.php
@@ -10,6 +10,7 @@
 namespace ladromelaboratoire\chronopostws\wsdata;
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
 use ladromelaboratoire\chronopostws\wsdata\wsdata;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 class wslabelrecoveryvalue extends wsdata {
 

diff --git a/src/wsdata/wsrecipientvalue.php b/src/wsdata/wsrecipientvalue.php
@@ -10,6 +10,7 @@
 namespace ladromelaboratoire\chronopostws\wsdata;
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
 use ladromelaboratoire\chronopostws\wsdata\wsdata;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 class wsrecipientvalue extends wsdata {
 

diff --git a/src/wsdata/wsscheduledvalue.php b/src/wsdata/wsscheduledvalue.php
@@ -11,6 +11,7 @@
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
 use ladromelaboratoire\chronopostws\wsdata\wsdata;
 use ladromelaboratoire\chronopostws\wsdata\wsappointmentvalue;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 class wsscheduledvalue extends wsdata {
 

diff --git a/src/wsdata/wssearchpodvalue.php b/src/wsdata/wssearchpodvalue.php
@@ -10,6 +10,7 @@
 namespace ladromelaboratoire\chronopostws\wsdata;
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
 use ladromelaboratoire\chronopostws\wsdata\wsdata;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 class wssearchpodvalue extends wsdata {
 

diff --git a/src/wsdata/wsshippervalue.php b/src/wsdata/wsshippervalue.php
@@ -10,6 +10,7 @@
 namespace ladromelaboratoire\chronopostws\wsdata;
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
 use ladromelaboratoire\chronopostws\wsdata\wsdata;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 class wsshippervalue extends wsdata {
 

diff --git a/src/wsdata/wsskybillparamsvalue.php b/src/wsdata/wsskybillparamsvalue.php
@@ -10,6 +10,7 @@
 namespace ladromelaboratoire\chronopostws\wsdata;
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
 use ladromelaboratoire\chronopostws\wsdata\wsdata;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 class wsskybillparamsvalue extends wsdata {
 

diff --git a/src/wsdata/wsskybillvalue.php b/src/wsdata/wsskybillvalue.php
@@ -10,6 +10,7 @@
 namespace ladromelaboratoire\chronopostws\wsdata;
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
 use ladromelaboratoire\chronopostws\wsdata\wsdata;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 class wsskybillvalue extends wsdata {
 

diff --git a/src/wsdata/wstrackingoneparcelvalue.php b/src/wsdata/wstrackingoneparcelvalue.php
@@ -10,6 +10,7 @@
 namespace ladromelaboratoire\chronopostws\wsdata;
 use ladromelaboratoire\chronopostws\wsdata\wsregex;
 use ladromelaboratoire\chronopostws\wsdata\wsdata;
+use ladromelaboratoire\chronopostws\exceptions\wsdataexception;
 
 class wstrackingoneparcelvalue extends wsdata {