Namespaced

14 files changed, 67 insertions, 86 deletions

diff --git a/library/SSRS/Object/ArrayIterator.php b/library/SSRS/Object/ArrayIterator.php
index ad53ad5..8171642 100755
--- a/library/SSRS/Object/ArrayIterator.php
+++ b/library/SSRS/Object/ArrayIterator.php
@@ -1,16 +1,13 @@
 <?php
 
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
+namespace SSRS\Object;
 
 /**
  * Description of Iterator
  *
  * @author andrew
  */
-class SSRS_Object_ArrayIterator extends SSRS_Object_Abstract implements Iterator {
+class ArrayIterator extends ObjectAbstract implements \Iterator {
 
     public $iteratorKey = 'Array';
 
@@ -38,4 +35,4 @@ class SSRS_Object_ArrayIterator extends SSRS_Object_Abstract implements Iterator
         return reset($this->data[$this->iteratorKey]);
     }
 
-}
\ No newline at end of file
+}
diff --git a/library/SSRS/Object/CatalogItem.php b/library/SSRS/Object/CatalogItem.php
index cf0e25d..bf1a60c 100755
--- a/library/SSRS/Object/CatalogItem.php
+++ b/library/SSRS/Object/CatalogItem.php
@@ -1,10 +1,12 @@
 <?php
 
+namespace SSRS\Object;
+
 /**
  * SSRS_Object_Abstract
  *
  * @author arron
  */
-class SSRS_Object_CatalogItem extends SSRS_Object_Abstract {
+class CatalogItem extends ObjectAbstract {
 
 }
diff --git a/library/SSRS/Object/CatalogItems.php b/library/SSRS/Object/CatalogItems.php
index ac16f77..7061e93 100755
--- a/library/SSRS/Object/CatalogItems.php
+++ b/library/SSRS/Object/CatalogItems.php
@@ -1,14 +1,13 @@
 <?php
 
+namespace SSRS\Object;
+
 /**
- * SSRS_Object_Abstract
+ * SSRS\Object\Abstract
  *
  * @author arron
  */
-
-require_once('ArrayIterator.php');
-
-class SSRS_Object_CatalogItems extends SSRS_Object_ArrayIterator {
+class CatalogItems extends ArrayIterator {
 
     public $iteratorKey = 'CatalogItems';
 
@@ -18,11 +17,11 @@ class SSRS_Object_CatalogItems extends SSRS_Object_ArrayIterator {
 
     public function setCatalogItems(stdClass $items) {
         foreach ($items->CatalogItem AS $item) {
-            $this->addCatalogItem(new SSRS_Object_CatalogItem($item));
+            $this->addCatalogItem(new CatalogItem($item));
         }
     }
 
-    public function addCatalogItem(SSRS_Object_CatalogItem $item) {
+    public function addCatalogItem(CatalogItem $item) {
         $this->data['CatalogItems'][] = $item;
     }
 
diff --git a/library/SSRS/Object/ExecutionInfo.php b/library/SSRS/Object/ExecutionInfo.php
index 1087e3f..49e6d15 100755
--- a/library/SSRS/Object/ExecutionInfo.php
+++ b/library/SSRS/Object/ExecutionInfo.php
@@ -1,16 +1,13 @@
 <?php
 
-/**
- * SSRS_Object_Abstract
- *
- * @author arron
- */
-class SSRS_Object_ExecutionInfo extends SSRS_Object_Abstract {
+namespace SSRS\Object;
+
+class ExecutionInfo extends ObjectAbstract {
 
     /**
      * Copy of self for backwards compatibility
      * 
-     * @var SSRS_Object_ExecutionInfo
+     * @var SSRS\Object\ExecutionInfo
      */
     public $executionInfo;
 
@@ -52,7 +49,7 @@ class SSRS_Object_ExecutionInfo extends SSRS_Object_Abstract {
                 $data = $reportParam;
             }
 
-            $parameter = new SSRS_Object_ReportParameter($data['name'], $data['value']);
+            $parameter = new ReportParameter($data['name'], $data['value']);
             $parameter->setData($reportParam);
 
             $parameters[] = $parameter;
@@ -100,4 +97,4 @@ class SSRS_Object_ExecutionInfo extends SSRS_Object_Abstract {
         return isset($this->data['NumPages']) ? $this->data['NumPages'] : 1;
     }
 
-}
\ No newline at end of file
+}
diff --git a/library/SSRS/Object/ExecutionParameters.php b/library/SSRS/Object/ExecutionParameters.php
index bf3b819..371b89c 100755
--- a/library/SSRS/Object/ExecutionParameters.php
+++ b/library/SSRS/Object/ExecutionParameters.php
@@ -1,11 +1,8 @@
 <?php
 
-/**
- * Description of ExecutionParameters
- *
- * @author andrew
- */
-class SSRS_Object_ExecutionParameters extends SSRS_Object_ArrayIterator {
+use SSRS\Object;
+
+class ExecutionParameters extends ArrayIterator {
 
     public $iteratorKey = 'Parameters';
 
@@ -22,10 +19,10 @@ class SSRS_Object_ExecutionParameters extends SSRS_Object_ArrayIterator {
         $this->data['Parameters'] = array();
 
         foreach ($parameters AS $key => $parameter) {
-            if (($parameter instanceof SSRS_Object_ReportParameter) === false) {
+            if (($parameter instanceof ReportParameter) === false) {
                 $values = (array) $parameter;
                 foreach ($values AS $value) {
-                    $this->data['Parameters'][] = new SSRS_Object_ReportParameter($key, $value);
+                    $this->data['Parameters'][] = new ReportParameter($key, $value);
                 }
             } else {
                 $this->data['Parameters'][] = $parameter;
diff --git a/library/SSRS/Object/Extension.php b/library/SSRS/Object/Extension.php
index efae2dd..e527968 100755
--- a/library/SSRS/Object/Extension.php
+++ b/library/SSRS/Object/Extension.php
@@ -1,10 +1,7 @@
 <?php
 
-/**
- * SSRS_Object_Abstract
- *
- * @author arron
- */
-class SSRS_Object_Extension extends SSRS_Object_Abstract {
+namespace SSRS\Object;
 
+class Extension extends ObjectAbstract {
+    
 }
diff --git a/library/SSRS/Object/Extensions.php b/library/SSRS/Object/Extensions.php
index 786c1b6..a9bdc7c 100755
--- a/library/SSRS/Object/Extensions.php
+++ b/library/SSRS/Object/Extensions.php
@@ -1,11 +1,8 @@
 <?php
 
-/**
- * SSRS_Object_Abstract
- *
- * @author arron
- */
-class SSRS_Object_Extensions extends SSRS_Object_ArrayIterator {
+namespace SSRS\Object;
+
+class Extensions extends ArrayIterator {
 
     public $iteratorKey = 'Extension';
 
@@ -15,11 +12,11 @@ class SSRS_Object_Extensions extends SSRS_Object_ArrayIterator {
 
     public function setExtensions(stdClass $items) {
         foreach ($items->Extension AS $item) {
-            $this->addExtension(new SSRS_Object_Extension($item));
+            $this->addExtension(new Extension($item));
         }
     }
 
-    public function addExtension(SSRS_Object_Extension $item) {
+    public function addExtension(Extension $item) {
         $this->data['Extension'][] = $item;
     }
 
diff --git a/library/SSRS/Object/ItemDefinition.php b/library/SSRS/Object/ItemDefinition.php
index f63d57e..0dadc93 100755
--- a/library/SSRS/Object/ItemDefinition.php
+++ b/library/SSRS/Object/ItemDefinition.php
@@ -1,11 +1,8 @@
 <?php
 
-/**
- * Description of ExecutionParameters
- *
- * @author andrew
- */
-class SSRS_Object_ItemDefinition extends SSRS_Object_Abstract {
+namespace SSRS\Object;
+
+class ItemDefinition extends ObjectAbstract {
 
     public function getXMLString() {
         return $this->Definition;
diff --git a/library/SSRS/Object/Abstract.php b/library/SSRS/Object/ObjectAbstract.php
index 4658b48..21d5301 100755
--- a/library/SSRS/Object/Abstract.php
+++ b/library/SSRS/Object/ObjectAbstract.php
@@ -1,11 +1,13 @@
 <?php
 
+namespace SSRS\Object;
+
 /**
- * SSRS_Object_Abstract
+ * SSRS\Object\Abstract
  *
  * @author arron
  */
-class SSRS_Object_Abstract {
+abstract class ObjectAbstract {
 
     public $data = array();
 
@@ -57,4 +59,4 @@ class SSRS_Object_Abstract {
         return isset($this->data[$key]) ? $this->data[$key] : null;
     }
 
-}
\ No newline at end of file
+}
diff --git a/library/SSRS/Object/Properties.php b/library/SSRS/Object/Properties.php
index 6765450..f4e9572 100644
--- a/library/SSRS/Object/Properties.php
+++ b/library/SSRS/Object/Properties.php
@@ -1,14 +1,16 @@
 <?php
 
-class SSRS_Object_Properties {
+namespace SSRS\Object;
+
+class Properties {
 
     protected $_properties = array();
 
     public function __construct($properties = array()) {
         $this->addProperties($properties);
     }
-    
-    public function __get($name){
+
+    public function __get($name) {
         return $this->getProperty($name);
     }
 
@@ -18,9 +20,9 @@ class SSRS_Object_Properties {
      */
     public function addProperties(array $properties) {
         foreach ($properties AS $key => $value) {
-            if (is_object($value) && isset($value->Name)) {                
+            if (is_object($value) && isset($value->Name)) {
                 $key = $value->Name;
-                $value = isset($value->Value)? $value->Value : null;
+                $value = isset($value->Value) ? $value->Value : null;
             }
 
             $this->addProperty($key, $value);
@@ -55,4 +57,4 @@ class SSRS_Object_Properties {
         return array_key_exists($key, $this->_properties) ? $this->_properties[$key] : null;
     }
 
-}
\ No newline at end of file
+}
diff --git a/library/SSRS/Object/RenderStream.php b/library/SSRS/Object/RenderStream.php
index a1027f8..9333631 100755
--- a/library/SSRS/Object/RenderStream.php
+++ b/library/SSRS/Object/RenderStream.php
@@ -1,11 +1,8 @@
 <?php
 
-/**
- * SSRS_Object_RenderStream
- *
- * @author arron
- */
-class SSRS_Object_RenderStream extends SSRS_Object_Abstract {
+namespace SSRS\Object;
+
+class RenderStream extends ObjectAbstract {
 
     public $Result;
     public $MimeType;
@@ -19,4 +16,4 @@ class SSRS_Object_RenderStream extends SSRS_Object_Abstract {
         return $this->Result;
     }
 
-}
\ No newline at end of file
+}
diff --git a/library/SSRS/Object/ReportOutput.php b/library/SSRS/Object/ReportOutput.php
index 208a638..0500525 100755
--- a/library/SSRS/Object/ReportOutput.php
+++ b/library/SSRS/Object/ReportOutput.php
@@ -1,11 +1,8 @@
 <?php
 
-/**
- * Description of ExecutionParameters
- *
- * @author andrew
- */
-class SSRS_Object_ReportOutput extends SSRS_Object_Abstract {
+namespace SSRS\Object;
+
+class ReportOutput extends ObjectAbstract {
 
     public function download($filename) {
         header("Cache-control: max-age=3600, must-revalidate");
diff --git a/library/SSRS/Object/ReportParameter.php b/library/SSRS/Object/ReportParameter.php
index 9f1e77e..c9f655b 100755
--- a/library/SSRS/Object/ReportParameter.php
+++ b/library/SSRS/Object/ReportParameter.php
@@ -1,11 +1,10 @@
 <?php
 
-/**
- * Description of ExecutionParameters
- *
- * @author andrew
- */
-class SSRS_Object_ReportParameter extends SSRS_Object_Abstract {
+namespace SSRS\Object;
+
+use SSRS\Object\ReportParameter\ValidValue;
+
+class ReportParameter extends ObjectAbstract {
 
     public function __construct($name, $value) {
         $this->name = $name;
@@ -48,11 +47,11 @@ class SSRS_Object_ReportParameter extends SSRS_Object_Abstract {
         $data = array();
         foreach ($validValues AS $value) {
             if (is_object($value)) {
-                $data[] = new SSRS_Object_ReportParameter_ValidValue((string) $value->Label, (string) $value->Value);
+                $data[] = new ValidValue((string) $value->Label, (string) $value->Value);
             } elseif (is_array($value)) {
-                $data[] = new SSRS_Object_ReportParameter_ValidValue((string) $value['Label'], (string) $value['Value']);
+                $data[] = new ValidValue((string) $value['Label'], (string) $value['Value']);
             } else {
-                $data[] = new SSRS_Object_ReportParameter_ValidValue((string) $value, (string) $value);
+                $data[] = new ValidValue((string) $value, (string) $value);
             }
         }
 
@@ -73,8 +72,7 @@ class SSRS_Object_ReportParameter extends SSRS_Object_Abstract {
      * @return bool 
      */
     public function hasDependencies() {
-        return (isset($this->data['Dependencies']->Dependency)
-                && !empty($this->data['Dependencies']->Dependency));
+        return (isset($this->data['Dependencies']->Dependency) && !empty($this->data['Dependencies']->Dependency));
     }
 
     /**
diff --git a/library/SSRS/Object/ReportParameter/ValidValue.php b/library/SSRS/Object/ReportParameter/ValidValue.php
index b75b07e..9a9925a 100644
--- a/library/SSRS/Object/ReportParameter/ValidValue.php
+++ b/library/SSRS/Object/ReportParameter/ValidValue.php
@@ -1,6 +1,8 @@
 <?php
 
-class SSRS_Object_ReportParameter_ValidValue {
+namespace SSRS\Object\ReportParameter;
+
+class ValidValue {
 
     /**
      * capitals because of SSRS!
@@ -17,4 +19,4 @@ class SSRS_Object_ReportParameter_ValidValue {
         return $this->Value;
     }
 
-}
\ No newline at end of file
+}