Passed
Push — master ( 61985e...8db7dc )
by Sebastian
04:44
created
src/ConvertHelper.php 1 patch
Indentation   +468 added lines, -468 removed lines patch added patch discarded remove patch
@@ -58,13 +58,13 @@  discard block
 block discarded – undo
58 58
         return str_replace("\t", str_repeat(' ', $tabSize), $string);
59 59
     }
60 60
     
61
-   /**
62
-    * Converts spaces to tabs in the specified string.
63
-    * 
64
-    * @param string $string
65
-    * @param int $tabSize The amount of spaces per tab in the source string.
66
-    * @return string
67
-    */
61
+    /**
62
+     * Converts spaces to tabs in the specified string.
63
+     * 
64
+     * @param string $string
65
+     * @param int $tabSize The amount of spaces per tab in the source string.
66
+     * @return string
67
+     */
68 68
     public static function spaces2tabs(string $string, int $tabSize=4) : string
69 69
     {
70 70
         return str_replace(str_repeat(' ', $tabSize), "\t", $string);
@@ -77,14 +77,14 @@  discard block
 block discarded – undo
77 77
         return $converter->convert($string);
78 78
     }
79 79
     
80
-   /**
81
-    * Converts the specified amount of seconds into
82
-    * a human readable string split in months, weeks,
83
-    * days, hours, minutes and seconds.
84
-    *
85
-    * @param float $seconds
86
-    * @return string
87
-    */
80
+    /**
81
+     * Converts the specified amount of seconds into
82
+     * a human readable string split in months, weeks,
83
+     * days, hours, minutes and seconds.
84
+     *
85
+     * @param float $seconds
86
+     * @return string
87
+     */
88 88
     public static function time2string($seconds)
89 89
     {
90 90
         static $units = null;
@@ -156,41 +156,41 @@  discard block
 block discarded – undo
156 156
         return implode(', ', $tokens) . ' ' . t('and') . ' ' . $last;
157 157
     }
158 158
 
159
-   /**
160
-    * Converts a timestamp into an easily understandable
161
-    * format, e.g. "2 hours", "1 day", "3 months"
162
-    *
163
-    * If you set the date to parameter, the difference
164
-    * will be calculated between the two dates and not
165
-    * the current time.
166
-    *
167
-    * @param integer|\DateTime $datefrom
168
-    * @param integer|\DateTime $dateto
169
-    * @return string
170
-    */
159
+    /**
160
+     * Converts a timestamp into an easily understandable
161
+     * format, e.g. "2 hours", "1 day", "3 months"
162
+     *
163
+     * If you set the date to parameter, the difference
164
+     * will be calculated between the two dates and not
165
+     * the current time.
166
+     *
167
+     * @param integer|\DateTime $datefrom
168
+     * @param integer|\DateTime $dateto
169
+     * @return string
170
+     */
171 171
     public static function duration2string($datefrom, $dateto = -1) : string
172 172
     {
173
-         $converter = new ConvertHelper_DurationConverter();
173
+            $converter = new ConvertHelper_DurationConverter();
174 174
          
175
-         if($datefrom instanceof \DateTime)
176
-         {
177
-             $converter->setDateFrom($datefrom);
178
-         }
179
-         else
180
-         {
181
-             $converter->setDateFrom(self::timestamp2date($datefrom)); 
182
-         }
175
+            if($datefrom instanceof \DateTime)
176
+            {
177
+                $converter->setDateFrom($datefrom);
178
+            }
179
+            else
180
+            {
181
+                $converter->setDateFrom(self::timestamp2date($datefrom)); 
182
+            }
183 183
 
184
-         if($dateto instanceof \DateTime)
185
-         {
186
-             $converter->setDateTo($dateto);
187
-         }
188
-         else if($dateto > 0)
189
-         {
190
-             $converter->setDateTo(self::timestamp2date($dateto));
191
-         }
184
+            if($dateto instanceof \DateTime)
185
+            {
186
+                $converter->setDateTo($dateto);
187
+            }
188
+            else if($dateto > 0)
189
+            {
190
+                $converter->setDateTo(self::timestamp2date($dateto));
191
+            }
192 192
 
193
-         return $converter->convert();
193
+            return $converter->convert();
194 194
     }
195 195
 
196 196
     /**
@@ -229,44 +229,44 @@  discard block
 block discarded – undo
229 229
         return $geshi->parse_code();
230 230
     }
231 231
     
232
-   /**
233
-    * Converts a number of bytes to a human readable form,
234
-    * e.g. xx Kb / xx Mb / xx Gb
235
-    *
236
-    * @param int $bytes The amount of bytes to convert.
237
-    * @param int $precision The amount of decimals
238
-    * @param int $base The base to calculate with: Base 10 is default (=1000 Bytes in a KB), Base 2 is mainly used for Windows memory (=1024 Bytes in a KB).
239
-    * @return string
240
-    * 
241
-    * @see https://en.m.wikipedia.org/wiki/Megabyte#Definitions
242
-    */
232
+    /**
233
+     * Converts a number of bytes to a human readable form,
234
+     * e.g. xx Kb / xx Mb / xx Gb
235
+     *
236
+     * @param int $bytes The amount of bytes to convert.
237
+     * @param int $precision The amount of decimals
238
+     * @param int $base The base to calculate with: Base 10 is default (=1000 Bytes in a KB), Base 2 is mainly used for Windows memory (=1024 Bytes in a KB).
239
+     * @return string
240
+     * 
241
+     * @see https://en.m.wikipedia.org/wiki/Megabyte#Definitions
242
+     */
243 243
     public static function bytes2readable(int $bytes, int $precision = 1, int $base = ConvertHelper_StorageSizeEnum::BASE_10) : string
244 244
     {
245 245
         return self::parseBytes($bytes)->toString($precision, $base);
246 246
     }
247 247
     
248
-   /**
249
-    * Parses a number of bytes, and creates a converter instance which
250
-    * allows doing common operations with it.
251
-    * 
252
-    * @param int $bytes
253
-    * @return ConvertHelper_ByteConverter
254
-    */
248
+    /**
249
+     * Parses a number of bytes, and creates a converter instance which
250
+     * allows doing common operations with it.
251
+     * 
252
+     * @param int $bytes
253
+     * @return ConvertHelper_ByteConverter
254
+     */
255 255
     public static function parseBytes(int $bytes) : ConvertHelper_ByteConverter
256 256
     {
257 257
         return new ConvertHelper_ByteConverter($bytes);
258 258
     }
259 259
 
260
-   /**
261
-    * Cuts a text to the specified length if it is longer than the
262
-    * target length. Appends a text to signify it has been cut at 
263
-    * the end of the string.
264
-    * 
265
-    * @param string $text
266
-    * @param int $targetLength
267
-    * @param string $append
268
-    * @return string
269
-    */
260
+    /**
261
+     * Cuts a text to the specified length if it is longer than the
262
+     * target length. Appends a text to signify it has been cut at 
263
+     * the end of the string.
264
+     * 
265
+     * @param string $text
266
+     * @param int $targetLength
267
+     * @param string $append
268
+     * @return string
269
+     */
270 270
     public static function text_cut(string $text, int $targetLength, string $append = '...') : string
271 271
     {
272 272
         $length = mb_strlen($text);
@@ -290,14 +290,14 @@  discard block
 block discarded – undo
290 290
         return $info->toString();
291 291
     }
292 292
     
293
-   /**
294
-    * Pretty print_r.
295
-    * 
296
-    * @param mixed $var The variable to dump.
297
-    * @param bool $return Whether to return the dumped code.
298
-    * @param bool $html Whether to style the dump as HTML.
299
-    * @return string
300
-    */
293
+    /**
294
+     * Pretty print_r.
295
+     * 
296
+     * @param mixed $var The variable to dump.
297
+     * @param bool $return Whether to return the dumped code.
298
+     * @param bool $html Whether to style the dump as HTML.
299
+     * @return string
300
+     */
301 301
     public static function print_r($var, bool $return=false, bool $html=true) : string
302 302
     {
303 303
         $result = parseVariable($var)->enableType()->toString();
@@ -327,15 +327,15 @@  discard block
 block discarded – undo
327 327
         'no' => false
328 328
     );
329 329
 
330
-   /**
331
-    * Converts a string, number or boolean value to a boolean value.
332
-    * 
333
-    * @param mixed $string
334
-    * @throws ConvertHelper_Exception
335
-    * @return bool
336
-    * 
337
-    * @see ConvertHelper::ERROR_INVALID_BOOLEAN_STRING
338
-    */
330
+    /**
331
+     * Converts a string, number or boolean value to a boolean value.
332
+     * 
333
+     * @param mixed $string
334
+     * @throws ConvertHelper_Exception
335
+     * @return bool
336
+     * 
337
+     * @see ConvertHelper::ERROR_INVALID_BOOLEAN_STRING
338
+     */
339 339
     public static function string2bool($string) : bool
340 340
     {
341 341
         if($string === '' || $string === null || !is_scalar($string)) 
@@ -363,27 +363,27 @@  discard block
 block discarded – undo
363 363
         );
364 364
     }
365 365
     
366
-   /**
367
-    * Whether the specified string is a boolean string or boolean value.
368
-    * Alias for {@link ConvertHelper::isBoolean()}.
369
-    * 
370
-    * @param mixed $string
371
-    * @return bool
372
-    * @deprecated
373
-    * @see ConvertHelper::isBoolean()
374
-    */
366
+    /**
367
+     * Whether the specified string is a boolean string or boolean value.
368
+     * Alias for {@link ConvertHelper::isBoolean()}.
369
+     * 
370
+     * @param mixed $string
371
+     * @return bool
372
+     * @deprecated
373
+     * @see ConvertHelper::isBoolean()
374
+     */
375 375
     public static function isBooleanString($string) : bool
376 376
     {
377 377
         return self::isBoolean($string);
378 378
     }
379 379
 
380
-   /**
381
-    * Alias for the {@\AppUtils\XMLHelper::string2xml()} method.
382
-    * 
383
-    * @param string $text
384
-    * @return string
385
-    * @deprecated
386
-    */
380
+    /**
381
+     * Alias for the {@\AppUtils\XMLHelper::string2xml()} method.
382
+     * 
383
+     * @param string $text
384
+     * @return string
385
+     * @deprecated
386
+     */
387 387
     public static function text_makeXMLCompliant($text)
388 388
     {
389 389
         return XMLHelper::string2xml($text);
@@ -485,13 +485,13 @@  discard block
 block discarded – undo
485 485
         return $translit->convert($string);
486 486
     }
487 487
     
488
-   /**
489
-    * Retrieves the HEX character codes for all control
490
-    * characters that the {@link stripControlCharacters()} 
491
-    * method will remove.
492
-    * 
493
-    * @return string[]
494
-    */
488
+    /**
489
+     * Retrieves the HEX character codes for all control
490
+     * characters that the {@link stripControlCharacters()} 
491
+     * method will remove.
492
+     * 
493
+     * @return string[]
494
+     */
495 495
     public static function getControlCharactersAsHex()
496 496
     {
497 497
         $hexAlphabet = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
@@ -527,13 +527,13 @@  discard block
 block discarded – undo
527 527
         return $stack;
528 528
     }
529 529
     
530
-   /**
531
-    * Retrieves an array of all control characters that
532
-    * the {@link stripControlCharacters()} method will 
533
-    * remove, as the actual UTF-8 characters.
534
-    * 
535
-    * @return string[]
536
-    */
530
+    /**
531
+     * Retrieves an array of all control characters that
532
+     * the {@link stripControlCharacters()} method will 
533
+     * remove, as the actual UTF-8 characters.
534
+     * 
535
+     * @return string[]
536
+     */
537 537
     public static function getControlCharactersAsUTF8()
538 538
     {
539 539
         $chars = self::getControlCharactersAsHex();
@@ -546,12 +546,12 @@  discard block
 block discarded – undo
546 546
         return $result;
547 547
     }
548 548
     
549
-   /**
550
-    * Retrieves all control characters as JSON encoded
551
-    * characters, e.g. "\u200b".
552
-    * 
553
-    * @return string[]
554
-    */
549
+    /**
550
+     * Retrieves all control characters as JSON encoded
551
+     * characters, e.g. "\u200b".
552
+     * 
553
+     * @return string[]
554
+     */
555 555
     public static function getControlCharactersAsJSON()
556 556
     {
557 557
         $chars = self::getControlCharactersAsHex();
@@ -608,20 +608,20 @@  discard block
 block discarded – undo
608 608
         return preg_replace(self::$controlCharsRegex, '', $string);
609 609
     }
610 610
 
611
-   /**
612
-    * Converts a unicode character to the PHPO notation.
613
-    * 
614
-    * Example:
615
-    * 
616
-    * <pre>unicodeChar2php('"\u0000"')</pre>
617
-    * 
618
-    * Returns
619
-    * 
620
-    * <pre>\x0</pre>
621
-    * 
622
-    * @param string $unicodeChar
623
-    * @return string
624
-    */
611
+    /**
612
+     * Converts a unicode character to the PHPO notation.
613
+     * 
614
+     * Example:
615
+     * 
616
+     * <pre>unicodeChar2php('"\u0000"')</pre>
617
+     * 
618
+     * Returns
619
+     * 
620
+     * <pre>\x0</pre>
621
+     * 
622
+     * @param string $unicodeChar
623
+     * @return string
624
+     */
625 625
     public static function unicodeChar2php(string $unicodeChar) : string 
626 626
     {
627 627
         $unicodeChar = json_decode($unicodeChar);
@@ -747,25 +747,25 @@  discard block
 block discarded – undo
747 747
         return 'false';
748 748
     }
749 749
     
750
-   /**
751
-    * Converts an associative array with attribute name > value pairs
752
-    * to an attribute string that can be used in an HTML tag. Empty 
753
-    * attribute values are ignored.
754
-    * 
755
-    * Example:
756
-    * 
757
-    * array2attributeString(array(
758
-    *     'id' => 45,
759
-    *     'href' => 'http://www.mistralys.com'
760
-    * ));
761
-    * 
762
-    * Result:
763
-    * 
764
-    * id="45" href="http://www.mistralys.com"
765
-    * 
766
-    * @param array $array
767
-    * @return string
768
-    */
750
+    /**
751
+     * Converts an associative array with attribute name > value pairs
752
+     * to an attribute string that can be used in an HTML tag. Empty 
753
+     * attribute values are ignored.
754
+     * 
755
+     * Example:
756
+     * 
757
+     * array2attributeString(array(
758
+     *     'id' => 45,
759
+     *     'href' => 'http://www.mistralys.com'
760
+     * ));
761
+     * 
762
+     * Result:
763
+     * 
764
+     * id="45" href="http://www.mistralys.com"
765
+     * 
766
+     * @param array $array
767
+     * @return string
768
+     */
769 769
     public static function array2attributeString($array)
770 770
     {
771 771
         $tokens = array();
@@ -784,14 +784,14 @@  discard block
 block discarded – undo
784 784
         return ' '.implode(' ', $tokens);
785 785
     }
786 786
     
787
-   /**
788
-    * Converts a string so it can safely be used in a javascript
789
-    * statement in an HTML tag: uses single quotes around the string
790
-    * and encodes all special characters as needed.
791
-    * 
792
-    * @param string $string
793
-    * @return string
794
-    */
787
+    /**
788
+     * Converts a string so it can safely be used in a javascript
789
+     * statement in an HTML tag: uses single quotes around the string
790
+     * and encodes all special characters as needed.
791
+     * 
792
+     * @param string $string
793
+     * @return string
794
+     */
795 795
     public static function string2attributeJS($string, $quoted=true)
796 796
     {
797 797
         $converted = addslashes(htmlspecialchars(strip_tags($string), ENT_QUOTES, 'UTF-8'));
@@ -802,15 +802,15 @@  discard block
 block discarded – undo
802 802
         return $converted;
803 803
     }
804 804
     
805
-   /**
806
-    * Checks if the specified string is a boolean value, which
807
-    * includes string representations of boolean values, like 
808
-    * <code>yes</code> or <code>no</code>, and <code>true</code>
809
-    * or <code>false</code>.
810
-    * 
811
-    * @param mixed $value
812
-    * @return boolean
813
-    */
805
+    /**
806
+     * Checks if the specified string is a boolean value, which
807
+     * includes string representations of boolean values, like 
808
+     * <code>yes</code> or <code>no</code>, and <code>true</code>
809
+     * or <code>false</code>.
810
+     * 
811
+     * @param mixed $value
812
+     * @return boolean
813
+     */
814 814
     public static function isBoolean($value) : bool
815 815
     {
816 816
         if(is_bool($value)) {
@@ -824,12 +824,12 @@  discard block
 block discarded – undo
824 824
         return array_key_exists($value, self::$booleanStrings);
825 825
     }
826 826
     
827
-   /**
828
-    * Converts an associative array to an HTML style attribute value string.
829
-    * 
830
-    * @param array $subject
831
-    * @return string
832
-    */
827
+    /**
828
+     * Converts an associative array to an HTML style attribute value string.
829
+     * 
830
+     * @param array $subject
831
+     * @return string
832
+     */
833 833
     public static function array2styleString(array $subject) : string
834 834
     {
835 835
         $tokens = array();
@@ -840,23 +840,23 @@  discard block
 block discarded – undo
840 840
         return implode(';', $tokens);
841 841
     }
842 842
     
843
-   /**
844
-    * Converts a DateTime object to a timestamp, which
845
-    * is PHP 5.2 compatible.
846
-    * 
847
-    * @param \DateTime $date
848
-    * @return integer
849
-    */
843
+    /**
844
+     * Converts a DateTime object to a timestamp, which
845
+     * is PHP 5.2 compatible.
846
+     * 
847
+     * @param \DateTime $date
848
+     * @return integer
849
+     */
850 850
     public static function date2timestamp(\DateTime $date) : int
851 851
     {
852 852
         return (int)$date->format('U');
853 853
     }
854 854
     
855
-   /**
856
-    * Converts a timestamp into a DateTime instance.
857
-    * @param int $timestamp
858
-    * @return \DateTime
859
-    */
855
+    /**
856
+     * Converts a timestamp into a DateTime instance.
857
+     * @param int $timestamp
858
+     * @return \DateTime
859
+     */
860 860
     public static function timestamp2date(int $timestamp) : \DateTime
861 861
     {
862 862
         $date = new \DateTime();
@@ -864,50 +864,50 @@  discard block
 block discarded – undo
864 864
         return $date;
865 865
     }
866 866
     
867
-   /**
868
-    * Strips an absolute path to a file within the application
869
-    * to make the path relative to the application root path.
870
-    * 
871
-    * @param string $path
872
-    * @return string
873
-    * 
874
-    * @see FileHelper::relativizePath()
875
-    * @see FileHelper::relativizePathByDepth()
876
-    */
867
+    /**
868
+     * Strips an absolute path to a file within the application
869
+     * to make the path relative to the application root path.
870
+     * 
871
+     * @param string $path
872
+     * @return string
873
+     * 
874
+     * @see FileHelper::relativizePath()
875
+     * @see FileHelper::relativizePathByDepth()
876
+     */
877 877
     public static function fileRelativize(string $path) : string
878 878
     {
879 879
         return FileHelper::relativizePathByDepth($path);
880 880
     }
881 881
     
882 882
     /**
883
-    * Converts a PHP regex to a javascript RegExp object statement.
884
-    * 
885
-    * NOTE: This is an alias for the JSHelper's `convertRegex` method. 
886
-    * More details are available on its usage there.
887
-    *
888
-    * @param string $regex A PHP preg regex
889
-    * @param string $statementType The type of statement to return: Defaults to a statement to create a RegExp object.
890
-    * @return array|string Depending on the specified return type.
891
-    * 
892
-    * @see JSHelper::buildRegexStatement()
893
-    */
883
+     * Converts a PHP regex to a javascript RegExp object statement.
884
+     * 
885
+     * NOTE: This is an alias for the JSHelper's `convertRegex` method. 
886
+     * More details are available on its usage there.
887
+     *
888
+     * @param string $regex A PHP preg regex
889
+     * @param string $statementType The type of statement to return: Defaults to a statement to create a RegExp object.
890
+     * @return array|string Depending on the specified return type.
891
+     * 
892
+     * @see JSHelper::buildRegexStatement()
893
+     */
894 894
     public static function regex2js(string $regex, string $statementType=JSHelper::JS_REGEX_OBJECT)
895 895
     {
896 896
         return JSHelper::buildRegexStatement($regex, $statementType);
897 897
     }
898 898
     
899
-   /**
900
-    * Converts the specified variable to JSON. Works just
901
-    * like the native `json_encode` method, except that it
902
-    * will trigger an exception on failure, which has the 
903
-    * json error details included in its developer details.
904
-    * 
905
-    * @param mixed $variable
906
-    * @param int $options JSON encode options.
907
-    * @param int $depth 
908
-    * @throws ConvertHelper_Exception
909
-    * @return string
910
-    */
899
+    /**
900
+     * Converts the specified variable to JSON. Works just
901
+     * like the native `json_encode` method, except that it
902
+     * will trigger an exception on failure, which has the 
903
+     * json error details included in its developer details.
904
+     * 
905
+     * @param mixed $variable
906
+     * @param int $options JSON encode options.
907
+     * @param int $depth 
908
+     * @throws ConvertHelper_Exception
909
+     * @return string
910
+     */
911 911
     public static function var2json($variable, int $options=0, int $depth=512) : string
912 912
     {
913 913
         $result = json_encode($variable, $options, $depth);
@@ -928,12 +928,12 @@  discard block
 block discarded – undo
928 928
         );
929 929
     }
930 930
     
931
-   /**
932
-    * Strips all known UTF byte order marks from the specified string.
933
-    * 
934
-    * @param string $string
935
-    * @return string
936
-    */
931
+    /**
932
+     * Strips all known UTF byte order marks from the specified string.
933
+     * 
934
+     * @param string $string
935
+     * @return string
936
+     */
937 937
     public static function stripUTFBom($string)
938 938
     {
939 939
         $boms = FileHelper::getUTFBOMs();
@@ -948,13 +948,13 @@  discard block
 block discarded – undo
948 948
         return $string;
949 949
     }
950 950
 
951
-   /**
952
-    * Converts a string to valid utf8, regardless
953
-    * of the string's encoding(s).
954
-    * 
955
-    * @param string $string
956
-    * @return string
957
-    */
951
+    /**
952
+     * Converts a string to valid utf8, regardless
953
+     * of the string's encoding(s).
954
+     * 
955
+     * @param string $string
956
+     * @return string
957
+     */
958 958
     public static function string2utf8($string)
959 959
     {
960 960
         if(!self::isStringASCII($string)) {
@@ -964,15 +964,15 @@  discard block
 block discarded – undo
964 964
         return $string;
965 965
     }
966 966
     
967
-   /**
968
-    * Checks whether the specified string is an ASCII
969
-    * string, without any special or UTF8 characters.
970
-    * Note: empty strings and NULL are considered ASCII.
971
-    * Any variable types other than strings are not.
972
-    * 
973
-    * @param mixed $string
974
-    * @return boolean
975
-    */
967
+    /**
968
+     * Checks whether the specified string is an ASCII
969
+     * string, without any special or UTF8 characters.
970
+     * Note: empty strings and NULL are considered ASCII.
971
+     * Any variable types other than strings are not.
972
+     * 
973
+     * @param mixed $string
974
+     * @return boolean
975
+     */
976 976
     public static function isStringASCII($string) : bool
977 977
     {
978 978
         if($string === '' || $string === NULL) {
@@ -997,22 +997,22 @@  discard block
 block discarded – undo
997 997
         return $url;
998 998
     }
999 999
 
1000
-   /**
1001
-    * Calculates a percentage match of the source string with the target string.
1002
-    * 
1003
-    * Options are:
1004
-    * 
1005
-    * - maxLevenshtein, default: 10
1006
-    *   Any levenshtein results above this value are ignored.
1007
-    *   
1008
-    * - precision, default: 1
1009
-    *   The precision of the percentage float value
1010
-    * 
1011
-    * @param string $source
1012
-    * @param string $target
1013
-    * @param array $options
1014
-    * @return float
1015
-    */
1000
+    /**
1001
+     * Calculates a percentage match of the source string with the target string.
1002
+     * 
1003
+     * Options are:
1004
+     * 
1005
+     * - maxLevenshtein, default: 10
1006
+     *   Any levenshtein results above this value are ignored.
1007
+     *   
1008
+     * - precision, default: 1
1009
+     *   The precision of the percentage float value
1010
+     * 
1011
+     * @param string $source
1012
+     * @param string $target
1013
+     * @param array $options
1014
+     * @return float
1015
+     */
1016 1016
     public static function matchString($source, $target, $options=array())
1017 1017
     {
1018 1018
         $defaults = array(
@@ -1036,14 +1036,14 @@  discard block
 block discarded – undo
1036 1036
         return round(100 - $percent, $options['precision']);
1037 1037
     }
1038 1038
     
1039
-   /**
1040
-    * Converts a date interval to a human readable string with
1041
-    * all necessary time components, e.g. "1 year, 2 months and 4 days".
1042
-    * 
1043
-    * @param \DateInterval $interval
1044
-    * @return string
1045
-    * @see ConvertHelper_IntervalConverter
1046
-    */
1039
+    /**
1040
+     * Converts a date interval to a human readable string with
1041
+     * all necessary time components, e.g. "1 year, 2 months and 4 days".
1042
+     * 
1043
+     * @param \DateInterval $interval
1044
+     * @return string
1045
+     * @see ConvertHelper_IntervalConverter
1046
+     */
1047 1047
     public static function interval2string(\DateInterval $interval) : string
1048 1048
     {
1049 1049
         $converter = new ConvertHelper_IntervalConverter();
@@ -1058,60 +1058,60 @@  discard block
 block discarded – undo
1058 1058
     
1059 1059
     const INTERVAL_SECONDS = 'seconds';
1060 1060
     
1061
-   /**
1062
-    * Converts an interval to its total amount of days.
1063
-    * @param \DateInterval $interval
1064
-    * @return int
1065
-    */
1061
+    /**
1062
+     * Converts an interval to its total amount of days.
1063
+     * @param \DateInterval $interval
1064
+     * @return int
1065
+     */
1066 1066
     public static function interval2days(\DateInterval $interval) : int
1067 1067
     {
1068 1068
         return self::interval2total($interval, self::INTERVAL_DAYS);
1069 1069
     }
1070 1070
 
1071
-   /**
1072
-    * Converts an interval to its total amount of hours.
1073
-    * @param \DateInterval $interval
1074
-    * @return int
1075
-    */
1071
+    /**
1072
+     * Converts an interval to its total amount of hours.
1073
+     * @param \DateInterval $interval
1074
+     * @return int
1075
+     */
1076 1076
     public static function interval2hours(\DateInterval $interval) : int
1077 1077
     {
1078 1078
         return self::interval2total($interval, self::INTERVAL_HOURS);
1079 1079
     }
1080 1080
     
1081
-   /**
1082
-    * Converts an interval to its total amount of minutes. 
1083
-    * @param \DateInterval $interval
1084
-    * @return int
1085
-    */
1081
+    /**
1082
+     * Converts an interval to its total amount of minutes. 
1083
+     * @param \DateInterval $interval
1084
+     * @return int
1085
+     */
1086 1086
     public static function interval2minutes(\DateInterval $interval) : int
1087 1087
     {
1088 1088
         return self::interval2total($interval, self::INTERVAL_MINUTES);
1089 1089
     }
1090 1090
     
1091
-   /**
1092
-    * Converts an interval to its total amount of seconds.
1093
-    * @param \DateInterval $interval
1094
-    * @return int
1095
-    */    
1091
+    /**
1092
+     * Converts an interval to its total amount of seconds.
1093
+     * @param \DateInterval $interval
1094
+     * @return int
1095
+     */    
1096 1096
     public static function interval2seconds(\DateInterval $interval) : int
1097 1097
     {
1098 1098
         return self::interval2total($interval, self::INTERVAL_SECONDS);
1099 1099
     }
1100 1100
     
1101
-   /**
1102
-    * Calculates the total amount of days / hours / minutes or seconds
1103
-    * of a date interval object (depending in the specified units), and 
1104
-    * returns the total amount.
1105
-    * 
1106
-    * @param \DateInterval $interval
1107
-    * @param string $unit What total value to calculate.
1108
-    * @return integer
1109
-    * 
1110
-    * @see ConvertHelper::INTERVAL_SECONDS
1111
-    * @see ConvertHelper::INTERVAL_MINUTES
1112
-    * @see ConvertHelper::INTERVAL_HOURS
1113
-    * @see ConvertHelper::INTERVAL_DAYS
1114
-    */
1101
+    /**
1102
+     * Calculates the total amount of days / hours / minutes or seconds
1103
+     * of a date interval object (depending in the specified units), and 
1104
+     * returns the total amount.
1105
+     * 
1106
+     * @param \DateInterval $interval
1107
+     * @param string $unit What total value to calculate.
1108
+     * @return integer
1109
+     * 
1110
+     * @see ConvertHelper::INTERVAL_SECONDS
1111
+     * @see ConvertHelper::INTERVAL_MINUTES
1112
+     * @see ConvertHelper::INTERVAL_HOURS
1113
+     * @see ConvertHelper::INTERVAL_DAYS
1114
+     */
1115 1115
     public static function interval2total(\DateInterval $interval, $unit=self::INTERVAL_SECONDS) : int
1116 1116
     {
1117 1117
         $total = (int)$interval->format('%a');
@@ -1151,13 +1151,13 @@  discard block
 block discarded – undo
1151 1151
         'Sunday'
1152 1152
     );
1153 1153
     
1154
-   /**
1155
-    * Converts a date to the corresponding day name.
1156
-    * 
1157
-    * @param \DateTime $date
1158
-    * @param bool $short
1159
-    * @return string|NULL
1160
-    */
1154
+    /**
1155
+     * Converts a date to the corresponding day name.
1156
+     * 
1157
+     * @param \DateTime $date
1158
+     * @param bool $short
1159
+     * @return string|NULL
1160
+     */
1161 1161
     public static function date2dayName(\DateTime $date, bool $short=false)
1162 1162
     {
1163 1163
         $day = $date->format('l');
@@ -1172,21 +1172,21 @@  discard block
 block discarded – undo
1172 1172
         return null;
1173 1173
     }
1174 1174
     
1175
-   /**
1176
-    * Retrieves a list of english day names.
1177
-    * @return string[]
1178
-    */
1175
+    /**
1176
+     * Retrieves a list of english day names.
1177
+     * @return string[]
1178
+     */
1179 1179
     public static function getDayNamesInvariant()
1180 1180
     {
1181 1181
         return self::$daysInvariant;
1182 1182
     }
1183 1183
     
1184
-   /**
1185
-    * Retrieves the day names list for the current locale.
1186
-    * 
1187
-    * @param bool $short
1188
-    * @return array
1189
-    */
1184
+    /**
1185
+     * Retrieves the day names list for the current locale.
1186
+     * 
1187
+     * @param bool $short
1188
+     * @return array
1189
+     */
1190 1190
     public static function getDayNames(bool $short=false) : array
1191 1191
     {
1192 1192
         if($short) {
@@ -1246,16 +1246,16 @@  discard block
 block discarded – undo
1246 1246
         return $last;
1247 1247
     }
1248 1248
     
1249
-   /**
1250
-    * Splits a string into an array of all characters it is composed of.
1251
-    * Unicode character safe.
1252
-    * 
1253
-    * NOTE: Spaces and newlines (both \r and \n) are also considered single
1254
-    * characters.
1255
-    * 
1256
-    * @param string $string
1257
-    * @return array
1258
-    */
1249
+    /**
1250
+     * Splits a string into an array of all characters it is composed of.
1251
+     * Unicode character safe.
1252
+     * 
1253
+     * NOTE: Spaces and newlines (both \r and \n) are also considered single
1254
+     * characters.
1255
+     * 
1256
+     * @param string $string
1257
+     * @return array
1258
+     */
1259 1259
     public static function string2array(string $string) : array
1260 1260
     {
1261 1261
         $result = preg_split('//u', $string, null, PREG_SPLIT_NO_EMPTY);
@@ -1266,12 +1266,12 @@  discard block
 block discarded – undo
1266 1266
         return array();
1267 1267
     }
1268 1268
     
1269
-   /**
1270
-    * Checks whether the specified string contains HTML code.
1271
-    * 
1272
-    * @param string $string
1273
-    * @return boolean
1274
-    */
1269
+    /**
1270
+     * Checks whether the specified string contains HTML code.
1271
+     * 
1272
+     * @param string $string
1273
+     * @return boolean
1274
+     */
1275 1275
     public static function isStringHTML(string $string) : bool
1276 1276
     {
1277 1277
         if(preg_match('%<[a-z/][\s\S]*>%siU', $string)) {
@@ -1286,17 +1286,17 @@  discard block
 block discarded – undo
1286 1286
         return false;
1287 1287
     }
1288 1288
     
1289
-   /**
1290
-    * UTF8-safe wordwrap method: works like the regular wordwrap
1291
-    * PHP function but compatible with UTF8. Otherwise the lengths
1292
-    * are not calculated correctly.
1293
-    * 
1294
-    * @param string $str
1295
-    * @param int $width
1296
-    * @param string $break
1297
-    * @param bool $cut
1298
-    * @return string
1299
-    */
1289
+    /**
1290
+     * UTF8-safe wordwrap method: works like the regular wordwrap
1291
+     * PHP function but compatible with UTF8. Otherwise the lengths
1292
+     * are not calculated correctly.
1293
+     * 
1294
+     * @param string $str
1295
+     * @param int $width
1296
+     * @param string $break
1297
+     * @param bool $cut
1298
+     * @return string
1299
+     */
1300 1300
     public static function wordwrap(string $str, int $width = 75, string $break = "\n", bool $cut = false) : string 
1301 1301
     {
1302 1302
         $wrapper = new ConvertHelper_WordWrapper();
@@ -1308,27 +1308,27 @@  discard block
 block discarded – undo
1308 1308
         ->wrapText($str);
1309 1309
     }
1310 1310
     
1311
-   /**
1312
-    * Calculates the byte length of a string, taking into 
1313
-    * account any unicode characters.
1314
-    * 
1315
-    * @param string $string
1316
-    * @return int
1317
-    * @see https://stackoverflow.com/a/9718273/2298192
1318
-    */
1311
+    /**
1312
+     * Calculates the byte length of a string, taking into 
1313
+     * account any unicode characters.
1314
+     * 
1315
+     * @param string $string
1316
+     * @return int
1317
+     * @see https://stackoverflow.com/a/9718273/2298192
1318
+     */
1319 1319
     public static function string2bytes($string)
1320 1320
     {
1321 1321
         return mb_strlen($string, '8bit');
1322 1322
     }
1323 1323
     
1324
-   /**
1325
-    * Creates a short, 8-character long hash for the specified string.
1326
-    * 
1327
-    * WARNING: Not cryptographically safe.
1328
-    * 
1329
-    * @param string $string
1330
-    * @return string
1331
-    */
1324
+    /**
1325
+     * Creates a short, 8-character long hash for the specified string.
1326
+     * 
1327
+     * WARNING: Not cryptographically safe.
1328
+     * 
1329
+     * @param string $string
1330
+     * @return string
1331
+     */
1332 1332
     public static function string2shortHash($string)
1333 1333
     {
1334 1334
         return hash('crc32', $string, false);
@@ -1354,40 +1354,40 @@  discard block
 block discarded – undo
1354 1354
         return ConvertHelper_ThrowableInfo::fromThrowable($e);
1355 1355
     }
1356 1356
     
1357
-   /**
1358
-    * Parses the specified query string like the native 
1359
-    * function <code>parse_str</code>, without the key
1360
-    * naming limitations.
1361
-    * 
1362
-    * Using parse_str, dots or spaces in key names are 
1363
-    * replaced by underscores. This method keeps all names
1364
-    * intact.
1365
-    * 
1366
-    * It still uses the parse_str implementation as it 
1367
-    * is tested and tried, but fixes the parameter names
1368
-    * after parsing, as needed.
1369
-    * 
1370
-    * @param string $queryString
1371
-    * @return array
1372
-    * @see ConvertHelper_QueryParser
1373
-    */
1357
+    /**
1358
+     * Parses the specified query string like the native 
1359
+     * function <code>parse_str</code>, without the key
1360
+     * naming limitations.
1361
+     * 
1362
+     * Using parse_str, dots or spaces in key names are 
1363
+     * replaced by underscores. This method keeps all names
1364
+     * intact.
1365
+     * 
1366
+     * It still uses the parse_str implementation as it 
1367
+     * is tested and tried, but fixes the parameter names
1368
+     * after parsing, as needed.
1369
+     * 
1370
+     * @param string $queryString
1371
+     * @return array
1372
+     * @see ConvertHelper_QueryParser
1373
+     */
1374 1374
     public static function parseQueryString(string $queryString) : array
1375 1375
     {
1376 1376
         $parser = new ConvertHelper_QueryParser();
1377 1377
         return $parser->parse($queryString);
1378 1378
     }
1379 1379
 
1380
-   /**
1381
-    * Searches for needle in the specified string, and returns a list
1382
-    * of all occurrences, including the matched string. The matched 
1383
-    * string is useful when doing a case insensitive search, as it 
1384
-    * shows the exact matched case of needle.
1385
-    *   
1386
-    * @param string $needle
1387
-    * @param string $haystack
1388
-    * @param bool $caseInsensitive
1389
-    * @return ConvertHelper_StringMatch[]
1390
-    */
1380
+    /**
1381
+     * Searches for needle in the specified string, and returns a list
1382
+     * of all occurrences, including the matched string. The matched 
1383
+     * string is useful when doing a case insensitive search, as it 
1384
+     * shows the exact matched case of needle.
1385
+     *   
1386
+     * @param string $needle
1387
+     * @param string $haystack
1388
+     * @param bool $caseInsensitive
1389
+     * @return ConvertHelper_StringMatch[]
1390
+     */
1391 1391
     public static function findString(string $needle, string $haystack, bool $caseInsensitive=false)
1392 1392
     {
1393 1393
         if($needle === '') {
@@ -1413,14 +1413,14 @@  discard block
 block discarded – undo
1413 1413
         return $positions;
1414 1414
     }
1415 1415
     
1416
-   /**
1417
-    * Like explode, but trims all entries, and removes 
1418
-    * empty entries from the resulting array.
1419
-    * 
1420
-    * @param string $delimiter
1421
-    * @param string $string
1422
-    * @return string[]
1423
-    */
1416
+    /**
1417
+     * Like explode, but trims all entries, and removes 
1418
+     * empty entries from the resulting array.
1419
+     * 
1420
+     * @param string $delimiter
1421
+     * @param string $string
1422
+     * @return string[]
1423
+     */
1424 1424
     public static function explodeTrim(string $delimiter, string $string) : array
1425 1425
     {
1426 1426
         if(empty($string) || empty($delimiter)) {
@@ -1442,12 +1442,12 @@  discard block
 block discarded – undo
1442 1442
     
1443 1443
     protected static $eolChars;
1444 1444
 
1445
-   /**
1446
-    * Detects the most used end-of-line character in the subject string.
1447
-    * 
1448
-    * @param string $subjectString The string to check.
1449
-    * @return NULL|ConvertHelper_EOL The detected EOL instance, or NULL if none has been detected.
1450
-    */
1445
+    /**
1446
+     * Detects the most used end-of-line character in the subject string.
1447
+     * 
1448
+     * @param string $subjectString The string to check.
1449
+     * @return NULL|ConvertHelper_EOL The detected EOL instance, or NULL if none has been detected.
1450
+     */
1451 1451
     public static function detectEOLCharacter(string $subjectString) : ?ConvertHelper_EOL
1452 1452
     {
1453 1453
         if(empty($subjectString)) {
@@ -1459,27 +1459,27 @@  discard block
 block discarded – undo
1459 1459
             $cr = chr((int)hexdec('0d'));
1460 1460
             $lf = chr((int)hexdec('0a'));
1461 1461
             
1462
-           self::$eolChars = array(
1463
-               array(
1464
-                   'char' => $cr.$lf,
1465
-                   'type' => ConvertHelper_EOL::TYPE_CRLF,
1466
-                   'description' => t('Carriage return followed by a line feed'),
1467
-               ),
1468
-               array(
1469
-                   'char' => $lf.$cr,
1470
-                   'type' => ConvertHelper_EOL::TYPE_LFCR,
1471
-                   'description' => t('Line feed followed by a carriage return'),
1472
-               ),
1473
-               array(
1474
-                  'char' => $lf,
1475
-                  'type' => ConvertHelper_EOL::TYPE_LF,
1476
-                  'description' => t('Line feed'),
1477
-               ),
1478
-               array(
1479
-                  'char' => $cr,
1480
-                  'type' => ConvertHelper_EOL::TYPE_CR,
1481
-                  'description' => t('Carriage Return'),
1482
-               ),
1462
+            self::$eolChars = array(
1463
+                array(
1464
+                    'char' => $cr.$lf,
1465
+                    'type' => ConvertHelper_EOL::TYPE_CRLF,
1466
+                    'description' => t('Carriage return followed by a line feed'),
1467
+                ),
1468
+                array(
1469
+                    'char' => $lf.$cr,
1470
+                    'type' => ConvertHelper_EOL::TYPE_LFCR,
1471
+                    'description' => t('Line feed followed by a carriage return'),
1472
+                ),
1473
+                array(
1474
+                    'char' => $lf,
1475
+                    'type' => ConvertHelper_EOL::TYPE_LF,
1476
+                    'description' => t('Line feed'),
1477
+                ),
1478
+                array(
1479
+                    'char' => $cr,
1480
+                    'type' => ConvertHelper_EOL::TYPE_CR,
1481
+                    'description' => t('Carriage Return'),
1482
+                ),
1483 1483
             );
1484 1484
         }
1485 1485
         
@@ -1507,13 +1507,13 @@  discard block
 block discarded – undo
1507 1507
         );
1508 1508
     }
1509 1509
 
1510
-   /**
1511
-    * Removes the specified keys from the target array,
1512
-    * if they exist.
1513
-    * 
1514
-    * @param array $array
1515
-    * @param array $keys
1516
-    */
1510
+    /**
1511
+     * Removes the specified keys from the target array,
1512
+     * if they exist.
1513
+     * 
1514
+     * @param array $array
1515
+     * @param array $keys
1516
+     */
1517 1517
     public static function arrayRemoveKeys(array &$array, array $keys) : void
1518 1518
     {
1519 1519
         foreach($keys as $key) 
@@ -1524,13 +1524,13 @@  discard block
 block discarded – undo
1524 1524
         }
1525 1525
     }
1526 1526
     
1527
-   /**
1528
-    * Checks if the specified variable is an integer or a string containing an integer.
1529
-    * Accepts both positive and negative integers.
1530
-    * 
1531
-    * @param mixed $value
1532
-    * @return bool
1533
-    */
1527
+    /**
1528
+     * Checks if the specified variable is an integer or a string containing an integer.
1529
+     * Accepts both positive and negative integers.
1530
+     * 
1531
+     * @param mixed $value
1532
+     * @return bool
1533
+     */
1534 1534
     public static function isInteger($value) : bool
1535 1535
     {
1536 1536
         if(is_int($value)) {
@@ -1550,40 +1550,40 @@  discard block
 block discarded – undo
1550 1550
         return false;    
1551 1551
     }
1552 1552
     
1553
-   /**
1554
-    * Converts an amount of seconds to a DateInterval object.
1555
-    * 
1556
-    * @param int $seconds
1557
-    * @return \DateInterval
1558
-    * @throws ConvertHelper_Exception If the date interval cannot be created.
1559
-    * 
1560
-    * @see ConvertHelper::ERROR_CANNOT_GET_DATE_DIFF
1561
-    */
1553
+    /**
1554
+     * Converts an amount of seconds to a DateInterval object.
1555
+     * 
1556
+     * @param int $seconds
1557
+     * @return \DateInterval
1558
+     * @throws ConvertHelper_Exception If the date interval cannot be created.
1559
+     * 
1560
+     * @see ConvertHelper::ERROR_CANNOT_GET_DATE_DIFF
1561
+     */
1562 1562
     public static function seconds2interval(int $seconds) : \DateInterval
1563 1563
     {
1564 1564
         return ConvertHelper_DateInterval::fromSeconds($seconds)->getInterval();
1565 1565
     }
1566 1566
     
1567
-   /**
1568
-    * Converts a size string like "50 MB" to the corresponding byte size.
1569
-    * It is case insensitive, ignores spaces, and supports both traditional
1570
-    * "MB" and "MiB" notations.
1571
-    * 
1572
-    * @param string $size
1573
-    * @return int
1574
-    */
1567
+    /**
1568
+     * Converts a size string like "50 MB" to the corresponding byte size.
1569
+     * It is case insensitive, ignores spaces, and supports both traditional
1570
+     * "MB" and "MiB" notations.
1571
+     * 
1572
+     * @param string $size
1573
+     * @return int
1574
+     */
1575 1575
     public static function size2bytes(string $size) : int
1576 1576
     {
1577 1577
         return self::parseSize($size)->toBytes();
1578 1578
     }
1579 1579
     
1580
-   /**
1581
-    * Parses a size string like "50 MB" and returns a size notation instance
1582
-    * that has utility methods to access information on it, and convert it.
1583
-    * 
1584
-    * @param string $size
1585
-    * @return ConvertHelper_SizeNotation
1586
-    */
1580
+    /**
1581
+     * Parses a size string like "50 MB" and returns a size notation instance
1582
+     * that has utility methods to access information on it, and convert it.
1583
+     * 
1584
+     * @param string $size
1585
+     * @return ConvertHelper_SizeNotation
1586
+     */
1587 1587
     public static function parseSize(string $size) : ConvertHelper_SizeNotation
1588 1588
     {
1589 1589
         return new ConvertHelper_SizeNotation($size);
Please login to merge, or discard this patch.
src/Request/Param/Validator.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -27,14 +27,14 @@
 block discarded – undo
27 27
      */
28 28
     protected $param;
29 29
     
30
-   /**
31
-    * @var mixed
32
-    */
30
+    /**
31
+     * @var mixed
32
+     */
33 33
     protected $value;
34 34
     
35
-   /**
36
-    * @var bool
37
-    */
35
+    /**
36
+     * @var bool
37
+     */
38 38
     protected $isSubvalue = false;
39 39
     
40 40
     public function __construct(Request_Param $param, bool $subval)
Please login to merge, or discard this patch.
src/Request/Param.php 1 patch
Indentation   +154 added lines, -154 removed lines patch added patch discarded remove patch
@@ -114,18 +114,18 @@  discard block
 block discarded – undo
114 114
         }
115 115
     }
116 116
     
117
-   /**
118
-    * Adds a callback as a validation method. The callback gets the
119
-    * value to validate as first parameter, and any additional 
120
-    * parameters passed here get appended to that.
121
-    * 
122
-    * The callback must return boolean true or false depending on
123
-    * whether the value is valid.
124
-    * 
125
-    * @param callable $callback
126
-    * @param array $args
127
-    * @return Request_Param
128
-    */
117
+    /**
118
+     * Adds a callback as a validation method. The callback gets the
119
+     * value to validate as first parameter, and any additional 
120
+     * parameters passed here get appended to that.
121
+     * 
122
+     * The callback must return boolean true or false depending on
123
+     * whether the value is valid.
124
+     * 
125
+     * @param callable $callback
126
+     * @param array $args
127
+     * @return Request_Param
128
+     */
129 129
     public function setCallback($callback, array $args=array()) : Request_Param
130 130
     {
131 131
         if(!is_callable($callback)) {
@@ -189,12 +189,12 @@  discard block
 block discarded – undo
189 189
         return $value;
190 190
     }
191 191
     
192
-   /**
193
-    * Runs the value through all validations that were added.
194
-    * 
195
-    * @param mixed $value
196
-    * @return mixed
197
-    */
192
+    /**
193
+     * Runs the value through all validations that were added.
194
+     * 
195
+     * @param mixed $value
196
+     * @return mixed
197
+     */
198 198
     protected function applyValidations($value, bool $subval=false)
199 199
     {
200 200
         // go through all enqueued validations in turn, each time
@@ -207,17 +207,17 @@  discard block
 block discarded – undo
207 207
         return $value;
208 208
     }
209 209
     
210
-   /**
211
-    * Validates the specified value using the validation type. Returns
212
-    * the validated value. 
213
-    * 
214
-    * @param mixed $value
215
-    * @param string $type
216
-    * @param array $params
217
-    * @param bool $subval Whether this is a subvalue in a list
218
-    * @throws Request_Exception
219
-    * @return mixed
220
-    */
210
+    /**
211
+     * Validates the specified value using the validation type. Returns
212
+     * the validated value. 
213
+     * 
214
+     * @param mixed $value
215
+     * @param string $type
216
+     * @param array $params
217
+     * @param bool $subval Whether this is a subvalue in a list
218
+     * @throws Request_Exception
219
+     * @return mixed
220
+     */
221 221
     protected function validateType($value, string $type, array $params, bool $subval)
222 222
     {
223 223
         $class = '\AppUtils\Request_Param_Validator_'.ucfirst($type);
@@ -286,13 +286,13 @@  discard block
 block discarded – undo
286 286
     
287 287
     protected $valueType = self::VALUE_TYPE_STRING;
288 288
 
289
-   /**
290
-    * Sets the variable to contain a comma-separated list of integer IDs.
291
-    * Example: <code>145,248,4556</code>. A single ID is also allowed, e.g.
292
-    * <code>145</code>.
293
-    * 
294
-    * @return Request_Param
295
-    */
289
+    /**
290
+     * Sets the variable to contain a comma-separated list of integer IDs.
291
+     * Example: <code>145,248,4556</code>. A single ID is also allowed, e.g.
292
+     * <code>145</code>.
293
+     * 
294
+     * @return Request_Param
295
+     */
296 296
     public function setIDList()
297 297
     {
298 298
         $this->valueType = self::VALUE_TYPE_LIST;
@@ -302,13 +302,13 @@  discard block
 block discarded – undo
302 302
         return $this;
303 303
     }
304 304
     
305
-   /**
306
-    * Sets the variable to be an alias, as defined by the
307
-    * {@link RegexHelper::REGEX_ALIAS} regular expression.
308
-    * 
309
-    * @return Request_Param
310
-    * @see RegexHelper::REGEX_ALIAS
311
-    */
305
+    /**
306
+     * Sets the variable to be an alias, as defined by the
307
+     * {@link RegexHelper::REGEX_ALIAS} regular expression.
308
+     * 
309
+     * @return Request_Param
310
+     * @see RegexHelper::REGEX_ALIAS
311
+     */
312 312
     public function setAlias()
313 313
     {
314 314
         return $this->setRegex(RegexHelper::REGEX_ALIAS);
@@ -349,12 +349,12 @@  discard block
 block discarded – undo
349 349
         return $this->setValidation(self::VALIDATION_TYPE_ALPHA);
350 350
     }
351 351
     
352
-   /**
353
-    * Sets the parameter value as a string containing lowercase
354
-    * and/or uppercase letters, as well as numbers.
355
-    * 
356
-    * @return Request_Param
357
-    */
352
+    /**
353
+     * Sets the parameter value as a string containing lowercase
354
+     * and/or uppercase letters, as well as numbers.
355
+     * 
356
+     * @return Request_Param
357
+     */
358 358
     public function setAlnum()
359 359
     {
360 360
         return $this->setValidation(self::VALIDATION_TYPE_ALNUM);   
@@ -387,17 +387,17 @@  discard block
 block discarded – undo
387 387
         );
388 388
     }
389 389
     
390
-   /**
391
-    * Only available for array values: the parameter must be
392
-    * an array value, and the array may only contain values 
393
-    * specified in the values array.
394
-    * 
395
-    * Submitted values that are not in the allowed list of
396
-    * values are stripped from the value.
397
-    *  
398
-    * @param array $values List of allowed values
399
-    * @return \AppUtils\Request_Param
400
-    */
390
+    /**
391
+     * Only available for array values: the parameter must be
392
+     * an array value, and the array may only contain values 
393
+     * specified in the values array.
394
+     * 
395
+     * Submitted values that are not in the allowed list of
396
+     * values are stripped from the value.
397
+     *  
398
+     * @param array $values List of allowed values
399
+     * @return \AppUtils\Request_Param
400
+     */
401 401
     public function setValuesList(array $values)
402 402
     {
403 403
         $this->setArray();
@@ -410,11 +410,11 @@  discard block
 block discarded – undo
410 410
         );
411 411
     }
412 412
     
413
-   /**
414
-    * Whether the parameter is a list of values.
415
-    * 
416
-    * @return bool
417
-    */
413
+    /**
414
+     * Whether the parameter is a list of values.
415
+     * 
416
+     * @return bool
417
+     */
418 418
     public function isList() : bool
419 419
     {
420 420
         return $this->valueType === self::VALUE_TYPE_LIST;
@@ -425,53 +425,53 @@  discard block
 block discarded – undo
425 425
         return $this->setValidation(self::VALIDATION_TYPE_ARRAY);
426 426
     }
427 427
     
428
-   /**
429
-    * Specifies that a JSON-encoded string is expected.
430
-    * 
431
-    * NOTE: Numbers or quoted strings are technically valid
432
-    * JSON, but are not accepted, because it is assumed
433
-    * at least an array or object are expected.
434
-    * 
435
-    * @return \AppUtils\Request_Param
436
-    */
428
+    /**
429
+     * Specifies that a JSON-encoded string is expected.
430
+     * 
431
+     * NOTE: Numbers or quoted strings are technically valid
432
+     * JSON, but are not accepted, because it is assumed
433
+     * at least an array or object are expected.
434
+     * 
435
+     * @return \AppUtils\Request_Param
436
+     */
437 437
     public function setJSON() : Request_Param
438 438
     {
439 439
         return $this->setValidation(self::VALIDATION_TYPE_JSON, array('arrays' => true));
440 440
     }
441 441
     
442
-   /**
443
-    * Like {@link Request_Param::setJSON()}, but accepts
444
-    * only JSON objects. Arrays will not be accepted.
445
-    * 
446
-    * @return \AppUtils\Request_Param
447
-    */
442
+    /**
443
+     * Like {@link Request_Param::setJSON()}, but accepts
444
+     * only JSON objects. Arrays will not be accepted.
445
+     * 
446
+     * @return \AppUtils\Request_Param
447
+     */
448 448
     public function setJSONObject() : Request_Param
449 449
     {
450 450
         return $this->setValidation(self::VALIDATION_TYPE_JSON, array('arrays' => false));
451 451
     }
452 452
     
453
-   /**
454
-    * The parameter is a string boolean representation. This means
455
-    * it can be any of the following: "yes", "true", "no", "false".
456
-    * The value is automatically converted to a boolean when retrieving
457
-    * the parameter.
458
-    * 
459
-    * @return Request_Param
460
-    */
453
+    /**
454
+     * The parameter is a string boolean representation. This means
455
+     * it can be any of the following: "yes", "true", "no", "false".
456
+     * The value is automatically converted to a boolean when retrieving
457
+     * the parameter.
458
+     * 
459
+     * @return Request_Param
460
+     */
461 461
     public function setBoolean() : Request_Param
462 462
     {
463 463
         return $this->addClassFilter('Boolean');
464 464
     }
465 465
     
466
-   /**
467
-    * Validates the request parameter as an MD5 string,
468
-    * so that only values resembling md5 values are accepted.
469
-    * 
470
-    * NOTE: This can only guarantee the format, not whether
471
-    * it is an actual valid hash of something.
472
-    * 
473
-    * @return \AppUtils\Request_Param
474
-    */
466
+    /**
467
+     * Validates the request parameter as an MD5 string,
468
+     * so that only values resembling md5 values are accepted.
469
+     * 
470
+     * NOTE: This can only guarantee the format, not whether
471
+     * it is an actual valid hash of something.
472
+     * 
473
+     * @return \AppUtils\Request_Param
474
+     */
475 475
     public function setMD5() : Request_Param
476 476
     {
477 477
         return $this->setRegex(RegexHelper::REGEX_MD5);
@@ -513,14 +513,14 @@  discard block
 block discarded – undo
513 513
         return $this;
514 514
     }
515 515
     
516
-   /**
517
-    * Retrieves the value of the request parameter,
518
-    * applying all filters (if any) and validation
519
-    * (if any).
520
-    * 
521
-    * @param mixed $default
522
-    * @return mixed
523
-    */
516
+    /**
517
+     * Retrieves the value of the request parameter,
518
+     * applying all filters (if any) and validation
519
+     * (if any).
520
+     * 
521
+     * @param mixed $default
522
+     * @return mixed
523
+     */
524 524
     public function get($default=null)
525 525
     {
526 526
         $value = $this->request->getParam($this->paramName);
@@ -531,14 +531,14 @@  discard block
 block discarded – undo
531 531
         return $this->validate($default);
532 532
     }
533 533
 
534
-   /**
535
-    * Filters the specified value by going through all available
536
-    * filters, if any. If none have been set, the value is simply
537
-    * passed through.
538
-    *
539
-    * @param mixed $value
540
-    * @return mixed
541
-    */
534
+    /**
535
+     * Filters the specified value by going through all available
536
+     * filters, if any. If none have been set, the value is simply
537
+     * passed through.
538
+     *
539
+     * @param mixed $value
540
+     * @return mixed
541
+     */
542 542
     protected function filter($value)
543 543
     {
544 544
         $total = count($this->filters);
@@ -608,12 +608,12 @@  discard block
 block discarded – undo
608 608
         return $this;
609 609
     }
610 610
     
611
-   /**
612
-    * Adds a filter that trims whitespace from the request
613
-    * parameter using the PHP <code>trim</code> function.
614
-    * 
615
-    * @return \AppUtils\Request_Param
616
-    */
611
+    /**
612
+     * Adds a filter that trims whitespace from the request
613
+     * parameter using the PHP <code>trim</code> function.
614
+     * 
615
+     * @return \AppUtils\Request_Param
616
+     */
617 617
     public function addFilterTrim() : Request_Param
618 618
     {
619 619
         // to guarantee we only work with strings
@@ -622,13 +622,13 @@  discard block
 block discarded – undo
622 622
         return $this->addCallbackFilter('trim');
623 623
     }
624 624
 
625
-   /**
626
-    * Converts the value to a string, even if it is not
627
-    * a string value. Complex types like arrays and objects
628
-    * are converted to an empty string.
629
-    * 
630
-    * @return \AppUtils\Request_Param
631
-    */
625
+    /**
626
+     * Converts the value to a string, even if it is not
627
+     * a string value. Complex types like arrays and objects
628
+     * are converted to an empty string.
629
+     * 
630
+     * @return \AppUtils\Request_Param
631
+     */
632 632
     public function addStringFilter() : Request_Param
633 633
     {
634 634
         return $this->addClassFilter('String');
@@ -678,12 +678,12 @@  discard block
 block discarded – undo
678 678
         return $this->addCallbackFilter('strip_tags', array($allowedTags));
679 679
     }
680 680
     
681
-   /**
682
-    * Adds a filter that strips all whitespace from the
683
-    * request parameter, from spaces to tabs and newlines.
684
-    * 
685
-    * @return \AppUtils\Request_Param
686
-    */
681
+    /**
682
+     * Adds a filter that strips all whitespace from the
683
+     * request parameter, from spaces to tabs and newlines.
684
+     * 
685
+     * @return \AppUtils\Request_Param
686
+     */
687 687
     public function addStripWhitespaceFilter() : Request_Param
688 688
     {
689 689
         // to ensure we only work with strings.
@@ -692,14 +692,14 @@  discard block
 block discarded – undo
692 692
         return $this->addClassFilter('StripWhitespace');
693 693
     }   
694 694
     
695
-   /**
696
-    * Adds a filter that transforms comma separated values
697
-    * into an array of values.
698
-    * 
699
-    * @param bool $trimEntries Trim whitespace from each entry?
700
-    * @param bool $stripEmptyEntries Remove empty entries from the array?
701
-    * @return \AppUtils\Request_Param
702
-    */
695
+    /**
696
+     * Adds a filter that transforms comma separated values
697
+     * into an array of values.
698
+     * 
699
+     * @param bool $trimEntries Trim whitespace from each entry?
700
+     * @param bool $stripEmptyEntries Remove empty entries from the array?
701
+     * @return \AppUtils\Request_Param
702
+     */
703 703
     public function addCommaSeparatedFilter(bool $trimEntries=true, bool $stripEmptyEntries=true) : Request_Param
704 704
     {
705 705
         $this->setArray();
@@ -724,12 +724,12 @@  discard block
 block discarded – undo
724 724
         );
725 725
     }
726 726
     
727
-   /**
728
-    * Adds a filter that encodes all HTML special characters
729
-    * using the PHP <code>htmlspecialchars</code> function.
730
-    * 
731
-    * @return \AppUtils\Request_Param
732
-    */
727
+    /**
728
+     * Adds a filter that encodes all HTML special characters
729
+     * using the PHP <code>htmlspecialchars</code> function.
730
+     * 
731
+     * @return \AppUtils\Request_Param
732
+     */
733 733
     public function addHTMLSpecialcharsFilter() : Request_Param
734 734
     {
735 735
         return $this->addCallbackFilter('htmlspecialchars', array(ENT_QUOTES, 'UTF-8'));
@@ -742,14 +742,14 @@  discard block
 block discarded – undo
742 742
     
743 743
     protected $required = false;
744 744
     
745
-   /**
746
-    * Marks this request parameter as required. To use this feature,
747
-    * you have to call the request's {@link Request::validate()}
748
-    * method.
749
-    * 
750
-    * @return Request_Param
751
-    * @see Request::validate()
752
-    */
745
+    /**
746
+     * Marks this request parameter as required. To use this feature,
747
+     * you have to call the request's {@link Request::validate()}
748
+     * method.
749
+     * 
750
+     * @return Request_Param
751
+     * @see Request::validate()
752
+     */
753 753
     public function makeRequired() : Request_Param
754 754
     {
755 755
         $this->required = true;
Please login to merge, or discard this patch.
src/FileHelper.php 1 patch
Indentation   +423 added lines, -423 removed lines patch added patch discarded remove patch
@@ -78,32 +78,32 @@  discard block
 block discarded – undo
78 78
     
79 79
     const ERROR_PATH_IS_NOT_A_FOLDER = 340034;
80 80
     
81
-   /**
82
-    * Opens a serialized file and returns the unserialized data.
83
-    * 
84
-    * @param string $file
85
-    * @throws FileHelper_Exception
86
-    * @return array
87
-    * @deprecated Use parseSerializedFile() instead.
88
-    * @see FileHelper::parseSerializedFile()
89
-    */
81
+    /**
82
+     * Opens a serialized file and returns the unserialized data.
83
+     * 
84
+     * @param string $file
85
+     * @throws FileHelper_Exception
86
+     * @return array
87
+     * @deprecated Use parseSerializedFile() instead.
88
+     * @see FileHelper::parseSerializedFile()
89
+     */
90 90
     public static function openUnserialized(string $file) : array
91 91
     {
92 92
         return self::parseSerializedFile($file);
93 93
     }
94 94
 
95
-   /**
96
-    * Opens a serialized file and returns the unserialized data.
97
-    *
98
-    * @param string $file
99
-    * @throws FileHelper_Exception
100
-    * @return array
101
-    * @see FileHelper::parseSerializedFile()
102
-    * 
103
-    * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
104
-    * @see FileHelper::ERROR_SERIALIZED_FILE_CANNOT_BE_READ
105
-    * @see FileHelper::ERROR_SERIALIZED_FILE_UNSERIALZE_FAILED
106
-    */
95
+    /**
96
+     * Opens a serialized file and returns the unserialized data.
97
+     *
98
+     * @param string $file
99
+     * @throws FileHelper_Exception
100
+     * @return array
101
+     * @see FileHelper::parseSerializedFile()
102
+     * 
103
+     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
104
+     * @see FileHelper::ERROR_SERIALIZED_FILE_CANNOT_BE_READ
105
+     * @see FileHelper::ERROR_SERIALIZED_FILE_UNSERIALZE_FAILED
106
+     */
107 107
     public static function parseSerializedFile(string $file)
108 108
     {
109 109
         self::requireFileExists($file);
@@ -172,13 +172,13 @@  discard block
 block discarded – undo
172 172
         return rmdir($rootFolder);
173 173
     }
174 174
     
175
-   /**
176
-    * Create a folder, if it does not exist yet.
177
-    *  
178
-    * @param string $path
179
-    * @throws FileHelper_Exception
180
-    * @see FileHelper::ERROR_CANNOT_CREATE_FOLDER
181
-    */
175
+    /**
176
+     * Create a folder, if it does not exist yet.
177
+     *  
178
+     * @param string $path
179
+     * @throws FileHelper_Exception
180
+     * @see FileHelper::ERROR_CANNOT_CREATE_FOLDER
181
+     */
182 182
     public static function createFolder($path)
183 183
     {
184 184
         if(is_dir($path) || mkdir($path, 0777, true)) {
@@ -225,22 +225,22 @@  discard block
 block discarded – undo
225 225
         }
226 226
     }
227 227
     
228
-   /**
229
-    * Copies a file to the target location. Includes checks
230
-    * for most error sources, like the source file not being
231
-    * readable. Automatically creates the target folder if it
232
-    * does not exist yet.
233
-    * 
234
-    * @param string $sourcePath
235
-    * @param string $targetPath
236
-    * @throws FileHelper_Exception
237
-    * 
238
-    * @see FileHelper::ERROR_CANNOT_CREATE_FOLDER
239
-    * @see FileHelper::ERROR_SOURCE_FILE_NOT_FOUND
240
-    * @see FileHelper::ERROR_SOURCE_FILE_NOT_READABLE
241
-    * @see FileHelper::ERROR_TARGET_COPY_FOLDER_NOT_WRITABLE
242
-    * @see FileHelper::ERROR_CANNOT_COPY_FILE
243
-    */
228
+    /**
229
+     * Copies a file to the target location. Includes checks
230
+     * for most error sources, like the source file not being
231
+     * readable. Automatically creates the target folder if it
232
+     * does not exist yet.
233
+     * 
234
+     * @param string $sourcePath
235
+     * @param string $targetPath
236
+     * @throws FileHelper_Exception
237
+     * 
238
+     * @see FileHelper::ERROR_CANNOT_CREATE_FOLDER
239
+     * @see FileHelper::ERROR_SOURCE_FILE_NOT_FOUND
240
+     * @see FileHelper::ERROR_SOURCE_FILE_NOT_READABLE
241
+     * @see FileHelper::ERROR_TARGET_COPY_FOLDER_NOT_WRITABLE
242
+     * @see FileHelper::ERROR_CANNOT_COPY_FILE
243
+     */
244 244
     public static function copyFile($sourcePath, $targetPath)
245 245
     {
246 246
         self::requireFileExists($sourcePath, self::ERROR_SOURCE_FILE_NOT_FOUND);
@@ -291,15 +291,15 @@  discard block
 block discarded – undo
291 291
         );
292 292
     }
293 293
     
294
-   /**
295
-    * Deletes the target file. Ignored if it cannot be found,
296
-    * and throws an exception if it fails.
297
-    * 
298
-    * @param string $filePath
299
-    * @throws FileHelper_Exception
300
-    * 
301
-    * @see FileHelper::ERROR_CANNOT_DELETE_FILE
302
-    */
294
+    /**
295
+     * Deletes the target file. Ignored if it cannot be found,
296
+     * and throws an exception if it fails.
297
+     * 
298
+     * @param string $filePath
299
+     * @throws FileHelper_Exception
300
+     * 
301
+     * @see FileHelper::ERROR_CANNOT_DELETE_FILE
302
+     */
303 303
     public static function deleteFile(string $filePath) : void
304 304
     {
305 305
         if(!file_exists($filePath)) {
@@ -321,15 +321,15 @@  discard block
 block discarded – undo
321 321
     }
322 322
 
323 323
     /**
324
-    * Creates a new CSV parser instance and returns it.
325
-    * 
326
-    * @param string $delimiter
327
-    * @param string $enclosure
328
-    * @param string $escape
329
-    * @param bool $heading
330
-    * @return \parseCSV
331
-    * @todo Move this to the CSV helper.
332
-    */
324
+     * Creates a new CSV parser instance and returns it.
325
+     * 
326
+     * @param string $delimiter
327
+     * @param string $enclosure
328
+     * @param string $escape
329
+     * @param bool $heading
330
+     * @return \parseCSV
331
+     * @todo Move this to the CSV helper.
332
+     */
333 333
     public static function createCSVParser(string $delimiter = ';', string $enclosure = '"', string $escape = '\\', bool $heading=false) : \parseCSV
334 334
     {
335 335
         if($delimiter==='') { $delimiter = ';'; }
@@ -344,23 +344,23 @@  discard block
 block discarded – undo
344 344
         return $parser;
345 345
     }
346 346
 
347
-   /**
348
-    * Parses all lines in the specified string and returns an
349
-    * indexed array with all csv values in each line.
350
-    *
351
-    * @param string $csv
352
-    * @param string $delimiter
353
-    * @param string $enclosure
354
-    * @param string $escape
355
-    * @param bool $heading
356
-    * @return array
357
-    * @throws FileHelper_Exception
358
-    * 
359
-    * @todo Move this to the CSVHelper.
360
-    *
361
-    * @see parseCSVFile()
362
-    * @see FileHelper::ERROR_PARSING_CSV
363
-    */
347
+    /**
348
+     * Parses all lines in the specified string and returns an
349
+     * indexed array with all csv values in each line.
350
+     *
351
+     * @param string $csv
352
+     * @param string $delimiter
353
+     * @param string $enclosure
354
+     * @param string $escape
355
+     * @param bool $heading
356
+     * @return array
357
+     * @throws FileHelper_Exception
358
+     * 
359
+     * @todo Move this to the CSVHelper.
360
+     *
361
+     * @see parseCSVFile()
362
+     * @see FileHelper::ERROR_PARSING_CSV
363
+     */
364 364
     public static function parseCSVString(string $csv, string $delimiter = ';', string $enclosure = '"', string $escape = '\\', bool $heading=false) : array
365 365
     {
366 366
         $parser = self::createCSVParser($delimiter, $enclosure, $escape, $heading);
@@ -532,31 +532,31 @@  discard block
 block discarded – undo
532 532
         );
533 533
     }
534 534
     
535
-   /**
536
-    * Verifies whether the target file is a PHP file. The path
537
-    * to the file can be a path to a file as a string, or a 
538
-    * DirectoryIterator object instance.
539
-    * 
540
-    * @param string|\DirectoryIterator $pathOrDirIterator
541
-    * @return boolean
542
-    */
535
+    /**
536
+     * Verifies whether the target file is a PHP file. The path
537
+     * to the file can be a path to a file as a string, or a 
538
+     * DirectoryIterator object instance.
539
+     * 
540
+     * @param string|\DirectoryIterator $pathOrDirIterator
541
+     * @return boolean
542
+     */
543 543
     public static function isPHPFile($pathOrDirIterator)
544 544
     {
545
-    	if(self::getExtension($pathOrDirIterator) == 'php') {
546
-    		return true;
547
-    	}
545
+        if(self::getExtension($pathOrDirIterator) == 'php') {
546
+            return true;
547
+        }
548 548
     	
549
-    	return false;
549
+        return false;
550 550
     }
551 551
     
552
-   /**
553
-    * Retrieves the extension of the specified file. Can be a path
554
-    * to a file as a string, or a DirectoryIterator object instance.
555
-    * 
556
-    * @param string|\DirectoryIterator $pathOrDirIterator
557
-    * @param bool $lowercase
558
-    * @return string
559
-    */
552
+    /**
553
+     * Retrieves the extension of the specified file. Can be a path
554
+     * to a file as a string, or a DirectoryIterator object instance.
555
+     * 
556
+     * @param string|\DirectoryIterator $pathOrDirIterator
557
+     * @param bool $lowercase
558
+     * @return string
559
+     */
560 560
     public static function getExtension($pathOrDirIterator, bool $lowercase = true) : string
561 561
     {
562 562
         if($pathOrDirIterator instanceof \DirectoryIterator) {
@@ -567,51 +567,51 @@  discard block
 block discarded – undo
567 567
          
568 568
         $ext = pathinfo($filename, PATHINFO_EXTENSION);
569 569
         if($lowercase) {
570
-        	$ext = mb_strtolower($ext);
570
+            $ext = mb_strtolower($ext);
571 571
         }
572 572
         
573 573
         return $ext;
574 574
     }
575 575
     
576
-   /**
577
-    * Retrieves the file name from a path, with or without extension.
578
-    * The path to the file can be a string, or a DirectoryIterator object
579
-    * instance.
580
-    * 
581
-    * In case of folders, behaves like the pathinfo function: returns
582
-    * the name of the folder.
583
-    * 
584
-    * @param string|\DirectoryIterator $pathOrDirIterator
585
-    * @param bool $extension
586
-    * @return string
587
-    */
576
+    /**
577
+     * Retrieves the file name from a path, with or without extension.
578
+     * The path to the file can be a string, or a DirectoryIterator object
579
+     * instance.
580
+     * 
581
+     * In case of folders, behaves like the pathinfo function: returns
582
+     * the name of the folder.
583
+     * 
584
+     * @param string|\DirectoryIterator $pathOrDirIterator
585
+     * @param bool $extension
586
+     * @return string
587
+     */
588 588
     public static function getFilename($pathOrDirIterator, $extension = true)
589 589
     {
590 590
         $path = $pathOrDirIterator;
591
-    	if($pathOrDirIterator instanceof \DirectoryIterator) {
592
-    		$path = $pathOrDirIterator->getFilename();
593
-    	}
591
+        if($pathOrDirIterator instanceof \DirectoryIterator) {
592
+            $path = $pathOrDirIterator->getFilename();
593
+        }
594 594
     	
595
-    	$path = self::normalizePath($path);
595
+        $path = self::normalizePath($path);
596 596
     	
597
-    	if(!$extension) {
598
-    	    return pathinfo($path, PATHINFO_FILENAME);
599
-    	}
597
+        if(!$extension) {
598
+            return pathinfo($path, PATHINFO_FILENAME);
599
+        }
600 600
     	
601
-    	return pathinfo($path, PATHINFO_BASENAME); 
601
+        return pathinfo($path, PATHINFO_BASENAME); 
602 602
     }
603 603
    
604
-   /**
605
-    * Tries to read the contents of the target file and
606
-    * treat it as JSON to return the decoded JSON data.
607
-    * 
608
-    * @param string $file
609
-    * @throws FileHelper_Exception
610
-    * @return array
611
-    * 
612
-    * @see FileHelper::ERROR_CANNOT_FIND_JSON_FILE
613
-    * @see FileHelper::ERROR_CANNOT_DECODE_JSON_FILE
614
-    */ 
604
+    /**
605
+     * Tries to read the contents of the target file and
606
+     * treat it as JSON to return the decoded JSON data.
607
+     * 
608
+     * @param string $file
609
+     * @throws FileHelper_Exception
610
+     * @return array
611
+     * 
612
+     * @see FileHelper::ERROR_CANNOT_FIND_JSON_FILE
613
+     * @see FileHelper::ERROR_CANNOT_DECODE_JSON_FILE
614
+     */ 
615 615
     public static function parseJSONFile(string $file, $targetEncoding=null, $sourceEncoding=null)
616 616
     {
617 617
         self::requireFileExists($file, self::ERROR_CANNOT_FIND_JSON_FILE);
@@ -647,16 +647,16 @@  discard block
 block discarded – undo
647 647
         return $json;
648 648
     }
649 649
     
650
-   /**
651
-    * Corrects common formatting mistakes when users enter
652
-    * file names, like too many spaces, dots and the like.
653
-    * 
654
-    * NOTE: if the file name contains a path, the path is
655
-    * stripped, leaving only the file name.
656
-    * 
657
-    * @param string $name
658
-    * @return string
659
-    */
650
+    /**
651
+     * Corrects common formatting mistakes when users enter
652
+     * file names, like too many spaces, dots and the like.
653
+     * 
654
+     * NOTE: if the file name contains a path, the path is
655
+     * stripped, leaving only the file name.
656
+     * 
657
+     * @param string $name
658
+     * @return string
659
+     */
660 660
     public static function fixFileName(string $name) : string
661 661
     {
662 662
         $name = trim($name);
@@ -686,68 +686,68 @@  discard block
 block discarded – undo
686 686
         return $name;
687 687
     }
688 688
     
689
-   /**
690
-    * Creates an instance of the file finder, which is an easier
691
-    * alternative to the other manual findFile methods, since all
692
-    * options can be set by chaining.
693
-    * 
694
-    * @param string $path
695
-    * @return FileHelper_FileFinder
696
-    */
689
+    /**
690
+     * Creates an instance of the file finder, which is an easier
691
+     * alternative to the other manual findFile methods, since all
692
+     * options can be set by chaining.
693
+     * 
694
+     * @param string $path
695
+     * @return FileHelper_FileFinder
696
+     */
697 697
     public static function createFileFinder(string $path) : FileHelper_FileFinder
698 698
     {
699 699
         return new FileHelper_FileFinder($path);
700 700
     }
701 701
     
702
-   /**
703
-    * Searches for all HTML files in the target folder.
704
-    * 
705
-    * NOTE: This method only exists for backwards compatibility.
706
-    * Use the `createFileFinder()` method instead, which offers
707
-    * an object oriented interface that is much easier to use.
708
-    * 
709
-    * @param string $targetFolder
710
-    * @param array $options
711
-    * @return array An indexed array with files.
712
-    * @see FileHelper::createFileFinder()
713
-    */
702
+    /**
703
+     * Searches for all HTML files in the target folder.
704
+     * 
705
+     * NOTE: This method only exists for backwards compatibility.
706
+     * Use the `createFileFinder()` method instead, which offers
707
+     * an object oriented interface that is much easier to use.
708
+     * 
709
+     * @param string $targetFolder
710
+     * @param array $options
711
+     * @return array An indexed array with files.
712
+     * @see FileHelper::createFileFinder()
713
+     */
714 714
     public static function findHTMLFiles(string $targetFolder, array $options=array()) : array
715 715
     {
716 716
         return self::findFiles($targetFolder, array('html'), $options);
717 717
     }
718 718
 
719
-   /**
720
-    * Searches for all PHP files in the target folder.
721
-    * 
722
-    * NOTE: This method only exists for backwards compatibility.
723
-    * Use the `createFileFinder()` method instead, which offers
724
-    * an object oriented interface that is much easier to use.
725
-    * 
726
-    * @param string $targetFolder
727
-    * @param array $options
728
-    * @return array An indexed array of PHP files.
729
-    * @see FileHelper::createFileFinder()
730
-    */
719
+    /**
720
+     * Searches for all PHP files in the target folder.
721
+     * 
722
+     * NOTE: This method only exists for backwards compatibility.
723
+     * Use the `createFileFinder()` method instead, which offers
724
+     * an object oriented interface that is much easier to use.
725
+     * 
726
+     * @param string $targetFolder
727
+     * @param array $options
728
+     * @return array An indexed array of PHP files.
729
+     * @see FileHelper::createFileFinder()
730
+     */
731 731
     public static function findPHPFiles(string $targetFolder, array $options=array()) : array
732 732
     {
733 733
         return self::findFiles($targetFolder, array('php'), $options);
734 734
     }
735 735
     
736
-   /**
737
-    * Finds files according to the specified options.
738
-    * 
739
-    * NOTE: This method only exists for backwards compatibility.
740
-    * Use the `createFileFinder()` method instead, which offers
741
-    * an object oriented interface that is much easier to use.
742
-    *  
743
-    * @param string $targetFolder
744
-    * @param array $extensions
745
-    * @param array $options
746
-    * @param array $files
747
-    * @throws FileHelper_Exception
748
-    * @return array
749
-    * @see FileHelper::createFileFinder()
750
-    */
736
+    /**
737
+     * Finds files according to the specified options.
738
+     * 
739
+     * NOTE: This method only exists for backwards compatibility.
740
+     * Use the `createFileFinder()` method instead, which offers
741
+     * an object oriented interface that is much easier to use.
742
+     *  
743
+     * @param string $targetFolder
744
+     * @param array $extensions
745
+     * @param array $options
746
+     * @param array $files
747
+     * @throws FileHelper_Exception
748
+     * @return array
749
+     * @see FileHelper::createFileFinder()
750
+     */
751 751
     public static function findFiles(string $targetFolder, array $extensions=array(), array $options=array(), array $files=array()) : array
752 752
     {
753 753
         $finder = self::createFileFinder($targetFolder);
@@ -773,14 +773,14 @@  discard block
 block discarded – undo
773 773
         return $finder->getAll();
774 774
     }
775 775
 
776
-   /**
777
-    * Removes the extension from the specified path or file name,
778
-    * if any, and returns the name without the extension.
779
-    * 
780
-    * @param string $filename
781
-    * @param bool $keepPath Whether to keep the path component, if any. Default PHP pathinfo behavior is not to.
782
-    * @return string
783
-    */
776
+    /**
777
+     * Removes the extension from the specified path or file name,
778
+     * if any, and returns the name without the extension.
779
+     * 
780
+     * @param string $filename
781
+     * @param bool $keepPath Whether to keep the path component, if any. Default PHP pathinfo behavior is not to.
782
+     * @return string
783
+     */
784 784
     public static function removeExtension(string $filename, bool $keepPath=false) : string
785 785
     {
786 786
         // normalize paths to allow windows style slashes even on nix servers
@@ -800,22 +800,22 @@  discard block
 block discarded – undo
800 800
         return implode('/', $parts);
801 801
     }
802 802
     
803
-   /**
804
-    * Detects the UTF BOM in the target file, if any. Returns
805
-    * the encoding matching the BOM, which can be any of the
806
-    * following:
807
-    * 
808
-    * <ul>
809
-    * <li>UTF32-BE</li>
810
-    * <li>UTF32-LE</li>
811
-    * <li>UTF16-BE</li>
812
-    * <li>UTF16-LE</li>
813
-    * <li>UTF8</li>
814
-    * </ul>
815
-    * 
816
-    * @param string $filename
817
-    * @return string|NULL
818
-    */
803
+    /**
804
+     * Detects the UTF BOM in the target file, if any. Returns
805
+     * the encoding matching the BOM, which can be any of the
806
+     * following:
807
+     * 
808
+     * <ul>
809
+     * <li>UTF32-BE</li>
810
+     * <li>UTF32-LE</li>
811
+     * <li>UTF16-BE</li>
812
+     * <li>UTF16-LE</li>
813
+     * <li>UTF8</li>
814
+     * </ul>
815
+     * 
816
+     * @param string $filename
817
+     * @return string|NULL
818
+     */
819 819
     public static function detectUTFBom(string $filename) : ?string
820 820
     {
821 821
         $fp = fopen($filename, 'r');
@@ -847,13 +847,13 @@  discard block
 block discarded – undo
847 847
     
848 848
     protected static $utfBoms;
849 849
     
850
-   /**
851
-    * Retrieves a list of all UTF byte order mark character
852
-    * sequences, as an assocative array with UTF encoding => bom sequence
853
-    * pairs.
854
-    * 
855
-    * @return array
856
-    */
850
+    /**
851
+     * Retrieves a list of all UTF byte order mark character
852
+     * sequences, as an assocative array with UTF encoding => bom sequence
853
+     * pairs.
854
+     * 
855
+     * @return array
856
+     */
857 857
     public static function getUTFBOMs()
858 858
     {
859 859
         if(!isset(self::$utfBoms)) {
@@ -869,15 +869,15 @@  discard block
 block discarded – undo
869 869
         return self::$utfBoms;
870 870
     }
871 871
     
872
-   /**
873
-    * Checks whether the specified encoding is a valid
874
-    * unicode encoding, for example "UTF16-LE" or "UTF8".
875
-    * Also accounts for alternate way to write the, like
876
-    * "UTF-8", and omitting little/big endian suffixes.
877
-    * 
878
-    * @param string $encoding
879
-    * @return boolean
880
-    */
872
+    /**
873
+     * Checks whether the specified encoding is a valid
874
+     * unicode encoding, for example "UTF16-LE" or "UTF8".
875
+     * Also accounts for alternate way to write the, like
876
+     * "UTF-8", and omitting little/big endian suffixes.
877
+     * 
878
+     * @param string $encoding
879
+     * @return boolean
880
+     */
881 881
     public static function isValidUnicodeEncoding(string $encoding) : bool
882 882
     {
883 883
         $encodings = self::getKnownUnicodeEncodings();
@@ -896,40 +896,40 @@  discard block
 block discarded – undo
896 896
         return in_array($encoding, $keep);
897 897
     }
898 898
     
899
-   /**
900
-    * Retrieves a list of all known unicode file encodings.
901
-    * @return array
902
-    */
899
+    /**
900
+     * Retrieves a list of all known unicode file encodings.
901
+     * @return array
902
+     */
903 903
     public static function getKnownUnicodeEncodings()
904 904
     {
905 905
         return array_keys(self::getUTFBOMs());
906 906
     }
907 907
     
908
-   /**
909
-    * Normalizes the slash style in a file or folder path,
910
-    * by replacing any antislashes with forward slashes.
911
-    * 
912
-    * @param string $path
913
-    * @return string
914
-    */
908
+    /**
909
+     * Normalizes the slash style in a file or folder path,
910
+     * by replacing any antislashes with forward slashes.
911
+     * 
912
+     * @param string $path
913
+     * @return string
914
+     */
915 915
     public static function normalizePath(string $path) : string
916 916
     {
917 917
         return str_replace(array('\\', '//'), array('/', '/'), $path);
918 918
     }
919 919
     
920
-   /**
921
-    * Saves the specified data to a file, JSON encoded.
922
-    * 
923
-    * @param mixed $data
924
-    * @param string $file
925
-    * @param bool $pretty
926
-    * @throws FileHelper_Exception
927
-    * 
928
-    * @see FileHelper::ERROR_JSON_ENCODE_ERROR
929
-    * @see FileHelper::ERROR_SAVE_FOLDER_NOT_WRITABLE
930
-    * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
931
-    * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
932
-    */
920
+    /**
921
+     * Saves the specified data to a file, JSON encoded.
922
+     * 
923
+     * @param mixed $data
924
+     * @param string $file
925
+     * @param bool $pretty
926
+     * @throws FileHelper_Exception
927
+     * 
928
+     * @see FileHelper::ERROR_JSON_ENCODE_ERROR
929
+     * @see FileHelper::ERROR_SAVE_FOLDER_NOT_WRITABLE
930
+     * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
931
+     * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
932
+     */
933 933
     public static function saveAsJSON($data, string $file, bool $pretty=false)
934 934
     {
935 935
         $options = null;
@@ -953,18 +953,18 @@  discard block
 block discarded – undo
953 953
         self::saveFile($file, $json);
954 954
     }
955 955
    
956
-   /**
957
-    * Saves the specified content to the target file, creating
958
-    * the file and the folder as necessary.
959
-    * 
960
-    * @param string $filePath
961
-    * @param string $content
962
-    * @throws FileHelper_Exception
963
-    * 
964
-    * @see FileHelper::ERROR_SAVE_FOLDER_NOT_WRITABLE
965
-    * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
966
-    * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
967
-    */
956
+    /**
957
+     * Saves the specified content to the target file, creating
958
+     * the file and the folder as necessary.
959
+     * 
960
+     * @param string $filePath
961
+     * @param string $content
962
+     * @throws FileHelper_Exception
963
+     * 
964
+     * @see FileHelper::ERROR_SAVE_FOLDER_NOT_WRITABLE
965
+     * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
966
+     * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
967
+     */
968 968
     public static function saveFile(string $filePath, string $content='') : void
969 969
     {
970 970
         // target file already exists
@@ -1017,12 +1017,12 @@  discard block
 block discarded – undo
1017 1017
         );
1018 1018
     }
1019 1019
     
1020
-   /**
1021
-    * Checks whether it is possible to run PHP command 
1022
-    * line commands.
1023
-    * 
1024
-    * @return boolean
1025
-    */
1020
+    /**
1021
+     * Checks whether it is possible to run PHP command 
1022
+     * line commands.
1023
+     * 
1024
+     * @return boolean
1025
+     */
1026 1026
     public static function canMakePHPCalls() : bool
1027 1027
     {
1028 1028
         return self::cliCommandExists('php');
@@ -1099,16 +1099,16 @@  discard block
 block discarded – undo
1099 1099
         return $result;
1100 1100
     }
1101 1101
     
1102
-   /**
1103
-    * Validates a PHP file's syntax.
1104
-    * 
1105
-    * NOTE: This will fail silently if the PHP command line
1106
-    * is not available. Use {@link FileHelper::canMakePHPCalls()}
1107
-    * to check this beforehand as needed.
1108
-    * 
1109
-    * @param string $path
1110
-    * @return boolean|array A boolean true if the file is valid, an array with validation messages otherwise.
1111
-    */
1102
+    /**
1103
+     * Validates a PHP file's syntax.
1104
+     * 
1105
+     * NOTE: This will fail silently if the PHP command line
1106
+     * is not available. Use {@link FileHelper::canMakePHPCalls()}
1107
+     * to check this beforehand as needed.
1108
+     * 
1109
+     * @param string $path
1110
+     * @return boolean|array A boolean true if the file is valid, an array with validation messages otherwise.
1111
+     */
1112 1112
     public static function checkPHPFileSyntax($path)
1113 1113
     {
1114 1114
         if(!self::canMakePHPCalls()) {
@@ -1132,14 +1132,14 @@  discard block
 block discarded – undo
1132 1132
         return $output;
1133 1133
     }
1134 1134
     
1135
-   /**
1136
-    * Retrieves the last modified date for the specified file or folder.
1137
-    * 
1138
-    * Note: If the target does not exist, returns null. 
1139
-    * 
1140
-    * @param string $path
1141
-    * @return \DateTime|NULL
1142
-    */
1135
+    /**
1136
+     * Retrieves the last modified date for the specified file or folder.
1137
+     * 
1138
+     * Note: If the target does not exist, returns null. 
1139
+     * 
1140
+     * @param string $path
1141
+     * @return \DateTime|NULL
1142
+     */
1143 1143
     public static function getModifiedDate($path)
1144 1144
     {
1145 1145
         $time = filemtime($path);
@@ -1152,24 +1152,24 @@  discard block
 block discarded – undo
1152 1152
         return null; 
1153 1153
     }
1154 1154
     
1155
-   /**
1156
-    * Retrieves the names of all subfolders in the specified path.
1157
-    * 
1158
-    * Available options:
1159
-    * 
1160
-    * - recursive: true/false
1161
-    *   Whether to search for subfolders recursively. 
1162
-    *   
1163
-    * - absolute-paths: true/false
1164
-    *   Whether to return a list of absolute paths.
1165
-    * 
1166
-    * @param string $targetFolder
1167
-    * @param array $options
1168
-    * @throws FileHelper_Exception
1169
-    * @return string[]
1170
-    * 
1171
-    * @todo Move this to a separate class.
1172
-    */
1155
+    /**
1156
+     * Retrieves the names of all subfolders in the specified path.
1157
+     * 
1158
+     * Available options:
1159
+     * 
1160
+     * - recursive: true/false
1161
+     *   Whether to search for subfolders recursively. 
1162
+     *   
1163
+     * - absolute-paths: true/false
1164
+     *   Whether to return a list of absolute paths.
1165
+     * 
1166
+     * @param string $targetFolder
1167
+     * @param array $options
1168
+     * @throws FileHelper_Exception
1169
+     * @return string[]
1170
+     * 
1171
+     * @todo Move this to a separate class.
1172
+     */
1173 1173
     public static function getSubfolders($targetFolder, $options = array())
1174 1174
     {
1175 1175
         if(!is_dir($targetFolder)) 
@@ -1230,16 +1230,16 @@  discard block
 block discarded – undo
1230 1230
         return $result;
1231 1231
     }
1232 1232
 
1233
-   /**
1234
-    * Retrieves the maximum allowed upload file size, in bytes.
1235
-    * Takes into account the PHP ini settings <code>post_max_size</code>
1236
-    * and <code>upload_max_filesize</code>. Since these cannot
1237
-    * be modified at runtime, they are the hard limits for uploads.
1238
-    * 
1239
-    * NOTE: Based on binary values, where 1KB = 1024 Bytes.
1240
-    * 
1241
-    * @return int Will return <code>-1</code> if no limit.
1242
-    */
1233
+    /**
1234
+     * Retrieves the maximum allowed upload file size, in bytes.
1235
+     * Takes into account the PHP ini settings <code>post_max_size</code>
1236
+     * and <code>upload_max_filesize</code>. Since these cannot
1237
+     * be modified at runtime, they are the hard limits for uploads.
1238
+     * 
1239
+     * NOTE: Based on binary values, where 1KB = 1024 Bytes.
1240
+     * 
1241
+     * @return int Will return <code>-1</code> if no limit.
1242
+     */
1243 1243
     public static function getMaxUploadFilesize() : int
1244 1244
     {
1245 1245
         static $max_size = -1;
@@ -1277,16 +1277,16 @@  discard block
 block discarded – undo
1277 1277
         return round($size);
1278 1278
     }
1279 1279
    
1280
-   /**
1281
-    * Makes a path relative using a folder depth: will reduce the
1282
-    * length of the path so that only the amount of folders defined
1283
-    * in the <code>$depth</code> attribute are shown below the actual
1284
-    * folder or file in the path.
1285
-    *  
1286
-    * @param string  $path The absolute or relative path
1287
-    * @param int $depth The folder depth to reduce the path to
1288
-    * @return string
1289
-    */
1280
+    /**
1281
+     * Makes a path relative using a folder depth: will reduce the
1282
+     * length of the path so that only the amount of folders defined
1283
+     * in the <code>$depth</code> attribute are shown below the actual
1284
+     * folder or file in the path.
1285
+     *  
1286
+     * @param string  $path The absolute or relative path
1287
+     * @param int $depth The folder depth to reduce the path to
1288
+     * @return string
1289
+     */
1290 1290
     public static function relativizePathByDepth(string $path, int $depth=2) : string
1291 1291
     {
1292 1292
         $path = self::normalizePath($path);
@@ -1324,23 +1324,23 @@  discard block
 block discarded – undo
1324 1324
         return trim(implode('/', $tokens), '/');
1325 1325
     }
1326 1326
     
1327
-   /**
1328
-    * Makes the specified path relative to another path,
1329
-    * by removing one from the other if found. Also 
1330
-    * normalizes the path to use forward slashes. 
1331
-    * 
1332
-    * Example:
1333
-    * 
1334
-    * <pre>
1335
-    * relativizePath('c:\some\folder\to\file.txt', 'c:\some\folder');
1336
-    * </pre>
1337
-    * 
1338
-    * Result: <code>to/file.txt</code>
1339
-    * 
1340
-    * @param string $path
1341
-    * @param string $relativeTo
1342
-    * @return string
1343
-    */
1327
+    /**
1328
+     * Makes the specified path relative to another path,
1329
+     * by removing one from the other if found. Also 
1330
+     * normalizes the path to use forward slashes. 
1331
+     * 
1332
+     * Example:
1333
+     * 
1334
+     * <pre>
1335
+     * relativizePath('c:\some\folder\to\file.txt', 'c:\some\folder');
1336
+     * </pre>
1337
+     * 
1338
+     * Result: <code>to/file.txt</code>
1339
+     * 
1340
+     * @param string $path
1341
+     * @param string $relativeTo
1342
+     * @return string
1343
+     */
1344 1344
     public static function relativizePath(string $path, string $relativeTo) : string
1345 1345
     {
1346 1346
         $path = self::normalizePath($path);
@@ -1352,17 +1352,17 @@  discard block
 block discarded – undo
1352 1352
         return $relative;
1353 1353
     }
1354 1354
     
1355
-   /**
1356
-    * Checks that the target file exists, and throws an exception
1357
-    * if it does not. 
1358
-    * 
1359
-    * @param string $path
1360
-    * @param int|NULL $errorCode Optional custom error code
1361
-    * @throws FileHelper_Exception
1362
-    * @return string The real path to the file
1363
-    * 
1364
-    * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
1365
-    */
1355
+    /**
1356
+     * Checks that the target file exists, and throws an exception
1357
+     * if it does not. 
1358
+     * 
1359
+     * @param string $path
1360
+     * @param int|NULL $errorCode Optional custom error code
1361
+     * @throws FileHelper_Exception
1362
+     * @return string The real path to the file
1363
+     * 
1364
+     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
1365
+     */
1366 1366
     public static function requireFileExists(string $path, $errorCode=null) : string
1367 1367
     {
1368 1368
         $result = realpath($path);
@@ -1381,18 +1381,18 @@  discard block
 block discarded – undo
1381 1381
         );
1382 1382
     }
1383 1383
     
1384
-   /**
1385
-    * Reads a specific line number from the target file and returns its
1386
-    * contents, if the file has such a line. Does so with little memory
1387
-    * usage, as the file is not read entirely into memory.
1388
-    * 
1389
-    * @param string $path
1390
-    * @param int $lineNumber Note: 1-based; the first line is number 1.
1391
-    * @return string|NULL Will return null if the requested line does not exist.
1392
-    * @throws FileHelper_Exception
1393
-    * 
1394
-    * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
1395
-    */
1384
+    /**
1385
+     * Reads a specific line number from the target file and returns its
1386
+     * contents, if the file has such a line. Does so with little memory
1387
+     * usage, as the file is not read entirely into memory.
1388
+     * 
1389
+     * @param string $path
1390
+     * @param int $lineNumber Note: 1-based; the first line is number 1.
1391
+     * @return string|NULL Will return null if the requested line does not exist.
1392
+     * @throws FileHelper_Exception
1393
+     * 
1394
+     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
1395
+     */
1396 1396
     public static function getLineFromFile(string $path, int $lineNumber) : ?string
1397 1397
     {
1398 1398
         self::requireFileExists($path);
@@ -1408,19 +1408,19 @@  discard block
 block discarded – undo
1408 1408
         $file->seek($targetLine);
1409 1409
         
1410 1410
         if($file->key() !== $targetLine) {
1411
-             return null;
1411
+                return null;
1412 1412
         }
1413 1413
         
1414 1414
         return $file->current(); 
1415 1415
     }
1416 1416
     
1417
-   /**
1418
-    * Retrieves the total amount of lines in the file, without 
1419
-    * reading the whole file into memory.
1420
-    * 
1421
-    * @param string $path
1422
-    * @return int
1423
-    */
1417
+    /**
1418
+     * Retrieves the total amount of lines in the file, without 
1419
+     * reading the whole file into memory.
1420
+     * 
1421
+     * @param string $path
1422
+     * @return int
1423
+     */
1424 1424
     public static function countFileLines(string $path) : int
1425 1425
     {
1426 1426
         self::requireFileExists($path);
@@ -1450,26 +1450,26 @@  discard block
 block discarded – undo
1450 1450
         return $number+1;
1451 1451
     }
1452 1452
     
1453
-   /**
1454
-    * Parses the target file to detect any PHP classes contained
1455
-    * within, and retrieve information on them. Does not use the 
1456
-    * PHP reflection API.
1457
-    * 
1458
-    * @param string $filePath
1459
-    * @return FileHelper_PHPClassInfo
1460
-    */
1453
+    /**
1454
+     * Parses the target file to detect any PHP classes contained
1455
+     * within, and retrieve information on them. Does not use the 
1456
+     * PHP reflection API.
1457
+     * 
1458
+     * @param string $filePath
1459
+     * @return FileHelper_PHPClassInfo
1460
+     */
1461 1461
     public static function findPHPClasses(string $filePath) : FileHelper_PHPClassInfo
1462 1462
     {
1463 1463
         return new FileHelper_PHPClassInfo($filePath);
1464 1464
     }
1465 1465
     
1466
-   /**
1467
-    * Detects the end of line style used in the target file, if any.
1468
-    * Can be used with large files, because it only reads part of it.
1469
-    * 
1470
-    * @param string $filePath The path to the file.
1471
-    * @return NULL|ConvertHelper_EOL The end of line character information, or NULL if none is found.
1472
-    */
1466
+    /**
1467
+     * Detects the end of line style used in the target file, if any.
1468
+     * Can be used with large files, because it only reads part of it.
1469
+     * 
1470
+     * @param string $filePath The path to the file.
1471
+     * @return NULL|ConvertHelper_EOL The end of line character information, or NULL if none is found.
1472
+     */
1473 1473
     public static function detectEOLCharacter(string $filePath) : ?ConvertHelper_EOL
1474 1474
     {
1475 1475
         // 20 lines is enough to get a good picture of the newline style in the file.
@@ -1482,18 +1482,18 @@  discard block
 block discarded – undo
1482 1482
         return ConvertHelper::detectEOLCharacter($string);
1483 1483
     }
1484 1484
     
1485
-   /**
1486
-    * Reads the specified amount of lines from the target file.
1487
-    * Unicode BOM compatible: any byte order marker is stripped
1488
-    * from the resulting lines.
1489
-    * 
1490
-    * @param string $filePath
1491
-    * @param int $amount Set to 0 to read all lines.
1492
-    * @return array
1493
-    * 
1494
-    * @see FileHelper::ERROR_CANNOT_OPEN_FILE_TO_READ_LINES
1495
-    * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
1496
-    */
1485
+    /**
1486
+     * Reads the specified amount of lines from the target file.
1487
+     * Unicode BOM compatible: any byte order marker is stripped
1488
+     * from the resulting lines.
1489
+     * 
1490
+     * @param string $filePath
1491
+     * @param int $amount Set to 0 to read all lines.
1492
+     * @return array
1493
+     * 
1494
+     * @see FileHelper::ERROR_CANNOT_OPEN_FILE_TO_READ_LINES
1495
+     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
1496
+     */
1497 1497
     public static function readLines(string $filePath, int $amount=0) : array
1498 1498
     {
1499 1499
         self::requireFileExists($filePath);
@@ -1546,16 +1546,16 @@  discard block
 block discarded – undo
1546 1546
         return $result;
1547 1547
     }
1548 1548
     
1549
-   /**
1550
-    * Reads all content from a file.
1551
-    * 
1552
-    * @param string $filePath
1553
-    * @throws FileHelper_Exception
1554
-    * @return string
1555
-    * 
1556
-    * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
1557
-    * @see FileHelper::ERROR_CANNOT_READ_FILE_CONTENTS
1558
-    */
1549
+    /**
1550
+     * Reads all content from a file.
1551
+     * 
1552
+     * @param string $filePath
1553
+     * @throws FileHelper_Exception
1554
+     * @return string
1555
+     * 
1556
+     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
1557
+     * @see FileHelper::ERROR_CANNOT_READ_FILE_CONTENTS
1558
+     */
1559 1559
     public static function readContents(string $filePath) : string
1560 1560
     {
1561 1561
         self::requireFileExists($filePath);
@@ -1576,18 +1576,18 @@  discard block
 block discarded – undo
1576 1576
         );
1577 1577
     }
1578 1578
 
1579
-   /**
1580
-    * Ensures that the target path exists on disk, and is a folder.
1581
-    * 
1582
-    * @param string $path
1583
-    * @return string The real path, with normalized slashes.
1584
-    * @throws FileHelper_Exception
1585
-    * 
1586
-    * @see FileHelper::normalizePath()
1587
-    * 
1588
-    * @see FileHelper::ERROR_FOLDER_DOES_NOT_EXIST
1589
-    * @see FileHelper::ERROR_PATH_IS_NOT_A_FOLDER
1590
-    */
1579
+    /**
1580
+     * Ensures that the target path exists on disk, and is a folder.
1581
+     * 
1582
+     * @param string $path
1583
+     * @return string The real path, with normalized slashes.
1584
+     * @throws FileHelper_Exception
1585
+     * 
1586
+     * @see FileHelper::normalizePath()
1587
+     * 
1588
+     * @see FileHelper::ERROR_FOLDER_DOES_NOT_EXIST
1589
+     * @see FileHelper::ERROR_PATH_IS_NOT_A_FOLDER
1590
+     */
1591 1591
     public static function requireFolderExists(string $path) : string
1592 1592
     {
1593 1593
         $actual = realpath($path);
Please login to merge, or discard this patch.
src/RequestHelper/Boundaries.php 1 patch
Indentation   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -22,19 +22,19 @@  discard block
 block discarded – undo
22 22
 {
23 23
     const ERROR_NO_BOUNDARIES_SPECIFIED = 44401;
24 24
     
25
-   /**
26
-    * @var RequestHelper
27
-    */
25
+    /**
26
+     * @var RequestHelper
27
+     */
28 28
     protected $helper;
29 29
 
30
-   /**
31
-    * @var RequestHelper_Boundaries_Boundary[]
32
-    */
30
+    /**
31
+     * @var RequestHelper_Boundaries_Boundary[]
32
+     */
33 33
     protected $boundaries = array();
34 34
     
35
-   /**
36
-    * @var integer
37
-    */
35
+    /**
36
+     * @var integer
37
+     */
38 38
     protected $contentLength = 0;
39 39
     
40 40
     public function __construct(RequestHelper $helper)
@@ -42,45 +42,45 @@  discard block
 block discarded – undo
42 42
         $this->helper = $helper;
43 43
     }
44 44
     
45
-   /**
46
-    * Retrieves the string that is used to separate mime boundaries in the body.
47
-    * 
48
-    * @return string
49
-    */
45
+    /**
46
+     * Retrieves the string that is used to separate mime boundaries in the body.
47
+     * 
48
+     * @return string
49
+     */
50 50
     public function getMimeBoundary() : string
51 51
     {
52 52
         return $this->helper->getMimeBoundary();
53 53
     }
54 54
     
55
-   /**
56
-    * Retrieves the end of line character(s) used in the body.
57
-    * 
58
-    * @return string
59
-    */
55
+    /**
56
+     * Retrieves the end of line character(s) used in the body.
57
+     * 
58
+     * @return string
59
+     */
60 60
     public function getEOL() : string
61 61
     {
62 62
         return $this->helper->getEOL();
63 63
     }
64 64
     
65
-   /**
66
-    * Retrieves the total content length of all boundary contents.
67
-    * 
68
-    * @return int
69
-    */
65
+    /**
66
+     * Retrieves the total content length of all boundary contents.
67
+     * 
68
+     * @return int
69
+     */
70 70
     public function getContentLength() : int
71 71
     {
72 72
         return mb_strlen($this->render());
73 73
     }
74 74
     
75
-   /**
76
-    * Adds a file to be sent with the request.
77
-    *
78
-    * @param string $varName The variable name to send the file in
79
-    * @param string $fileName The name of the file as it should be received at the destination
80
-    * @param string $content The raw content of the file
81
-    * @param string $contentType The content type, use the constants to specify this
82
-    * @param string $encoding The encoding of the file, use the constants to specify this
83
-    */
75
+    /**
76
+     * Adds a file to be sent with the request.
77
+     *
78
+     * @param string $varName The variable name to send the file in
79
+     * @param string $fileName The name of the file as it should be received at the destination
80
+     * @param string $content The raw content of the file
81
+     * @param string $contentType The content type, use the constants to specify this
82
+     * @param string $encoding The encoding of the file, use the constants to specify this
83
+     */
84 84
     public function addFile(string $varName, string $fileName, string $content, string $contentType = '', string $encoding = '') : RequestHelper_Boundaries
85 85
     {
86 86
         if(empty($contentType))
@@ -104,13 +104,13 @@  discard block
 block discarded – undo
104 104
         return $this->addBoundary($boundary);
105 105
     }
106 106
     
107
-   /**
108
-    * Adds arbitrary content.
109
-    *
110
-    * @param string $varName
111
-    * @param string $content
112
-    * @param string $contentType
113
-    */
107
+    /**
108
+     * Adds arbitrary content.
109
+     *
110
+     * @param string $varName
111
+     * @param string $content
112
+     * @param string $contentType
113
+     */
114 114
     public function addContent(string $varName, string $content, string $contentType) : RequestHelper_Boundaries
115 115
     {
116 116
         $content = ConvertHelper::string2utf8($content);
@@ -124,13 +124,13 @@  discard block
 block discarded – undo
124 124
         return $this->addBoundary($boundary);
125 125
     }
126 126
     
127
-   /**
128
-    * Adds a variable to be sent with the request. If it
129
-    * already exists, its value is overwritten.
130
-    *
131
-    * @param string $name
132
-    * @param string $value
133
-    */
127
+    /**
128
+     * Adds a variable to be sent with the request. If it
129
+     * already exists, its value is overwritten.
130
+     *
131
+     * @param string $name
132
+     * @param string $value
133
+     */
134 134
     public function addVariable(string $name, string $value) : RequestHelper_Boundaries
135 135
     {
136 136
         $boundary = $this->createBoundary($value)
@@ -146,11 +146,11 @@  discard block
 block discarded – undo
146 146
         return $this;
147 147
     }
148 148
     
149
-   /**
150
-    * Renders the response body with all mime boundaries.
151
-    * 
152
-    * @return string
153
-    */
149
+    /**
150
+     * Renders the response body with all mime boundaries.
151
+     * 
152
+     * @return string
153
+     */
154 154
     public function render() : string
155 155
     {
156 156
         if(empty($this->boundaries)) 
Please login to merge, or discard this patch.
src/RequestHelper/Boundaries/Boundary.php 1 patch
Indentation   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -19,34 +19,34 @@  discard block
 block discarded – undo
19 19
  */
20 20
 class RequestHelper_Boundaries_Boundary
21 21
 {
22
-   /**
23
-    * @var string
24
-    */
22
+    /**
23
+     * @var string
24
+     */
25 25
     protected $content;
26 26
     
27
-   /**
28
-    * @var array
29
-    */
27
+    /**
28
+     * @var array
29
+     */
30 30
     protected $dispositionParams = array();
31 31
 
32
-   /**
33
-    * @var string
34
-    */
32
+    /**
33
+     * @var string
34
+     */
35 35
     protected $contentType = '';
36 36
 
37
-   /**
38
-    * @var string
39
-    */
37
+    /**
38
+     * @var string
39
+     */
40 40
     protected $contentEncoding = '';
41 41
     
42
-   /**
43
-    * @var RequestHelper_Boundaries
44
-    */
42
+    /**
43
+     * @var RequestHelper_Boundaries
44
+     */
45 45
     protected $boundaries;
46 46
     
47
-   /**
48
-    * @var string
49
-    */
47
+    /**
48
+     * @var string
49
+     */
50 50
     protected $transferEncoding = '';
51 51
     
52 52
     public function __construct(RequestHelper_Boundaries $boundaries, string $content)
@@ -60,46 +60,46 @@  discard block
 block discarded – undo
60 60
         return strlen($this->content);
61 61
     }
62 62
     
63
-   /**
64
-    * Sets the name of the request parameter.
65
-    * 
66
-    * @param string $name
67
-    * @return RequestHelper_Boundaries_Boundary
68
-    */
63
+    /**
64
+     * Sets the name of the request parameter.
65
+     * 
66
+     * @param string $name
67
+     * @return RequestHelper_Boundaries_Boundary
68
+     */
69 69
     public function setName(string $name) : RequestHelper_Boundaries_Boundary
70 70
     {
71 71
         return $this->setDispositionParam('name', $name);
72 72
     }
73 73
     
74
-   /**
75
-    * Sets the filename to use for the content, if applicable.
76
-    *  
77
-    * @param string $fileName
78
-    * @return RequestHelper_Boundaries_Boundary
79
-    */
74
+    /**
75
+     * Sets the filename to use for the content, if applicable.
76
+     *  
77
+     * @param string $fileName
78
+     * @return RequestHelper_Boundaries_Boundary
79
+     */
80 80
     public function setFileName(string $fileName) : RequestHelper_Boundaries_Boundary
81 81
     {
82 82
         return $this->setDispositionParam('filename', $fileName);
83 83
     }
84 84
     
85
-   /**
86
-    * Sets the content type to use for the content.
87
-    * 
88
-    * @param string $contentType
89
-    * @return RequestHelper_Boundaries_Boundary
90
-    */
85
+    /**
86
+     * Sets the content type to use for the content.
87
+     * 
88
+     * @param string $contentType
89
+     * @return RequestHelper_Boundaries_Boundary
90
+     */
91 91
     public function setContentType(string $contentType) : RequestHelper_Boundaries_Boundary
92 92
     {
93 93
         $this->contentType = $contentType;
94 94
         return $this;
95 95
     }
96 96
     
97
-   /**
98
-    * Sets the encoding to specify for the content.
99
-    * 
100
-    * @param string $encoding An encoding string, e.g. "UTF-8", "ASCII"
101
-    * @return RequestHelper_Boundaries_Boundary
102
-    */
97
+    /**
98
+     * Sets the encoding to specify for the content.
99
+     * 
100
+     * @param string $encoding An encoding string, e.g. "UTF-8", "ASCII"
101
+     * @return RequestHelper_Boundaries_Boundary
102
+     */
103 103
     public function setContentEncoding(string $encoding) : RequestHelper_Boundaries_Boundary
104 104
     {
105 105
         $this->contentEncoding = $encoding;
@@ -119,11 +119,11 @@  discard block
 block discarded – undo
119 119
         return $this;
120 120
     }
121 121
     
122
-   /**
123
-    * Renders the mime boundary text.
124
-    * 
125
-    * @return string
126
-    */
122
+    /**
123
+     * Renders the mime boundary text.
124
+     * 
125
+     * @return string
126
+     */
127 127
     public function render()
128 128
     {
129 129
         $eol = $this->boundaries->getEOL();
Please login to merge, or discard this patch.
src/RequestHelper.php 1 patch
Indentation   +115 added lines, -115 removed lines patch added patch discarded remove patch
@@ -39,66 +39,66 @@  discard block
 block discarded – undo
39 39
     
40 40
     const ERROR_CANNOT_OPEN_LOGFILE = 17904;
41 41
 
42
-   /**
43
-    * @var string
44
-    */
42
+    /**
43
+     * @var string
44
+     */
45 45
     protected $eol = "\r\n";
46 46
 
47
-   /**
48
-    * @var string
49
-    */
47
+    /**
48
+     * @var string
49
+     */
50 50
     protected $mimeBoundary;
51 51
 
52
-   /**
53
-    * @var string
54
-    */
52
+    /**
53
+     * @var string
54
+     */
55 55
     protected $data = '';
56 56
 
57
-   /**
58
-    * @var string
59
-    */
57
+    /**
58
+     * @var string
59
+     */
60 60
     protected $destination;
61 61
 
62
-   /**
63
-    * @var array
64
-    */
62
+    /**
63
+     * @var array
64
+     */
65 65
     protected $headers = array();
66 66
     
67
-   /**
68
-    * Whether to verify SSL certificates.
69
-    * @var bool
70
-    */
67
+    /**
68
+     * Whether to verify SSL certificates.
69
+     * @var bool
70
+     */
71 71
     protected $verifySSL = true;
72 72
     
73
-   /**
74
-    * @var RequestHelper_Boundaries
75
-    */
73
+    /**
74
+     * @var RequestHelper_Boundaries
75
+     */
76 76
     protected $boundaries;
77 77
     
78
-   /**
79
-    * @var RequestHelper_Response|NULL
80
-    */
78
+    /**
79
+     * @var RequestHelper_Response|NULL
80
+     */
81 81
     protected $response;
82 82
 
83
-   /**
84
-    * @var integer
85
-    */
83
+    /**
84
+     * @var integer
85
+     */
86 86
     protected $timeout = 30;
87 87
     
88
-   /**
89
-    * @var string
90
-    */
88
+    /**
89
+     * @var string
90
+     */
91 91
     protected $logfile = '';
92 92
 
93
-   /**
94
-    * @var resource|NULL
95
-    */
93
+    /**
94
+     * @var resource|NULL
95
+     */
96 96
     protected $logfilePointer = null;
97 97
     
98
-   /**
99
-    * Creates a new request helper to send POST data to the specified destination URL.
100
-    * @param string $destinationURL
101
-    */
98
+    /**
99
+     * Creates a new request helper to send POST data to the specified destination URL.
100
+     * @param string $destinationURL
101
+     */
102 102
     public function __construct(string $destinationURL)
103 103
     {
104 104
         $this->destination = $destinationURL;
@@ -130,13 +130,13 @@  discard block
 block discarded – undo
130 130
         return $this;
131 131
     }
132 132
     
133
-   /**
134
-    * Enables verbose logging of the CURL request, which
135
-    * is then redirected to the target file.
136
-    * 
137
-    * @param string $targetFile
138
-    * @return RequestHelper
139
-    */
133
+    /**
134
+     * Enables verbose logging of the CURL request, which
135
+     * is then redirected to the target file.
136
+     * 
137
+     * @param string $targetFile
138
+     * @return RequestHelper
139
+     */
140 140
     public function enableLogging(string $targetFile) : RequestHelper
141 141
     {
142 142
         $this->logfile = $targetFile;
@@ -144,15 +144,15 @@  discard block
 block discarded – undo
144 144
         return $this;
145 145
     }
146 146
 
147
-   /**
148
-    * Adds a file to be sent with the request.
149
-    *
150
-    * @param string $varName The variable name to send the file in
151
-    * @param string $fileName The name of the file as it should be received at the destination
152
-    * @param string $content The raw content of the file
153
-    * @param string $contentType The content type, use the constants to specify this
154
-    * @param string $encoding The encoding of the file, use the constants to specify this
155
-    */
147
+    /**
148
+     * Adds a file to be sent with the request.
149
+     *
150
+     * @param string $varName The variable name to send the file in
151
+     * @param string $fileName The name of the file as it should be received at the destination
152
+     * @param string $content The raw content of the file
153
+     * @param string $contentType The content type, use the constants to specify this
154
+     * @param string $encoding The encoding of the file, use the constants to specify this
155
+     */
156 156
     public function addFile(string $varName, string $fileName, string $content, string $contentType = '', string $encoding = '') : RequestHelper
157 157
     {
158 158
         $this->boundaries->addFile($varName, $fileName, $content, $contentType, $encoding);
@@ -160,13 +160,13 @@  discard block
 block discarded – undo
160 160
         return $this;
161 161
     }
162 162
     
163
-   /**
164
-    * Adds arbitrary content.
165
-    * 
166
-    * @param string $varName The variable name to send the content in.
167
-    * @param string $content
168
-    * @param string $contentType
169
-    */
163
+    /**
164
+     * Adds arbitrary content.
165
+     * 
166
+     * @param string $varName The variable name to send the content in.
167
+     * @param string $content
168
+     * @param string $contentType
169
+     */
170 170
     public function addContent(string $varName, string $content, string $contentType) : RequestHelper
171 171
     {
172 172
         $this->boundaries->addContent($varName, $content, $contentType);
@@ -188,13 +188,13 @@  discard block
 block discarded – undo
188 188
         return $this;
189 189
     }
190 190
     
191
-   /**
192
-    * Sets an HTTP header to include in the request.
193
-    * 
194
-    * @param string $name
195
-    * @param string $value
196
-    * @return RequestHelper
197
-    */
191
+    /**
192
+     * Sets an HTTP header to include in the request.
193
+     * 
194
+     * @param string $name
195
+     * @param string $value
196
+     * @return RequestHelper
197
+     */
198 198
     public function setHeader(string $name, string $value) : RequestHelper
199 199
     {
200 200
         $this->headers[$name] = $value;
@@ -202,36 +202,36 @@  discard block
 block discarded – undo
202 202
         return $this;
203 203
     }
204 204
     
205
-   /**
206
-    * Disables SSL certificate checking.
207
-    * 
208
-    * @return RequestHelper
209
-    */
205
+    /**
206
+     * Disables SSL certificate checking.
207
+     * 
208
+     * @return RequestHelper
209
+     */
210 210
     public function disableSSLChecks() : RequestHelper
211 211
     {
212 212
         $this->verifySSL = false;
213 213
         return $this;
214 214
     }
215 215
    
216
-   /**
217
-    * @var integer
218
-    */
216
+    /**
217
+     * @var integer
218
+     */
219 219
     protected $contentLength = 0;
220 220
 
221
-   /**
222
-    * Sends the POST request to the destination, and returns
223
-    * the response text.
224
-    *
225
-    * The response object is stored internally, so after calling
226
-    * this method it may be retrieved at any moment using the
227
-    * {@link getResponse()} method.
228
-    *
229
-    * @return string
230
-    * @see RequestHelper::getResponse()
231
-    * @throws RequestHelper_Exception
232
-    * 
233
-    * @see RequestHelper::ERROR_REQUEST_FAILED
234
-    */
221
+    /**
222
+     * Sends the POST request to the destination, and returns
223
+     * the response text.
224
+     *
225
+     * The response object is stored internally, so after calling
226
+     * this method it may be retrieved at any moment using the
227
+     * {@link getResponse()} method.
228
+     *
229
+     * @return string
230
+     * @see RequestHelper::getResponse()
231
+     * @throws RequestHelper_Exception
232
+     * 
233
+     * @see RequestHelper::ERROR_REQUEST_FAILED
234
+     */
235 235
     public function send() : string
236 236
     {
237 237
         $info = parseURL($this->destination);
@@ -274,14 +274,14 @@  discard block
 block discarded – undo
274 274
         return $this->data;
275 275
     }
276 276
     
277
-   /**
278
-    * Creates a new CURL resource configured according to the
279
-    * request's settings.
280
-    * 
281
-    * @param URLInfo $url
282
-    * @throws RequestHelper_Exception
283
-    * @return resource
284
-    */
277
+    /**
278
+     * Creates a new CURL resource configured according to the
279
+     * request's settings.
280
+     * 
281
+     * @param URLInfo $url
282
+     * @throws RequestHelper_Exception
283
+     * @return resource
284
+     */
285 285
     protected function createCURL(URLInfo $url)
286 286
     {
287 287
         $ch = curl_init();
@@ -329,10 +329,10 @@  discard block
 block discarded – undo
329 329
         return $ch;
330 330
     }
331 331
     
332
-   /**
333
-    * @param resource $ch
334
-    * @return bool Whether logging is enabled.
335
-    */
332
+    /**
333
+     * @param resource $ch
334
+     * @return bool Whether logging is enabled.
335
+     */
336 336
     protected function configureLogging($ch) : bool
337 337
     {
338 338
         if(empty($this->logfile))
@@ -359,13 +359,13 @@  discard block
 block discarded – undo
359 359
         return true;
360 360
     }
361 361
 
362
-   /**
363
-    * Compiles the associative headers array into
364
-    * the format understood by CURL, namely an indexed
365
-    * array with one header string per entry.
366
-    * 
367
-    * @return array
368
-    */
362
+    /**
363
+     * Compiles the associative headers array into
364
+     * the format understood by CURL, namely an indexed
365
+     * array with one header string per entry.
366
+     * 
367
+     * @return array
368
+     */
369 369
     protected function renderHeaders() : array
370 370
     {
371 371
         $result = array();
@@ -379,12 +379,12 @@  discard block
 block discarded – undo
379 379
         return $result;
380 380
     }
381 381
     
382
-   /**
383
-    * Retrieves the raw response header, in the form of an indexed
384
-    * array containing all response header lines.
385
-    * 
386
-    * @return array
387
-    */
382
+    /**
383
+     * Retrieves the raw response header, in the form of an indexed
384
+     * array containing all response header lines.
385
+     * 
386
+     * @return array
387
+     */
388 388
     public function getResponseHeader() : array
389 389
     {
390 390
         $response = $this->getResponse();
Please login to merge, or discard this patch.
src/OperationResult.php 1 patch
Indentation   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -27,73 +27,73 @@  discard block
 block discarded – undo
27 27
  */
28 28
 class OperationResult
29 29
 {
30
-   /**
31
-    * @var string
32
-    */
30
+    /**
31
+     * @var string
32
+     */
33 33
     protected $message = '';
34 34
     
35
-   /**
36
-    * @var bool
37
-    */
35
+    /**
36
+     * @var bool
37
+     */
38 38
     protected $valid = true;
39 39
   
40
-   /**
41
-    * @var object
42
-    */
40
+    /**
41
+     * @var object
42
+     */
43 43
     protected $subject;
44 44
     
45
-   /**
46
-    * @var integer
47
-    */
45
+    /**
46
+     * @var integer
47
+     */
48 48
     protected $code = 0;
49 49
     
50
-   /**
51
-    * The subject being validated.
52
-    * 
53
-    * @param object $subject
54
-    */
50
+    /**
51
+     * The subject being validated.
52
+     * 
53
+     * @param object $subject
54
+     */
55 55
     public function __construct(object $subject)
56 56
     {
57 57
         $this->subject = $subject;
58 58
     }
59 59
     
60
-   /**
61
-    * Whether the validation was successful.
62
-    * 
63
-    * @return bool
64
-    */
60
+    /**
61
+     * Whether the validation was successful.
62
+     * 
63
+     * @return bool
64
+     */
65 65
     public function isValid() : bool
66 66
     {
67 67
         return $this->valid;
68 68
     }
69 69
     
70
-   /**
71
-    * Retrieves the subject that was validated.
72
-    * 
73
-    * @return object
74
-    */
70
+    /**
71
+     * Retrieves the subject that was validated.
72
+     * 
73
+     * @return object
74
+     */
75 75
     public function getSubject() : object
76 76
     {
77 77
         return $this->subject;
78 78
     }
79 79
     
80
-   /**
81
-    * Makes the result a succes, with the specified message.
82
-    * 
83
-    * @param string $message Should not contain a date, just the system specific info.
84
-    * @return OperationResult
85
-    */
80
+    /**
81
+     * Makes the result a succes, with the specified message.
82
+     * 
83
+     * @param string $message Should not contain a date, just the system specific info.
84
+     * @return OperationResult
85
+     */
86 86
     public function makeSuccess(string $message, int $code=0) : OperationResult
87 87
     {
88 88
         return $this->setMessage($message, $code, true);
89 89
     }
90 90
     
91
-   /**
92
-    * Sets the result as an error.
93
-    * 
94
-    * @param string $message Should be as detailed as possible.
95
-    * @return OperationResult
96
-    */
91
+    /**
92
+     * Sets the result as an error.
93
+     * 
94
+     * @param string $message Should be as detailed as possible.
95
+     * @return OperationResult
96
+     */
97 97
     public function makeError(string $message, int $code=0) : OperationResult
98 98
     {
99 99
         return $this->setMessage($message, $code, false);
@@ -108,21 +108,21 @@  discard block
 block discarded – undo
108 108
         return $this;
109 109
     }
110 110
     
111
-   /**
112
-    * Retrieves the error message, if an error occurred.
113
-    * 
114
-    * @return string The error message, or an empty string if no error occurred.
115
-    */
111
+    /**
112
+     * Retrieves the error message, if an error occurred.
113
+     * 
114
+     * @return string The error message, or an empty string if no error occurred.
115
+     */
116 116
     public function getErrorMessage() : string
117 117
     {
118 118
         return $this->getMessage(false);
119 119
     }
120 120
     
121
-   /**
122
-    * Retrieves the success message, if one has been provided.
123
-    * 
124
-    * @return string
125
-    */
121
+    /**
122
+     * Retrieves the success message, if one has been provided.
123
+     * 
124
+     * @return string
125
+     */
126 126
     public function getSuccessMessage() : string
127 127
     {
128 128
         return $this->getMessage(true);
Please login to merge, or discard this patch.
src/Traits/Classable.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -87,37 +87,37 @@
 block discarded – undo
87 87
  */
88 88
 interface Interface_Classable
89 89
 {
90
-   /**
91
-    * @param string $name
92
-    * @return $this
93
-    */
90
+    /**
91
+     * @param string $name
92
+     * @return $this
93
+     */
94 94
     public function addClass(string $name);
95 95
 
96
-   /**
97
-    * @param array $names
98
-    * @return $this
99
-    */
96
+    /**
97
+     * @param array $names
98
+     * @return $this
99
+     */
100 100
     public function addClasses(array $names);
101 101
     
102
-   /**
103
-    * @param string $name
104
-    * @return bool
105
-    */
102
+    /**
103
+     * @param string $name
104
+     * @return bool
105
+     */
106 106
     public function hasClass(string $name) : bool;
107 107
     
108
-   /**
109
-    * @param string $name
110
-    * @return $this
111
-    */
108
+    /**
109
+     * @param string $name
110
+     * @return $this
111
+     */
112 112
     public function removeClass(string $name);
113 113
     
114
-   /**
115
-    * @return array
116
-    */
114
+    /**
115
+     * @return array
116
+     */
117 117
     public function getClasses() : array;
118 118
     
119
-   /**
120
-    * @return string
121
-    */
119
+    /**
120
+     * @return string
121
+     */
122 122
     public function classesToString() : string;
123 123
 }
Please login to merge, or discard this patch.