Passed
Push — master ( 428f46...c925bb )
by Sebastian
02:32
created
src/VariableInfo.php 1 patch
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -32,25 +32,25 @@  discard block
 block discarded – undo
32 32
         self::TYPE_CALLABLE => 'cf5e20'
33 33
     );
34 34
     
35
-   /**
36
-    * @var string
37
-    */
35
+    /**
36
+     * @var string
37
+     */
38 38
     protected $string;
39 39
     
40
-   /**
41
-    * @var mixed
42
-    */
40
+    /**
41
+     * @var mixed
42
+     */
43 43
     protected $value;
44 44
     
45
-   /**
46
-    * @var string
47
-    */
45
+    /**
46
+     * @var string
47
+     */
48 48
     protected $type;
49 49
     
50
-   /**
51
-    * @param mixed $value
52
-    * @param array|null $serialized
53
-    */
50
+    /**
51
+     * @param mixed $value
52
+     * @param array|null $serialized
53
+     */
54 54
     public function __construct($value, $serialized=null)
55 55
     {
56 56
         if(is_array($serialized))
@@ -63,26 +63,26 @@  discard block
 block discarded – undo
63 63
         }
64 64
     }
65 65
     
66
-   /**
67
-    * Creates a new variable info instance from a PHP variable
68
-    * of any type.
69
-    * 
70
-    * @param mixed $variable
71
-    * @return VariableInfo
72
-    */
66
+    /**
67
+     * Creates a new variable info instance from a PHP variable
68
+     * of any type.
69
+     * 
70
+     * @param mixed $variable
71
+     * @return VariableInfo
72
+     */
73 73
     public static function fromVariable($variable) : VariableInfo
74 74
     {
75 75
         return new VariableInfo($variable);
76 76
     }
77 77
     
78
-   /**
79
-    * Restores a variable info instance using a previously serialized
80
-    * array using the serialize() method.
81
-    * 
82
-    * @param array $serialized
83
-    * @return VariableInfo
84
-    * @see VariableInfo::serialize()
85
-    */
78
+    /**
79
+     * Restores a variable info instance using a previously serialized
80
+     * array using the serialize() method.
81
+     * 
82
+     * @param array $serialized
83
+     * @return VariableInfo
84
+     * @see VariableInfo::serialize()
85
+     */
86 86
     public static function fromSerialized(array $serialized) : VariableInfo
87 87
     {
88 88
         return new VariableInfo(null, $serialized);
@@ -108,12 +108,12 @@  discard block
 block discarded – undo
108 108
         $this->string = $this->_toString();
109 109
     }
110 110
     
111
-   /**
112
-    * The variable type - this is the same string that
113
-    * is returned by the PHP function `gettype`.
114
-    * 
115
-    * @return string
116
-    */
111
+    /**
112
+     * The variable type - this is the same string that
113
+     * is returned by the PHP function `gettype`.
114
+     * 
115
+     * @return string
116
+     */
117 117
     public function getType() : string
118 118
     {
119 119
         return $this->type;
@@ -127,13 +127,13 @@  discard block
 block discarded – undo
127 127
         );
128 128
     }
129 129
     
130
-   /**
131
-    * Whether to prepend the variable type before the value, 
132
-    * like the var_dump function. Example: <code>string "Some text"</code>.
133
-    * 
134
-    * @param bool $enable
135
-    * @return VariableInfo
136
-    */
130
+    /**
131
+     * Whether to prepend the variable type before the value, 
132
+     * like the var_dump function. Example: <code>string "Some text"</code>.
133
+     * 
134
+     * @param bool $enable
135
+     * @return VariableInfo
136
+     */
137 137
     public function enableType(bool $enable=true) : VariableInfo
138 138
     {
139 139
         return $this->setOption('prepend-type', $enable);
Please login to merge, or discard this patch.
src/FileHelper/FileFinder.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@
 block discarded – undo
31 31
     
32 32
     const PATH_MODE_STRIP = 'strip';
33 33
     
34
-   /**
35
-    * @var string
36
-    */
34
+    /**
35
+     * @var string
36
+     */
37 37
     protected $path;
38 38
     
39 39
     public function __construct(string $path)
Please login to merge, or discard this patch.
src/BaseException.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -20,17 +20,17 @@  discard block
 block discarded – undo
20 20
  */
21 21
 class BaseException extends \Exception
22 22
 {
23
-   /**
24
-    * @var string
25
-    */
23
+    /**
24
+     * @var string
25
+     */
26 26
     protected $details;
27 27
     
28
-   /**
29
-    * @param string $message
30
-    * @param string $details
31
-    * @param int $code
32
-    * @param \Exception $previous
33
-    */
28
+    /**
29
+     * @param string $message
30
+     * @param string $details
31
+     * @param int $code
32
+     * @param \Exception $previous
33
+     */
34 34
     public function __construct(string $message, $details=null, $code=null, $previous=null)
35 35
     {
36 36
         parent::__construct($message, $code, $previous);
@@ -38,10 +38,10 @@  discard block
 block discarded – undo
38 38
         $this->details = $details;
39 39
     }
40 40
     
41
-   /**
42
-    * Retrieves the detailed error description, if any.
43
-    * @return string
44
-    */
41
+    /**
42
+     * Retrieves the detailed error description, if any.
43
+     * @return string
44
+     */
45 45
     public function getDetails() : string
46 46
     {
47 47
         if($this->details !== null) {
@@ -51,10 +51,10 @@  discard block
 block discarded – undo
51 51
         return '';
52 52
     }
53 53
     
54
-   /**
55
-    * Displays pertinent information on the exception in
56
-    * the browser, and exits the script.
57
-    */
54
+    /**
55
+     * Displays pertinent information on the exception in
56
+     * the browser, and exits the script.
57
+     */
58 58
     public function display()
59 59
     {
60 60
         if(!headers_sent()) {
@@ -65,20 +65,20 @@  discard block
 block discarded – undo
65 65
         exit;
66 66
     }
67 67
     
68
-   /**
69
-    * Retrieves information on the exception that can be
70
-    * easily accessed.
71
-    * 
72
-    * @return ConvertHelper_ThrowableInfo
73
-    */
68
+    /**
69
+     * Retrieves information on the exception that can be
70
+     * easily accessed.
71
+     * 
72
+     * @return ConvertHelper_ThrowableInfo
73
+     */
74 74
     public function getInfo() : ConvertHelper_ThrowableInfo
75 75
     {
76 76
         return ConvertHelper::throwable2info($this);
77 77
     }
78 78
     
79
-   /**
80
-    * Dumps a current PHP function trace, as a textonly string.
81
-    */
79
+    /**
80
+     * Dumps a current PHP function trace, as a textonly string.
81
+     */
82 82
     public static function dumpTraceAsString()
83 83
     {
84 84
         try
@@ -91,9 +91,9 @@  discard block
 block discarded – undo
91 91
         }
92 92
     }
93 93
 
94
-   /**
95
-    * Dumps a current PHP function trace, with HTML styling.
96
-    */
94
+    /**
95
+     * Dumps a current PHP function trace, with HTML styling.
96
+     */
97 97
     public static function dumpTraceAsHTML()
98 98
     {
99 99
         try
@@ -108,13 +108,13 @@  discard block
 block discarded – undo
108 108
         }
109 109
     }
110 110
     
111
-   /**
112
-    * Creates an exception info instance from a throwable instance.
113
-    * 
114
-    * @param \Throwable $e
115
-    * @return ConvertHelper_ThrowableInfo
116
-    * @see ConvertHelper::throwable2info()
117
-    */
111
+    /**
112
+     * Creates an exception info instance from a throwable instance.
113
+     * 
114
+     * @param \Throwable $e
115
+     * @return ConvertHelper_ThrowableInfo
116
+     * @see ConvertHelper::throwable2info()
117
+     */
118 118
     public static function createInfo(\Throwable $e) : ConvertHelper_ThrowableInfo
119 119
     {
120 120
         return ConvertHelper::throwable2info($e);
Please login to merge, or discard this patch.
src/NumberInfo.php 1 patch
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -38,24 +38,24 @@  discard block
 block discarded – undo
38 38
  */
39 39
 class NumberInfo
40 40
 {
41
-   /**
42
-    * @var mixed
43
-    */
41
+    /**
42
+     * @var mixed
43
+     */
44 44
     protected $rawValue;
45 45
     
46
-   /**
47
-    * @var array
48
-    */
46
+    /**
47
+     * @var array
48
+     */
49 49
     protected $info;
50 50
     
51
-   /**
52
-    * @var bool
53
-    */
51
+    /**
52
+     * @var bool
53
+     */
54 54
     protected $empty = false;
55 55
     
56
-   /**
57
-    * @var array
58
-    */
56
+    /**
57
+     * @var array
58
+     */
59 59
     protected $knownUnits = array(
60 60
         '%' => true,
61 61
         'rem' => true,
@@ -95,21 +95,21 @@  discard block
 block discarded – undo
95 95
         return $this;
96 96
     }
97 97
     
98
-   /**
99
-    * Retrieves the raw, internal information array resulting
100
-    * from the parsing of the number.
101
-    *  
102
-    * @return array
103
-    */
98
+    /**
99
+     * Retrieves the raw, internal information array resulting
100
+     * from the parsing of the number.
101
+     *  
102
+     * @return array
103
+     */
104 104
     public function getRawInfo() : array
105 105
     {
106 106
         return $this->info;
107 107
     }
108 108
     
109
-   /**
110
-    * Whether the number was empty (null or empty string).
111
-    * @return boolean
112
-    */
109
+    /**
110
+     * Whether the number was empty (null or empty string).
111
+     * @return boolean
112
+     */
113 113
     public function isEmpty() : bool
114 114
     {
115 115
         return $this->empty;
@@ -590,14 +590,14 @@  discard block
 block discarded – undo
590 590
     
591 591
     protected $postProcess = false;
592 592
     
593
-   /**
594
-    * Called if explicitly enabled: allows filtering the 
595
-    * number after the detection process has completed.
596
-    * 
597
-    * @param string|NULL $number The adjusted number
598
-    * @param string $originalString The original value before it was parsed
599
-    * @return mixed
600
-    */
593
+    /**
594
+     * Called if explicitly enabled: allows filtering the 
595
+     * number after the detection process has completed.
596
+     * 
597
+     * @param string|NULL $number The adjusted number
598
+     * @param string $originalString The original value before it was parsed
599
+     * @return mixed
600
+     */
601 601
     protected function postProcess(?string $number, string $originalString)
602 602
     {
603 603
         print_r(gettype($number));
@@ -605,46 +605,46 @@  discard block
 block discarded – undo
605 605
         return $number;
606 606
     }
607 607
     
608
-   /**
609
-    * Filters the value before it is parsed, but only if it is a string.
610
-    * 
611
-    * NOTE: This may be overwritten in a subclass, to allow custom filtering
612
-    * the the values. An example of a use case would be a preprocessor for
613
-    * variables in a templating system.
614
-    * 
615
-    * @param string $trimmedString The trimmed value.
616
-    * @param array $cache The internal values cache array.
617
-    * @param string $originalValue The original value that the NumberInfo was created for.
618
-    * @return string
619
-    * 
620
-    * @see NumberInfo::enablePostProcess()
621
-    */
608
+    /**
609
+     * Filters the value before it is parsed, but only if it is a string.
610
+     * 
611
+     * NOTE: This may be overwritten in a subclass, to allow custom filtering
612
+     * the the values. An example of a use case would be a preprocessor for
613
+     * variables in a templating system.
614
+     * 
615
+     * @param string $trimmedString The trimmed value.
616
+     * @param array $cache The internal values cache array.
617
+     * @param string $originalValue The original value that the NumberInfo was created for.
618
+     * @return string
619
+     * 
620
+     * @see NumberInfo::enablePostProcess()
621
+     */
622 622
     protected function preProcess(string $trimmedString, /** @scrutinizer ignore-unused */ array &$cache, /** @scrutinizer ignore-unused */ string $originalValue) : string
623 623
     {
624 624
         return str_replace(',', '.', $trimmedString);
625 625
     }
626 626
     
627
-   /**
628
-    * Enables the post processing so the postProcess method gets called.
629
-    * This should be called in the {@link NumberInfo::preProcess()}
630
-    * method as needed.
631
-    * 
632
-    * @return NumberInfo
633
-    * @see NumberInfo::postProcess()
634
-    */
627
+    /**
628
+     * Enables the post processing so the postProcess method gets called.
629
+     * This should be called in the {@link NumberInfo::preProcess()}
630
+     * method as needed.
631
+     * 
632
+     * @return NumberInfo
633
+     * @see NumberInfo::postProcess()
634
+     */
635 635
     private function enablePostProcess() : NumberInfo
636 636
     {
637 637
         $this->postProcess = true;
638 638
         return $this;
639 639
     }
640 640
     
641
-   /**
642
-    * Filters the number info array to adjust the units
643
-    * and number according to the required rules.
644
-    * 
645
-    * @param array $info
646
-    * @return array
647
-    */
641
+    /**
642
+     * Filters the number info array to adjust the units
643
+     * and number according to the required rules.
644
+     * 
645
+     * @param array $info
646
+     * @return array
647
+     */
648 648
     protected function filterInfo(array $info) : array
649 649
     {
650 650
         $useUnits = 'px';
Please login to merge, or discard this patch.
src/IniHelper.php 1 patch
Indentation   +85 added lines, -85 removed lines patch added patch discarded remove patch
@@ -60,23 +60,23 @@  discard block
 block discarded – undo
60 60
         }
61 61
     }
62 62
     
63
-   /**
64
-    * The end of line character used in the INI source string.
65
-    * @return string
66
-    */
63
+    /**
64
+     * The end of line character used in the INI source string.
65
+     * @return string
66
+     */
67 67
     public function getEOLChar() : string
68 68
     {
69 69
         return $this->eol;
70 70
     }
71 71
     
72
-   /**
73
-    * Factory method: creates a new helper instance loading the
74
-    * ini content from the specified file.
75
-    * 
76
-    * @param string $iniPath
77
-    * @throws IniHelper_Exception
78
-    * @return \AppUtils\IniHelper
79
-    */
72
+    /**
73
+     * Factory method: creates a new helper instance loading the
74
+     * ini content from the specified file.
75
+     * 
76
+     * @param string $iniPath
77
+     * @throws IniHelper_Exception
78
+     * @return \AppUtils\IniHelper
79
+     */
80 80
     public static function createFromFile(string $iniPath)
81 81
     {
82 82
         $iniPath = FileHelper::requireFileExists($iniPath);
@@ -96,35 +96,35 @@  discard block
 block discarded – undo
96 96
         );
97 97
     }
98 98
     
99
-   /**
100
-    * Factory method: Creates a new ini helper instance from an ini string.
101
-    * 
102
-    * @param string $iniContent
103
-    * @return \AppUtils\IniHelper
104
-    */
99
+    /**
100
+     * Factory method: Creates a new ini helper instance from an ini string.
101
+     * 
102
+     * @param string $iniContent
103
+     * @return \AppUtils\IniHelper
104
+     */
105 105
     public static function createFromString(string $iniContent)
106 106
     {
107 107
         return new IniHelper($iniContent);
108 108
     }
109 109
     
110
-   /**
111
-    * Factory method: Creates a new empty ini helper.
112
-    *  
113
-    * @return \AppUtils\IniHelper
114
-    */
110
+    /**
111
+     * Factory method: Creates a new empty ini helper.
112
+     *  
113
+     * @return \AppUtils\IniHelper
114
+     */
115 115
     public static function createNew()
116 116
     {
117 117
         return self::createFromString('');
118 118
     }
119 119
     
120
-   /**
121
-    * Adds a new data section, and returns the section instance.
122
-    * If a section with the name already exists, returns that
123
-    * section instead of creating a new one.
124
-    *  
125
-    * @param string $name
126
-    * @return IniHelper_Section
127
-    */
120
+    /**
121
+     * Adds a new data section, and returns the section instance.
122
+     * If a section with the name already exists, returns that
123
+     * section instead of creating a new one.
124
+     *  
125
+     * @param string $name
126
+     * @return IniHelper_Section
127
+     */
128 128
     public function addSection(string $name) : IniHelper_Section
129 129
     {
130 130
         if(!isset($this->sections[$name])) {
@@ -134,12 +134,12 @@  discard block
 block discarded – undo
134 134
         return $this->sections[$name];
135 135
     }
136 136
     
137
-   /**
138
-    * Retrieves a section by its name, if it exists.
139
-    * 
140
-    * @param string $name
141
-    * @return IniHelper_Section|NULL
142
-    */
137
+    /**
138
+     * Retrieves a section by its name, if it exists.
139
+     * 
140
+     * @param string $name
141
+     * @return IniHelper_Section|NULL
142
+     */
143 143
     public function getSection(string $name) : ?IniHelper_Section
144 144
     {
145 145
         if(isset($this->sections[$name])) {
@@ -149,11 +149,11 @@  discard block
 block discarded – undo
149 149
         return null;
150 150
     }
151 151
     
152
-   /**
153
-    * Gets the data from the INI file as an associative array.
154
-    * 
155
-    * @return array
156
-    */
152
+    /**
153
+     * Gets the data from the INI file as an associative array.
154
+     * 
155
+     * @return array
156
+     */
157 157
     public function toArray() : array
158 158
     {
159 159
         $result = array();
@@ -173,17 +173,17 @@  discard block
 block discarded – undo
173 173
         return $result;
174 174
     }
175 175
     
176
-   /**
177
-    * Saves the INI content to the target file.
178
-    * 
179
-    * @param string $filePath
180
-    * @return IniHelper
181
-    * @throws FileHelper_Exception
182
-    * 
183
-    * @see FileHelper::ERROR_SAVE_FOLDER_NOT_WRITABLE
184
-    * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
185
-    * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
186
-    */
176
+    /**
177
+     * Saves the INI content to the target file.
178
+     * 
179
+     * @param string $filePath
180
+     * @return IniHelper
181
+     * @throws FileHelper_Exception
182
+     * 
183
+     * @see FileHelper::ERROR_SAVE_FOLDER_NOT_WRITABLE
184
+     * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
185
+     * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
186
+     */
187 187
     public function saveToFile(string $filePath) : IniHelper
188 188
     {
189 189
         FileHelper::saveFile($filePath, $this->saveToString());
@@ -191,11 +191,11 @@  discard block
 block discarded – undo
191 191
         return $this;
192 192
     }
193 193
     
194
-   /**
195
-    * Returns the INI content as string.
196
-    * 
197
-    * @return string
198
-    */
194
+    /**
195
+     * Returns the INI content as string.
196
+     * 
197
+     * @return string
198
+     */
199 199
     public function saveToString() : string
200 200
     {
201 201
         $parts = array();
@@ -208,15 +208,15 @@  discard block
 block discarded – undo
208 208
         return implode($this->eol, $parts);
209 209
     }
210 210
     
211
-   /**
212
-    * Sets or adds the value of a setting in the INI content.
213
-    * If the setting does not exist, it is added. Otherwise,
214
-    * the existing value is overwritten.
215
-    * 
216
-    * @param string $path A variable path, either <code>varname</code> or <code>section.varname</code>.
217
-    * @param mixed $value
218
-    * @return IniHelper
219
-    */
211
+    /**
212
+     * Sets or adds the value of a setting in the INI content.
213
+     * If the setting does not exist, it is added. Otherwise,
214
+     * the existing value is overwritten.
215
+     * 
216
+     * @param string $path A variable path, either <code>varname</code> or <code>section.varname</code>.
217
+     * @param mixed $value
218
+     * @return IniHelper
219
+     */
220 220
     public function setValue(string $path, $value) : IniHelper
221 221
     {
222 222
         $path = $this->parsePath($path);
@@ -235,12 +235,12 @@  discard block
 block discarded – undo
235 235
         return $this;
236 236
     }
237 237
     
238
-   /**
239
-    * Checks whether a section with the specified name exists.
240
-    * 
241
-    * @param string $name
242
-    * @return bool
243
-    */
238
+    /**
239
+     * Checks whether a section with the specified name exists.
240
+     * 
241
+     * @param string $name
242
+     * @return bool
243
+     */
244 244
     public function sectionExists(string $name) : bool
245 245
     {
246 246
         foreach($this->sections as $section) {
@@ -252,23 +252,23 @@  discard block
 block discarded – undo
252 252
         return false;
253 253
     }
254 254
     
255
-   /**
256
-    * Retrieves the default section, which is used to add
257
-    * values in the root of the document.
258
-    * 
259
-    * @return IniHelper_Section
260
-    */
255
+    /**
256
+     * Retrieves the default section, which is used to add
257
+     * values in the root of the document.
258
+     * 
259
+     * @return IniHelper_Section
260
+     */
261 261
     public function getDefaultSection() : IniHelper_Section
262 262
     {
263 263
         return $this->addSection(self::SECTION_DEFAULT);
264 264
     }
265 265
     
266
-   /**
267
-    * Retrieves all variable lines for the specified path.
268
-    * 
269
-    * @param string $path A variable path. Either <code>varname</code> or <code>section.varname</code>.
270
-    * @return array|\AppUtils\IniHelper_Line[]
271
-    */
266
+    /**
267
+     * Retrieves all variable lines for the specified path.
268
+     * 
269
+     * @param string $path A variable path. Either <code>varname</code> or <code>section.varname</code>.
270
+     * @return array|\AppUtils\IniHelper_Line[]
271
+     */
272 272
     public function getLinesByVariable(string $path)
273 273
     {
274 274
         $path = $this->parsePath($path);
Please login to merge, or discard this patch.
src/Traits/Optionable.php 1 patch
Indentation   +71 added lines, -71 removed lines patch added patch discarded remove patch
@@ -26,19 +26,19 @@  discard block
 block discarded – undo
26 26
  */
27 27
 trait Traits_Optionable
28 28
 {
29
-   /**
30
-    * @var array
31
-    */
29
+    /**
30
+     * @var array
31
+     */
32 32
     protected $options;
33 33
     
34
-   /**
35
-    * Sets an option to the specified value. This can be any
36
-    * kind of variable type, including objects, as needed.
37
-    * 
38
-    * @param string $name
39
-    * @param mixed $default
40
-    * @return mixed
41
-    */
34
+    /**
35
+     * Sets an option to the specified value. This can be any
36
+     * kind of variable type, including objects, as needed.
37
+     * 
38
+     * @param string $name
39
+     * @param mixed $default
40
+     * @return mixed
41
+     */
42 42
     public function setOption(string $name, $value) : Interface_Optionable
43 43
     {
44 44
         if(!isset($this->options)) {
@@ -49,13 +49,13 @@  discard block
 block discarded – undo
49 49
         return $this;
50 50
     }
51 51
     
52
-   /**
53
-    * Sets a collection of options at once, from an
54
-    * associative array.
55
-    * 
56
-    * @param array $options
57
-    * @return Interface_Optionable
58
-    */
52
+    /**
53
+     * Sets a collection of options at once, from an
54
+     * associative array.
55
+     * 
56
+     * @param array $options
57
+     * @return Interface_Optionable
58
+     */
59 59
     public function setOptions(array $options) : Interface_Optionable
60 60
     {
61 61
         foreach($options as $name => $value) {
@@ -65,16 +65,16 @@  discard block
 block discarded – undo
65 65
         return $this;
66 66
     }
67 67
     
68
-   /**
69
-    * Retrieves an option's value.
70
-    * 
71
-    * NOTE: Use the specialized type getters to ensure an option
72
-    * contains the expected type (for ex. getArrayOption()). 
73
-    * 
74
-    * @param string $name
75
-    * @param mixed $default The default value to return if the option does not exist.
76
-    * @return mixed
77
-    */
68
+    /**
69
+     * Retrieves an option's value.
70
+     * 
71
+     * NOTE: Use the specialized type getters to ensure an option
72
+     * contains the expected type (for ex. getArrayOption()). 
73
+     * 
74
+     * @param string $name
75
+     * @param mixed $default The default value to return if the option does not exist.
76
+     * @return mixed
77
+     */
78 78
     public function getOption(string $name, $default=null)
79 79
     {
80 80
         if(!isset($this->options)) {
@@ -88,14 +88,14 @@  discard block
 block discarded – undo
88 88
         return $default;
89 89
     }
90 90
     
91
-   /**
92
-    * Enforces that the option value is a string. Scalar 
93
-    * values are converted to string, and non-scalar values
94
-    * are converted to an empty string.
95
-    * 
96
-    * @param string $name
97
-    * @return string
98
-    */
91
+    /**
92
+     * Enforces that the option value is a string. Scalar 
93
+     * values are converted to string, and non-scalar values
94
+     * are converted to an empty string.
95
+     * 
96
+     * @param string $name
97
+     * @return string
98
+     */
99 99
     public function getStringOption(string $name) : string
100 100
     {
101 101
         $value = $this->getOption($name, false);
@@ -107,15 +107,15 @@  discard block
 block discarded – undo
107 107
         return '';
108 108
     }
109 109
     
110
-   /**
111
-    * Treats the option value as a boolean value: will return
112
-    * true if the value actually is a boolean true.
113
-    * 
114
-    * NOTE: boolean string representations are not accepted.
115
-    * 
116
-    * @param string $name
117
-    * @return bool
118
-    */
110
+    /**
111
+     * Treats the option value as a boolean value: will return
112
+     * true if the value actually is a boolean true.
113
+     * 
114
+     * NOTE: boolean string representations are not accepted.
115
+     * 
116
+     * @param string $name
117
+     * @return bool
118
+     */
119 119
     public function getBoolOption(string $name) : bool
120 120
     {
121 121
         if($this->getOption($name) === true) {
@@ -125,14 +125,14 @@  discard block
 block discarded – undo
125 125
         return false;
126 126
     }
127 127
     
128
-   /**
129
-    * Treats an option as an array, and returns its value
130
-    * only if it contains an array - otherwise, an empty
131
-    * array is returned.
132
-    * 
133
-    * @param string $name
134
-    * @return array
135
-    */
128
+    /**
129
+     * Treats an option as an array, and returns its value
130
+     * only if it contains an array - otherwise, an empty
131
+     * array is returned.
132
+     * 
133
+     * @param string $name
134
+     * @return array
135
+     */
136 136
     public function getArrayOption(string $name) : array
137 137
     {
138 138
         $val = $this->getOption($name);
@@ -143,13 +143,13 @@  discard block
 block discarded – undo
143 143
         return array();
144 144
     }
145 145
     
146
-   /**
147
-    * Checks whether the specified option exists - even
148
-    * if it has a NULL value.
149
-    * 
150
-    * @param string $name
151
-    * @return bool
152
-    */
146
+    /**
147
+     * Checks whether the specified option exists - even
148
+     * if it has a NULL value.
149
+     * 
150
+     * @param string $name
151
+     * @return bool
152
+     */
153 153
     public function hasOption(string $name) : bool
154 154
     {
155 155
         if(!isset($this->options)) {
@@ -159,10 +159,10 @@  discard block
 block discarded – undo
159 159
         return array_key_exists($name, $this->options);
160 160
     }
161 161
     
162
-   /**
163
-    * Returns all options in one associative array.
164
-    * @return array
165
-    */
162
+    /**
163
+     * Returns all options in one associative array.
164
+     * @return array
165
+     */
166 166
     public function getOptions() : array
167 167
     {
168 168
         if(!isset($this->options)) {
@@ -172,13 +172,13 @@  discard block
 block discarded – undo
172 172
         return $this->options;
173 173
     }
174 174
     
175
-   /**
176
-    * Checks whether the option's value is the one specified.
177
-    * 
178
-    * @param string $name
179
-    * @param mixed $value
180
-    * @return bool
181
-    */
175
+    /**
176
+     * Checks whether the option's value is the one specified.
177
+     * 
178
+     * @param string $name
179
+     * @param mixed $value
180
+     * @return bool
181
+     */
182 182
     public function isOption(string $name, $value) : bool
183 183
     {
184 184
         return $this->getOption($name) === $value;
Please login to merge, or discard this patch.
src/FileHelper.php 1 patch
Indentation   +387 added lines, -387 removed lines patch added patch discarded remove patch
@@ -78,32 +78,32 @@  discard block
 block discarded – undo
78 78
     
79 79
     const ERROR_CURL_OUTPUT_NOT_STRING = 340031;
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);
@@ -547,31 +547,31 @@  discard block
 block discarded – undo
547 547
         );
548 548
     }
549 549
     
550
-   /**
551
-    * Verifies whether the target file is a PHP file. The path
552
-    * to the file can be a path to a file as a string, or a 
553
-    * DirectoryIterator object instance.
554
-    * 
555
-    * @param string|\DirectoryIterator $pathOrDirIterator
556
-    * @return boolean
557
-    */
550
+    /**
551
+     * Verifies whether the target file is a PHP file. The path
552
+     * to the file can be a path to a file as a string, or a 
553
+     * DirectoryIterator object instance.
554
+     * 
555
+     * @param string|\DirectoryIterator $pathOrDirIterator
556
+     * @return boolean
557
+     */
558 558
     public static function isPHPFile($pathOrDirIterator)
559 559
     {
560
-    	if(self::getExtension($pathOrDirIterator) == 'php') {
561
-    		return true;
562
-    	}
560
+        if(self::getExtension($pathOrDirIterator) == 'php') {
561
+            return true;
562
+        }
563 563
     	
564
-    	return false;
564
+        return false;
565 565
     }
566 566
     
567
-   /**
568
-    * Retrieves the extension of the specified file. Can be a path
569
-    * to a file as a string, or a DirectoryIterator object instance.
570
-    * 
571
-    * @param string|\DirectoryIterator $pathOrDirIterator
572
-    * @param bool $lowercase
573
-    * @return string
574
-    */
567
+    /**
568
+     * Retrieves the extension of the specified file. Can be a path
569
+     * to a file as a string, or a DirectoryIterator object instance.
570
+     * 
571
+     * @param string|\DirectoryIterator $pathOrDirIterator
572
+     * @param bool $lowercase
573
+     * @return string
574
+     */
575 575
     public static function getExtension($pathOrDirIterator, bool $lowercase = true) : string
576 576
     {
577 577
         if($pathOrDirIterator instanceof \DirectoryIterator) {
@@ -582,51 +582,51 @@  discard block
 block discarded – undo
582 582
          
583 583
         $ext = pathinfo($filename, PATHINFO_EXTENSION);
584 584
         if($lowercase) {
585
-        	$ext = mb_strtolower($ext);
585
+            $ext = mb_strtolower($ext);
586 586
         }
587 587
         
588 588
         return $ext;
589 589
     }
590 590
     
591
-   /**
592
-    * Retrieves the file name from a path, with or without extension.
593
-    * The path to the file can be a string, or a DirectoryIterator object
594
-    * instance.
595
-    * 
596
-    * In case of folders, behaves like the pathinfo function: returns
597
-    * the name of the folder.
598
-    * 
599
-    * @param string|\DirectoryIterator $pathOrDirIterator
600
-    * @param bool $extension
601
-    * @return string
602
-    */
591
+    /**
592
+     * Retrieves the file name from a path, with or without extension.
593
+     * The path to the file can be a string, or a DirectoryIterator object
594
+     * instance.
595
+     * 
596
+     * In case of folders, behaves like the pathinfo function: returns
597
+     * the name of the folder.
598
+     * 
599
+     * @param string|\DirectoryIterator $pathOrDirIterator
600
+     * @param bool $extension
601
+     * @return string
602
+     */
603 603
     public static function getFilename($pathOrDirIterator, $extension = true)
604 604
     {
605 605
         $path = $pathOrDirIterator;
606
-    	if($pathOrDirIterator instanceof \DirectoryIterator) {
607
-    		$path = $pathOrDirIterator->getFilename();
608
-    	}
606
+        if($pathOrDirIterator instanceof \DirectoryIterator) {
607
+            $path = $pathOrDirIterator->getFilename();
608
+        }
609 609
     	
610
-    	$path = self::normalizePath($path);
610
+        $path = self::normalizePath($path);
611 611
     	
612
-    	if(!$extension) {
613
-    	    return pathinfo($path, PATHINFO_FILENAME);
614
-    	}
612
+        if(!$extension) {
613
+            return pathinfo($path, PATHINFO_FILENAME);
614
+        }
615 615
     	
616
-    	return pathinfo($path, PATHINFO_BASENAME); 
616
+        return pathinfo($path, PATHINFO_BASENAME); 
617 617
     }
618 618
    
619
-   /**
620
-    * Tries to read the contents of the target file and
621
-    * treat it as JSON to return the decoded JSON data.
622
-    * 
623
-    * @param string $file
624
-    * @throws FileHelper_Exception
625
-    * @return array
626
-    * 
627
-    * @see FileHelper::ERROR_CANNOT_FIND_JSON_FILE
628
-    * @see FileHelper::ERROR_CANNOT_DECODE_JSON_FILE
629
-    */ 
619
+    /**
620
+     * Tries to read the contents of the target file and
621
+     * treat it as JSON to return the decoded JSON data.
622
+     * 
623
+     * @param string $file
624
+     * @throws FileHelper_Exception
625
+     * @return array
626
+     * 
627
+     * @see FileHelper::ERROR_CANNOT_FIND_JSON_FILE
628
+     * @see FileHelper::ERROR_CANNOT_DECODE_JSON_FILE
629
+     */ 
630 630
     public static function parseJSONFile(string $file, $targetEncoding=null, $sourceEncoding=null)
631 631
     {
632 632
         self::requireFileExists($file, self::ERROR_CANNOT_FIND_JSON_FILE);
@@ -662,16 +662,16 @@  discard block
 block discarded – undo
662 662
         return $json;
663 663
     }
664 664
     
665
-   /**
666
-    * Corrects common formatting mistakes when users enter
667
-    * file names, like too many spaces, dots and the like.
668
-    * 
669
-    * NOTE: if the file name contains a path, the path is
670
-    * stripped, leaving only the file name.
671
-    * 
672
-    * @param string $name
673
-    * @return string
674
-    */
665
+    /**
666
+     * Corrects common formatting mistakes when users enter
667
+     * file names, like too many spaces, dots and the like.
668
+     * 
669
+     * NOTE: if the file name contains a path, the path is
670
+     * stripped, leaving only the file name.
671
+     * 
672
+     * @param string $name
673
+     * @return string
674
+     */
675 675
     public static function fixFileName(string $name) : string
676 676
     {
677 677
         $name = trim($name);
@@ -701,60 +701,60 @@  discard block
 block discarded – undo
701 701
         return $name;
702 702
     }
703 703
     
704
-   /**
705
-    * Creates an instance of the file finder, which is an easier
706
-    * alternative to the other manual findFile methods, since all
707
-    * options can be set by chaining.
708
-    * 
709
-    * @param string $path
710
-    * @return FileHelper_FileFinder
711
-    */
704
+    /**
705
+     * Creates an instance of the file finder, which is an easier
706
+     * alternative to the other manual findFile methods, since all
707
+     * options can be set by chaining.
708
+     * 
709
+     * @param string $path
710
+     * @return FileHelper_FileFinder
711
+     */
712 712
     public static function createFileFinder(string $path) : FileHelper_FileFinder
713 713
     {
714 714
         return new FileHelper_FileFinder($path);
715 715
     }
716 716
     
717
-   /**
718
-    * Searches for all HTML files in the target folder.
719
-    * 
720
-    * @param string $targetFolder
721
-    * @param array $options
722
-    * @return array An indexed array with files.
723
-    * @see FileHelper::createFileFinder()
724
-    * 
725
-    * @todo Convert this to use the file finder.
726
-    */
717
+    /**
718
+     * Searches for all HTML files in the target folder.
719
+     * 
720
+     * @param string $targetFolder
721
+     * @param array $options
722
+     * @return array An indexed array with files.
723
+     * @see FileHelper::createFileFinder()
724
+     * 
725
+     * @todo Convert this to use the file finder.
726
+     */
727 727
     public static function findHTMLFiles(string $targetFolder, array $options=array()) : array
728 728
     {
729 729
         return self::findFiles($targetFolder, array('html'), $options);
730 730
     }
731 731
 
732
-   /**
733
-    * Searches for all PHP files in the target folder.
734
-    * 
735
-    * @param string $targetFolder
736
-    * @param array $options
737
-    * @return array An indexed array of PHP files.
738
-    * @see FileHelper::createFileFinder()
739
-    * 
740
-    * @todo Convert this to use the file finder.
741
-    */
732
+    /**
733
+     * Searches for all PHP files in the target folder.
734
+     * 
735
+     * @param string $targetFolder
736
+     * @param array $options
737
+     * @return array An indexed array of PHP files.
738
+     * @see FileHelper::createFileFinder()
739
+     * 
740
+     * @todo Convert this to use the file finder.
741
+     */
742 742
     public static function findPHPFiles(string $targetFolder, array $options=array()) : array
743 743
     {
744 744
         return self::findFiles($targetFolder, array('php'), $options);
745 745
     }
746 746
     
747
-   /**
748
-    * 
749
-    * @param string $targetFolder
750
-    * @param array $extensions
751
-    * @param array $options
752
-    * @param array $files
753
-    * @throws FileHelper_Exception
754
-    * @return array
755
-    * @deprecated Will be replaced by the file finder in the future.
756
-    * @see FileHelper::createFileFinder()
757
-    */
747
+    /**
748
+     * 
749
+     * @param string $targetFolder
750
+     * @param array $extensions
751
+     * @param array $options
752
+     * @param array $files
753
+     * @throws FileHelper_Exception
754
+     * @return array
755
+     * @deprecated Will be replaced by the file finder in the future.
756
+     * @see FileHelper::createFileFinder()
757
+     */
758 758
     public static function findFiles(string $targetFolder, array $extensions=array(), array $options=array(), array $files=array()) : array
759 759
     {
760 760
         if(!isset($options['strip-extension'])) {
@@ -835,13 +835,13 @@  discard block
 block discarded – undo
835 835
         return $files;
836 836
     }
837 837
 
838
-   /**
839
-    * Removes the extension from the specified path or file name,
840
-    * if any, and returns the name without the extension.
841
-    * 
842
-    * @param string $filename
843
-    * @return sTring
844
-    */
838
+    /**
839
+     * Removes the extension from the specified path or file name,
840
+     * if any, and returns the name without the extension.
841
+     * 
842
+     * @param string $filename
843
+     * @return sTring
844
+     */
845 845
     public static function removeExtension(string $filename) : string
846 846
     {
847 847
         // normalize paths to allow windows style slashes even on nix servers
@@ -850,22 +850,22 @@  discard block
 block discarded – undo
850 850
         return pathinfo($filename, PATHINFO_FILENAME);
851 851
     }
852 852
     
853
-   /**
854
-    * Detects the UTF BOM in the target file, if any. Returns
855
-    * the encoding matching the BOM, which can be any of the
856
-    * following:
857
-    * 
858
-    * <ul>
859
-    * <li>UTF32-BE</li>
860
-    * <li>UTF32-LE</li>
861
-    * <li>UTF16-BE</li>
862
-    * <li>UTF16-LE</li>
863
-    * <li>UTF8</li>
864
-    * </ul>
865
-    * 
866
-    * @param string $filename
867
-    * @return string|NULL
868
-    */
853
+    /**
854
+     * Detects the UTF BOM in the target file, if any. Returns
855
+     * the encoding matching the BOM, which can be any of the
856
+     * following:
857
+     * 
858
+     * <ul>
859
+     * <li>UTF32-BE</li>
860
+     * <li>UTF32-LE</li>
861
+     * <li>UTF16-BE</li>
862
+     * <li>UTF16-LE</li>
863
+     * <li>UTF8</li>
864
+     * </ul>
865
+     * 
866
+     * @param string $filename
867
+     * @return string|NULL
868
+     */
869 869
     public static function detectUTFBom(string $filename) 
870 870
     {
871 871
         $fp = fopen($filename, 'r');
@@ -885,13 +885,13 @@  discard block
 block discarded – undo
885 885
     
886 886
     protected static $utfBoms;
887 887
     
888
-   /**
889
-    * Retrieves a list of all UTF byte order mark character
890
-    * sequences, as an assocative array with UTF encoding => bom sequence
891
-    * pairs.
892
-    * 
893
-    * @return array
894
-    */
888
+    /**
889
+     * Retrieves a list of all UTF byte order mark character
890
+     * sequences, as an assocative array with UTF encoding => bom sequence
891
+     * pairs.
892
+     * 
893
+     * @return array
894
+     */
895 895
     public static function getUTFBOMs()
896 896
     {
897 897
         if(!isset(self::$utfBoms)) {
@@ -907,15 +907,15 @@  discard block
 block discarded – undo
907 907
         return self::$utfBoms;
908 908
     }
909 909
     
910
-   /**
911
-    * Checks whether the specified encoding is a valid
912
-    * unicode encoding, for example "UTF16-LE" or "UTF8".
913
-    * Also accounts for alternate way to write the, like
914
-    * "UTF-8", and omitting little/big endian suffixes.
915
-    * 
916
-    * @param string $encoding
917
-    * @return boolean
918
-    */
910
+    /**
911
+     * Checks whether the specified encoding is a valid
912
+     * unicode encoding, for example "UTF16-LE" or "UTF8".
913
+     * Also accounts for alternate way to write the, like
914
+     * "UTF-8", and omitting little/big endian suffixes.
915
+     * 
916
+     * @param string $encoding
917
+     * @return boolean
918
+     */
919 919
     public static function isValidUnicodeEncoding(string $encoding) : bool
920 920
     {
921 921
         $encodings = self::getKnownUnicodeEncodings();
@@ -934,22 +934,22 @@  discard block
 block discarded – undo
934 934
         return in_array($encoding, $keep);
935 935
     }
936 936
     
937
-   /**
938
-    * Retrieves a list of all known unicode file encodings.
939
-    * @return array
940
-    */
937
+    /**
938
+     * Retrieves a list of all known unicode file encodings.
939
+     * @return array
940
+     */
941 941
     public static function getKnownUnicodeEncodings()
942 942
     {
943 943
         return array_keys(self::getUTFBOMs());
944 944
     }
945 945
     
946
-   /**
947
-    * Normalizes the slash style in a file or folder path,
948
-    * by replacing any antislashes with forward slashes.
949
-    * 
950
-    * @param string $path
951
-    * @return string
952
-    */
946
+    /**
947
+     * Normalizes the slash style in a file or folder path,
948
+     * by replacing any antislashes with forward slashes.
949
+     * 
950
+     * @param string $path
951
+     * @return string
952
+     */
953 953
     public static function normalizePath(string $path) : string
954 954
     {
955 955
         return str_replace(array('\\', '//'), array('/', '/'), $path);
@@ -982,18 +982,18 @@  discard block
 block discarded – undo
982 982
         }
983 983
     }
984 984
    
985
-   /**
986
-    * Saves the specified content to the target file, creating
987
-    * the file and the folder as necessary.
988
-    * 
989
-    * @param string $filePath
990
-    * @param string $content
991
-    * @throws FileHelper_Exception
992
-    * 
993
-    * @see FileHelper::ERROR_SAVE_FOLDER_NOT_WRITABLE
994
-    * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
995
-    * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
996
-    */
985
+    /**
986
+     * Saves the specified content to the target file, creating
987
+     * the file and the folder as necessary.
988
+     * 
989
+     * @param string $filePath
990
+     * @param string $content
991
+     * @throws FileHelper_Exception
992
+     * 
993
+     * @see FileHelper::ERROR_SAVE_FOLDER_NOT_WRITABLE
994
+     * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
995
+     * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
996
+     */
997 997
     public static function saveFile(string $filePath, string $content='') : void
998 998
     {
999 999
         // target file already exists
@@ -1046,12 +1046,12 @@  discard block
 block discarded – undo
1046 1046
         );
1047 1047
     }
1048 1048
     
1049
-   /**
1050
-    * Checks whether it is possible to run PHP command 
1051
-    * line commands.
1052
-    * 
1053
-    * @return boolean
1054
-    */
1049
+    /**
1050
+     * Checks whether it is possible to run PHP command 
1051
+     * line commands.
1052
+     * 
1053
+     * @return boolean
1054
+     */
1055 1055
     public static function canMakePHPCalls() : bool
1056 1056
     {
1057 1057
         return self::cliCommandExists('php');
@@ -1126,16 +1126,16 @@  discard block
 block discarded – undo
1126 1126
         return $result;
1127 1127
     }
1128 1128
     
1129
-   /**
1130
-    * Validates a PHP file's syntax.
1131
-    * 
1132
-    * NOTE: This will fail silently if the PHP command line
1133
-    * is not available. Use {@link FileHelper::canMakePHPCalls()}
1134
-    * to check this beforehand as needed.
1135
-    * 
1136
-    * @param string $path
1137
-    * @return boolean|array A boolean true if the file is valid, an array with validation messages otherwise.
1138
-    */
1129
+    /**
1130
+     * Validates a PHP file's syntax.
1131
+     * 
1132
+     * NOTE: This will fail silently if the PHP command line
1133
+     * is not available. Use {@link FileHelper::canMakePHPCalls()}
1134
+     * to check this beforehand as needed.
1135
+     * 
1136
+     * @param string $path
1137
+     * @return boolean|array A boolean true if the file is valid, an array with validation messages otherwise.
1138
+     */
1139 1139
     public static function checkPHPFileSyntax($path)
1140 1140
     {
1141 1141
         if(!self::canMakePHPCalls()) {
@@ -1159,14 +1159,14 @@  discard block
 block discarded – undo
1159 1159
         return $output;
1160 1160
     }
1161 1161
     
1162
-   /**
1163
-    * Retrieves the last modified date for the specified file or folder.
1164
-    * 
1165
-    * Note: If the target does not exist, returns null. 
1166
-    * 
1167
-    * @param string $path
1168
-    * @return \DateTime|NULL
1169
-    */
1162
+    /**
1163
+     * Retrieves the last modified date for the specified file or folder.
1164
+     * 
1165
+     * Note: If the target does not exist, returns null. 
1166
+     * 
1167
+     * @param string $path
1168
+     * @return \DateTime|NULL
1169
+     */
1170 1170
     public static function getModifiedDate($path)
1171 1171
     {
1172 1172
         $time = filemtime($path);
@@ -1179,22 +1179,22 @@  discard block
 block discarded – undo
1179 1179
         return null; 
1180 1180
     }
1181 1181
     
1182
-   /**
1183
-    * Retrieves the names of all subfolders in the specified path.
1184
-    * 
1185
-    * Available options:
1186
-    * 
1187
-    * - recursive: true/false
1188
-    *   Whether to search for subfolders recursively. 
1189
-    *   
1190
-    * - absolute-paths: true/false
1191
-    *   Whether to return a list of absolute paths.
1192
-    * 
1193
-    * @param string $targetFolder
1194
-    * @param array $options
1195
-    * @throws FileHelper_Exception
1196
-    * @return string[]
1197
-    */
1182
+    /**
1183
+     * Retrieves the names of all subfolders in the specified path.
1184
+     * 
1185
+     * Available options:
1186
+     * 
1187
+     * - recursive: true/false
1188
+     *   Whether to search for subfolders recursively. 
1189
+     *   
1190
+     * - absolute-paths: true/false
1191
+     *   Whether to return a list of absolute paths.
1192
+     * 
1193
+     * @param string $targetFolder
1194
+     * @param array $options
1195
+     * @throws FileHelper_Exception
1196
+     * @return string[]
1197
+     */
1198 1198
     public static function getSubfolders($targetFolder, $options = array())
1199 1199
     {
1200 1200
         if(!is_dir($targetFolder)) 
@@ -1255,16 +1255,16 @@  discard block
 block discarded – undo
1255 1255
         return $result;
1256 1256
     }
1257 1257
 
1258
-   /**
1259
-    * Retrieves the maximum allowed upload file size, in bytes.
1260
-    * Takes into account the PHP ini settings <code>post_max_size</code>
1261
-    * and <code>upload_max_filesize</code>. Since these cannot
1262
-    * be modified at runtime, they are the hard limits for uploads.
1263
-    * 
1264
-    * NOTE: Based on binary values, where 1KB = 1024 Bytes.
1265
-    * 
1266
-    * @return int Will return <code>-1</code> if no limit.
1267
-    */
1258
+    /**
1259
+     * Retrieves the maximum allowed upload file size, in bytes.
1260
+     * Takes into account the PHP ini settings <code>post_max_size</code>
1261
+     * and <code>upload_max_filesize</code>. Since these cannot
1262
+     * be modified at runtime, they are the hard limits for uploads.
1263
+     * 
1264
+     * NOTE: Based on binary values, where 1KB = 1024 Bytes.
1265
+     * 
1266
+     * @return int Will return <code>-1</code> if no limit.
1267
+     */
1268 1268
     public static function getMaxUploadFilesize() : int
1269 1269
     {
1270 1270
         static $max_size = -1;
@@ -1301,16 +1301,16 @@  discard block
 block discarded – undo
1301 1301
         return round($size);
1302 1302
     }
1303 1303
    
1304
-   /**
1305
-    * Makes a path relative using a folder depth: will reduce the
1306
-    * length of the path so that only the amount of folders defined
1307
-    * in the <code>$depth</code> attribute are shown below the actual
1308
-    * folder or file in the path.
1309
-    *  
1310
-    * @param string  $path The absolute or relative path
1311
-    * @param int $depth The folder depth to reduce the path to
1312
-    * @return string
1313
-    */
1304
+    /**
1305
+     * Makes a path relative using a folder depth: will reduce the
1306
+     * length of the path so that only the amount of folders defined
1307
+     * in the <code>$depth</code> attribute are shown below the actual
1308
+     * folder or file in the path.
1309
+     *  
1310
+     * @param string  $path The absolute or relative path
1311
+     * @param int $depth The folder depth to reduce the path to
1312
+     * @return string
1313
+     */
1314 1314
     public static function relativizePathByDepth(string $path, int $depth=2) : string
1315 1315
     {
1316 1316
         $path = self::normalizePath($path);
@@ -1348,23 +1348,23 @@  discard block
 block discarded – undo
1348 1348
         return trim(implode('/', $tokens), '/');
1349 1349
     }
1350 1350
     
1351
-   /**
1352
-    * Makes the specified path relative to another path,
1353
-    * by removing one from the other if found. Also 
1354
-    * normalizes the path to use forward slashes. 
1355
-    * 
1356
-    * Example:
1357
-    * 
1358
-    * <pre>
1359
-    * relativizePath('c:\some\folder\to\file.txt', 'c:\some\folder');
1360
-    * </pre>
1361
-    * 
1362
-    * Result: <code>to/file.txt</code>
1363
-    * 
1364
-    * @param string $path
1365
-    * @param string $relativeTo
1366
-    * @return string
1367
-    */
1351
+    /**
1352
+     * Makes the specified path relative to another path,
1353
+     * by removing one from the other if found. Also 
1354
+     * normalizes the path to use forward slashes. 
1355
+     * 
1356
+     * Example:
1357
+     * 
1358
+     * <pre>
1359
+     * relativizePath('c:\some\folder\to\file.txt', 'c:\some\folder');
1360
+     * </pre>
1361
+     * 
1362
+     * Result: <code>to/file.txt</code>
1363
+     * 
1364
+     * @param string $path
1365
+     * @param string $relativeTo
1366
+     * @return string
1367
+     */
1368 1368
     public static function relativizePath(string $path, string $relativeTo) : string
1369 1369
     {
1370 1370
         $path = self::normalizePath($path);
@@ -1376,17 +1376,17 @@  discard block
 block discarded – undo
1376 1376
         return $relative;
1377 1377
     }
1378 1378
     
1379
-   /**
1380
-    * Checks that the target file exists, and throws an exception
1381
-    * if it does not. 
1382
-    * 
1383
-    * @param string $path
1384
-    * @param int|NULL $errorCode Optional custom error code
1385
-    * @throws FileHelper_Exception
1386
-    * @return string The real path to the file
1387
-    * 
1388
-    * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
1389
-    */
1379
+    /**
1380
+     * Checks that the target file exists, and throws an exception
1381
+     * if it does not. 
1382
+     * 
1383
+     * @param string $path
1384
+     * @param int|NULL $errorCode Optional custom error code
1385
+     * @throws FileHelper_Exception
1386
+     * @return string The real path to the file
1387
+     * 
1388
+     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
1389
+     */
1390 1390
     public static function requireFileExists(string $path, $errorCode=null) : string
1391 1391
     {
1392 1392
         $result = realpath($path);
@@ -1405,18 +1405,18 @@  discard block
 block discarded – undo
1405 1405
         );
1406 1406
     }
1407 1407
     
1408
-   /**
1409
-    * Reads a specific line number from the target file and returns its
1410
-    * contents, if the file has such a line. Does so with little memory
1411
-    * usage, as the file is not read entirely into memory.
1412
-    * 
1413
-    * @param string $path
1414
-    * @param int $lineNumber Note: 1-based; the first line is number 1.
1415
-    * @return string|NULL Will return null if the requested line does not exist.
1416
-    * @throws FileHelper_Exception
1417
-    * 
1418
-    * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
1419
-    */
1408
+    /**
1409
+     * Reads a specific line number from the target file and returns its
1410
+     * contents, if the file has such a line. Does so with little memory
1411
+     * usage, as the file is not read entirely into memory.
1412
+     * 
1413
+     * @param string $path
1414
+     * @param int $lineNumber Note: 1-based; the first line is number 1.
1415
+     * @return string|NULL Will return null if the requested line does not exist.
1416
+     * @throws FileHelper_Exception
1417
+     * 
1418
+     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
1419
+     */
1420 1420
     public static function getLineFromFile(string $path, int $lineNumber) : ?string
1421 1421
     {
1422 1422
         self::requireFileExists($path);
@@ -1432,19 +1432,19 @@  discard block
 block discarded – undo
1432 1432
         $file->seek($targetLine);
1433 1433
         
1434 1434
         if($file->key() !== $targetLine) {
1435
-             return null;
1435
+                return null;
1436 1436
         }
1437 1437
         
1438 1438
         return $file->current(); 
1439 1439
     }
1440 1440
     
1441
-   /**
1442
-    * Retrieves the total amount of lines in the file, without 
1443
-    * reading the whole file into memory.
1444
-    * 
1445
-    * @param string $path
1446
-    * @return int
1447
-    */
1441
+    /**
1442
+     * Retrieves the total amount of lines in the file, without 
1443
+     * reading the whole file into memory.
1444
+     * 
1445
+     * @param string $path
1446
+     * @return int
1447
+     */
1448 1448
     public static function countFileLines(string $path) : int
1449 1449
     {
1450 1450
         self::requireFileExists($path);
@@ -1474,26 +1474,26 @@  discard block
 block discarded – undo
1474 1474
         return $number+1;
1475 1475
     }
1476 1476
     
1477
-   /**
1478
-    * Parses the target file to detect any PHP classes contained
1479
-    * within, and retrieve information on them. Does not use the 
1480
-    * PHP reflection API.
1481
-    * 
1482
-    * @param string $filePath
1483
-    * @return FileHelper_PHPClassInfo
1484
-    */
1477
+    /**
1478
+     * Parses the target file to detect any PHP classes contained
1479
+     * within, and retrieve information on them. Does not use the 
1480
+     * PHP reflection API.
1481
+     * 
1482
+     * @param string $filePath
1483
+     * @return FileHelper_PHPClassInfo
1484
+     */
1485 1485
     public static function findPHPClasses(string $filePath) : FileHelper_PHPClassInfo
1486 1486
     {
1487 1487
         return new FileHelper_PHPClassInfo($filePath);
1488 1488
     }
1489 1489
     
1490
-   /**
1491
-    * Detects the end of line style used in the target file, if any.
1492
-    * Can be used with large files, because it only reads part of it.
1493
-    * 
1494
-    * @param string $filePath The path to the file.
1495
-    * @return NULL|ConvertHelper_EOL The end of line character information, or NULL if none is found.
1496
-    */
1490
+    /**
1491
+     * Detects the end of line style used in the target file, if any.
1492
+     * Can be used with large files, because it only reads part of it.
1493
+     * 
1494
+     * @param string $filePath The path to the file.
1495
+     * @return NULL|ConvertHelper_EOL The end of line character information, or NULL if none is found.
1496
+     */
1497 1497
     public static function detectEOLCharacter(string $filePath) : ?ConvertHelper_EOL
1498 1498
     {
1499 1499
         // 20 lines is enough to get a good picture of the newline style in the file.
@@ -1506,18 +1506,18 @@  discard block
 block discarded – undo
1506 1506
         return ConvertHelper::detectEOLCharacter($string);
1507 1507
     }
1508 1508
     
1509
-   /**
1510
-    * Reads the specified amount of lines from the target file.
1511
-    * Unicode BOM compatible: any byte order marker is stripped
1512
-    * from the resulting lines.
1513
-    * 
1514
-    * @param string $filePath
1515
-    * @param int $amount Set to 0 to read all lines.
1516
-    * @return array
1517
-    * 
1518
-    * @see FileHelper::ERROR_CANNOT_OPEN_FILE_TO_READ_LINES
1519
-    * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
1520
-    */
1509
+    /**
1510
+     * Reads the specified amount of lines from the target file.
1511
+     * Unicode BOM compatible: any byte order marker is stripped
1512
+     * from the resulting lines.
1513
+     * 
1514
+     * @param string $filePath
1515
+     * @param int $amount Set to 0 to read all lines.
1516
+     * @return array
1517
+     * 
1518
+     * @see FileHelper::ERROR_CANNOT_OPEN_FILE_TO_READ_LINES
1519
+     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
1520
+     */
1521 1521
     public static function readLines(string $filePath, int $amount=0) : array
1522 1522
     {
1523 1523
         self::requireFileExists($filePath);
@@ -1568,16 +1568,16 @@  discard block
 block discarded – undo
1568 1568
         return $result;
1569 1569
     }
1570 1570
     
1571
-   /**
1572
-    * Reads all content from a file.
1573
-    * 
1574
-    * @param string $filePath
1575
-    * @throws FileHelper_Exception
1576
-    * @return string
1577
-    * 
1578
-    * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
1579
-    * @see FileHelper::ERROR_CANNOT_READ_FILE_CONTENTS
1580
-    */
1571
+    /**
1572
+     * Reads all content from a file.
1573
+     * 
1574
+     * @param string $filePath
1575
+     * @throws FileHelper_Exception
1576
+     * @return string
1577
+     * 
1578
+     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
1579
+     * @see FileHelper::ERROR_CANNOT_READ_FILE_CONTENTS
1580
+     */
1581 1581
     public static function readContents(string $filePath) : string
1582 1582
     {
1583 1583
         self::requireFileExists($filePath);
Please login to merge, or discard this patch.
src/SVNHelper.php 1 patch
Indentation   +161 added lines, -161 removed lines patch added patch discarded remove patch
@@ -23,91 +23,91 @@  discard block
 block discarded – undo
23 23
  */
24 24
 class SVNHelper
25 25
 {
26
-   /**
27
-    * @var integer
28
-    */
26
+    /**
27
+     * @var integer
28
+     */
29 29
     const ERROR_LOCAL_PATH_DOES_NOT_EXIST = 22401;
30 30
     
31
-   /**
32
-    * @var integer
33
-    */
31
+    /**
32
+     * @var integer
33
+     */
34 34
     const ERROR_INVALID_REP_URL = 22402;
35 35
     
36
-   /**
37
-    * @var integer
38
-    */
36
+    /**
37
+     * @var integer
38
+     */
39 39
     const ERROR_PATH_IS_OUTSIDE_REPOSITORY = 22403;
40 40
     
41
-   /**
42
-    * @var integer
43
-    */
41
+    /**
42
+     * @var integer
43
+     */
44 44
     const ERROR_TARGET_FOLDER_IS_A_FILE = 22404;
45 45
     
46
-   /**
47
-    * @var integer
48
-    */
46
+    /**
47
+     * @var integer
48
+     */
49 49
     const ERROR_CANNOT_ADD_INEXISTENT_FILE = 22405;
50 50
     
51
-   /**
52
-    * @var integer
53
-    */
51
+    /**
52
+     * @var integer
53
+     */
54 54
     const ERROR_TARGET_PATH_NOT_FOUND = 22406;
55 55
     
56
-   /**
57
-    * @var integer
58
-    */
56
+    /**
57
+     * @var integer
58
+     */
59 59
     const ERROR_INVALID_TARGET_TYPE = 22407;
60 60
     
61
-   /**
62
-    * @var SVNHelper_Target_Folder
63
-    */
61
+    /**
62
+     * @var SVNHelper_Target_Folder
63
+     */
64 64
     protected $target;
65 65
     
66
-   /**
67
-    * @var string
68
-    */
66
+    /**
67
+     * @var string
68
+     */
69 69
     protected $path;
70 70
     
71
-   /**
72
-    * @var string
73
-    */
71
+    /**
72
+     * @var string
73
+     */
74 74
     protected $url;
75 75
     
76
-   /**
77
-    * @var string
78
-    */
76
+    /**
77
+     * @var string
78
+     */
79 79
     protected $user;
80 80
     
81
-   /**
82
-    * @var string
83
-    */
81
+    /**
82
+     * @var string
83
+     */
84 84
     protected $pass;
85 85
     
86
-   /**
87
-    * @var array
88
-    */
86
+    /**
87
+     * @var array
88
+     */
89 89
     protected $options = array(
90 90
         'binaries-path' => ''
91 91
     );
92 92
     
93
-   /**
94
-    * @var boolean
95
-    */
93
+    /**
94
+     * @var boolean
95
+     */
96 96
     protected $isWindows = false;
97 97
     
98
-   /**
99
-    * @var array
100
-    */
98
+    /**
99
+     * @var array
100
+     */
101 101
     protected $normalize = array(
102 102
         'from' => '\\',
103 103
         'to' => '/'
104 104
     );
105 105
     
106
-   /**
107
-    * @param string $repPath The path to the repository
108
-    * @param string $repURL The SVN URL to the repository
109
-    * @throws SVNHelper_Exception
110
-    */
106
+    /**
107
+     * @param string $repPath The path to the repository
108
+     * @param string $repURL The SVN URL to the repository
109
+     * @throws SVNHelper_Exception
110
+     */
111 111
     public function __construct(string $repPath, string $repURL)
112 112
     {
113 113
         $this->isWindows = substr(PHP_OS, 0, 3) == 'WIN';
@@ -168,16 +168,16 @@  discard block
 block discarded – undo
168 168
         return $this->pass;
169 169
     }
170 170
     
171
-   /**
172
-    * Normalizes slashes in the path according to the
173
-    * operating system, i.e. forward slashes for NIX-systems
174
-    * and backward slashes for Windows.
175
-    *
176
-    * @param string $path An absolute path to normalize
177
-    * @param bool $relativize Whether to return a path relative to the repository
178
-    * @throws SVNHelper_Exception
179
-    * @return string
180
-    */
171
+    /**
172
+     * Normalizes slashes in the path according to the
173
+     * operating system, i.e. forward slashes for NIX-systems
174
+     * and backward slashes for Windows.
175
+     *
176
+     * @param string $path An absolute path to normalize
177
+     * @param bool $relativize Whether to return a path relative to the repository
178
+     * @throws SVNHelper_Exception
179
+     * @return string
180
+     */
181 181
     public function normalizePath($path, $relativize=false)
182 182
     {
183 183
         if(empty($path)) {
@@ -212,32 +212,32 @@  discard block
 block discarded – undo
212 212
         );
213 213
     }
214 214
     
215
-   /**
216
-    * Retrieves the path slash style according to the
217
-    * current operating system.
218
-    * 
219
-    * @return string
220
-    */
215
+    /**
216
+     * Retrieves the path slash style according to the
217
+     * current operating system.
218
+     * 
219
+     * @return string
220
+     */
221 221
     public function getSlash()
222 222
     {
223 223
         return $this->normalize['to'];
224 224
     }
225 225
     
226
-   /**
227
-    * Keeps instances of files.
228
-    * @var SVNHelper_Target[]
229
-    */
226
+    /**
227
+     * Keeps instances of files.
228
+     * @var SVNHelper_Target[]
229
+     */
230 230
     protected $targets = array();
231 231
     
232
-   /**
233
-    * Retrieves a file instance from the SVN repository:
234
-    * this allows all possible operations on the file as
235
-    * well as accessing more information on it.
236
-    * 
237
-    * @param string $path A path to the file, relative to the repository path or absolute.
238
-    * @return SVNHelper_Target_File
239
-    * @throws SVNHelper_Exception
240
-    */
232
+    /**
233
+     * Retrieves a file instance from the SVN repository:
234
+     * this allows all possible operations on the file as
235
+     * well as accessing more information on it.
236
+     * 
237
+     * @param string $path A path to the file, relative to the repository path or absolute.
238
+     * @return SVNHelper_Target_File
239
+     * @throws SVNHelper_Exception
240
+     */
241 241
     public function getFile($path)
242 242
     {
243 243
         $path = $this->filterPath($path);
@@ -245,15 +245,15 @@  discard block
 block discarded – undo
245 245
         return $this->getTarget('File', $this->relativizePath($path));
246 246
     }
247 247
 
248
-   /**
249
-    * Retrieves a folder instance from the SVN repository:
250
-    * This allows all possible operations on the folder as
251
-    * well as accessing more information on it.
252
-    * 
253
-    * @param string $path
254
-    * @return SVNHelper_Target_Folder
255
-    * @throws SVNHelper_Exception
256
-    */
248
+    /**
249
+     * Retrieves a folder instance from the SVN repository:
250
+     * This allows all possible operations on the folder as
251
+     * well as accessing more information on it.
252
+     * 
253
+     * @param string $path
254
+     * @return SVNHelper_Target_Folder
255
+     * @throws SVNHelper_Exception
256
+     */
257 257
     public function getFolder($path)
258 258
     {
259 259
         $path = $this->filterPath($path);
@@ -261,13 +261,13 @@  discard block
 block discarded – undo
261 261
         return $this->getTarget('Folder', $this->relativizePath($path));
262 262
     }
263 263
     
264
-   /**
265
-    * Passes the path through realpath and ensures it exists.
266
-    *
267
-    * @param string $path
268
-    * @throws SVNHelper_Exception
269
-    * @return string
270
-    */
264
+    /**
265
+     * Passes the path through realpath and ensures it exists.
266
+     *
267
+     * @param string $path
268
+     * @throws SVNHelper_Exception
269
+     * @return string
270
+     */
271 271
     protected function filterPath($path)
272 272
     {
273 273
         if(empty($path)) {
@@ -292,13 +292,13 @@  discard block
 block discarded – undo
292 292
         );
293 293
     }
294 294
     
295
-   /**
296
-    * Retrieves a target file or folder within the repository.
297
-    *
298
-    * @param string $type The target type, "File" or "Folder".
299
-    * @param string $relativePath A path relative to the root folder.
300
-    * @return SVNHelper_Target
301
-    */
295
+    /**
296
+     * Retrieves a target file or folder within the repository.
297
+     *
298
+     * @param string $type The target type, "File" or "Folder".
299
+     * @param string $relativePath A path relative to the root folder.
300
+     * @return SVNHelper_Target
301
+     */
302 302
     protected function getTarget($type, $relativePath)
303 303
     {
304 304
         $key = $type.':'.$relativePath;
@@ -346,33 +346,33 @@  discard block
 block discarded – undo
346 346
         return $this->url;
347 347
     }
348 348
     
349
-   /**
350
-    * Updates the whole SVN repository from the root folder.
351
-    * @return SVNHelper_CommandResult
352
-    */
349
+    /**
350
+     * Updates the whole SVN repository from the root folder.
351
+     * @return SVNHelper_CommandResult
352
+     */
353 353
     public function runUpdate()
354 354
     {
355 355
         return $this->createUpdate($this->target)->execute();
356 356
     }
357 357
     
358
-   /**
359
-    * Creates an update command for the target file or folder.
360
-    * This can be configured further before it is executed.
361
-    * 
362
-    * @param SVNHelper_Target $target
363
-    * @return SVNHelper_Command_Update
364
-    */
358
+    /**
359
+     * Creates an update command for the target file or folder.
360
+     * This can be configured further before it is executed.
361
+     * 
362
+     * @param SVNHelper_Target $target
363
+     * @return SVNHelper_Command_Update
364
+     */
365 365
     public function createUpdate(SVNHelper_Target $target)
366 366
     {
367 367
         return $this->createCommand('Update', $target);
368 368
     }
369 369
     
370
-   /**
371
-    * Creates an add command for the targt file or folder.
372
-    * 
373
-    * @param SVNHelper_Target $target
374
-    * @return SVNHelper_Command_Add
375
-    */
370
+    /**
371
+     * Creates an add command for the targt file or folder.
372
+     * 
373
+     * @param SVNHelper_Target $target
374
+     * @return SVNHelper_Command_Add
375
+     */
376 376
     public function createAdd(SVNHelper_Target $target)
377 377
     {
378 378
         return $this->createCommand('Add', $target);
@@ -389,12 +389,12 @@  discard block
 block discarded – undo
389 389
         return $this->createCommand('Info', $target);
390 390
     }
391 391
     
392
-   /**
393
-    * Creates a status command for the target file or folder.
394
-    * 
395
-    * @param SVNHelper_Target $target
396
-    * @return SVNHelper_Command_Status
397
-    */
392
+    /**
393
+     * Creates a status command for the target file or folder.
394
+     * 
395
+     * @param SVNHelper_Target $target
396
+     * @return SVNHelper_Command_Status
397
+     */
398 398
     public function createStatus(SVNHelper_Target $target)
399 399
     {
400 400
         return $this->createCommand('Status', $target);
@@ -419,28 +419,28 @@  discard block
 block discarded – undo
419 419
         return $cmd;
420 420
     }
421 421
     
422
-   /**
423
-    * Creates a path relative to the repository for the target
424
-    * file or folder, from an absolute path.
425
-    *
426
-    * @param string $path An absolute path.
427
-    * @return string
428
-    */
422
+    /**
423
+     * Creates a path relative to the repository for the target
424
+     * file or folder, from an absolute path.
425
+     *
426
+     * @param string $path An absolute path.
427
+     * @return string
428
+     */
429 429
     public function relativizePath($path)
430 430
     {
431 431
         return $this->normalizePath($path, true);
432 432
     }
433 433
     
434
-   /**
435
-    * Adds a folder: creates it as necessary (recursive),
436
-    * and adds it to be committed if it is not versioned yet.
437
-    * Use this instead of {@link getFolder()} when you are
438
-    * not sure that it exists yet, and will need it.
439
-    * 
440
-    * @param string $path Absolute or relative path to the folder
441
-    * @throws SVNHelper_Exception
442
-    * @return SVNHelper_Target_Folder
443
-    */
434
+    /**
435
+     * Adds a folder: creates it as necessary (recursive),
436
+     * and adds it to be committed if it is not versioned yet.
437
+     * Use this instead of {@link getFolder()} when you are
438
+     * not sure that it exists yet, and will need it.
439
+     * 
440
+     * @param string $path Absolute or relative path to the folder
441
+     * @throws SVNHelper_Exception
442
+     * @return SVNHelper_Target_Folder
443
+     */
444 444
     public function addFolder($path)
445 445
     {
446 446
         if(is_dir($path)) {
@@ -490,14 +490,14 @@  discard block
 block discarded – undo
490 490
     
491 491
     protected static $logCallback;
492 492
 
493
-   /**
494
-    * Sets the callback function/method to use for
495
-    * SVH helper log messages. This gets the message
496
-    * and the SVNHelper instance as parameters.
497
-    * 
498
-    * @param callable $callback
499
-    * @throws SVNHelper_Exception
500
-    */
493
+    /**
494
+     * Sets the callback function/method to use for
495
+     * SVH helper log messages. This gets the message
496
+     * and the SVNHelper instance as parameters.
497
+     * 
498
+     * @param callable $callback
499
+     * @throws SVNHelper_Exception
500
+     */
501 501
     public static function setLogCallback($callback)
502 502
     {
503 503
         if(!is_callable($callback)) {
@@ -518,22 +518,22 @@  discard block
 block discarded – undo
518 518
         }
519 519
     }
520 520
 
521
-   /**
522
-    * Retrieves information about the file, and adds it
523
-    * to be committed later if it not versioned yet. 
524
-    * 
525
-    * @param string $path
526
-    * @return SVNHelper_Target_File
527
-    */
521
+    /**
522
+     * Retrieves information about the file, and adds it
523
+     * to be committed later if it not versioned yet. 
524
+     * 
525
+     * @param string $path
526
+     * @return SVNHelper_Target_File
527
+     */
528 528
     public function addFile($path)
529 529
     {
530 530
         return $this->getFile($path)->runAdd();        
531 531
     }
532 532
     
533
-   /**
534
-    * Commits all changes in the repository.
535
-    * @param string $message The commit message to log.
536
-    */
533
+    /**
534
+     * Commits all changes in the repository.
535
+     * @param string $message The commit message to log.
536
+     */
537 537
     public function runCommit($message)
538 538
     {
539 539
         $this->createCommit($this->getFolder($this->path), $message)->execute();
Please login to merge, or discard this patch.