Tests almost back to passing

5 files changed, 9 insertions, 8 deletions

diff --git a/library/SSRS/Object/CatalogItems.php b/library/SSRS/Object/CatalogItems.php
index 7061e93..6386cd5 100755
--- a/library/SSRS/Object/CatalogItems.php
+++ b/library/SSRS/Object/CatalogItems.php
@@ -15,7 +15,7 @@ class CatalogItems extends ArrayIterator {
         $this->data['CatalogItems'] = array();
     }
 
-    public function setCatalogItems(stdClass $items) {
+    public function setCatalogItems(\stdClass $items) {
         foreach ($items->CatalogItem AS $item) {
             $this->addCatalogItem(new CatalogItem($item));
         }
diff --git a/library/SSRS/Object/ExecutionInfo.php b/library/SSRS/Object/ExecutionInfo.php
index 49e6d15..0a723db 100755
--- a/library/SSRS/Object/ExecutionInfo.php
+++ b/library/SSRS/Object/ExecutionInfo.php
@@ -11,7 +11,7 @@ class ExecutionInfo extends ObjectAbstract {
      */
     public $executionInfo;
 
-    public function __construct(stdClass $info = null) {
+    public function __construct(\stdClass $info = null) {
         if ($info) {
             $this->setData($info->executionInfo);
         }
@@ -27,14 +27,14 @@ class ExecutionInfo extends ObjectAbstract {
         return strtotime($this->data['ExpirationDateTime']);
     }
 
-    public function setParameters(stdClass $params) {
+    public function setParameters(\stdClass $params) {
         return $this->setReportParameters($params);
     }
 
     public function setReportParameters($reportParameters) {
         $parameters = array();
 
-        if ($reportParameters instanceof stdClass) {
+        if ($reportParameters instanceof \stdClass) {
             $reportParameters = isset($reportParameters->ReportParameter) ? $reportParameters->ReportParameter : array();
             $reportParameters = is_array($reportParameters) ? $reportParameters : array($reportParameters);
         }
diff --git a/library/SSRS/Object/ReportParameter.php b/library/SSRS/Object/ReportParameter.php
index c9f655b..893c427 100755
--- a/library/SSRS/Object/ReportParameter.php
+++ b/library/SSRS/Object/ReportParameter.php
@@ -49,6 +49,7 @@ class ReportParameter extends ObjectAbstract {
             if (is_object($value)) {
                 $data[] = new ValidValue((string) $value->Label, (string) $value->Value);
             } elseif (is_array($value)) {
+                var_dump($value);
                 $data[] = new ValidValue((string) $value['Label'], (string) $value['Value']);
             } else {
                 $data[] = new ValidValue((string) $value, (string) $value);
diff --git a/library/SSRS/Soap/Exception.php b/library/SSRS/Soap/Exception.php
index 2257404..4ee891c 100755
--- a/library/SSRS/Soap/Exception.php
+++ b/library/SSRS/Soap/Exception.php
@@ -7,7 +7,7 @@ class Exception extends \Exception {
     public $httpCode;
     public $response;
 
-    public function __construct($message, $code, $response = null) {
+    public function __construct($message, $code = null, $response = null) {
         $this->httpCode = $code;
         $this->response = $response;
 
diff --git a/library/SSRS/Soap/NTLM.php b/library/SSRS/Soap/NTLM.php
index 084e92c..3820de8 100755
--- a/library/SSRS/Soap/NTLM.php
+++ b/library/SSRS/Soap/NTLM.php
@@ -77,11 +77,11 @@ class NTLM extends \SoapClient {
         $folder = dirname($path);
 
         if (!is_dir($folder)) {
-            throw new SSRS_Soap_Exception('WSDL cache path is not valid');
+            throw new Exception('WSDL cache path is not valid');
         }
 
         if (!is_writeable($folder)) {
-            throw new SSRS_Soap_Exception('WSDL cache path not writeable');
+            throw new Exception('WSDL cache path not writeable');
         }
 
         $this->_cachePath = $path;
@@ -174,4 +174,4 @@ class NTLM extends \SoapClient {
         return $this->_lastResponse;
     }
 
-}
+}
\ No newline at end of file