@@ -39,137 +39,137 @@ |
||
| 39 | 39 | * @author Guillaume Viguier-Just <[email protected]> |
| 40 | 40 | * @licence http://www.gnu.org/licenses/gpl.txt |
| 41 | 41 | */ |
| 42 | - class PENSResponse extends PENSMessage { |
|
| 43 | - /** |
|
| 44 | - * Error code |
|
| 45 | - * @var int |
|
| 46 | - */ |
|
| 47 | - protected $_error = null; |
|
| 42 | + class PENSResponse extends PENSMessage { |
|
| 43 | + /** |
|
| 44 | + * Error code |
|
| 45 | + * @var int |
|
| 46 | + */ |
|
| 47 | + protected $_error = null; |
|
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * Descriptive text of the error |
|
| 51 | - * @var string |
|
| 52 | - */ |
|
| 53 | - protected $_error_text = null; |
|
| 49 | + /** |
|
| 50 | + * Descriptive text of the error |
|
| 51 | + * @var string |
|
| 52 | + */ |
|
| 53 | + protected $_error_text = null; |
|
| 54 | 54 | |
| 55 | - /** |
|
| 56 | - * Data linked to the error |
|
| 57 | - * @var string |
|
| 58 | - */ |
|
| 59 | - protected $_pens_data = null; |
|
| 55 | + /** |
|
| 56 | + * Data linked to the error |
|
| 57 | + * @var string |
|
| 58 | + */ |
|
| 59 | + protected $_pens_data = null; |
|
| 60 | 60 | |
| 61 | - /** |
|
| 62 | - * Version |
|
| 63 | - * @var string |
|
| 64 | - */ |
|
| 65 | - protected $_pens_version = null; |
|
| 61 | + /** |
|
| 62 | + * Version |
|
| 63 | + * @var string |
|
| 64 | + */ |
|
| 65 | + protected $_pens_version = null; |
|
| 66 | 66 | |
| 67 | - /** |
|
| 68 | - * Constructor |
|
| 69 | - * |
|
| 70 | - * @param mixed Can be a PENSException or an error code or a string representing an HTTP response |
|
| 71 | - * @param string error text |
|
| 72 | - * @param string PENS data |
|
| 73 | - */ |
|
| 74 | - public function __construct($error, $error_text = null, $pens_data = null) { |
|
| 75 | - $this->_pens_version = PENSConfig::$version; |
|
| 76 | - if($error instanceof PENSException) { |
|
| 77 | - $this->_error = $error->getCode(); |
|
| 78 | - $this->_error_text = $error->getMessage(); |
|
| 79 | - } else if(is_string($error)){ |
|
| 80 | - // Parse the string |
|
| 81 | - $this->parseResponse($error); |
|
| 82 | - } else if(is_array($error)) { |
|
| 83 | - // Try to build from array |
|
| 84 | - $this->_error = $error["error"]; |
|
| 85 | - $this->_error_text = $error["error-text"]; |
|
| 86 | - $this->_pens_data = $error["pens-data"]; |
|
| 87 | - } else { |
|
| 88 | - $this->_error = $error; |
|
| 89 | - $this->_error_text = $error_text; |
|
| 90 | - $this->_pens_data = $pens_data; |
|
| 91 | - } |
|
| 67 | + /** |
|
| 68 | + * Constructor |
|
| 69 | + * |
|
| 70 | + * @param mixed Can be a PENSException or an error code or a string representing an HTTP response |
|
| 71 | + * @param string error text |
|
| 72 | + * @param string PENS data |
|
| 73 | + */ |
|
| 74 | + public function __construct($error, $error_text = null, $pens_data = null) { |
|
| 75 | + $this->_pens_version = PENSConfig::$version; |
|
| 76 | + if($error instanceof PENSException) { |
|
| 77 | + $this->_error = $error->getCode(); |
|
| 78 | + $this->_error_text = $error->getMessage(); |
|
| 79 | + } else if(is_string($error)){ |
|
| 80 | + // Parse the string |
|
| 81 | + $this->parseResponse($error); |
|
| 82 | + } else if(is_array($error)) { |
|
| 83 | + // Try to build from array |
|
| 84 | + $this->_error = $error["error"]; |
|
| 85 | + $this->_error_text = $error["error-text"]; |
|
| 86 | + $this->_pens_data = $error["pens-data"]; |
|
| 87 | + } else { |
|
| 88 | + $this->_error = $error; |
|
| 89 | + $this->_error_text = $error_text; |
|
| 90 | + $this->_pens_data = $pens_data; |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | - } |
|
| 93 | + } |
|
| 94 | 94 | |
| 95 | - /** |
|
| 96 | - * Parses an HTTP response and assigns the attributes of the object |
|
| 97 | - * |
|
| 98 | - * @param string HTTP response |
|
| 99 | - */ |
|
| 100 | - protected function parseResponse($response) { |
|
| 101 | - $lines = explode(PENSConfig::$eol, $response); |
|
| 102 | - $i = 1; |
|
| 103 | - foreach($lines as $line) { |
|
| 104 | - if($i < 5) { |
|
| 105 | - $pair = explode("=", $line); |
|
| 106 | - if($pair[0] == "error") { |
|
| 107 | - $this->_error = intval($pair[1]); |
|
| 108 | - } else if($pair[0] == "error-text") { |
|
| 109 | - $this->_error_text = $pair[1]; |
|
| 110 | - } else if($pair[0] == "version") { |
|
| 111 | - $this->_pens_version = $pair[1]; |
|
| 112 | - } else if($pair[0] == "pens-data") { |
|
| 113 | - if(!empty($pair[1])) { |
|
| 114 | - $this->_pens_data = $pair[1].PENSConfig::$eol; |
|
| 115 | - } |
|
| 116 | - } |
|
| 117 | - } else { |
|
| 118 | - if(!empty($line)) { |
|
| 119 | - $this->_pens_data .= $line.PENSConfig::$eol; |
|
| 120 | - } |
|
| 121 | - } |
|
| 122 | - $i++; |
|
| 123 | - } |
|
| 124 | - } |
|
| 95 | + /** |
|
| 96 | + * Parses an HTTP response and assigns the attributes of the object |
|
| 97 | + * |
|
| 98 | + * @param string HTTP response |
|
| 99 | + */ |
|
| 100 | + protected function parseResponse($response) { |
|
| 101 | + $lines = explode(PENSConfig::$eol, $response); |
|
| 102 | + $i = 1; |
|
| 103 | + foreach($lines as $line) { |
|
| 104 | + if($i < 5) { |
|
| 105 | + $pair = explode("=", $line); |
|
| 106 | + if($pair[0] == "error") { |
|
| 107 | + $this->_error = intval($pair[1]); |
|
| 108 | + } else if($pair[0] == "error-text") { |
|
| 109 | + $this->_error_text = $pair[1]; |
|
| 110 | + } else if($pair[0] == "version") { |
|
| 111 | + $this->_pens_version = $pair[1]; |
|
| 112 | + } else if($pair[0] == "pens-data") { |
|
| 113 | + if(!empty($pair[1])) { |
|
| 114 | + $this->_pens_data = $pair[1].PENSConfig::$eol; |
|
| 115 | + } |
|
| 116 | + } |
|
| 117 | + } else { |
|
| 118 | + if(!empty($line)) { |
|
| 119 | + $this->_pens_data .= $line.PENSConfig::$eol; |
|
| 120 | + } |
|
| 121 | + } |
|
| 122 | + $i++; |
|
| 123 | + } |
|
| 124 | + } |
|
| 125 | 125 | |
| 126 | - public function getError() { |
|
| 127 | - return $this->_error; |
|
| 128 | - } |
|
| 126 | + public function getError() { |
|
| 127 | + return $this->_error; |
|
| 128 | + } |
|
| 129 | 129 | |
| 130 | - public function getErrorText() { |
|
| 131 | - return $this->_error_text; |
|
| 132 | - } |
|
| 130 | + public function getErrorText() { |
|
| 131 | + return $this->_error_text; |
|
| 132 | + } |
|
| 133 | 133 | |
| 134 | - public function getPensData() { |
|
| 135 | - return $this->_pens_data; |
|
| 136 | - } |
|
| 134 | + public function getPensData() { |
|
| 135 | + return $this->_pens_data; |
|
| 136 | + } |
|
| 137 | 137 | |
| 138 | - public function getVersion() { |
|
| 139 | - return $this->_pens_version; |
|
| 140 | - } |
|
| 138 | + public function getVersion() { |
|
| 139 | + return $this->_pens_version; |
|
| 140 | + } |
|
| 141 | 141 | |
| 142 | - /** |
|
| 143 | - * Sends the response content through HTTP headers |
|
| 144 | - */ |
|
| 145 | - public function send() { |
|
| 146 | - header("Content-Type: text/plain"); |
|
| 147 | - print $this; |
|
| 148 | - } |
|
| 142 | + /** |
|
| 143 | + * Sends the response content through HTTP headers |
|
| 144 | + */ |
|
| 145 | + public function send() { |
|
| 146 | + header("Content-Type: text/plain"); |
|
| 147 | + print $this; |
|
| 148 | + } |
|
| 149 | 149 | |
| 150 | - /** |
|
| 151 | - * Returns an associative array of the response |
|
| 152 | - * |
|
| 153 | - * @return array Associative array |
|
| 154 | - */ |
|
| 155 | - public function getArray() { |
|
| 156 | - return array("error" => $this->_error, |
|
| 157 | - "error-text" => $this->_error_text, |
|
| 158 | - "version" => PENSConfig::$version, |
|
| 159 | - "pens-data" => $this->_pens_data); |
|
| 160 | - } |
|
| 150 | + /** |
|
| 151 | + * Returns an associative array of the response |
|
| 152 | + * |
|
| 153 | + * @return array Associative array |
|
| 154 | + */ |
|
| 155 | + public function getArray() { |
|
| 156 | + return array("error" => $this->_error, |
|
| 157 | + "error-text" => $this->_error_text, |
|
| 158 | + "version" => PENSConfig::$version, |
|
| 159 | + "pens-data" => $this->_pens_data); |
|
| 160 | + } |
|
| 161 | 161 | |
| 162 | - /** |
|
| 163 | - * Transforms the object into a string |
|
| 164 | - */ |
|
| 165 | - public function __toString() { |
|
| 166 | - $eol = PENSConfig::$eol; |
|
| 167 | - $return = "error=".$this->_error.$eol; |
|
| 168 | - $return .= "error-text=".$this->_error_text.$eol; |
|
| 169 | - $return .= "version=".PENSConfig::$version.$eol; |
|
| 170 | - $return .= "pens-data=".$this->_pens_data.$eol; |
|
| 171 | - return $return; |
|
| 172 | - } |
|
| 162 | + /** |
|
| 163 | + * Transforms the object into a string |
|
| 164 | + */ |
|
| 165 | + public function __toString() { |
|
| 166 | + $eol = PENSConfig::$eol; |
|
| 167 | + $return = "error=".$this->_error.$eol; |
|
| 168 | + $return .= "error-text=".$this->_error_text.$eol; |
|
| 169 | + $return .= "version=".PENSConfig::$version.$eol; |
|
| 170 | + $return .= "pens-data=".$this->_pens_data.$eol; |
|
| 171 | + return $return; |
|
| 172 | + } |
|
| 173 | 173 | |
| 174 | - } |
|
| 174 | + } |
|
| 175 | 175 | |
@@ -26,9 +26,9 @@ discard block |
||
| 26 | 26 | * @licence http://www.gnu.org/licenses/gpl.txt |
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | -require_once __DIR__ . '/pens_config.php'; |
|
| 30 | -require_once __DIR__ . '/pens_message.php'; |
|
| 31 | -require_once __DIR__ . '/pens_exception.php'; |
|
| 29 | +require_once __DIR__.'/pens_config.php'; |
|
| 30 | +require_once __DIR__.'/pens_message.php'; |
|
| 31 | +require_once __DIR__.'/pens_exception.php'; |
|
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | 34 | * PENSResponse |
@@ -73,13 +73,13 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | public function __construct($error, $error_text = null, $pens_data = null) { |
| 75 | 75 | $this->_pens_version = PENSConfig::$version; |
| 76 | - if($error instanceof PENSException) { |
|
| 76 | + if ($error instanceof PENSException) { |
|
| 77 | 77 | $this->_error = $error->getCode(); |
| 78 | 78 | $this->_error_text = $error->getMessage(); |
| 79 | - } else if(is_string($error)){ |
|
| 79 | + } else if (is_string($error)) { |
|
| 80 | 80 | // Parse the string |
| 81 | 81 | $this->parseResponse($error); |
| 82 | - } else if(is_array($error)) { |
|
| 82 | + } else if (is_array($error)) { |
|
| 83 | 83 | // Try to build from array |
| 84 | 84 | $this->_error = $error["error"]; |
| 85 | 85 | $this->_error_text = $error["error-text"]; |
@@ -100,22 +100,22 @@ discard block |
||
| 100 | 100 | protected function parseResponse($response) { |
| 101 | 101 | $lines = explode(PENSConfig::$eol, $response); |
| 102 | 102 | $i = 1; |
| 103 | - foreach($lines as $line) { |
|
| 104 | - if($i < 5) { |
|
| 103 | + foreach ($lines as $line) { |
|
| 104 | + if ($i < 5) { |
|
| 105 | 105 | $pair = explode("=", $line); |
| 106 | - if($pair[0] == "error") { |
|
| 106 | + if ($pair[0] == "error") { |
|
| 107 | 107 | $this->_error = intval($pair[1]); |
| 108 | - } else if($pair[0] == "error-text") { |
|
| 108 | + } else if ($pair[0] == "error-text") { |
|
| 109 | 109 | $this->_error_text = $pair[1]; |
| 110 | - } else if($pair[0] == "version") { |
|
| 110 | + } else if ($pair[0] == "version") { |
|
| 111 | 111 | $this->_pens_version = $pair[1]; |
| 112 | - } else if($pair[0] == "pens-data") { |
|
| 113 | - if(!empty($pair[1])) { |
|
| 112 | + } else if ($pair[0] == "pens-data") { |
|
| 113 | + if (!empty($pair[1])) { |
|
| 114 | 114 | $this->_pens_data = $pair[1].PENSConfig::$eol; |
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | } else { |
| 118 | - if(!empty($line)) { |
|
| 118 | + if (!empty($line)) { |
|
| 119 | 119 | $this->_pens_data .= $line.PENSConfig::$eol; |
| 120 | 120 | } |
| 121 | 121 | } |
@@ -26,9 +26,9 @@ |
||
| 26 | 26 | require_once __DIR__ . '/pens.php'; |
| 27 | 27 | |
| 28 | 28 | class MyRequestHandler extends PENSRequestHandler { |
| 29 | - public function processRequest($request, $response) { |
|
| 30 | - // Do the processing of the alert or the receipt here |
|
| 31 | - } |
|
| 29 | + public function processRequest($request, $response) { |
|
| 30 | + // Do the processing of the alert or the receipt here |
|
| 31 | + } |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | $handler = new MyRequestHandler(); |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | * @licence http://www.gnu.org/licenses/gpl.txt |
| 24 | 24 | */ |
| 25 | 25 | |
| 26 | -require_once __DIR__ . '/pens.php'; |
|
| 26 | +require_once __DIR__.'/pens.php'; |
|
| 27 | 27 | |
| 28 | 28 | class MyPackageHandler extends PENSPackageHandler { |
| 29 | 29 | public function processPackage($request, $path_to_package) { |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -require_once __DIR__ . '/pens/pens_request_factory.php'; |
|
| 4 | -require_once __DIR__ . '/pens/pens_response.php'; |
|
| 5 | -require_once __DIR__ . '/pens/pens_package_handler.php'; |
|
| 6 | -require_once __DIR__ . '/pens/pens_server.php'; |
|
| 7 | -require_once __DIR__ . '/pens/pens_client.php'; |
|
| 3 | +require_once __DIR__.'/pens/pens_request_factory.php'; |
|
| 4 | +require_once __DIR__.'/pens/pens_response.php'; |
|
| 5 | +require_once __DIR__.'/pens/pens_package_handler.php'; |
|
| 6 | +require_once __DIR__.'/pens/pens_server.php'; |
|
| 7 | +require_once __DIR__.'/pens/pens_client.php'; |
|
@@ -26,9 +26,9 @@ |
||
| 26 | 26 | require_once __DIR__ . '/pens.php'; |
| 27 | 27 | |
| 28 | 28 | class MyPackageHandler extends PENSPackageHandler { |
| 29 | - public function processPackage($request, $path_to_package) { |
|
| 30 | - // Do the package processing here |
|
| 31 | - } |
|
| 29 | + public function processPackage($request, $path_to_package) { |
|
| 30 | + // Do the package processing here |
|
| 31 | + } |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | $handler = new MyPackageHandler(); |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | * @licence http://www.gnu.org/licenses/gpl.txt |
| 24 | 24 | */ |
| 25 | 25 | |
| 26 | -require_once __DIR__ . '/pens.php'; |
|
| 26 | +require_once __DIR__.'/pens.php'; |
|
| 27 | 27 | |
| 28 | 28 | class MyPackageHandler extends PENSPackageHandler { |
| 29 | 29 | public function processPackage($request, $path_to_package) { |
@@ -44,25 +44,25 @@ |
||
| 44 | 44 | */ |
| 45 | 45 | class TestPENSResponse extends UnitTestCase { |
| 46 | 46 | |
| 47 | - public function testCreationFromPENSException() { |
|
| 48 | - $object = new PENSResponse(new PENSException(1101)); |
|
| 49 | - $this->assertEqual($object->getError(), 1101); |
|
| 50 | - $this->assertNotNull($object->getErrorText()); |
|
| 51 | - } |
|
| 47 | + public function testCreationFromPENSException() { |
|
| 48 | + $object = new PENSResponse(new PENSException(1101)); |
|
| 49 | + $this->assertEqual($object->getError(), 1101); |
|
| 50 | + $this->assertNotNull($object->getErrorText()); |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | - public function testCreationFromArguments() { |
|
| 54 | - $object = new PENSResponse(0, "collect command received and understood"); |
|
| 55 | - $this->assertIdentical($object->getError(), 0); |
|
| 56 | - $this->assertEqual($object->getErrorText(), "collect command received and understood"); |
|
| 57 | - } |
|
| 53 | + public function testCreationFromArguments() { |
|
| 54 | + $object = new PENSResponse(0, "collect command received and understood"); |
|
| 55 | + $this->assertIdentical($object->getError(), 0); |
|
| 56 | + $this->assertEqual($object->getErrorText(), "collect command received and understood"); |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - public function testCreationFromHTTPResponse() { |
|
| 60 | - $eol = PENSConfig::$eol; |
|
| 61 | - $response = "error=1101".$eol."error-text=unable to parse PENS command".$eol."version=1.0.0".$eol."pens-data=".$eol; |
|
| 62 | - $object = new PENSResponse($response); |
|
| 63 | - $this->assertIdentical($object->getError(), 1101); |
|
| 64 | - $this->assertIdentical($object->getErrorText(), "unable to parse PENS command"); |
|
| 65 | - $this->assertIdentical($object->getVersion(), "1.0.0"); |
|
| 66 | - $this->assertNull($object->getPensData()); |
|
| 67 | - } |
|
| 59 | + public function testCreationFromHTTPResponse() { |
|
| 60 | + $eol = PENSConfig::$eol; |
|
| 61 | + $response = "error=1101".$eol."error-text=unable to parse PENS command".$eol."version=1.0.0".$eol."pens-data=".$eol; |
|
| 62 | + $object = new PENSResponse($response); |
|
| 63 | + $this->assertIdentical($object->getError(), 1101); |
|
| 64 | + $this->assertIdentical($object->getErrorText(), "unable to parse PENS command"); |
|
| 65 | + $this->assertIdentical($object->getVersion(), "1.0.0"); |
|
| 66 | + $this->assertNull($object->getPensData()); |
|
| 67 | + } |
|
| 68 | 68 | } |
@@ -33,8 +33,8 @@ discard block |
||
| 33 | 33 | require_once(dirname(__FILE__)."/../pens.php"); |
| 34 | 34 | |
| 35 | 35 | class MyPackageHandler extends PENSPackageHandler { |
| 36 | - public function processPackage($request, $path_to_package) { |
|
| 37 | - } |
|
| 36 | + public function processPackage($request, $path_to_package) { |
|
| 37 | + } |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | /** |
@@ -49,39 +49,39 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | class TestPENSPackageHandler extends UnitTestCase { |
| 51 | 51 | |
| 52 | - public function testSupportedPackageTypesInvalid() { |
|
| 53 | - $object = new MyPackageHandler(); |
|
| 54 | - $object->setSupportedPackageTypes("testing"); |
|
| 55 | - $this->assertEqual($object->getSupportedPackageTypes(), null); |
|
| 56 | - } |
|
| 52 | + public function testSupportedPackageTypesInvalid() { |
|
| 53 | + $object = new MyPackageHandler(); |
|
| 54 | + $object->setSupportedPackageTypes("testing"); |
|
| 55 | + $this->assertEqual($object->getSupportedPackageTypes(), null); |
|
| 56 | + } |
|
| 57 | 57 | |
| 58 | - public function testSupportedPackageTypesInvalid2() { |
|
| 59 | - $object = new MyPackageHandler(); |
|
| 60 | - $object->setSupportedPackageTypes(array("aicc-pkg", "testing")); |
|
| 61 | - $this->assertEqual($object->getSupportedPackageTypes(), array("aicc-pkg")); |
|
| 62 | - } |
|
| 58 | + public function testSupportedPackageTypesInvalid2() { |
|
| 59 | + $object = new MyPackageHandler(); |
|
| 60 | + $object->setSupportedPackageTypes(array("aicc-pkg", "testing")); |
|
| 61 | + $this->assertEqual($object->getSupportedPackageTypes(), array("aicc-pkg")); |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - public function testSupportedPackageTypesValid() { |
|
| 65 | - $object = new MyPackageHandler(); |
|
| 66 | - $object->setSupportedPackageTypes(array("aicc-pkg", "lms-qti")); |
|
| 67 | - $this->assertEqual($object->getSupportedPackageTypes(), array("aicc-pkg", "lms-qti")); |
|
| 68 | - } |
|
| 64 | + public function testSupportedPackageTypesValid() { |
|
| 65 | + $object = new MyPackageHandler(); |
|
| 66 | + $object->setSupportedPackageTypes(array("aicc-pkg", "lms-qti")); |
|
| 67 | + $this->assertEqual($object->getSupportedPackageTypes(), array("aicc-pkg", "lms-qti")); |
|
| 68 | + } |
|
| 69 | 69 | |
| 70 | - public function testSupportedPackageFormatsInvalid() { |
|
| 71 | - $object = new MyPackageHandler(); |
|
| 72 | - $object->setSupportedPackageFormats("testing"); |
|
| 73 | - $this->assertEqual($object->getSupportedPackageFormats(), null); |
|
| 74 | - } |
|
| 70 | + public function testSupportedPackageFormatsInvalid() { |
|
| 71 | + $object = new MyPackageHandler(); |
|
| 72 | + $object->setSupportedPackageFormats("testing"); |
|
| 73 | + $this->assertEqual($object->getSupportedPackageFormats(), null); |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | - public function testSupportedPackageFormatsInvalid2() { |
|
| 77 | - $object = new MyPackageHandler(); |
|
| 78 | - $object->setSupportedPackageFormats(array("zip", "testing")); |
|
| 79 | - $this->assertEqual($object->getSupportedPackageFormats(), array("zip")); |
|
| 80 | - } |
|
| 76 | + public function testSupportedPackageFormatsInvalid2() { |
|
| 77 | + $object = new MyPackageHandler(); |
|
| 78 | + $object->setSupportedPackageFormats(array("zip", "testing")); |
|
| 79 | + $this->assertEqual($object->getSupportedPackageFormats(), array("zip")); |
|
| 80 | + } |
|
| 81 | 81 | |
| 82 | - public function testSupportedPackageFormatsValid() { |
|
| 83 | - $object = new MyPackageHandler(); |
|
| 84 | - $object->setSupportedPackageFormats(array("zip", "jar")); |
|
| 85 | - $this->assertEqual($object->getSupportedPackageFormats(), array("zip", "jar")); |
|
| 86 | - } |
|
| 82 | + public function testSupportedPackageFormatsValid() { |
|
| 83 | + $object = new MyPackageHandler(); |
|
| 84 | + $object->setSupportedPackageFormats(array("zip", "jar")); |
|
| 85 | + $this->assertEqual($object->getSupportedPackageFormats(), array("zip", "jar")); |
|
| 86 | + } |
|
| 87 | 87 | } |
@@ -46,77 +46,77 @@ |
||
| 46 | 46 | */ |
| 47 | 47 | class TestPENSServer extends WebTestCase { |
| 48 | 48 | |
| 49 | - private $_valid_params = array( |
|
| 50 | - "command" => "collect", |
|
| 51 | - "pens-version" => "1.0.0", |
|
| 52 | - "package-type" => "aicc-pkg", |
|
| 53 | - "package-type-version" => "1.0", |
|
| 54 | - "package-format" => "zip", |
|
| 55 | - "package-id" => "http://myurl.com/12345", |
|
| 56 | - "package-url" => "http://www.aicc.org/pens/sample/captivatequiz.zip", |
|
| 57 | - "package-url-expiry" => "2099-04-09T14:17:43Z", |
|
| 58 | - "client" => "test-pens-server", |
|
| 59 | - "receipt" => PENS_TEST_RECEIPT_MAILTO); |
|
| 49 | + private $_valid_params = array( |
|
| 50 | + "command" => "collect", |
|
| 51 | + "pens-version" => "1.0.0", |
|
| 52 | + "package-type" => "aicc-pkg", |
|
| 53 | + "package-type-version" => "1.0", |
|
| 54 | + "package-format" => "zip", |
|
| 55 | + "package-id" => "http://myurl.com/12345", |
|
| 56 | + "package-url" => "http://www.aicc.org/pens/sample/captivatequiz.zip", |
|
| 57 | + "package-url-expiry" => "2099-04-09T14:17:43Z", |
|
| 58 | + "client" => "test-pens-server", |
|
| 59 | + "receipt" => PENS_TEST_RECEIPT_MAILTO); |
|
| 60 | 60 | |
| 61 | - public function testEmptyQuery() { |
|
| 62 | - $this->get(PENS_TEST_SERVER_URL); |
|
| 63 | - $this->assertText("error=2002"); |
|
| 64 | - } |
|
| 61 | + public function testEmptyQuery() { |
|
| 62 | + $this->get(PENS_TEST_SERVER_URL); |
|
| 63 | + $this->assertText("error=2002"); |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - public function testValidQuery() { |
|
| 67 | - $this->get(PENS_TEST_SERVER_URL, $this->_valid_params); |
|
| 68 | - $this->assertText("error=0"); |
|
| 69 | - } |
|
| 66 | + public function testValidQuery() { |
|
| 67 | + $this->get(PENS_TEST_SERVER_URL, $this->_valid_params); |
|
| 68 | + $this->assertText("error=0"); |
|
| 69 | + } |
|
| 70 | 70 | |
| 71 | - private function invalidParameterTest($name, $value, $error) { |
|
| 72 | - $params = $this->_valid_params; |
|
| 73 | - $params[$name] = $value; |
|
| 74 | - $this->get(PENS_TEST_SERVER_URL, $params); |
|
| 75 | - $this->assertText("error=".$error); |
|
| 76 | - } |
|
| 71 | + private function invalidParameterTest($name, $value, $error) { |
|
| 72 | + $params = $this->_valid_params; |
|
| 73 | + $params[$name] = $value; |
|
| 74 | + $this->get(PENS_TEST_SERVER_URL, $params); |
|
| 75 | + $this->assertText("error=".$error); |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | - private function validParameterTest($name, $value) { |
|
| 79 | - $params = $this->_valid_params; |
|
| 80 | - $params[$name] = $value; |
|
| 81 | - $this->get(PENS_TEST_SERVER_URL, $params); |
|
| 82 | - $this->assertText("error=0"); |
|
| 83 | - } |
|
| 78 | + private function validParameterTest($name, $value) { |
|
| 79 | + $params = $this->_valid_params; |
|
| 80 | + $params[$name] = $value; |
|
| 81 | + $this->get(PENS_TEST_SERVER_URL, $params); |
|
| 82 | + $this->assertText("error=0"); |
|
| 83 | + } |
|
| 84 | 84 | |
| 85 | - public function testInvalidCommand() { |
|
| 86 | - $this->invalidParameterTest("command", "invalid", 2002); |
|
| 87 | - } |
|
| 85 | + public function testInvalidCommand() { |
|
| 86 | + $this->invalidParameterTest("command", "invalid", 2002); |
|
| 87 | + } |
|
| 88 | 88 | |
| 89 | - public function testInvalidVersion() { |
|
| 90 | - $this->invalidParameterTest("pens-version", "0.8.0", 2001); |
|
| 91 | - } |
|
| 89 | + public function testInvalidVersion() { |
|
| 90 | + $this->invalidParameterTest("pens-version", "0.8.0", 2001); |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | - public function testInvalidPackageType() { |
|
| 94 | - $this->invalidParameterTest("package-type", "invalid", 2003); |
|
| 95 | - } |
|
| 93 | + public function testInvalidPackageType() { |
|
| 94 | + $this->invalidParameterTest("package-type", "invalid", 2003); |
|
| 95 | + } |
|
| 96 | 96 | |
| 97 | - public function testEmptyPackageTypeVersion() { |
|
| 98 | - $this->invalidParameterTest("package-type-version", null, 2004); |
|
| 99 | - } |
|
| 97 | + public function testEmptyPackageTypeVersion() { |
|
| 98 | + $this->invalidParameterTest("package-type-version", null, 2004); |
|
| 99 | + } |
|
| 100 | 100 | |
| 101 | - public function testInvalidPackageFormat() { |
|
| 102 | - $this->invalidParameterTest("package-format", "invalid", 2005); |
|
| 103 | - } |
|
| 101 | + public function testInvalidPackageFormat() { |
|
| 102 | + $this->invalidParameterTest("package-format", "invalid", 2005); |
|
| 103 | + } |
|
| 104 | 104 | |
| 105 | - public function testInvalidPackageId() { |
|
| 106 | - $this->invalidParameterTest("package-id", "invalid", 2007); |
|
| 107 | - } |
|
| 105 | + public function testInvalidPackageId() { |
|
| 106 | + $this->invalidParameterTest("package-id", "invalid", 2007); |
|
| 107 | + } |
|
| 108 | 108 | |
| 109 | - public function testInvalidPackageUrl() { |
|
| 110 | - $this->invalidParameterTest("package-url", "invalid", 2008); |
|
| 111 | - } |
|
| 109 | + public function testInvalidPackageUrl() { |
|
| 110 | + $this->invalidParameterTest("package-url", "invalid", 2008); |
|
| 111 | + } |
|
| 112 | 112 | |
| 113 | - public function testInvalidPackageUrlExpiry() { |
|
| 114 | - $this->invalidParameterTest("package-url-expiry", "invalid", 2009); |
|
| 115 | - } |
|
| 113 | + public function testInvalidPackageUrlExpiry() { |
|
| 114 | + $this->invalidParameterTest("package-url-expiry", "invalid", 2009); |
|
| 115 | + } |
|
| 116 | 116 | |
| 117 | - public function testValidPackageUrlExpiry() { |
|
| 118 | - $this->validParameterTest("package-url-expiry", "2099-01-01"); |
|
| 119 | - } |
|
| 117 | + public function testValidPackageUrlExpiry() { |
|
| 118 | + $this->validParameterTest("package-url-expiry", "2099-01-01"); |
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | 121 | } |
| 122 | 122 | |
@@ -129,9 +129,9 @@ |
||
| 129 | 129 | */ |
| 130 | 130 | public function getTourConfig() |
| 131 | 131 | { |
| 132 | - $pluginPath = api_get_path(PLUGIN_PATH) . 'tour/'; |
|
| 132 | + $pluginPath = api_get_path(PLUGIN_PATH).'tour/'; |
|
| 133 | 133 | |
| 134 | - $jsonContent = file_get_contents($pluginPath . 'config/tour.json'); |
|
| 134 | + $jsonContent = file_get_contents($pluginPath.'config/tour.json'); |
|
| 135 | 135 | |
| 136 | 136 | $jsonData = json_decode($jsonContent, true); |
| 137 | 137 | |
@@ -5,10 +5,10 @@ |
||
| 5 | 5 | * @author Angel Fernando Quiroz Campos <[email protected]> |
| 6 | 6 | * @package chamilo.plugin.tour |
| 7 | 7 | */ |
| 8 | -require_once __DIR__ . '/config.php'; |
|
| 8 | +require_once __DIR__.'/config.php'; |
|
| 9 | 9 | |
| 10 | -$pluginPath = api_get_path(PLUGIN_PATH) . 'tour/'; |
|
| 11 | -$pluginWebPath = api_get_path(WEB_PLUGIN_PATH) . 'tour/'; |
|
| 10 | +$pluginPath = api_get_path(PLUGIN_PATH).'tour/'; |
|
| 11 | +$pluginWebPath = api_get_path(WEB_PLUGIN_PATH).'tour/'; |
|
| 12 | 12 | |
| 13 | 13 | $userId = api_get_user_id(); |
| 14 | 14 | |