Uses a better method to avoid the Weak-Warning Bug

Author: Petschko

README.md

@@ -67,7 +67,6 @@ All these Persons helped to create this SDK for the DHL-API:
 - [aschempp](https://github.com/aschempp) - For the help with the Notification E-Mail
 - [cedricziel](https://github.com/cedricziel) - For turning this Project into a [Composer](https://getcomposer.org/)-Package
 - [Dakror](https://github.com/Dakror) - For the `ProductInfo`-Class
-- [Magellanth](https://github.com/Magellanth) - For helping to solve the "Weak-Warning" issue
 - [octlabs](https://github.com/octlabs) - For adding some missing Documentation
 - [Petschko](https://github.com/Petschko) - Initially created this Project and decided to share it for free
 - [tobias-redmann](https://github.com/tobias-redmann) - For the `setFullStreet` method and the PHP-DHL-Example-Project for Version 1 _(This helped a lot to understand how the API works)_

includes/Response.php

@@ -8,7 +8,7 @@
  * Date: 18.11.2016
  * Time: 16:00
  * Update: 15.04.2019
- * Version: 1.3.4
+ * Version: 1.3.5
  *
  * Notes: Contains the DHL-Response Class, which manages the response that you get with simple getters
  */
@@ -321,8 +321,31 @@ private function validateStatusCode() {
 			$this->setStatusCode(self::DHL_ERROR_WEAK_WARNING);
 
 		// Fix the DHL-Error Weak-Warning-Bug
-		if($this->getStatusCode() === self::DHL_ERROR_WEAK_WARNING && $this->getStatusMessage() === 'ok;Der Webservice wurde ohne Fehler ausgeführt.')
-			$this->setStatusCode(self::DHL_ERROR_NO_ERROR);
+		if($this->countLabelData() === 1) {
+			// ALWAYS uses the Shipment-Response when only 1
+			$this->setStatusCode($this->getLabelData(0)->getStatusCode());
+			$this->setStatusText($this->getLabelData(0)->getStatusText());
+			$this->setStatusMessage($this->getLabelData(0)->getStatusMessage());
+		} else if($this->getStatusCode() === self::DHL_ERROR_WEAK_WARNING) {
+			$noError = true;
+
+			// Search in all shipments if an error/warning exists
+			foreach($this->getLabelData() as &$labelData) {
+				/**
+				 * @var LabelData $labelData
+				 */
+				if($labelData->getStatusCode() !== self::DHL_ERROR_NO_ERROR) {
+					$noError = false;
+					break;
+				}
+			}
+
+			if($noError) {
+				$this->setStatusCode(self::DHL_ERROR_NO_ERROR);
+				$this->setStatusText('ok');
+				$this->setStatusMessage('Der Webservice wurde ohne Fehler ausgeführt.');
+			}
+		}
 	}
 
 	/**
@@ -374,8 +397,6 @@ private function loadResponse_v2($response) {
 				else
 					$this->setStatusMessage($response->Status->statusMessage);
 			}
-
-			$this->validateStatusCode();
 		}
 
 		// Set Manifest if exists (getManifest)
@@ -407,5 +428,9 @@ private function loadResponse_v2($response) {
 			$this->handleMultiShipments($response->ExportDocData);
 		else if(isset($response->ManifestState)) // 6
 			$this->handleMultiShipments($response->ManifestState);
+
+		// Validate the status to fix errors on the Main-Status and show weak-warnings
+		if($this->getStatusCode() !== self::DHL_ERROR_NOT_SET)
+			$this->validateStatusCode();
 	}
 }