Fixed a small possible bug

Garethp · Sep 28, 2015 · 52a0b60 · 52a0b60
1 parent 0909944
commit 52a0b60
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/src/API/Type/ArrayOfFoldersType.php b/src/API/Type/ArrayOfFoldersType.php
@@ -58,22 +58,35 @@ public function getAllFolders()
     {
         $folders = array();
         if ($this->folder !== null) {
-            $folders = array_merge($folders, $this->folder);
+            $folders = array_merge($folders, (is_array($this->folder) ? $this->folder : array($this->folder)));
         }
 
         if ($this->calendarFolder !== null) {
-            $folders = array_merge($folders, $this->calendarFolder);
+            $folders = array_merge(
+                $folders,
+                (is_array($this->calendarFolder) ? $this->calendarFolder : array($this->calendarFolder))
+            );
         }
 
         if ($this->contactsFolder !== null) {
-            $folders = array_merge($folders, $this->contactsFolder);
+            $folders = array_merge(
+                $folders,
+                (is_array($this->contactsFolder) ? $this->contactsFolder : array($this->contactsFolder))
+            );
         }
 
         if ($this->searchFolder !== null) {
-            $folders = array_merge($folders, $this->searchFolder);
+            $folders = array_merge(
+                $folders,
+                (is_array($this->searchFolder) ? $this->searchFolder : array($this->searchFolder))
+            );
         }
 
         if ($this->tasksFolder !== null) {
+            $folders = array_merge(
+                $folders,
+                (is_array($this->tasksFolder) ? $this->tasksFolder : array($this->tasksFolder))
+            );
             $folders = array_merge($folders, $this->tasksFolder);
         }
 

diff --git a/src/API/Type/FolderIdType.php b/src/API/Type/FolderIdType.php
@@ -15,7 +15,6 @@
  */
 class FolderIdType extends BaseFolderIdType
 {
-
     /**
      * @var string
      */
@@ -26,6 +25,13 @@ class FolderIdType extends BaseFolderIdType
      */
     protected $changeKey = null;
 
+    public function __construct($id, $changeKey)
+    {
+        $this->id = $id;
+        $this->changeKey = $changeKey;
+    }
+
+
     public function toArray()
     {
         return [ 'Id' => $this->id, 'ChangeKey' => $this->changeKey ];

diff --git a/tests/src/API/NTLMSoapClientTest.php b/tests/src/API/NTLMSoapClientTest.php
@@ -68,8 +68,12 @@ public function testValidateCertificate()
         $prop = $reflection->getProperty('validate');
         $prop->setAccessible(true);
 
-        $client = new NTLMSoapClient('location', 'user', 'password',
-            __DIR__ . '/../../../Resources/wsdl/services.wsdl');
+        $client = new NTLMSoapClient(
+            'location',
+            'user',
+            'password',
+            __DIR__ . '/../../../Resources/wsdl/services.wsdl'
+        );
 
         $this->assertFalse($prop->getValue($client));