Completed
Pull Request — master (#18)
by John
02:39
created
src/AccessControl/AllAccessListAccessControl.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -9,8 +9,7 @@  discard block
 block discarded – undo
9 9
  * Class AllAccessListAccessControl
10 10
  * @package LunixREST\AccessControl
11 11
  */
12
-class AllAccessListAccessControl implements AccessControl
13
-{
12
+class AllAccessListAccessControl implements AccessControl {
14 13
     /**
15 14
      * @var array
16 15
      */
@@ -19,8 +18,7 @@  discard block
 block discarded – undo
19 18
     /**
20 19
      * @param array $keys
21 20
      */
22
-    public function __construct(Array $keys)
23
-    {
21
+    public function __construct(Array $keys) {
24 22
         $this->keys = $keys;
25 23
     }
26 24
 
@@ -28,8 +26,7 @@  discard block
 block discarded – undo
28 26
      * @param \LunixREST\APIRequest\APIRequest $request
29 27
      * @return bool true if key is valid
30 28
      */
31
-    public function validateAccess(APIRequest $request)
32
-    {
29
+    public function validateAccess(APIRequest $request) {
33 30
         return $this->validateKey($request->getApiKey());
34 31
     }
35 32
 
@@ -37,8 +34,7 @@  discard block
 block discarded – undo
37 34
      * @param $apiKey
38 35
      * @return bool true if key is in the array passed to this object in it's construction
39 36
      */
40
-    public function validateKey($apiKey)
41
-    {
37
+    public function validateKey($apiKey) {
42 38
         return in_array($apiKey, $this->keys);
43 39
     }
44 40
 }
Please login to merge, or discard this patch.
src/Throttle/NoThrottle.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -3,8 +3,7 @@  discard block
 block discarded – undo
3 3
 
4 4
 use LunixREST\APIRequest\APIRequest;
5 5
 
6
-class NoThrottle implements Throttle
7
-{
6
+class NoThrottle implements Throttle {
8 7
     /**
9 8
      * Never throttle
10 9
      * @param \LunixREST\APIRequest\APIRequest $request
@@ -19,8 +18,7 @@  discard block
 block discarded – undo
19 18
      * Log that a request took place
20 19
      * @param \LunixREST\APIRequest\APIRequest $request
21 20
      */
22
-    public function logRequest(APIRequest $request)
23
-    {
21
+    public function logRequest(APIRequest $request) {
24 22
         //Do nothing
25 23
     }
26 24
 }
Please login to merge, or discard this patch.
src/APIRequest/APIRequest.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -6,8 +6,7 @@  discard block
 block discarded – undo
6 6
  * Class APIRequest
7 7
  * @package LunixREST\Request
8 8
  */
9
-class APIRequest
10
-{
9
+class APIRequest {
11 10
     /**
12 11
      * @var string
13 12
      */
@@ -91,8 +90,7 @@  discard block
 block discarded – undo
91 90
     /**
92 91
      * @return null|string
93 92
      */
94
-    public function getElement()
95
-    {
93
+    public function getElement() {
96 94
         return $this->element;
97 95
     }
98 96
 
@@ -107,16 +105,14 @@  discard block
 block discarded – undo
107 105
     /**
108 106
      * @return null|string
109 107
      */
110
-    public function getVersion()
111
-    {
108
+    public function getVersion() {
112 109
         return $this->version;
113 110
     }
114 111
 
115 112
     /**
116 113
      * @return null|string
117 114
      */
118
-    public function getApiKey()
119
-    {
115
+    public function getApiKey() {
120 116
         return $this->apiKey;
121 117
     }
122 118
 
@@ -131,8 +127,7 @@  discard block
 block discarded – undo
131 127
     /**
132 128
      * @return array|null|object
133 129
      */
134
-    public function getData()
135
-    {
130
+    public function getData() {
136 131
         return $this->data;
137 132
     }
138 133
 }
Please login to merge, or discard this patch.
src/APIRequest/RequestData/URLEncodedQueryStringRequestData.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,15 +1,13 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 namespace LunixREST\Request\RequestData;
3 3
 
4
-class URLEncodedQueryStringRequestData implements RequestData
5
-{
4
+class URLEncodedQueryStringRequestData implements RequestData {
6 5
 
7 6
     protected $queryString;
8 7
 
9 8
     protected $parsedData = [];
10 9
 
11
-    public function __construct($queryString)
12
-    {
10
+    public function __construct($queryString) {
13 11
         $this->queryString = $queryString;
14 12
         parse_str($queryString, $this->parsedData);
15 13
     }
@@ -30,8 +28,7 @@  discard block
 block discarded – undo
30 28
      * @param string $key
31 29
      * @return mixed
32 30
      */
33
-    public function get(string $key)
34
-    {
31
+    public function get(string $key) {
35 32
         return $this->parsedData[$key] ?? null;
36 33
     }
37 34
 
Please login to merge, or discard this patch.
src/APIRequest/RequestData/JSONRequestData.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -3,8 +3,7 @@  discard block
 block discarded – undo
3 3
 
4 4
 use LunixREST\Request\BodyParser\Exceptions\InvalidRequestDataException;
5 5
 
6
-class JSONRequestData implements RequestData
7
-{
6
+class JSONRequestData implements RequestData {
8 7
 
9 8
     protected $jsonString;
10 9
 
@@ -15,8 +14,7 @@  discard block
 block discarded – undo
15 14
      * @param $body
16 15
      * @throws InvalidRequestDataException
17 16
      */
18
-    public function __construct($body)
19
-    {
17
+    public function __construct($body) {
20 18
         $this->jsonString = $body;
21 19
         $this->parsedData = json_decode($body, true);
22 20
         if ($this->parsedData === null) {
@@ -40,8 +38,7 @@  discard block
 block discarded – undo
40 38
      * @param string $key
41 39
      * @return mixed
42 40
      */
43
-    public function get(string $key)
44
-    {
41
+    public function get(string $key) {
45 42
         return $this->parsedData[$key] ?? null;
46 43
     }
47 44
 
Please login to merge, or discard this patch.
src/APIRequest/RequestData/RequestData.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,8 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 namespace LunixREST\Request\RequestData;
3 3
 
4
-interface RequestData
5
-{
4
+interface RequestData {
6 5
     /**
7 6
      * Returns the raw data that the requestData tried to parse
8 7
      * @return string
Please login to merge, or discard this patch.
src/APIRequest/RequestFactory/GenericRequestFactory.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -28,8 +28,7 @@  discard block
 block discarded – undo
28 28
      * @param URLParser $URLParser
29 29
      * @param HeaderParser $headerParser
30 30
      */
31
-    public function __construct(URLParser $URLParser, HeaderParser $headerParser)
32
-    {
31
+    public function __construct(URLParser $URLParser, HeaderParser $headerParser) {
33 32
         $this->URLParser = $URLParser;
34 33
         $this->headerParser = $headerParser;
35 34
     }
@@ -47,14 +46,12 @@  discard block
 block discarded – undo
47 46
         $parsedHeaders = $this->headerParser->parse($serverRequest->getHeaders());
48 47
 
49 48
         $urlQueryData = [];
50
-        if($urlQueryString = $parsedURL->getQueryString())
51
-        {
49
+        if($urlQueryString = $parsedURL->getQueryString()) {
52 50
             parse_str($parsedURL->getQueryString(), $urlQueryData);
53 51
         }
54 52
 
55 53
         $apiKey = $parsedURL->getAPIKey();
56
-        if($apiKey === null)
57
-        {
54
+        if($apiKey === null) {
58 55
             $apiKey = $parsedHeaders->getAPIKey();
59 56
         }
60 57
 
Please login to merge, or discard this patch.
src/APIRequest/RequestFactory/DefaultRequestFactory.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -10,10 +10,8 @@
 block discarded – undo
10 10
  * Class BasicRequestFactory
11 11
  * @package LunixREST\Request\RequestFactory
12 12
  */
13
-class DefaultRequestFactory extends GenericRequestFactory
14
-{
15
-    public function __construct(URLParser $URLParser)
16
-    {
13
+class DefaultRequestFactory extends GenericRequestFactory {
14
+    public function __construct(URLParser $URLParser) {
17 15
         parent::__construct($URLParser, new DefaultBodyParserFactory(), new DefaultHeaderParser());
18 16
     }
19 17
 }
Please login to merge, or discard this patch.
src/APIRequest/RequestFactory/BasicRequestFactory.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,10 +9,8 @@
 block discarded – undo
9 9
  * Class BasicRequestFactory
10 10
  * @package LunixREST\Request\RequestFactory
11 11
  */
12
-class BasicRequestFactory extends DefaultRequestFactory
13
-{
14
-    public function __construct()
15
-    {
12
+class BasicRequestFactory extends DefaultRequestFactory {
13
+    public function __construct() {
16 14
         parent::__construct(new BasicURLParser(new MIMEFileProvider()));
17 15
     }
18 16
 }
Please login to merge, or discard this patch.