diff options
25 files changed, 169 insertions, 164 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 +} diff --git a/library/SSRS/Report.php b/library/SSRS/Report.php index 7bab994..6aff53b 100755 --- a/library/SSRS/Report.php +++ b/library/SSRS/Report.php @@ -12,6 +12,20 @@ namespace SSRS; +use SoapClient; +use SoapVar; +use SoapHeader; +use SSRS\Soap\NTLM as SoapNTLM; +use SSRS\Object\CatalogItems; +use SSRS\Object\Properties; +use SSRS\Object\ItemDefinition; +use SSRS\Object\Extensions; +use SSRS\Object\ExecutionInfo; +use SSRS\Object\ExecutionParameters; +use SSRS\Object\ReportOutput; +use SSRS\Object\RenderStream; +use SSRS\Report\Exception as ReportException; + class Report { public $servicePath = 'ReportService2010.asmx'; @@ -81,7 +95,7 @@ class Report { public function getSoapExecution($runInit = true) { if ($this->_soapExecution === null) { $options = array('username' => $this->_username, 'password' => $this->_passwd); - $client = new SSRS_Soap_NTLM($this->_baseUri . '/' . $this->executionPath, $options); + $client = new SoapNTLM($this->_baseUri . '/' . $this->executionPath, $options); if ($runInit) { $client->init(); } @@ -101,7 +115,7 @@ class Report { public function getSoapService($runInit = true) { if ($this->_soapService === null) { $options = array('username' => $this->_username, 'password' => $this->_passwd); - $client = new SSRS_Soap_NTLM($this->_baseUri . '/' . $this->servicePath, $options); + $client = new SoapNTLM($this->_baseUri . '/' . $this->servicePath, $options); if ($runInit) { $client->init(); } @@ -116,7 +130,7 @@ class Report { * Sets username property * * @param string $username - * @return SSRS_Report + * @return \SSRS\Report */ public function setUsername($username) { $this->_username = (string) $username; @@ -127,7 +141,7 @@ class Report { * Sets password property * * @param string $password - * @return SSRS_Report + * @return \SSRS\Report */ public function setPassword($password) { $this->_passwd = (string) $password; @@ -179,7 +193,7 @@ class Report { * * @param string $itemPath * @param boolean $recursive - * @return SSRS_Object_CatalogItems + * @return \SSRS\Object\CatalogItems */ public function listChildren($itemPath, $recursive = false) { $params = array( @@ -188,14 +202,14 @@ class Report { ); $result = $this->getSoapService()->ListChildren($params); - return new SSRS_Object_CatalogItems($result); + return new CatalogItems($result); } /** * Returns item properties * * @param string $path - * @return \SSRS_Object_Properties + * @return \SSRS\Object\Properties */ public function getProperties($itemPath) { $params = array( @@ -203,7 +217,7 @@ class Report { ); $result = $this->getSoapService()->GetProperties($params); - return new SSRS_Object_Properties($result->Values->Property); + return new Properties($result->Values->Property); } /** @@ -211,23 +225,23 @@ class Report { * Used to backup report definitions into a XML based RDL file. * * @param string $itemPath - * @return SSRS_Object_ItemDefinition + * @return \SSRS\Object\ItemDefinition */ public function getItemDefinition($itemPath) { $params = array( 'ItemPath' => $itemPath, ); $result = $this->getSoapService()->GetItemDefinition($params); - return new SSRS_Object_ItemDefinition($result); + return new ItemDefinition($result); } /** * Returns a list of all render types to output reports to, such as XML, HTML & PDF. * - * @return SSRS_Object_Extensions + * @return \SSRS\Object\Extensions */ public function listRenderingExtensions() { - return new SSRS_Object_Extensions($this->getSoapExecution()->ListRenderingExtensions()); + return new Extensions($this->getSoapExecution()->ListRenderingExtensions()); } /** @@ -256,7 +270,7 @@ class Report { * * @param string $Report * @param string $HistoryId - * @return SSRS_Object_ExecutionInfo + * @return \SSRS\Object\ExecutionInfo */ public function loadReport($Report, $HistoryId = null) { $params = array( @@ -265,17 +279,17 @@ class Report { ); $result = $this->getSoapExecution()->LoadReport($params); - return new SSRS_Object_ExecutionInfo($result); + return new ExecutionInfo($result); } /** * Get current execution info * - * @return \SSRS_Object_ExecutionInfo + * @return \SSRS\Object\ExecutionInfo */ public function getExecutionInfo() { $result = $this->getSoapExecution()->GetExecutionInfo2(); - return new SSRS_Object_ExecutionInfo($result); + return new ExecutionInfo($result); } /** @@ -283,11 +297,11 @@ class Report { * Pass details from 'LoadReport' method to set the search parameters. * Requires the Session/Execution ID to be set. * - * @param SSRS_Object_ExecutionParameters $request + * @param SSRS\Object\ExecutionParameters $request * @param string $id - * @return SSRS_Object_ExecutionInfo + * @return SSRS\Object\ExecutionInfo */ - public function setExecutionParameters(SSRS_Object_ExecutionParameters $parameters, $parameterLanguage = 'en-us') { + public function setExecutionParameters(ExecutionParameters $parameters, $parameterLanguage = 'en-us') { $this->checkSessionId(); $options = array( @@ -296,7 +310,7 @@ class Report { ); $result = $this->getSoapExecution()->SetExecutionParameters($options); - return new SSRS_Object_ExecutionInfo($result); + return new ExecutionInfo($result); } /** @@ -304,7 +318,7 @@ class Report { * * @param string $format * @param string $PaginationMode - * @return SSRS_Object_ReportOutput + * @return SSRS\Object\ReportOutput */ public function render($format, $deviceInfo = array(), $PaginationMode = 'Estimate') { $this->checkSessionId(); @@ -317,7 +331,7 @@ class Report { ); $result = $this->getSoapExecution()->Render2($renderParams); - return new SSRS_Object_ReportOutput($result); + return new ReportOutput($result); } /** @@ -325,7 +339,7 @@ class Report { * @param string $format * @param string $streamId * @param array $deviceInfo - * @return \SSRS_Object_RenderStream + * @return \SSRS\Object\RenderStream */ public function renderStream($format, $streamId, $deviceInfo = array()) { $this->checkSessionId(); @@ -338,7 +352,7 @@ class Report { ); $result = $this->getSoapExecution()->RenderStream($renderParams); - return new SSRS_Object_RenderStream($result); + return new RenderStream($result); } /** @@ -346,7 +360,7 @@ class Report { * @param string $format * @param string $streamId * @param array $deviceInfo - * @return \SSRS_Object_RenderStream + * @return \SSRS\Object\RenderStream */ public function getRenderResource($format, $deviceInfo = array()) { $this->checkSessionId(); @@ -359,7 +373,7 @@ class Report { ); $result = $this->getSoapExecution()->GetRenderResource($renderParams); - return new SSRS_Object_RenderStream($result); + return new RenderStream($result); } /** @@ -368,7 +382,7 @@ class Report { */ public function checkSessionId() { if ($this->hasValidSessionId() === false) { - throw new SSRS_Report_Exception('Session ID not set'); + throw new ReportException('Session ID not set'); } } diff --git a/library/SSRS/Report/Exception.php b/library/SSRS/Report/Exception.php index a6afac5..0010f47 100755 --- a/library/SSRS/Report/Exception.php +++ b/library/SSRS/Report/Exception.php @@ -1,3 +1,7 @@ <?php -class SSRS_Report_Exception extends Exception{}
\ No newline at end of file +namespace SSRS\Report; + +class Exception extends \Exception { + +} diff --git a/library/SSRS/Soap/Exception.php b/library/SSRS/Soap/Exception.php index 5e6170d..2257404 100755 --- a/library/SSRS/Soap/Exception.php +++ b/library/SSRS/Soap/Exception.php @@ -1,15 +1,17 @@ <?php -class SSRS_Soap_Exception extends Exception{ - +namespace SSRS\Soap; + +class Exception extends \Exception { + public $httpCode; public $response; - + public function __construct($message, $code, $response = null) { $this->httpCode = $code; $this->response = $response; - + parent::__construct($message, $code); } - -}
\ No newline at end of file + +} diff --git a/library/SSRS/Soap/NTLM.php b/library/SSRS/Soap/NTLM.php index 929a642..084e92c 100755 --- a/library/SSRS/Soap/NTLM.php +++ b/library/SSRS/Soap/NTLM.php @@ -1,6 +1,8 @@ <?php -class SSRS_Soap_NTLM extends SoapClient { +namespace SSRS\Soap; + +class NTLM extends \SoapClient { protected $_uri; protected $_username; @@ -154,9 +156,9 @@ class SSRS_Soap_NTLM extends SoapClient { $httpCode = curl_getinfo($handle, CURLINFO_HTTP_CODE); if ($httpCode >= 300 && $httpCode <= 600) { - throw SSRS_Soap_ServerException::fromResponse($response); + throw ServerException::fromResponse($response); } else if ($httpCode !== 200) { - throw new SSRS_Soap_Exception('HTTP error: ' . $httpCode . ' ' . $response, $httpCode, $response); + throw new Exception('HTTP error: ' . $httpCode . ' ' . $response, $httpCode, $response); } curl_close($handle); diff --git a/library/SSRS/Soap/ServerException.php b/library/SSRS/Soap/ServerException.php index 3ffce47..7d71d10 100644 --- a/library/SSRS/Soap/ServerException.php +++ b/library/SSRS/Soap/ServerException.php @@ -1,6 +1,8 @@ <?php -class SSRS_Soap_ServerException extends Exception { +namespace SSRS\Soap; + +class ServerException extends \Exception { public $faultcode; public $faultstring; @@ -15,15 +17,15 @@ class SSRS_Soap_ServerException extends Exception { if (isset($body->Fault)) { $fault = $body->Fault->children(); - $exception = new SSRS_Soap_ServerException((string) $fault->faultstring); + $exception = new ServerException((string) $fault->faultstring); $exception->faultcode = (string) $fault->faultcode; $exception->faultstring = (string) $fault->faultstring; $exception->faultactor = (string) $fault->faultactor; } else { - throw new SSRS_Soap_Exception('Invalid server response'); + throw new Exception('Invalid server response'); } return $exception; } -}
\ No newline at end of file +} diff --git a/samples/GetItemDefinition.php b/samples/GetItemDefinition.php index ff62818..b8df557 100755 --- a/samples/GetItemDefinition.php +++ b/samples/GetItemDefinition.php @@ -1,16 +1,16 @@ <?php -require('../library/SSRS/Report.php'); +require(__DIR__ . '/../vendor/autoload.php'); $options = array( 'username' => 'testing', 'password' => 'password' ); -$ssrs = new SSRS_Report('http://localhost/reportserver/', $options); +$ssrs = new \SSRS\Report('http://localhost/reportserver/', $options); $ItemPath = '/Reports/Reference_Report'; $result = $ssrs->getItemDefinition($ItemPath); header('Content-Type:text/xml'); -echo $result;
\ No newline at end of file +echo $result; diff --git a/samples/ListChildren.php b/samples/ListChildren.php index 513e7a2..ccedde4 100755 --- a/samples/ListChildren.php +++ b/samples/ListChildren.php @@ -1,13 +1,13 @@ <?php -require(dirname(__FILE__) . '/../library/SSRS/Report.php'); +require(__DIR__ . '/../vendor/autoload.php'); $options = array( 'username' => 'testing', 'password' => 'password', ); -$ssrs = new SSRS_Report('http://localhost/reportserver/', $options); +$ssrs = new \SSRS\Report('http://localhost/reportserver/', $options); $result = $ssrs->listChildren('/Reports', true); foreach ($result->CatalogItems AS $item) { diff --git a/samples/ListRenderingExtensions.php b/samples/ListRenderingExtensions.php index 5b3bf91..036cd18 100755 --- a/samples/ListRenderingExtensions.php +++ b/samples/ListRenderingExtensions.php @@ -1,13 +1,13 @@ <?php -require('../library/SSRS/Report.php'); +require(__DIR__ . '/../vendor/autoload.php'); $options = array( 'username' => 'testing', 'password' => 'password' ); -$ssrs = new SSRS_Report('http://localhost/reportserver/', $options); +$ssrs = new \SSRS\Report('http://localhost/reportserver/', $options); $results = $ssrs->listRenderingExtensions(); echo '<table border="1" width="100%">'; diff --git a/samples/LoadReport.php b/samples/LoadReport.php index 81fb150..08061db 100755 --- a/samples/LoadReport.php +++ b/samples/LoadReport.php @@ -1,13 +1,13 @@ <?php -require('../library/SSRS/Report.php'); +require(__DIR__ . '/../vendor/autoload.php'); $options = array( 'username' => 'testing', 'password' => 'password' ); -$ssrs = new SSRS_Report('http://localhost/reportserver/', $options); +$ssrs = new \SSRS\Report('http://localhost/reportserver/', $options); $result = $ssrs->loadReport('/Reports/Reference_Report'); $ssrs->setSessionId($result->executionInfo->ExecutionID); diff --git a/samples/LoadReportWithParameters.php b/samples/LoadReportWithParameters.php index a99c582..e2a89dd 100755 --- a/samples/LoadReportWithParameters.php +++ b/samples/LoadReportWithParameters.php @@ -1,18 +1,18 @@ <?php -require('../library/SSRS/Report.php'); -include_once('Zend/Debug.php'); + +require(__DIR__ . '/../vendor/autoload.php'); + $options = array( - 'username' => 'CaymanUnreg', - 'password' => 'Gottex2011' + 'username' => 'testing', + 'password' => 'password' ); -$ssrs = new SSRS_Report('http://212.203.112.85/reportserver/', $options); -$result = $ssrs->loadReport('/Off Shore/Cayman Weekly Risk'); -Zend_Debug::dump($result); -//die(); +$ssrs = new \SSRS\Report('http://localhost/reportserver/', $options); +$result = $ssrs->loadReport('/Reports/Reference_Report'); + $reportParameters = array( - 'managedaccount' => '1' - ); + 'test' => '1' +); $parameters = new SSRS_Object_ExecutionParameters($reportParameters); @@ -20,4 +20,4 @@ $ssrs->setSessionId($result->executionInfo->ExecutionID) ->setExecutionParameters($parameters); $output = $ssrs->render('HTML4.0'); // PDF | XML | CSV -echo $output;
\ No newline at end of file +echo $output; diff --git a/tests/library/SSRS/ReportTest.php b/tests/library/SSRS/ReportTest.php index 03961e7..ec7120e 100755 --- a/tests/library/SSRS/ReportTest.php +++ b/tests/library/SSRS/ReportTest.php @@ -1,8 +1,8 @@ <?php -require_once('SSRS/Report.php'); +namespace SSRSTest; -class SSRS_ReportTest extends PHPUnit_Framework_TestCase { +class ReportTest extends PHPUnit_Framework_TestCase { public function testPassCredentialsOnConstruct() { $options = array( @@ -10,25 +10,25 @@ class SSRS_ReportTest extends PHPUnit_Framework_TestCase { 'password' => 'monkhouse' ); - $ssrs = new SSRS_Report('http://test', $options); + $ssrs = new \SSRS\Report('http://test', $options); $this->assertEquals($options['username'], $ssrs->getUsername()); $this->assertEquals($options['password'], $ssrs->getPassword()); } public function testGetSoapServiceReturnsNTLMByDefault() { - $ssrs = new SSRS_Report('http://test'); + $ssrs = new \SSRS\Report('http://test'); $soap = $ssrs->getSoapService(false); - $this->assertInstanceOf('SSRS_Soap_NTLM', $soap); + $this->assertInstanceOf('\SSRS\Soap_NTLM', $soap); $this->assertEquals('http://test/ReportService2010.asmx', $soap->getUri()); } public function testGetSoapExecutionReturnsNTLMByDefault() { - $ssrs = new SSRS_Report('http://test'); + $ssrs = new \SSRS\Report('http://test'); $soap = $ssrs->getSoapExecution(false); - $this->assertInstanceOf('SSRS_Soap_NTLM', $soap); + $this->assertInstanceOf('\SSRS\Soap\NTLM', $soap); $this->assertEquals('http://test/ReportExecution2005.asmx', $soap->getUri()); } @@ -44,7 +44,7 @@ class SSRS_ReportTest extends PHPUnit_Framework_TestCase { ->method('__setSoapHeaders') ->with($this->equalTo(array($soapHeader))); - $ssrs = new SSRS_Report('http://test/ReportServer'); + $ssrs = new \SSRS\Report('http://test/ReportServer'); $ssrs->setSoapExecution($soapMock); $result = $ssrs->setSessionId($sessionId); @@ -73,13 +73,13 @@ class SSRS_ReportTest extends PHPUnit_Framework_TestCase { ->with($this->equalTo(array('ItemPath' => '/Reports', 'Recursive' => true))) ->will($this->returnValue($return)); - $ssrs = new SSRS_Report('http://test/ReportServer'); + $ssrs = new \SSRS\Report('http://test/ReportServer'); $ssrs->setSoapService($soapMock); $result = $ssrs->listChildren('/Reports', true); - $expected = new SSRS_Object_CatalogItems($return); + $expected = new \SSRS\Object\CatalogItems($return); - $this->assertInstanceOf('SSRS_Object_CatalogItems', $result); + $this->assertInstanceOf('\SSRS\Object\CatalogItems', $result); $this->assertEquals($expected, $result); } @@ -92,7 +92,7 @@ class SSRS_ReportTest extends PHPUnit_Framework_TestCase { ->method('ListChildren') ->with($this->equalTo(array('ItemPath' => '/Reports', 'Recursive' => true))); - $ssrs = new SSRS_Report('http://test/ReportServer'); + $ssrs = new \SSRS\Report('http://test/ReportServer'); $ssrs->setSoapService($soapMock); $result = $ssrs->listChildren('/Reports', $recursiveParam); @@ -105,7 +105,7 @@ class SSRS_ReportTest extends PHPUnit_Framework_TestCase { ->method('getItemDefinition') ->with($this->equalTo(array('ItemPath' => '/Reports/Managed Account Performance'))); - $ssrs = new SSRS_Report('http://test/ReportServer'); + $ssrs = new \SSRS\Report('http://test/ReportServer'); $ssrs->setSoapService($soapMock); $result = $ssrs->getItemDefinition('/Reports/Managed Account Performance'); @@ -120,9 +120,9 @@ class SSRS_ReportTest extends PHPUnit_Framework_TestCase { ->with($this->equalTo(array('Report' => '/Reports/Reference_Report', 'HistoryID' => null))) ->will($this->returnValue($testReport)); - $ssrs = new SSRS_Report('http://test/ReportServer'); + $ssrs = new \SSRS\Report('http://test/ReportServer'); $ssrs->setSoapExecution($soapMock); - $expected = new SSRS_Object_Report($testReport); + $expected = new \SSRS\Object\Report($testReport); $result = $ssrs->loadReport('/Reports/Reference_Report'); $this->assertEquals($expected, $result); @@ -139,7 +139,7 @@ class SSRS_ReportTest extends PHPUnit_Framework_TestCase { 'PaginationMode' => 'Estimate' ))); - $ssrs = new SSRS_Report('http://test/ReportServer'); + $ssrs = new \SSRS\Report('http://test/ReportServer'); $ssrs->setSoapExecution($soapMock) ->setSessionId($executionID); @@ -155,7 +155,7 @@ class SSRS_ReportTest extends PHPUnit_Framework_TestCase { 'PaginationMode' => 'Another' ))); - $ssrs = new SSRS_Report('http://test/ReportServer'); + $ssrs = new \SSRS\Report('http://test/ReportServer'); $ssrs->setSoapExecution($soapMock) ->setSessionId('test'); |