@@ -9,52 +9,52 @@ |
||
| 9 | 9 | * @package LunixREST\Configuration |
| 10 | 10 | */ |
| 11 | 11 | class INIConfiguration implements Configuration { |
| 12 | - /** |
|
| 13 | - * @var null |
|
| 14 | - */ |
|
| 15 | - protected $nameSpace; |
|
| 16 | - /** |
|
| 17 | - * @var |
|
| 18 | - */ |
|
| 19 | - protected $filename; |
|
| 20 | - |
|
| 21 | - /** |
|
| 22 | - * @param string $filename |
|
| 23 | - * @param string $nameSpace |
|
| 24 | - */ |
|
| 25 | - public function __construct($filename, $nameSpace = null){ |
|
| 26 | - $this->filename = $filename; |
|
| 27 | - $this->nameSpace = $nameSpace; |
|
| 28 | - } |
|
| 29 | - |
|
| 30 | - /** |
|
| 31 | - * @param $key |
|
| 32 | - * @return mixed |
|
| 33 | - * @throws INIKeyNotFoundException |
|
| 34 | - * @throws INIParseException |
|
| 35 | - */ |
|
| 36 | - public function get($key){ |
|
| 37 | - $config = parse_ini_file($this->filename, (bool)$this->nameSpace); |
|
| 38 | - |
|
| 39 | - if($config === false){ |
|
| 40 | - throw new INIParseException('Could not parse: ' . $this->filename, true); |
|
| 41 | - } |
|
| 42 | - |
|
| 43 | - if($this->nameSpace) { |
|
| 44 | - if(isset($config[$this->nameSpace])) { |
|
| 45 | - $config = $config[$this->nameSpace]; |
|
| 46 | - } else { |
|
| 47 | - throw new INIKeyNotFoundException(); |
|
| 48 | - } |
|
| 49 | - } |
|
| 50 | - |
|
| 51 | - return isset($config[$key]) ? $config[$key] : null; |
|
| 52 | - } |
|
| 53 | - |
|
| 54 | - /** |
|
| 55 | - * @param $key |
|
| 56 | - */ |
|
| 57 | - public function set($key){ |
|
| 58 | - //TODO write this |
|
| 59 | - } |
|
| 12 | + /** |
|
| 13 | + * @var null |
|
| 14 | + */ |
|
| 15 | + protected $nameSpace; |
|
| 16 | + /** |
|
| 17 | + * @var |
|
| 18 | + */ |
|
| 19 | + protected $filename; |
|
| 20 | + |
|
| 21 | + /** |
|
| 22 | + * @param string $filename |
|
| 23 | + * @param string $nameSpace |
|
| 24 | + */ |
|
| 25 | + public function __construct($filename, $nameSpace = null){ |
|
| 26 | + $this->filename = $filename; |
|
| 27 | + $this->nameSpace = $nameSpace; |
|
| 28 | + } |
|
| 29 | + |
|
| 30 | + /** |
|
| 31 | + * @param $key |
|
| 32 | + * @return mixed |
|
| 33 | + * @throws INIKeyNotFoundException |
|
| 34 | + * @throws INIParseException |
|
| 35 | + */ |
|
| 36 | + public function get($key){ |
|
| 37 | + $config = parse_ini_file($this->filename, (bool)$this->nameSpace); |
|
| 38 | + |
|
| 39 | + if($config === false){ |
|
| 40 | + throw new INIParseException('Could not parse: ' . $this->filename, true); |
|
| 41 | + } |
|
| 42 | + |
|
| 43 | + if($this->nameSpace) { |
|
| 44 | + if(isset($config[$this->nameSpace])) { |
|
| 45 | + $config = $config[$this->nameSpace]; |
|
| 46 | + } else { |
|
| 47 | + throw new INIKeyNotFoundException(); |
|
| 48 | + } |
|
| 49 | + } |
|
| 50 | + |
|
| 51 | + return isset($config[$key]) ? $config[$key] : null; |
|
| 52 | + } |
|
| 53 | + |
|
| 54 | + /** |
|
| 55 | + * @param $key |
|
| 56 | + */ |
|
| 57 | + public function set($key){ |
|
| 58 | + //TODO write this |
|
| 59 | + } |
|
| 60 | 60 | } |
@@ -2,6 +2,6 @@ |
||
| 2 | 2 | namespace LunixREST\Configuration; |
| 3 | 3 | |
| 4 | 4 | interface Configuration { |
| 5 | - public function get($key); |
|
| 6 | - public function set($key); |
|
| 5 | + public function get($key); |
|
| 6 | + public function set($key); |
|
| 7 | 7 | } |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | $router = new \LunixREST\Router\Router($accessControl, $throttle, $responseFactory, $endpointFactory); |
| 11 | 11 | |
| 12 | 12 | try { |
| 13 | - $request = \LunixREST\Request\Request::createFromURL("GET", [], [], '127.0.0.1', "/1/123456/phonenumbers/6517855237.json");// \LunixREST\Request\Request::createFromURL($_SERVER['REQUEST_METHOD'], getallheaders(), $_REQUEST, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI']); |
|
| 13 | + $request = \LunixREST\Request\Request::createFromURL("GET", [], [], '127.0.0.1', "/1/123456/phonenumbers/6517855237.json");// \LunixREST\Request\Request::createFromURL($_SERVER['REQUEST_METHOD'], getallheaders(), $_REQUEST, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI']); |
|
| 14 | 14 | |
| 15 | 15 | try { |
| 16 | 16 | $response = $router->route($request); |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | header('500 Internal Server Error', true, 500); |
| 30 | 30 | } |
| 31 | 31 | } catch(\LunixREST\Exceptions\InvalidRequestFormatException $e){ |
| 32 | - header('400 Bad Request', 400); |
|
| 32 | + header('400 Bad Request', 400); |
|
| 33 | 33 | } catch(Exception|Error $e){ |
| 34 | - header('500 Internal Server Error', true, 500); |
|
| 34 | + header('500 Internal Server Error', true, 500); |
|
| 35 | 35 | } |
@@ -7,7 +7,7 @@ |
||
| 7 | 7 | class phonenumbers extends Endpoint { |
| 8 | 8 | |
| 9 | 9 | public function get(){ |
| 10 | - $geoPhone = new GeoPhone('data.csv'); |
|
| 11 | - return $geoPhone->lookupNumber($this->request->getInstance()); |
|
| 12 | - } |
|
| 10 | + $geoPhone = new GeoPhone('data.csv'); |
|
| 11 | + return $geoPhone->lookupNumber($this->request->getInstance()); |
|
| 12 | + } |
|
| 13 | 13 | } |
| 14 | 14 | \ No newline at end of file |
@@ -11,26 +11,26 @@ |
||
| 11 | 11 | $router = new \LunixREST\Router\Router($accessControl, $throttle, $responseFactory, $endpointFactory); |
| 12 | 12 | |
| 13 | 13 | try { |
| 14 | - $request = \LunixREST\Request\Request::createFromURL("GET", [], [], '127.0.0.1', "/1.0/public/helloworld.json");// \LunixREST\Request\Request::createFromURL($_SERVER['REQUEST_METHOD'], getallheaders(), $_REQUEST, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI']); |
|
| 14 | + $request = \LunixREST\Request\Request::createFromURL("GET", [], [], '127.0.0.1', "/1.0/public/helloworld.json");// \LunixREST\Request\Request::createFromURL($_SERVER['REQUEST_METHOD'], getallheaders(), $_REQUEST, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI']); |
|
| 15 | 15 | |
| 16 | - try { |
|
| 17 | - $response = $router->route($request); |
|
| 18 | - echo $response->getAsString(); |
|
| 19 | - } catch(\LunixREST\Exceptions\InvalidAPIKeyException $e){ |
|
| 20 | - header('400 Bad Request', true, 400); |
|
| 21 | - } catch(\LunixREST\Endpoint\Exceptions\UnknownEndpointException $e){ |
|
| 22 | - header('404 Not Found', true, 404); |
|
| 23 | - } catch(\LunixREST\Response\Exceptions\UnknownResponseTypeException $e){ |
|
| 24 | - header('404 Not Found', true, 404); |
|
| 25 | - } catch(\LunixREST\Exceptions\AccessDeniedException $e){ |
|
| 26 | - header('403 Access Denied', true, 403); |
|
| 27 | - } catch(\LunixREST\Exceptions\ThrottleLimitExceededException $e){ |
|
| 28 | - header('429 Too Many Requests', true, 429); |
|
| 29 | - } catch(Exception $e){ |
|
| 30 | - header('500 Internal Server Error', true, 500); |
|
| 31 | - } |
|
| 16 | + try { |
|
| 17 | + $response = $router->route($request); |
|
| 18 | + echo $response->getAsString(); |
|
| 19 | + } catch(\LunixREST\Exceptions\InvalidAPIKeyException $e){ |
|
| 20 | + header('400 Bad Request', true, 400); |
|
| 21 | + } catch(\LunixREST\Endpoint\Exceptions\UnknownEndpointException $e){ |
|
| 22 | + header('404 Not Found', true, 404); |
|
| 23 | + } catch(\LunixREST\Response\Exceptions\UnknownResponseTypeException $e){ |
|
| 24 | + header('404 Not Found', true, 404); |
|
| 25 | + } catch(\LunixREST\Exceptions\AccessDeniedException $e){ |
|
| 26 | + header('403 Access Denied', true, 403); |
|
| 27 | + } catch(\LunixREST\Exceptions\ThrottleLimitExceededException $e){ |
|
| 28 | + header('429 Too Many Requests', true, 429); |
|
| 29 | + } catch(Exception $e){ |
|
| 30 | + header('500 Internal Server Error', true, 500); |
|
| 31 | + } |
|
| 32 | 32 | } catch(\LunixREST\Exceptions\InvalidRequestFormatException $e){ |
| 33 | - header('400 Bad Request', true, 400); |
|
| 33 | + header('400 Bad Request', true, 400); |
|
| 34 | 34 | } catch(Exception $e){ |
| 35 | - header('500 Internal Server Error', true, 500); |
|
| 35 | + header('500 Internal Server Error', true, 500); |
|
| 36 | 36 | } |
@@ -17,5 +17,5 @@ |
||
| 17 | 17 | $helloWorld = new \HelloWorld\Models\HelloWorld(); |
| 18 | 18 | |
| 19 | 19 | return $helloWorld; |
| 20 | - } |
|
| 20 | + } |
|
| 21 | 21 | } |