Passed
Pull Request — master (#3)
by
unknown
04:36
created
src/ConvertHelper/StorageSizeEnum/Size.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -25,34 +25,34 @@
 block discarded – undo
25 25
  */
26 26
 class ConvertHelper_StorageSizeEnum_Size
27 27
 {
28
-   /**
29
-    * @var string
30
-    */
28
+    /**
29
+     * @var string
30
+     */
31 31
     protected $name;
32 32
     
33
-   /**
34
-    * @var int
35
-    */
33
+    /**
34
+     * @var int
35
+     */
36 36
     protected $base;
37 37
     
38
-   /**
39
-    * @var int
40
-    */
38
+    /**
39
+     * @var int
40
+     */
41 41
     protected $exponent;
42 42
     
43
-   /**
44
-    * @var string
45
-    */
43
+    /**
44
+     * @var string
45
+     */
46 46
     protected $singular;
47 47
     
48
-   /**
49
-    * @var string
50
-    */
48
+    /**
49
+     * @var string
50
+     */
51 51
     protected $plural;
52 52
     
53
-   /**
54
-    * @var string
55
-    */
53
+    /**
54
+     * @var string
55
+     */
56 56
     protected $suffix;
57 57
     
58 58
     public function __construct(string $name, int $base, int $exponent, string $suffix, string $singular, string $plural)
Please login to merge, or discard this patch.
src/ConvertHelper/SizeNotation.php 2 patches
Indentation   +86 added lines, -86 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
     
32 32
     const VALIDATION_ERROR_NEGATIVE_VALUE = 43803;
33 33
     
34
-   /**
35
-    * @var string
36
-    */
34
+    /**
35
+     * @var string
36
+     */
37 37
     protected $sizeString;
38 38
 
39 39
     /**
@@ -41,41 +41,41 @@  discard block
 block discarded – undo
41 41
      */
42 42
     protected $sizeDefinition;
43 43
     
44
-   /**
45
-    * @var integer
46
-    */
44
+    /**
45
+     * @var integer
46
+     */
47 47
     protected $bytes = 0;
48 48
     
49
-   /**
50
-    * @var bool
51
-    */
49
+    /**
50
+     * @var bool
51
+     */
52 52
     protected $valid = true;
53 53
     
54
-   /**
55
-    * @var string
56
-    */
54
+    /**
55
+     * @var string
56
+     */
57 57
     protected $units = null;
58 58
     
59
-   /**
60
-    * @var string
61
-    */
59
+    /**
60
+     * @var string
61
+     */
62 62
     protected $number = '';
63 63
     
64
-   /**
65
-    * @var string
66
-    */
64
+    /**
65
+     * @var string
66
+     */
67 67
     protected $errorMessage = '';
68 68
     
69
-   /**
70
-    * @var int
71
-    */
69
+    /**
70
+     * @var int
71
+     */
72 72
     protected $errorCode = 0;
73 73
     
74
-   /**
75
-    * Create a new instance for the specified size string.
76
-    * 
77
-    * @param string $sizeString A size notation in the format "50 MB", or a number of bytes without units. Spaces are ignored, so "50MB" = "50 MB" = "  50   MB   ". Floating point values are accepted, both with dot and comma notation ("50.5" = "50,5"). To use Base 2 values, ose appropriate units, e.g. "50 MiB", "1.5 GiB". The units are case insensitive, so "50 MB" = "50 mb". 
78
-    */
74
+    /**
75
+     * Create a new instance for the specified size string.
76
+     * 
77
+     * @param string $sizeString A size notation in the format "50 MB", or a number of bytes without units. Spaces are ignored, so "50MB" = "50 MB" = "  50   MB   ". Floating point values are accepted, both with dot and comma notation ("50.5" = "50,5"). To use Base 2 values, ose appropriate units, e.g. "50 MiB", "1.5 GiB". The units are case insensitive, so "50 MB" = "50 mb". 
78
+     */
79 79
     public function __construct(string $sizeString)
80 80
     {
81 81
         $this->sizeString = $this->cleanString($sizeString);
@@ -83,31 +83,31 @@  discard block
 block discarded – undo
83 83
         $this->convert();
84 84
     }
85 85
     
86
-   /**
87
-    * Gets the amount of bytes contained in the size notation.
88
-    * @return int
89
-    */
86
+    /**
87
+     * Gets the amount of bytes contained in the size notation.
88
+     * @return int
89
+     */
90 90
     public function toBytes() : int
91 91
     {
92 92
         return $this->bytes;
93 93
     }
94 94
     
95
-   /**
96
-    * Converts the size notation to a human readable string, e.g. "50 MB".
97
-    * 
98
-    * @param int $precision
99
-    * @return string
100
-    * @see ConvertHelper::bytes2readable()
101
-    */
95
+    /**
96
+     * Converts the size notation to a human readable string, e.g. "50 MB".
97
+     * 
98
+     * @param int $precision
99
+     * @return string
100
+     * @see ConvertHelper::bytes2readable()
101
+     */
102 102
     public function toString(int $precision=1) : string
103 103
     {
104 104
         return ConvertHelper::bytes2readable($this->bytes, $precision, $this->getBase());
105 105
     }
106 106
     
107
-   /**
108
-    * Retrieves the detected number's base.
109
-    * @return int The base number (1000 for Base 10, or 1024 for Base 2), or 0 if it is not valid.
110
-    */
107
+    /**
108
+     * Retrieves the detected number's base.
109
+     * @return int The base number (1000 for Base 10, or 1024 for Base 2), or 0 if it is not valid.
110
+     */
111 111
     public function getBase() : int
112 112
     {
113 113
         if($this->isValid()) {
@@ -117,13 +117,13 @@  discard block
 block discarded – undo
117 117
         return 0;
118 118
     }
119 119
     
120
-   /**
121
-    * Retrieves the detected storage size instance, if 
122
-    * the size string is valid.
123
-    * 
124
-    * @return ConvertHelper_StorageSizeEnum_Size|NULL
125
-    * @see ConvertHelper_StorageSizeEnum_Size
126
-    */
120
+    /**
121
+     * Retrieves the detected storage size instance, if 
122
+     * the size string is valid.
123
+     * 
124
+     * @return ConvertHelper_StorageSizeEnum_Size|NULL
125
+     * @see ConvertHelper_StorageSizeEnum_Size
126
+     */
127 127
     public function getSizeDefinition() : ?ConvertHelper_StorageSizeEnum_Size
128 128
     {
129 129
         if($this->isValid()) {
@@ -133,27 +133,27 @@  discard block
 block discarded – undo
133 133
         return null;
134 134
     }
135 135
     
136
-   /**
137
-    * Checks whether the size notation was valid and could be parsed
138
-    * into a meaningful byte value. If this returns `false`, it is 
139
-    * possible to use the `getErrorXXX` methods to retrieve information
140
-    * on what went wrong. 
141
-    * 
142
-    * @return bool
143
-    * @see ConvertHelper_SizeNotation::getErrorMessage()
144
-    * @see ConvertHelper_SizeNotation::getErrorCode()
145
-    */
136
+    /**
137
+     * Checks whether the size notation was valid and could be parsed
138
+     * into a meaningful byte value. If this returns `false`, it is 
139
+     * possible to use the `getErrorXXX` methods to retrieve information
140
+     * on what went wrong. 
141
+     * 
142
+     * @return bool
143
+     * @see ConvertHelper_SizeNotation::getErrorMessage()
144
+     * @see ConvertHelper_SizeNotation::getErrorCode()
145
+     */
146 146
     public function isValid() : bool
147 147
     {
148 148
         return $this->valid;
149 149
     }
150 150
     
151
-   /**
152
-    * Retrieves the error message if the size notation validation failed.
153
-    * 
154
-    * @return string
155
-    * @see ConvertHelper_SizeNotation::getErrorCode()
156
-    */
151
+    /**
152
+     * Retrieves the error message if the size notation validation failed.
153
+     * 
154
+     * @return string
155
+     * @see ConvertHelper_SizeNotation::getErrorCode()
156
+     */
157 157
     public function getErrorMessage() : string
158 158
     {
159 159
         return $this->errorMessage;
@@ -200,12 +200,12 @@  discard block
 block discarded – undo
200 200
         );
201 201
     }
202 202
     
203
-   /**
204
-    * Detects the units and the number in the size notation string.
205
-    * Populates the `units` and `number` properties.
206
-    * 
207
-    * @return bool Whether the string could be parsed successfully.
208
-    */
203
+    /**
204
+     * Detects the units and the number in the size notation string.
205
+     * Populates the `units` and `number` properties.
206
+     * 
207
+     * @return bool Whether the string could be parsed successfully.
208
+     */
209 209
     protected function detectParts() : bool
210 210
     {
211 211
         $units = ConvertHelper_StorageSizeEnum::getSizeNames();
@@ -241,16 +241,16 @@  discard block
 block discarded – undo
241 241
         return true;
242 242
     }
243 243
     
244
-   /**
245
-    * If the validation fails, this is used to store the reason for retrieval later.
246
-    *  
247
-    * @param string $message
248
-    * @param int $code
249
-    * 
250
-    * @see ConvertHelper_SizeNotation::isValid()
251
-    * @see ConvertHelper_SizeNotation::getErrorMessage()
252
-    * @see ConvertHelper_SizeNotation::getErrorCode()
253
-    */
244
+    /**
245
+     * If the validation fails, this is used to store the reason for retrieval later.
246
+     *  
247
+     * @param string $message
248
+     * @param int $code
249
+     * 
250
+     * @see ConvertHelper_SizeNotation::isValid()
251
+     * @see ConvertHelper_SizeNotation::getErrorMessage()
252
+     * @see ConvertHelper_SizeNotation::getErrorCode()
253
+     */
254 254
     protected function setError(string $message, int $code) : void
255 255
     {
256 256
         $this->valid = false;
@@ -258,12 +258,12 @@  discard block
 block discarded – undo
258 258
         $this->errorCode = $code;
259 259
     }
260 260
     
261
-   /**
262
-    * Retrieves the error code, if the size notation validation failed.
263
-    * 
264
-    * @return int
265
-    * @see ConvertHelper_SizeNotation::getErrorMessage()
266
-    */
261
+    /**
262
+     * Retrieves the error code, if the size notation validation failed.
263
+     * 
264
+     * @return int
265
+     * @see ConvertHelper_SizeNotation::getErrorMessage()
266
+     */
267 267
     public function getErrorCode() : int
268 268
     {
269 269
         return $this->errorCode;
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
     * @return string
100 100
     * @see ConvertHelper::bytes2readable()
101 101
     */
102
-    public function toString(int $precision=1) : string
102
+    public function toString(int $precision = 1) : string
103 103
     {
104 104
         return ConvertHelper::bytes2readable($this->bytes, $precision, $this->getBase());
105 105
     }
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
     */
111 111
     public function getBase() : int
112 112
     {
113
-        if($this->isValid()) {
113
+        if ($this->isValid()) {
114 114
             return $this->sizeDefinition->getBase(); 
115 115
         }
116 116
         
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
     */
127 127
     public function getSizeDefinition() : ?ConvertHelper_StorageSizeEnum_Size
128 128
     {
129
-        if($this->isValid()) {
129
+        if ($this->isValid()) {
130 130
             return $this->sizeDefinition;
131 131
         }
132 132
         
@@ -175,18 +175,18 @@  discard block
 block discarded – undo
175 175
     
176 176
     protected function parseSize() : void
177 177
     {
178
-        if(!$this->detectParts()) {
178
+        if (!$this->detectParts()) {
179 179
             return;
180 180
         }
181 181
         
182 182
         // we detected units in the string: all good.
183
-        if($this->units !== null)
183
+        if ($this->units !== null)
184 184
         {
185 185
             return;
186 186
         }
187 187
         
188 188
         // just a numeric value: we assume this means we're dealing with bytes.
189
-        if(is_numeric($this->number)) 
189
+        if (is_numeric($this->number)) 
190 190
         {
191 191
             $this->units = 'b';
192 192
             return;
@@ -212,12 +212,12 @@  discard block
 block discarded – undo
212 212
         
213 213
         $number = $this->sizeString;
214 214
         
215
-        foreach($units as $unit)
215
+        foreach ($units as $unit)
216 216
         {
217
-            if(stristr($number, $unit))
217
+            if (stristr($number, $unit))
218 218
             {
219 219
                 // there are more than 1 unit defined in the string
220
-                if($this->units !== null)
220
+                if ($this->units !== null)
221 221
                 {
222 222
                     $this->setError(
223 223
                         t(
@@ -273,14 +273,14 @@  discard block
 block discarded – undo
273 273
     {
274 274
         $this->parseSize();
275 275
         
276
-        if(!$this->valid) {
276
+        if (!$this->valid) {
277 277
             return;
278 278
         }
279 279
         
280 280
         $int = intval($this->number);
281 281
         
282 282
         // negative values
283
-        if($int < 0) 
283
+        if ($int < 0) 
284 284
         {
285 285
             $this->setError(
286 286
                 t('Negative values cannot be used as size.'),
Please login to merge, or discard this patch.
src/Request/AcceptHeaders.php 3 patches
Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -28,20 +28,20 @@  discard block
 block discarded – undo
28 28
         $this->parse();
29 29
     }
30 30
     
31
-   /**
32
-    * Retrieves an indexed array with accept mime types
33
-    * that the client sent, in the order of preference
34
-    * the client specified.
35
-    *
36
-    * Example:
37
-    *
38
-    * array(
39
-    *     'text/html',
40
-    *     'application/xhtml+xml',
41
-    *     'image/webp'
42
-    *     ...
43
-    * )
44
-    */
31
+    /**
32
+     * Retrieves an indexed array with accept mime types
33
+     * that the client sent, in the order of preference
34
+     * the client specified.
35
+     *
36
+     * Example:
37
+     *
38
+     * array(
39
+     *     'text/html',
40
+     *     'application/xhtml+xml',
41
+     *     'image/webp'
42
+     *     ...
43
+     * )
44
+     */
45 45
     public function getMimeStrings() : array
46 46
     {
47 47
         $result = array();
@@ -54,9 +54,9 @@  discard block
 block discarded – undo
54 54
         return $result;
55 55
     }
56 56
     
57
-   /**
58
-    * Checks that an accept header string exists, and tries to parse it.
59
-    */
57
+    /**
58
+     * Checks that an accept header string exists, and tries to parse it.
59
+     */
60 60
     protected function parse() : void
61 61
     {
62 62
         // we may be in a CLI environment where the headers
@@ -68,11 +68,11 @@  discard block
 block discarded – undo
68 68
         $this->headers = $this->parseHeader($_SERVER['HTTP_ACCEPT']);
69 69
     }
70 70
     
71
-   /**
72
-    * Splits the accept header string and parses the mime types.
73
-    *  
74
-    * @param string $acceptHeader 
75
-    */
71
+    /**
72
+     * Splits the accept header string and parses the mime types.
73
+     *  
74
+     * @param string $acceptHeader 
75
+     */
76 76
     protected function parseHeader(string $acceptHeader) : array
77 77
     {
78 78
         $tokens = preg_split('/\s*,\s*/', $acceptHeader);
@@ -89,13 +89,13 @@  discard block
 block discarded – undo
89 89
         return $accept;
90 90
     }
91 91
     
92
-   /**
93
-    * Parses a single mime type entry.
94
-    * 
95
-    * @param int $i The position in the accept string
96
-    * @param string $mime The mime type
97
-    * @return array
98
-    */
92
+    /**
93
+     * Parses a single mime type entry.
94
+     * 
95
+     * @param int $i The position in the accept string
96
+     * @param string $mime The mime type
97
+     * @return array
98
+     */
99 99
     protected function parseEntry(int $i, string $mime) : array
100 100
     {
101 101
         $entry = array(
@@ -125,14 +125,14 @@  discard block
 block discarded – undo
125 125
         return $entry;
126 126
     }
127 127
     
128
-   /**
129
-    * Sorts the mime types collection, first by quality
130
-    * and then by position in the list.
131
-    * 
132
-    * @param array $a
133
-    * @param array $b
134
-    * @return number
135
-    */
128
+    /**
129
+     * Sorts the mime types collection, first by quality
130
+     * and then by position in the list.
131
+     * 
132
+     * @param array $a
133
+     * @param array $b
134
+     * @return number
135
+     */
136 136
     protected function sortMimeTypes(array $a, array $b)
137 137
     {
138 138
         /* first tier: highest q factor wins */
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
     {
47 47
         $result = array();
48 48
         
49
-        foreach($this->headers as $header)
49
+        foreach ($this->headers as $header)
50 50
         {
51 51
             $result[] = $header['type'];
52 52
         }
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
     {
62 62
         // we may be in a CLI environment where the headers
63 63
         // are not populated.
64
-        if(!isset($_SERVER['HTTP_ACCEPT'])) {
64
+        if (!isset($_SERVER['HTTP_ACCEPT'])) {
65 65
             return;
66 66
         }
67 67
         
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
         
80 80
         $accept = array();
81 81
         
82
-        foreach($tokens as $i => $term)
82
+        foreach ($tokens as $i => $term)
83 83
         {
84 84
             $accept[] = $this->parseEntry($i, $term);
85 85
         }
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
             'type' => null
106 106
         );
107 107
         
108
-        if(strstr($mime, ';'))
108
+        if (strstr($mime, ';'))
109 109
         {
110 110
             $parts = explode(';', $mime);
111 111
             $mime = array_shift($parts);
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
             // like an URL query string if separated by ampersands;
115 115
             $entry['params'] = ConvertHelper::parseQueryString(implode('&', $parts));
116 116
                 
117
-            if(isset($entry['params']['q'])) 
117
+            if (isset($entry['params']['q'])) 
118 118
             {
119 119
                 $entry['quality'] = (double)$entry['params']['q'];
120 120
             } 
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -141,14 +141,12 @@
 block discarded – undo
141 141
         if ($diff > 0) 
142 142
         {
143 143
             $diff = 1;
144
-        } 
145
-        else 
144
+        } else 
146 145
         {
147 146
             if ($diff < 0) 
148 147
             {
149 148
                 $diff = -1;
150
-            } 
151
-            else 
149
+            } else 
152 150
             {
153 151
                 /* tie-breaker: first listed item wins */
154 152
                 $diff = $a['pos'] - $b['pos'];
Please login to merge, or discard this patch.
src/Request/Param/Filter.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,9 +22,9 @@
 block discarded – undo
22 22
 {
23 23
     use Traits_Optionable;
24 24
     
25
-   /**
26
-    * @var Request_Param
27
-    */
25
+    /**
26
+     * @var Request_Param
27
+     */
28 28
     protected $param;
29 29
     
30 30
     protected $value;
Please login to merge, or discard this patch.
src/Request/Param/Filter/Boolean.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
     
21 21
     protected function _filter()
22 22
     {
23
-        if($this->value === 'yes' || $this->value === 'true' || $this->value === true) {
23
+        if ($this->value === 'yes' || $this->value === 'true' || $this->value === true) {
24 24
             return true;
25 25
         }
26 26
         
Please login to merge, or discard this patch.
src/Request/Param/Filter/CommaSeparated.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -23,11 +23,11 @@  discard block
 block discarded – undo
23 23
     
24 24
     protected function _filter()
25 25
     {
26
-        if(is_array($this->value)) {
26
+        if (is_array($this->value)) {
27 27
             return $this->value;
28 28
         }
29 29
         
30
-        if($this->value === '' || $this->value === null || !is_string($this->value)) {
30
+        if ($this->value === '' || $this->value === null || !is_string($this->value)) {
31 31
             return array();
32 32
         }
33 33
         
@@ -35,19 +35,19 @@  discard block
 block discarded – undo
35 35
         $stripEmptyEntries = $this->getBoolOption('stripEmptyEntries');
36 36
         $result = explode(',', $this->value);
37 37
         
38
-        if(!$trimEntries && !$stripEmptyEntries) {
38
+        if (!$trimEntries && !$stripEmptyEntries) {
39 39
             return $result;
40 40
         }
41 41
         
42 42
         $keep = array();
43 43
         
44
-        foreach($result as $entry)
44
+        foreach ($result as $entry)
45 45
         {
46
-            if($trimEntries === true) {
46
+            if ($trimEntries === true) {
47 47
                 $entry = trim($entry);
48 48
             }
49 49
             
50
-            if($stripEmptyEntries === true && $entry === '') {
50
+            if ($stripEmptyEntries === true && $entry === '') {
51 51
                 continue;
52 52
             }
53 53
             
Please login to merge, or discard this patch.
src/Request/Param/Filter/String.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
     
21 21
     protected function _filter()
22 22
     {
23
-        if(!is_scalar($this->value)) {
23
+        if (!is_scalar($this->value)) {
24 24
             return '';
25 25
         }
26 26
         
Please login to merge, or discard this patch.
src/Request/Param/Validator/Alpha.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,11 +27,11 @@
 block discarded – undo
27 27
     
28 28
     protected function _validate()
29 29
     {
30
-        if(!is_scalar($this->value)) {
30
+        if (!is_scalar($this->value)) {
31 31
             return null;
32 32
         }
33 33
         
34
-        if(preg_match('/\A[a-zA-Z]+\z/', $this->value)) {
34
+        if (preg_match('/\A[a-zA-Z]+\z/', $this->value)) {
35 35
             return $this->value;
36 36
         }
37 37
         
Please login to merge, or discard this patch.
src/Request/Param/Validator/Callback.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
         array_unshift($args, $this->value);
35 35
         
36 36
         $result = call_user_func_array($this->getOption('callback'), $args);
37
-        if($result !== false) {
37
+        if ($result !== false) {
38 38
             return $this->value;
39 39
         }
40 40
         
Please login to merge, or discard this patch.