Merge pull request #173 in ZP/z-push from...

Merge pull request #173 in ZP/z-push from bugfix/ZP-856-code-still-contains-while-1-in-command to develop

* commit '6b17c078':
  ZP-856 Remove while(1)s.

src/lib/request/getitemestimate.php

@@ -67,7 +67,8 @@ class GetItemEstimate extends RequestProcessor {
             $spastatus = false;
 
             // read the folder properties
-            while (1) {
+            WBXMLDecoder::ResetInWhile("getItemEstimateFolders");
+            while(WBXMLDecoder::InWhile("getItemEstimateFolders")) {
                 if(self::$decoder->getElementStartTag(SYNC_SYNCKEY)) {
                     try {
                         $spa->SetSyncKey(self::$decoder->getElementContent());

src/lib/request/itemoperations.php

@@ -59,7 +59,8 @@ class ItemOperations extends RequestProcessor {
 
         $itemoperations = array();
         //ItemOperations can either be Fetch, EmptyFolderContents or Move
-        while (1) {
+        WBXMLDecoder::ResetInWhile("itemOperationsActions");
+        while(WBXMLDecoder::InWhile("itemOperationsActions")) {
             //TODO check if multiple item operations are possible in one request
             $el = self::$decoder->getElement();
 
@@ -182,7 +183,8 @@ class ItemOperations extends RequestProcessor {
 
                             if(self::$decoder->getElementStartTag(SYNC_ITEMOPERATIONS_SCHEMA)) {
                                 // read schema tags
-                                while (1) {
+                                WBXMLDecoder::ResetInWhile("itemOperationsSchema");
+                                while(WBXMLDecoder::InWhile("itemOperationsSchema")) {
                                     // TODO save elements
                                     $el = self::$decoder->getElement();
                                     $e = self::$decoder->peek();

src/lib/request/settings.php

@@ -64,7 +64,8 @@ class Settings extends RequestProcessor {
         // - DeviceInformation
         // - UserInformation
         // Each of them should only be once per request. Each property must be processed in order.
-        while (1) {
+        WBXMLDecoder::ResetInWhile("settingsMain");
+        while(WBXMLDecoder::InWhile("settingsMain")) {
             $propertyName = "";
             if (self::$decoder->getElementStartTag(SYNC_SETTINGS_OOF)) {
                 $propertyName = SYNC_SETTINGS_OOF;