Passed
Push — master ( aecd40...074997 )
by Sebastian
10:13 queued 07:17
created
src/IniHelper.php 3 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -163,8 +163,7 @@
 block discarded – undo
163 163
             if($section->isDefault()) 
164 164
             {
165 165
                 $result = array_merge($result, $section->toArray());
166
-            } 
167
-            else 
166
+            } else 
168 167
             {
169 168
                 $result[$section->getName()] = $section->toArray();
170 169
             }
Please login to merge, or discard this patch.
Indentation   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -62,10 +62,10 @@  discard block
 block discarded – undo
62 62
         }
63 63
     }
64 64
     
65
-   /**
66
-    * The end of line character used in the INI source string.
67
-    * @return string
68
-    */
65
+    /**
66
+     * The end of line character used in the INI source string.
67
+     * @return string
68
+     */
69 69
     public function getEOLChar() : string
70 70
     {
71 71
         return $this->eol;
@@ -99,35 +99,35 @@  discard block
 block discarded – undo
99 99
         );
100 100
     }
101 101
     
102
-   /**
103
-    * Factory method: Creates a new ini helper instance from an ini string.
104
-    * 
105
-    * @param string $iniContent
106
-    * @return IniHelper
107
-    */
102
+    /**
103
+     * Factory method: Creates a new ini helper instance from an ini string.
104
+     * 
105
+     * @param string $iniContent
106
+     * @return IniHelper
107
+     */
108 108
     public static function createFromString(string $iniContent) : IniHelper
109 109
     {
110 110
         return new IniHelper($iniContent);
111 111
     }
112 112
     
113
-   /**
114
-    * Factory method: Creates a new empty ini helper.
115
-    *  
116
-    * @return IniHelper
117
-    */
113
+    /**
114
+     * Factory method: Creates a new empty ini helper.
115
+     *  
116
+     * @return IniHelper
117
+     */
118 118
     public static function createNew() : IniHelper
119 119
     {
120 120
         return self::createFromString('');
121 121
     }
122 122
     
123
-   /**
124
-    * Adds a new data section, and returns the section instance.
125
-    * If a section with the name already exists, returns that
126
-    * section instead of creating a new one.
127
-    *  
128
-    * @param string $name
129
-    * @return IniHelper_Section
130
-    */
123
+    /**
124
+     * Adds a new data section, and returns the section instance.
125
+     * If a section with the name already exists, returns that
126
+     * section instead of creating a new one.
127
+     *  
128
+     * @param string $name
129
+     * @return IniHelper_Section
130
+     */
131 131
     public function addSection(string $name) : IniHelper_Section
132 132
     {
133 133
         if(!isset($this->sections[$name])) {
@@ -137,22 +137,22 @@  discard block
 block discarded – undo
137 137
         return $this->sections[$name];
138 138
     }
139 139
     
140
-   /**
141
-    * Retrieves a section by its name, if it exists.
142
-    * 
143
-    * @param string $name
144
-    * @return IniHelper_Section|NULL
145
-    */
140
+    /**
141
+     * Retrieves a section by its name, if it exists.
142
+     * 
143
+     * @param string $name
144
+     * @return IniHelper_Section|NULL
145
+     */
146 146
     public function getSection(string $name) : ?IniHelper_Section
147 147
     {
148 148
         return $this->sections[$name] ?? null;
149 149
     }
150 150
     
151
-   /**
152
-    * Gets the data from the INI file as an associative array.
153
-    * 
154
-    * @return array<string,mixed>
155
-    */
151
+    /**
152
+     * Gets the data from the INI file as an associative array.
153
+     * 
154
+     * @return array<string,mixed>
155
+     */
156 156
     public function toArray() : array
157 157
     {
158 158
         $result = array();
@@ -172,17 +172,17 @@  discard block
 block discarded – undo
172 172
         return $result;
173 173
     }
174 174
     
175
-   /**
176
-    * Saves the INI content to the target file.
177
-    * 
178
-    * @param string $filePath
179
-    * @return IniHelper
180
-    * @throws FileHelper_Exception
181
-    * 
182
-    * @see FileHelper::ERROR_SAVE_FOLDER_NOT_WRITABLE
183
-    * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
184
-    * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
185
-    */
175
+    /**
176
+     * Saves the INI content to the target file.
177
+     * 
178
+     * @param string $filePath
179
+     * @return IniHelper
180
+     * @throws FileHelper_Exception
181
+     * 
182
+     * @see FileHelper::ERROR_SAVE_FOLDER_NOT_WRITABLE
183
+     * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
184
+     * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
185
+     */
186 186
     public function saveToFile(string $filePath) : IniHelper
187 187
     {
188 188
         FileHelper::saveFile($filePath, $this->saveToString());
@@ -190,11 +190,11 @@  discard block
 block discarded – undo
190 190
         return $this;
191 191
     }
192 192
     
193
-   /**
194
-    * Returns the INI content as string.
195
-    * 
196
-    * @return string
197
-    */
193
+    /**
194
+     * Returns the INI content as string.
195
+     * 
196
+     * @return string
197
+     */
198 198
     public function saveToString() : string
199 199
     {
200 200
         $parts = array();
@@ -207,15 +207,15 @@  discard block
 block discarded – undo
207 207
         return implode($this->eol, $parts);
208 208
     }
209 209
     
210
-   /**
211
-    * Sets or adds the value of a setting in the INI content.
212
-    * If the setting does not exist, it is added. Otherwise,
213
-    * the existing value is overwritten.
214
-    * 
215
-    * @param string $path A variable path, either <code>varname</code> or <code>section.varname</code>.
216
-    * @param mixed $value
217
-    * @return IniHelper
218
-    */
210
+    /**
211
+     * Sets or adds the value of a setting in the INI content.
212
+     * If the setting does not exist, it is added. Otherwise,
213
+     * the existing value is overwritten.
214
+     * 
215
+     * @param string $path A variable path, either <code>varname</code> or <code>section.varname</code>.
216
+     * @param mixed $value
217
+     * @return IniHelper
218
+     */
219 219
     public function setValue(string $path, $value) : IniHelper
220 220
     {
221 221
         $info = $this->parsePath($path);
@@ -239,12 +239,12 @@  discard block
 block discarded – undo
239 239
         return $this;
240 240
     }
241 241
     
242
-   /**
243
-    * Checks whether a section with the specified name exists.
244
-    * 
245
-    * @param string $name
246
-    * @return bool
247
-    */
242
+    /**
243
+     * Checks whether a section with the specified name exists.
244
+     * 
245
+     * @param string $name
246
+     * @return bool
247
+     */
248 248
     public function sectionExists(string $name) : bool
249 249
     {
250 250
         foreach($this->sections as $section) {
@@ -256,23 +256,23 @@  discard block
 block discarded – undo
256 256
         return false;
257 257
     }
258 258
     
259
-   /**
260
-    * Retrieves the default section, which is used to add
261
-    * values in the root of the document.
262
-    * 
263
-    * @return IniHelper_Section
264
-    */
259
+    /**
260
+     * Retrieves the default section, which is used to add
261
+     * values in the root of the document.
262
+     * 
263
+     * @return IniHelper_Section
264
+     */
265 265
     public function getDefaultSection() : IniHelper_Section
266 266
     {
267 267
         return $this->addSection(self::SECTION_DEFAULT);
268 268
     }
269 269
     
270
-   /**
271
-    * Retrieves all variable lines for the specified path.
272
-    * 
273
-    * @param string $path A variable path. Either <code>varname</code> or <code>section.varname</code>.
274
-    * @return INILine[]
275
-    */
270
+    /**
271
+     * Retrieves all variable lines for the specified path.
272
+     * 
273
+     * @param string $path A variable path. Either <code>varname</code> or <code>section.varname</code>.
274
+     * @return INILine[]
275
+     */
276 276
     public function getLinesByVariable(string $path) : array
277 277
     {
278 278
         $info = $this->parsePath($path);
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -39,12 +39,12 @@  discard block
 block discarded – undo
39 39
     {
40 40
         $section = $this->addSection(self::SECTION_DEFAULT);
41 41
         
42
-        if(empty($iniString)) {
42
+        if (empty($iniString)) {
43 43
             return;
44 44
         }
45 45
         
46 46
         $eol = ConvertHelper::detectEOLCharacter($iniString);
47
-        if($eol !== null) {
47
+        if ($eol !== null) {
48 48
             $this->eol = $eol->getCharacter();
49 49
         }
50 50
         
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
         {
55 55
             $line = new INILine($value, $index);
56 56
             
57
-            if($line->isSection()) {
57
+            if ($line->isSection()) {
58 58
                 $section = $this->addSection($line->getSectionName());
59 59
             }
60 60
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
         $iniPath = FileHelper::requireFileExists($iniPath);
86 86
         
87 87
         $content = file_get_contents($iniPath);
88
-        if($content !== false) {
88
+        if ($content !== false) {
89 89
             return self::createFromString($content);
90 90
         }
91 91
         
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
     */
131 131
     public function addSection(string $name) : IniHelper_Section
132 132
     {
133
-        if(!isset($this->sections[$name])) {
133
+        if (!isset($this->sections[$name])) {
134 134
             $this->sections[$name] = new IniHelper_Section($this, $name);
135 135
         }
136 136
         
@@ -157,9 +157,9 @@  discard block
 block discarded – undo
157 157
     {
158 158
         $result = array();
159 159
         
160
-        foreach($this->sections as $section)
160
+        foreach ($this->sections as $section)
161 161
         {
162
-            if($section->isDefault()) 
162
+            if ($section->isDefault()) 
163 163
             {
164 164
                 $result = array_merge($result, $section->toArray());
165 165
             } 
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
     {
200 200
         $parts = array();
201 201
         
202
-        foreach($this->sections as $section)
202
+        foreach ($this->sections as $section)
203 203
         {
204 204
             $parts[] = $section->toString();
205 205
         }
@@ -247,8 +247,8 @@  discard block
 block discarded – undo
247 247
     */
248 248
     public function sectionExists(string $name) : bool
249 249
     {
250
-        foreach($this->sections as $section) {
251
-            if($section->getName() === $name) {
250
+        foreach ($this->sections as $section) {
251
+            if ($section->getName() === $name) {
252 252
                 return true;
253 253
             }
254 254
         }
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
     {
278 278
         $info = $this->parsePath($path);
279 279
         
280
-        if(!$this->sectionExists($info['section'])) {
280
+        if (!$this->sectionExists($info['section'])) {
281 281
             return array();
282 282
         }
283 283
         
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
     {
293 293
         $parts = explode($this->pathSeparator, $path);
294 294
         
295
-        if(count($parts) === 1)
295
+        if (count($parts) === 1)
296 296
         {
297 297
             return array(
298 298
                 'section' => self::SECTION_DEFAULT,
Please login to merge, or discard this patch.
src/JSHelper.php 3 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -159,8 +159,7 @@  discard block
 block discarded – undo
159 159
             if($hash === true) 
160 160
             { 
161 161
                 $hash = 'true'; 
162
-            } 
163
-            else if($hash === false) 
162
+            } else if($hash === false) 
164 163
             { 
165 164
                 $hash = 'false'; 
166 165
             }
@@ -184,8 +183,7 @@  discard block
 block discarded – undo
184 183
                 if($string === false) 
185 184
                 {
186 185
                     $string = '';
187
-                } 
188
-                else if($quoteStyle === self::QUOTE_STYLE_SINGLE) 
186
+                } else if($quoteStyle === self::QUOTE_STYLE_SINGLE) 
189 187
                 {
190 188
                     $string = mb_substr($string, 1, mb_strlen($string)-2);
191 189
                     $string = "'".str_replace("'", "\'", $string)."'";
Please login to merge, or discard this patch.
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -95,20 +95,20 @@  discard block
 block discarded – undo
95 95
         $quoteStyle = array_shift($params);
96 96
         $method = array_shift($params);
97 97
         
98
-        $call = $method . '(';
98
+        $call = $method.'(';
99 99
         
100 100
         $total = count($params);
101
-        if($total > 0) {
102
-            for($i=0; $i < $total; $i++) 
101
+        if ($total > 0) {
102
+            for ($i = 0; $i < $total; $i++) 
103 103
             {
104 104
                 $call .= self::phpVariable2JS($params[$i], $quoteStyle);
105
-                if($i < ($total-1)) {
105
+                if ($i < ($total - 1)) {
106 106
                     $call .= ',';
107 107
                 }
108 108
             }
109 109
         }
110 110
         
111
-        return $call . ');';
111
+        return $call.');';
112 112
     }
113 113
 
114 114
    /**
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
     */
133 133
     public static function buildVariable(string $varName, $varValue) : string
134 134
     {
135
-        return $varName . "=" . self::phpVariable2JS($varValue) . ';';
135
+        return $varName."=".self::phpVariable2JS($varValue).';';
136 136
     }
137 137
     
138 138
    /**
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
     * @param int $quoteStyle The quote style to use for strings
145 145
     * @return string
146 146
     */
147
-    public static function phpVariable2JS($variable, int $quoteStyle=self::QUOTE_STYLE_DOUBLE) : string
147
+    public static function phpVariable2JS($variable, int $quoteStyle = self::QUOTE_STYLE_DOUBLE) : string
148 148
     {
149 149
         // after much profiling, this variant of the method offers
150 150
         // the best performance. Repeat scalar values are cached 
@@ -152,22 +152,22 @@  discard block
 block discarded – undo
152 152
         
153 153
         $type = gettype($variable);
154 154
         $hash = null;
155
-        if(is_scalar($variable) === true) 
155
+        if (is_scalar($variable) === true) 
156 156
         {
157 157
             $hash = $variable;
158 158
         
159
-            if($hash === true) 
159
+            if ($hash === true) 
160 160
             { 
161 161
                 $hash = 'true'; 
162 162
             } 
163
-            else if($hash === false) 
163
+            else if ($hash === false) 
164 164
             { 
165 165
                 $hash = 'false'; 
166 166
             }
167 167
             
168 168
             $hash .= '-'.$quoteStyle.'-'.$type;
169 169
             
170
-            if(isset(self::$variableCache[$hash])) {
170
+            if (isset(self::$variableCache[$hash])) {
171 171
                 return self::$variableCache[$hash];
172 172
             }
173 173
         }
@@ -175,19 +175,19 @@  discard block
 block discarded – undo
175 175
         $result = 'null';
176 176
 
177 177
         // one gettype call is better than a strict if-else.
178
-        switch($type) 
178
+        switch ($type) 
179 179
         {
180 180
             case 'double':
181 181
             case 'string':
182 182
                 $string = json_encode($variable);
183 183
                 
184
-                if($string === false) 
184
+                if ($string === false) 
185 185
                 {
186 186
                     $string = '';
187 187
                 } 
188
-                else if($quoteStyle === self::QUOTE_STYLE_SINGLE) 
188
+                else if ($quoteStyle === self::QUOTE_STYLE_SINGLE) 
189 189
                 {
190
-                    $string = mb_substr($string, 1, mb_strlen($string)-2);
190
+                    $string = mb_substr($string, 1, mb_strlen($string) - 2);
191 191
                     $string = "'".str_replace("'", "\'", $string)."'";
192 192
                 }
193 193
                 
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
                 break;
196 196
                 
197 197
             case 'boolean':
198
-                if($variable === true) {
198
+                if ($variable === true) {
199 199
                     $result = 'true';
200 200
                 } else {
201 201
                     $result = 'false';
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
         }
214 214
 
215 215
         // cache cacheable values
216
-        if($hash !== null) 
216
+        if ($hash !== null) 
217 217
         {
218 218
             self::$variableCache[$hash] = $result;
219 219
         }
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
     {
246 246
         self::$elementCounter++;
247 247
 
248
-        return self::$idPrefix . self::$elementCounter;
248
+        return self::$idPrefix.self::$elementCounter;
249 249
     }
250 250
     
251 251
    /**
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
      * @see JSHelper::JS_REGEX_OBJECT
320 320
      * @see JSHelper::JS_REGEX_JSON
321 321
      */
322
-    public static function buildRegexStatement(string $regex, string $statementType=self::JS_REGEX_OBJECT) : string
322
+    public static function buildRegexStatement(string $regex, string $statementType = self::JS_REGEX_OBJECT) : string
323 323
     {
324 324
         $regex = trim($regex);
325 325
         $separator = substr($regex, 0, 1);
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
         array_shift($parts);
328 328
         
329 329
         $modifiers = array_pop($parts);
330
-        if($modifiers == $separator) {
330
+        if ($modifiers == $separator) {
331 331
             $modifiers = '';
332 332
         }
333 333
         
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
         // convert the anchors that are not supported in js regexes
344 344
         $format = str_replace(array('\\A', '\\Z', '\\z'), array('^', '$', ''), $format);
345 345
         
346
-        if($statementType==self::JS_REGEX_JSON)
346
+        if ($statementType == self::JS_REGEX_JSON)
347 347
         {
348 348
             return ConvertHelper::var2json(array(
349 349
                 'format' => $format,
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
             ));
352 352
         }
353 353
         
354
-        if(!empty($modifiers)) {
354
+        if (!empty($modifiers)) {
355 355
             return sprintf(
356 356
                 'new RegExp(%s, %s)',
357 357
                 ConvertHelper::var2json($format),
Please login to merge, or discard this patch.
Indentation   +85 added lines, -85 removed lines patch added patch discarded remove patch
@@ -29,28 +29,28 @@  discard block
 block discarded – undo
29 29
     public const QUOTE_STYLE_SINGLE = 1;
30 30
     public const QUOTE_STYLE_DOUBLE = 2;
31 31
 
32
-   /**
33
-    * @var array<string,string>
34
-    */
32
+    /**
33
+     * @var array<string,string>
34
+     */
35 35
     protected static array $variableCache = array();
36 36
     protected static int $elementCounter = 0;
37 37
     protected static string $idPrefix = 'E';
38 38
     
39
-   /**
40
-    * Builds a javascript statement. The first parameter is the
41
-    * javascript function to call, any additional parameters are
42
-    * used as arguments for the javascript function call. Variable
43
-    * types are automagically converted to the javascript equivalents.
44
-    *
45
-    * Examples:
46
-    *
47
-    * // add an alert(); statement:
48
-    * JSHelper::buildStatement('alert');
49
-    *
50
-    * // add an alert('Alert text'); statement
51
-    * JSHelper::buildStatement('alert', 'Alert text');
52
-    *
53
-    */
39
+    /**
40
+     * Builds a javascript statement. The first parameter is the
41
+     * javascript function to call, any additional parameters are
42
+     * used as arguments for the javascript function call. Variable
43
+     * types are automagically converted to the javascript equivalents.
44
+     *
45
+     * Examples:
46
+     *
47
+     * // add an alert(); statement:
48
+     * JSHelper::buildStatement('alert');
49
+     *
50
+     * // add an alert('Alert text'); statement
51
+     * JSHelper::buildStatement('alert', 'Alert text');
52
+     *
53
+     */
54 54
     public static function buildStatement() : string
55 55
     {
56 56
         $args = func_get_args();
@@ -58,13 +58,13 @@  discard block
 block discarded – undo
58 58
         return call_user_func_array(array(self::class, 'buildStatementQuoteStyle'), $args);
59 59
     }
60 60
     
61
-   /**
62
-    * Like {@link JSHelper::buildStatement()}, but using single quotes
63
-    * to make it possible to use the statement in an HTML tag attribute.
64
-    * 
65
-    * @return string
66
-    * @see JSHelper::buildStatement()
67
-    */
61
+    /**
62
+     * Like {@link JSHelper::buildStatement()}, but using single quotes
63
+     * to make it possible to use the statement in an HTML tag attribute.
64
+     * 
65
+     * @return string
66
+     * @see JSHelper::buildStatement()
67
+     */
68 68
     public static function buildStatementAttribute() : string
69 69
     {
70 70
         $args = func_get_args();
@@ -94,39 +94,39 @@  discard block
 block discarded – undo
94 94
         return $call . ');';
95 95
     }
96 96
 
97
-   /**
98
-    * Builds a set variable statement. The variable value is
99
-    * automatically converted to the javascript equivalent.
100
-    *
101
-    * Examples:
102
-    *
103
-    * // foo = 'bar';
104
-    * JSHelper::buildVariable('foo', 'bar');
105
-    *
106
-    * // foo = 42;
107
-    * JSHelper::buildVariable('foo', 42);
108
-    *
109
-    * // foo = true;
110
-    * JSHelper::buildVariable('foo', true);
111
-    *
112
-    * @param string $varName
113
-    * @param mixed $varValue
114
-    * @return string
115
-    */
97
+    /**
98
+     * Builds a set variable statement. The variable value is
99
+     * automatically converted to the javascript equivalent.
100
+     *
101
+     * Examples:
102
+     *
103
+     * // foo = 'bar';
104
+     * JSHelper::buildVariable('foo', 'bar');
105
+     *
106
+     * // foo = 42;
107
+     * JSHelper::buildVariable('foo', 42);
108
+     *
109
+     * // foo = true;
110
+     * JSHelper::buildVariable('foo', true);
111
+     *
112
+     * @param string $varName
113
+     * @param mixed $varValue
114
+     * @return string
115
+     */
116 116
     public static function buildVariable(string $varName, $varValue) : string
117 117
     {
118 118
         return $varName . "=" . self::phpVariable2JS($varValue) . ';';
119 119
     }
120 120
     
121
-   /**
122
-    * Converts a PHP variable to its javascript equivalent. Note that
123
-    * if a variable cannot be converted (like a PHP resource), this will
124
-    * return a javascript "null".
125
-    *
126
-    * @param mixed $variable
127
-    * @param int $quoteStyle The quote style to use for strings
128
-    * @return string
129
-    */
121
+    /**
122
+     * Converts a PHP variable to its javascript equivalent. Note that
123
+     * if a variable cannot be converted (like a PHP resource), this will
124
+     * return a javascript "null".
125
+     *
126
+     * @param mixed $variable
127
+     * @param int $quoteStyle The quote style to use for strings
128
+     * @return string
129
+     */
130 130
     public static function phpVariable2JS($variable, int $quoteStyle=self::QUOTE_STYLE_DOUBLE) : string
131 131
     {
132 132
         // after much profiling, this variant of the method offers
@@ -204,26 +204,26 @@  discard block
 block discarded – undo
204 204
         return $result;
205 205
     }
206 206
     
207
-   /**
208
-    * Converts a variable to a JS string that can be 
209
-    * used in an HTML attribute: it uses single quotes
210
-    * instead of the default double quotes.
211
-    * 
212
-    * @param mixed $variable
213
-    * @return string
214
-    */
207
+    /**
208
+     * Converts a variable to a JS string that can be 
209
+     * used in an HTML attribute: it uses single quotes
210
+     * instead of the default double quotes.
211
+     * 
212
+     * @param mixed $variable
213
+     * @return string
214
+     */
215 215
     public static function phpVariable2AttributeJS($variable) : string
216 216
     {
217 217
         return self::phpVariable2JS($variable, self::QUOTE_STYLE_SINGLE);
218 218
     }
219 219
 
220
-   /**
221
-    * Generates a dynamic element ID to be used with dynamically generated
222
-    * HTML code to tie in with clientside javascript when compact but unique
223
-    * IDs are needed in a  request.
224
-    *
225
-    * @return string
226
-    */
220
+    /**
221
+     * Generates a dynamic element ID to be used with dynamically generated
222
+     * HTML code to tie in with clientside javascript when compact but unique
223
+     * IDs are needed in a  request.
224
+     *
225
+     * @return string
226
+     */
227 227
     public static function nextElementID() : string
228 228
     {
229 229
         self::$elementCounter++;
@@ -231,33 +231,33 @@  discard block
 block discarded – undo
231 231
         return self::$idPrefix . self::$elementCounter;
232 232
     }
233 233
     
234
-   /**
235
-    * Retrieves the ID prefix currently used.
236
-    * 
237
-    * @return string
238
-    */
234
+    /**
235
+     * Retrieves the ID prefix currently used.
236
+     * 
237
+     * @return string
238
+     */
239 239
     public static function getIDPrefix() : string
240 240
     {
241 241
         return self::$idPrefix;
242 242
     }
243 243
     
244
-   /**
245
-    * Retrieves the value of the internal elements counter.
246
-    * 
247
-    * @return integer
248
-    */
244
+    /**
245
+     * Retrieves the value of the internal elements counter.
246
+     * 
247
+     * @return integer
248
+     */
249 249
     public static function getElementCounter() : int
250 250
     {
251 251
         return self::$elementCounter;
252 252
     }
253 253
     
254
-   /**
255
-    * Sets the prefix that is added in front of all IDs
256
-    * retrieved using the {@link nextElementID()} method.
257
-    * 
258
-    * @param string $prefix
259
-    * @see JSHelper::nextElementID()
260
-    */
254
+    /**
255
+     * Sets the prefix that is added in front of all IDs
256
+     * retrieved using the {@link nextElementID()} method.
257
+     * 
258
+     * @param string $prefix
259
+     * @see JSHelper::nextElementID()
260
+     */
261 261
     public static function setIDPrefix(string $prefix) : void
262 262
     {
263 263
         self::$idPrefix = $prefix;
Please login to merge, or discard this patch.
src/PaginationHelper.php 3 patches
Indentation   +115 added lines, -115 removed lines patch added patch discarded remove patch
@@ -24,56 +24,56 @@  discard block
 block discarded – undo
24 24
  */
25 25
 class PaginationHelper
26 26
 {
27
-   /**
28
-    * @var int
29
-    */
27
+    /**
28
+     * @var int
29
+     */
30 30
     protected $total;
31 31
     
32
-   /**
33
-    * @var int
34
-    */
32
+    /**
33
+     * @var int
34
+     */
35 35
     protected $perPage;
36 36
     
37
-   /**
38
-    * @var int
39
-    */
37
+    /**
38
+     * @var int
39
+     */
40 40
     protected $current;
41 41
     
42
-   /**
43
-    * @var int
44
-    */
42
+    /**
43
+     * @var int
44
+     */
45 45
     protected $next = 0;
46 46
     
47
-   /**
48
-    * @var int
49
-    */
47
+    /**
48
+     * @var int
49
+     */
50 50
     protected $prev = 0;
51 51
     
52
-   /**
53
-    * @var int
54
-    */
52
+    /**
53
+     * @var int
54
+     */
55 55
     protected $last = 0; 
56 56
     
57
-   /**
58
-    * @var int
59
-    */
57
+    /**
58
+     * @var int
59
+     */
60 60
     protected $adjacentPages = 3;
61 61
     
62
-   /**
63
-    * @var int
64
-    */
62
+    /**
63
+     * @var int
64
+     */
65 65
     protected $offsetEnd = 0;
66 66
     
67
-   /**
68
-    * @var int
69
-    */
67
+    /**
68
+     * @var int
69
+     */
70 70
     protected $offsetStart = 0;
71 71
     
72
-   /**
73
-    * @param int $totalItems The total amount of items available.
74
-    * @param int $itemsPerPage How many items to display per page.
75
-    * @param int $currentPage The current page number (1-based)
76
-    */
72
+    /**
73
+     * @param int $totalItems The total amount of items available.
74
+     * @param int $itemsPerPage How many items to display per page.
75
+     * @param int $currentPage The current page number (1-based)
76
+     */
77 77
     public function __construct(int $totalItems, int $itemsPerPage, int $currentPage)
78 78
     {
79 79
         $this->total = $totalItems;
@@ -83,34 +83,34 @@  discard block
 block discarded – undo
83 83
         $this->calculate();
84 84
     }
85 85
     
86
-   /**
87
-    * Sets the amount of adjacent pages to display next to the
88
-    * current one when using the pages list.
89
-    *
90
-    * @param int $amount
91
-    * @return PaginationHelper
92
-    */
86
+    /**
87
+     * Sets the amount of adjacent pages to display next to the
88
+     * current one when using the pages list.
89
+     *
90
+     * @param int $amount
91
+     * @return PaginationHelper
92
+     */
93 93
     public function setAdjacentPages(int $amount) : PaginationHelper
94 94
     {
95 95
         $this->adjacentPages = $amount;
96 96
         return $this;
97 97
     }
98 98
     
99
-   /**
100
-    * Whether there is a next page after the current page.
101
-    * @return bool
102
-    */
99
+    /**
100
+     * Whether there is a next page after the current page.
101
+     * @return bool
102
+     */
103 103
     public function hasNextPage() : bool
104 104
     {
105 105
         return $this->next > 0;
106 106
     }
107 107
     
108
-   /**
109
-    * The next page number. Returns the last page
110
-    * number if there is no next page.
111
-    *  
112
-    * @return int
113
-    */
108
+    /**
109
+     * The next page number. Returns the last page
110
+     * number if there is no next page.
111
+     *  
112
+     * @return int
113
+     */
114 114
     public function getNextPage() : int
115 115
     {
116 116
         if($this->next === 0) {
@@ -120,21 +120,21 @@  discard block
 block discarded – undo
120 120
         return $this->next;
121 121
     }
122 122
     
123
-   /**
124
-    * Whether there is a previous page before the current page.
125
-    * @return bool
126
-    */
123
+    /**
124
+     * Whether there is a previous page before the current page.
125
+     * @return bool
126
+     */
127 127
     public function hasPreviousPage() : bool
128 128
     {
129 129
         return $this->prev > 0;
130 130
     }
131 131
     
132
-   /**
133
-    * The previous page number. Returns the first page
134
-    * number if there is no previous page.
135
-    * 
136
-    * @return int
137
-    */
132
+    /**
133
+     * The previous page number. Returns the first page
134
+     * number if there is no previous page.
135
+     * 
136
+     * @return int
137
+     */
138 138
     public function getPreviousPage() : int
139 139
     {
140 140
         if($this->prev === 0) {
@@ -144,21 +144,21 @@  discard block
 block discarded – undo
144 144
         return $this->prev;
145 145
     }
146 146
     
147
-   /**
148
-    * Retrieves the last page number.
149
-    * @return int
150
-    */
147
+    /**
148
+     * Retrieves the last page number.
149
+     * @return int
150
+     */
151 151
     public function getLastPage() : int
152 152
     {
153 153
         return $this->last;
154 154
     }
155 155
     
156
-   /**
157
-    * Whether there is more than one page, i.e. whether
158
-    * pagination is required at all.
159
-    *  
160
-    * @return bool
161
-    */
156
+    /**
157
+     * Whether there is more than one page, i.e. whether
158
+     * pagination is required at all.
159
+     *  
160
+     * @return bool
161
+     */
162 162
     public function hasPages() : bool
163 163
     {
164 164
         return $this->last > 1;
@@ -169,12 +169,12 @@  discard block
 block discarded – undo
169 169
         return $this->current;
170 170
     }
171 171
     
172
-   /**
173
-    * Retrieves a list of page numbers for a page
174
-    * navigator, to quickly jump between pages.
175
-    *
176
-    * @return int[]
177
-    */
172
+    /**
173
+     * Retrieves a list of page numbers for a page
174
+     * navigator, to quickly jump between pages.
175
+     *
176
+     * @return int[]
177
+     */
178 178
     public function getPageNumbers() : array
179 179
     {
180 180
         $adjacent = $this->adjacentPages;
@@ -250,66 +250,66 @@  discard block
 block discarded – undo
250 250
         return $numbers;
251 251
     }
252 252
     
253
-   /**
254
-    * Whether the specified page number is the current page.
255
-    * 
256
-    * @param int $pageNumber
257
-    * @return bool
258
-    */
253
+    /**
254
+     * Whether the specified page number is the current page.
255
+     * 
256
+     * @param int $pageNumber
257
+     * @return bool
258
+     */
259 259
     public function isCurrentPage(int $pageNumber) : bool
260 260
     {
261 261
         return $pageNumber === $this->current;
262 262
     }
263 263
     
264
-   /**
265
-    * Retrieves the 1-based starting offset of
266
-    * items currently displayed in the page.
267
-    * 
268
-    * Note: Use this to create a text like 
269
-    * "showing entries x to y".
270
-    * 
271
-    * @return int
272
-    * @see PaginationHelper::getOffsetEnd()
273
-    */
264
+    /**
265
+     * Retrieves the 1-based starting offset of
266
+     * items currently displayed in the page.
267
+     * 
268
+     * Note: Use this to create a text like 
269
+     * "showing entries x to y".
270
+     * 
271
+     * @return int
272
+     * @see PaginationHelper::getOffsetEnd()
273
+     */
274 274
     public function getItemsStart() : int
275 275
     {
276 276
         return $this->getOffsetStart() + 1;
277 277
     }
278 278
 
279
-   /**
280
-    * Retrieves the 1-based ending offset of
281
-    * items currently displayed in the page.
282
-    * 
283
-    * Note: Use this to create a text like 
284
-    * "showing entries x to y".
285
-    * 
286
-    * @return int
287
-    * @see PaginationHelper::getOffsetStart()
288
-    */
279
+    /**
280
+     * Retrieves the 1-based ending offset of
281
+     * items currently displayed in the page.
282
+     * 
283
+     * Note: Use this to create a text like 
284
+     * "showing entries x to y".
285
+     * 
286
+     * @return int
287
+     * @see PaginationHelper::getOffsetStart()
288
+     */
289 289
     public function getItemsEnd() : int
290 290
     {
291 291
         return $this->getOffsetEnd() + 1;
292 292
     }
293 293
     
294
-   /**
295
-    * Retrieves the 0-based starting offset of
296
-    * items currently displayed in the page.
297
-    * 
298
-    * @return int
299
-    * @see PaginationHelper::getItemsStart()
300
-    */
294
+    /**
295
+     * Retrieves the 0-based starting offset of
296
+     * items currently displayed in the page.
297
+     * 
298
+     * @return int
299
+     * @see PaginationHelper::getItemsStart()
300
+     */
301 301
     public function getOffsetStart() : int
302 302
     {
303 303
         return $this->offsetStart;
304 304
     }
305 305
     
306
-   /**
307
-    * Retrieves the 0-based ending offset of
308
-    * items currently displayed in the page.
309
-    * 
310
-    * @return int
311
-    * @see PaginationHelper::getItemsEnd()
312
-    */
306
+    /**
307
+     * Retrieves the 0-based ending offset of
308
+     * items currently displayed in the page.
309
+     * 
310
+     * @return int
311
+     * @see PaginationHelper::getItemsEnd()
312
+     */
313 313
     public function getOffsetEnd() : int
314 314
     {
315 315
         return $this->offsetEnd;
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -322,8 +322,7 @@
 block discarded – undo
322 322
         if($this->current < 1)
323 323
         {
324 324
             $this->current = 1;
325
-        }
326
-        else if($this->current > $pages)
325
+        } else if($this->current > $pages)
327 326
         {
328 327
             $this->current = $pages;
329 328
         }
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
     */
114 114
     public function getNextPage() : int
115 115
     {
116
-        if($this->next === 0) {
116
+        if ($this->next === 0) {
117 117
             return $this->last;
118 118
         }
119 119
         
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
     */
138 138
     public function getPreviousPage() : int
139 139
     {
140
-        if($this->prev === 0) {
140
+        if ($this->prev === 0) {
141 141
             return 1;
142 142
         }
143 143
         
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
         // adjust the adjacent value if it exceeds the
183 183
         // total amount of pages
184 184
         $adjacentTotal = ($adjacent * 2) + 1;
185
-        if($adjacentTotal > $this->last) 
185
+        if ($adjacentTotal > $this->last) 
186 186
         {
187 187
             $adjacent = (int)floor($this->last / 2);
188 188
         }
@@ -195,13 +195,13 @@  discard block
 block discarded – undo
195 195
         $back = 0;
196 196
         $fwd = 0;
197 197
         
198
-        if($maxBack >= $adjacent) {
198
+        if ($maxBack >= $adjacent) {
199 199
             $back = $adjacent; 
200 200
         } else {
201 201
             $back = $maxBack;
202 202
         }
203 203
         
204
-        if($maxFwd >= $adjacent)  {
204
+        if ($maxFwd >= $adjacent) {
205 205
             $fwd = $adjacent;
206 206
         } else {
207 207
             $fwd = $maxFwd;
@@ -217,16 +217,16 @@  discard block
 block discarded – undo
217 217
         $fwd += $backDiff;
218 218
         $back += $fwdDiff;
219 219
         
220
-        if($fwd > $maxFwd) { $fwd = $maxFwd; }
221
-        if($back > $maxBack) { $back = $maxBack; }
220
+        if ($fwd > $maxFwd) { $fwd = $maxFwd; }
221
+        if ($back > $maxBack) { $back = $maxBack; }
222 222
         
223 223
         // calculate the first and last page in the list
224 224
         $prev = $this->current - $back;
225 225
         $next = $this->current + $fwd;
226 226
         
227 227
         // failsafe so we stay within the bounds
228
-        if($prev < 1) { $prev = 1; }
229
-        if($next > $this->last) { $next = $this->last; }
228
+        if ($prev < 1) { $prev = 1; }
229
+        if ($next > $this->last) { $next = $this->last; }
230 230
         
231 231
         // create and return the page numbers list
232 232
         $numbers = range($prev, $next);
@@ -319,11 +319,11 @@  discard block
 block discarded – undo
319 319
     {
320 320
         $pages = (int)ceil($this->total / $this->perPage);
321 321
         
322
-        if($this->current < 1)
322
+        if ($this->current < 1)
323 323
         {
324 324
             $this->current = 1;
325 325
         }
326
-        else if($this->current > $pages)
326
+        else if ($this->current > $pages)
327 327
         {
328 328
             $this->current = $pages;
329 329
         }
@@ -331,19 +331,19 @@  discard block
 block discarded – undo
331 331
         $this->last = $pages;
332 332
         
333 333
         $nextPage = $this->current + 1;
334
-        if($nextPage <= $pages) {
334
+        if ($nextPage <= $pages) {
335 335
             $this->next = $nextPage;
336 336
         }
337 337
         
338 338
         $prevPage = $this->current - 1;
339
-        if($prevPage > 0) {
339
+        if ($prevPage > 0) {
340 340
             $this->prev = $prevPage;
341 341
         }
342 342
         
343 343
         $this->offsetStart = ($this->current - 1) * $this->perPage;
344 344
         
345 345
         $this->offsetEnd = $this->offsetStart + $this->perPage;
346
-        if($this->offsetEnd > ($this->total - 1)) {
346
+        if ($this->offsetEnd > ($this->total - 1)) {
347 347
             $this->offsetEnd = ($this->total - 1);
348 348
         }
349 349
     }
Please login to merge, or discard this patch.
src/SVNHelper.php 2 patches
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
     {
66 66
         $this->isWindows = substr(PHP_OS, 0, 3) == 'WIN';
67 67
         
68
-        if($this->isWindows) {
68
+        if ($this->isWindows) {
69 69
             $this->normalize['from'] = '/';
70 70
             $this->normalize['to'] = '\\';
71 71
         }
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
         //
81 81
         // NOTE: In case of symlinks, this resolves the symlink to its source (WIN/NIX)
82 82
         $realPath = realpath($this->sourcePath);
83
-        if(!is_dir($realPath)) {
83
+        if (!is_dir($realPath)) {
84 84
             throw new SVNHelper_Exception(
85 85
                 'Local repository path does not exist',
86 86
                 sprintf(
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
         $result = array();
99 99
         preg_match_all('%([^:]+):(.+)@(https|http|svn)://(.+)%sm', $repURL, $result, PREG_PATTERN_ORDER);
100 100
         
101
-        if(!isset($result[1]) || !isset($result[1][0])) {
101
+        if (!isset($result[1]) || !isset($result[1][0])) {
102 102
             throw new SVNHelper_Exception(
103 103
                 'Invalid SVN repository URL',
104 104
                 'The SVN URL must have the following format: [username:password@http://domain.com/path/to/rep].',
@@ -131,18 +131,18 @@  discard block
 block discarded – undo
131 131
     * @throws SVNHelper_Exception
132 132
     * @return string
133 133
     */
134
-    public function normalizePath($path, $relativize=false)
134
+    public function normalizePath($path, $relativize = false)
135 135
     {
136
-        if(empty($path)) {
136
+        if (empty($path)) {
137 137
             return '';
138 138
         }
139 139
         
140
-        if($relativize) 
140
+        if ($relativize) 
141 141
         {
142 142
             $path = $this->normalizePath($path);
143 143
 
144 144
             // path is absolute, and does not match the realpath or the source path?
145
-            if(strstr($path, ':'.$this->getSlash()) && (!stristr($path, $this->path) && !stristr($path, $this->sourcePath))) {
145
+            if (strstr($path, ':'.$this->getSlash()) && (!stristr($path, $this->path) && !stristr($path, $this->sourcePath))) {
146 146
                 throw new SVNHelper_Exception(
147 147
                     'Cannot relativize path outside of repository',
148 148
                     sprintf(
@@ -223,14 +223,14 @@  discard block
 block discarded – undo
223 223
     */
224 224
     protected function filterPath($path)
225 225
     {
226
-        if(empty($path)) {
226
+        if (empty($path)) {
227 227
             return '';
228 228
         }
229 229
         
230 230
         $path = $this->getPath().'/'.$this->relativizePath($path);
231 231
         
232 232
         $real = realpath($path);
233
-        if($real !== false) {
233
+        if ($real !== false) {
234 234
             return $real;
235 235
         }
236 236
         
@@ -257,13 +257,13 @@  discard block
 block discarded – undo
257 257
         $key = $type.':'.$relativePath;
258 258
         
259 259
         $relativePath = $this->normalizePath($relativePath, true);
260
-        if(isset($this->targets[$key])) {
260
+        if (isset($this->targets[$key])) {
261 261
             return $this->targets[$key];
262 262
         }
263 263
 
264 264
         $target = null;
265 265
         
266
-        switch($type)
266
+        switch ($type)
267 267
         {
268 268
             case 'File':
269 269
                 $target = new SVNHelper_Target_File($this, $relativePath);
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
     */
397 397
     public function addFolder($path)
398 398
     {
399
-        if(is_dir($path)) {
399
+        if (is_dir($path)) {
400 400
             return $this->getFolder($path);
401 401
         }
402 402
         
@@ -404,12 +404,12 @@  discard block
 block discarded – undo
404 404
         $tokens = explode($this->getSlash(), $path);
405 405
         
406 406
         $target = $this->path;
407
-        foreach($tokens as $folder) 
407
+        foreach ($tokens as $folder) 
408 408
         {
409 409
             $target .= $this->getSlash().$folder;
410
-            if(file_exists($target)) 
410
+            if (file_exists($target)) 
411 411
             {
412
-                if(!is_dir($target)) {
412
+                if (!is_dir($target)) {
413 413
                     throw new SVNHelper_Exception(
414 414
                         'Target folder is a file',
415 415
                         sprintf(
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
                 continue;
424 424
             }
425 425
             
426
-            if(!mkdir($target, 0777)) {
426
+            if (!mkdir($target, 0777)) {
427 427
                 throw new SVNHelper_Exception(
428 428
                     'Cannot create folder',
429 429
                     sprintf(
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
     */
454 454
     public static function setLogCallback($callback)
455 455
     {
456
-        if(!is_callable($callback)) {
456
+        if (!is_callable($callback)) {
457 457
             throw new SVNHelper_Exception(
458 458
                 'Not a valid logging callback',
459 459
                 'The specified argument is not callable.',
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
466 466
     
467 467
     public static function log($message)
468 468
     {
469
-        if(isset(self::$logCallback)) {
469
+        if (isset(self::$logCallback)) {
470 470
             call_user_func(self::$logCallback, 'SVNHelper | '.$message);
471 471
         }
472 472
     }
Please login to merge, or discard this patch.
Indentation   +167 added lines, -167 removed lines patch added patch discarded remove patch
@@ -23,101 +23,101 @@  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
     public const ERROR_LOCAL_PATH_DOES_NOT_EXIST = 22401;
30 30
     
31
-   /**
32
-    * @var integer
33
-    */
31
+    /**
32
+     * @var integer
33
+     */
34 34
     public const ERROR_INVALID_REP_URL = 22402;
35 35
     
36
-   /**
37
-    * @var integer
38
-    */
36
+    /**
37
+     * @var integer
38
+     */
39 39
     public const ERROR_PATH_IS_OUTSIDE_REPOSITORY = 22403;
40 40
     
41
-   /**
42
-    * @var integer
43
-    */
41
+    /**
42
+     * @var integer
43
+     */
44 44
     public const ERROR_TARGET_FOLDER_IS_A_FILE = 22404;
45 45
     
46
-   /**
47
-    * @var integer
48
-    */
46
+    /**
47
+     * @var integer
48
+     */
49 49
     public const ERROR_CANNOT_ADD_INEXISTENT_FILE = 22405;
50 50
     
51
-   /**
52
-    * @var integer
53
-    */
51
+    /**
52
+     * @var integer
53
+     */
54 54
     public const ERROR_TARGET_PATH_NOT_FOUND = 22406;
55 55
     
56
-   /**
57
-    * @var integer
58
-    */
56
+    /**
57
+     * @var integer
58
+     */
59 59
     public const ERROR_INVALID_TARGET_TYPE = 22407;
60 60
     
61
-   /**
62
-    * @var integer
63
-    */
61
+    /**
62
+     * @var integer
63
+     */
64 64
     public const ERROR_INVALID_LOG_CALLBACK = 22408; 
65 65
     
66
-   /**
67
-    * @var SVNHelper_Target_Folder
68
-    */
66
+    /**
67
+     * @var SVNHelper_Target_Folder
68
+     */
69 69
     protected $target;
70 70
     
71
-   /**
72
-    * @var string
73
-    */
71
+    /**
72
+     * @var string
73
+     */
74 74
     protected $path;
75 75
     
76
-   /**
77
-    * @var string
78
-    */
76
+    /**
77
+     * @var string
78
+     */
79 79
     protected $url;
80 80
     
81
-   /**
82
-    * @var string
83
-    */
81
+    /**
82
+     * @var string
83
+     */
84 84
     protected $user;
85 85
     
86
-   /**
87
-    * @var string
88
-    */
86
+    /**
87
+     * @var string
88
+     */
89 89
     protected $pass;
90 90
     
91
-   /**
92
-    * @var array
93
-    */
91
+    /**
92
+     * @var array
93
+     */
94 94
     protected $options = array(
95 95
         'binaries-path' => ''
96 96
     );
97 97
     
98
-   /**
99
-    * @var boolean
100
-    */
98
+    /**
99
+     * @var boolean
100
+     */
101 101
     protected $isWindows = false;
102 102
     
103
-   /**
104
-    * @var array
105
-    */
103
+    /**
104
+     * @var array
105
+     */
106 106
     protected $normalize = array(
107 107
         'from' => '\\',
108 108
         'to' => '/'
109 109
     );
110 110
     
111
-   /**
112
-    * @var string
113
-    */
111
+    /**
112
+     * @var string
113
+     */
114 114
     protected $sourcePath;
115 115
     
116
-   /**
117
-    * @param string $repPath The path to the repository
118
-    * @param string $repURL The SVN URL to the repository
119
-    * @throws SVNHelper_Exception
120
-    */
116
+    /**
117
+     * @param string $repPath The path to the repository
118
+     * @param string $repURL The SVN URL to the repository
119
+     * @throws SVNHelper_Exception
120
+     */
121 121
     public function __construct(string $repPath, string $repURL)
122 122
     {
123 123
         $this->isWindows = substr(PHP_OS, 0, 3) == 'WIN';
@@ -178,16 +178,16 @@  discard block
 block discarded – undo
178 178
         return $this->pass;
179 179
     }
180 180
     
181
-   /**
182
-    * Normalizes slashes in the path according to the
183
-    * operating system, i.e. forward slashes for NIX-systems
184
-    * and backward slashes for Windows.
185
-    *
186
-    * @param string $path An absolute path to normalize
187
-    * @param bool $relativize Whether to return a path relative to the repository
188
-    * @throws SVNHelper_Exception
189
-    * @return string
190
-    */
181
+    /**
182
+     * Normalizes slashes in the path according to the
183
+     * operating system, i.e. forward slashes for NIX-systems
184
+     * and backward slashes for Windows.
185
+     *
186
+     * @param string $path An absolute path to normalize
187
+     * @param bool $relativize Whether to return a path relative to the repository
188
+     * @throws SVNHelper_Exception
189
+     * @return string
190
+     */
191 191
     public function normalizePath($path, $relativize=false)
192 192
     {
193 193
         if(empty($path)) {
@@ -222,32 +222,32 @@  discard block
 block discarded – undo
222 222
         );
223 223
     }
224 224
     
225
-   /**
226
-    * Retrieves the path slash style according to the
227
-    * current operating system.
228
-    * 
229
-    * @return string
230
-    */
225
+    /**
226
+     * Retrieves the path slash style according to the
227
+     * current operating system.
228
+     * 
229
+     * @return string
230
+     */
231 231
     public function getSlash()
232 232
     {
233 233
         return $this->normalize['to'];
234 234
     }
235 235
     
236
-   /**
237
-    * Keeps instances of files.
238
-    * @var SVNHelper_Target[]
239
-    */
236
+    /**
237
+     * Keeps instances of files.
238
+     * @var SVNHelper_Target[]
239
+     */
240 240
     protected $targets = array();
241 241
     
242
-   /**
243
-    * Retrieves a file instance from the SVN repository:
244
-    * this allows all possible operations on the file as
245
-    * well as accessing more information on it.
246
-    * 
247
-    * @param string $path A path to the file, relative to the repository path or absolute.
248
-    * @return SVNHelper_Target_File
249
-    * @throws SVNHelper_Exception
250
-    */
242
+    /**
243
+     * Retrieves a file instance from the SVN repository:
244
+     * this allows all possible operations on the file as
245
+     * well as accessing more information on it.
246
+     * 
247
+     * @param string $path A path to the file, relative to the repository path or absolute.
248
+     * @return SVNHelper_Target_File
249
+     * @throws SVNHelper_Exception
250
+     */
251 251
     public function getFile(string $path) : SVNHelper_Target_File
252 252
     {
253 253
         $path = $this->filterPath($path);
@@ -256,15 +256,15 @@  discard block
 block discarded – undo
256 256
             ->requireIsFile();
257 257
     }
258 258
 
259
-   /**
260
-    * Retrieves a folder instance from the SVN repository:
261
-    * This allows all possible operations on the folder as
262
-    * well as accessing more information on it.
263
-    * 
264
-    * @param string $path
265
-    * @return SVNHelper_Target_Folder
266
-    * @throws SVNHelper_Exception
267
-    */
259
+    /**
260
+     * Retrieves a folder instance from the SVN repository:
261
+     * This allows all possible operations on the folder as
262
+     * well as accessing more information on it.
263
+     * 
264
+     * @param string $path
265
+     * @return SVNHelper_Target_Folder
266
+     * @throws SVNHelper_Exception
267
+     */
268 268
     public function getFolder(string $path) : SVNHelper_Target_Folder
269 269
     {
270 270
         $path = $this->filterPath($path);
@@ -273,13 +273,13 @@  discard block
 block discarded – undo
273 273
             ->requireIsFolder();
274 274
     }
275 275
     
276
-   /**
277
-    * Passes the path through realpath and ensures it exists.
278
-    *
279
-    * @param string $path
280
-    * @throws SVNHelper_Exception
281
-    * @return string
282
-    */
276
+    /**
277
+     * Passes the path through realpath and ensures it exists.
278
+     *
279
+     * @param string $path
280
+     * @throws SVNHelper_Exception
281
+     * @return string
282
+     */
283 283
     protected function filterPath($path)
284 284
     {
285 285
         if(empty($path)) {
@@ -304,13 +304,13 @@  discard block
 block discarded – undo
304 304
         );
305 305
     }
306 306
     
307
-   /**
308
-    * Retrieves a target file or folder within the repository.
309
-    *
310
-    * @param string $type The target type, "File" or "Folder".
311
-    * @param string $relativePath A path relative to the root folder.
312
-    * @return SVNHelper_Target
313
-    */
307
+    /**
308
+     * Retrieves a target file or folder within the repository.
309
+     *
310
+     * @param string $type The target type, "File" or "Folder".
311
+     * @param string $relativePath A path relative to the root folder.
312
+     * @return SVNHelper_Target
313
+     */
314 314
     protected function getTarget(string $type, string $relativePath) : SVNHelper_Target
315 315
     {
316 316
         $key = $type.':'.$relativePath;
@@ -358,33 +358,33 @@  discard block
 block discarded – undo
358 358
         return $this->url;
359 359
     }
360 360
     
361
-   /**
362
-    * Updates the whole SVN repository from the root folder.
363
-    * @return SVNHelper_CommandResult
364
-    */
361
+    /**
362
+     * Updates the whole SVN repository from the root folder.
363
+     * @return SVNHelper_CommandResult
364
+     */
365 365
     public function runUpdate()
366 366
     {
367 367
         return $this->createUpdate($this->target)->execute();
368 368
     }
369 369
     
370
-   /**
371
-    * Creates an update command for the target file or folder.
372
-    * This can be configured further before it is executed.
373
-    * 
374
-    * @param SVNHelper_Target $target
375
-    * @return SVNHelper_Command_Update
376
-    */
370
+    /**
371
+     * Creates an update command for the target file or folder.
372
+     * This can be configured further before it is executed.
373
+     * 
374
+     * @param SVNHelper_Target $target
375
+     * @return SVNHelper_Command_Update
376
+     */
377 377
     public function createUpdate(SVNHelper_Target $target)
378 378
     {
379 379
         return $this->createCommand('Update', $target);
380 380
     }
381 381
     
382
-   /**
383
-    * Creates an add command for the targt file or folder.
384
-    * 
385
-    * @param SVNHelper_Target $target
386
-    * @return SVNHelper_Command_Add
387
-    */
382
+    /**
383
+     * Creates an add command for the targt file or folder.
384
+     * 
385
+     * @param SVNHelper_Target $target
386
+     * @return SVNHelper_Command_Add
387
+     */
388 388
     public function createAdd(SVNHelper_Target $target)
389 389
     {
390 390
         return $this->createCommand('Add', $target);
@@ -401,12 +401,12 @@  discard block
 block discarded – undo
401 401
         return $this->createCommand('Info', $target);
402 402
     }
403 403
     
404
-   /**
405
-    * Creates a status command for the target file or folder.
406
-    * 
407
-    * @param SVNHelper_Target $target
408
-    * @return SVNHelper_Command_Status
409
-    */
404
+    /**
405
+     * Creates a status command for the target file or folder.
406
+     * 
407
+     * @param SVNHelper_Target $target
408
+     * @return SVNHelper_Command_Status
409
+     */
410 410
     public function createStatus(SVNHelper_Target $target)
411 411
     {
412 412
         return $this->createCommand('Status', $target);
@@ -431,28 +431,28 @@  discard block
 block discarded – undo
431 431
         return $cmd;
432 432
     }
433 433
     
434
-   /**
435
-    * Creates a path relative to the repository for the target
436
-    * file or folder, from an absolute path.
437
-    *
438
-    * @param string $path An absolute path.
439
-    * @return string
440
-    */
434
+    /**
435
+     * Creates a path relative to the repository for the target
436
+     * file or folder, from an absolute path.
437
+     *
438
+     * @param string $path An absolute path.
439
+     * @return string
440
+     */
441 441
     public function relativizePath($path)
442 442
     {
443 443
         return $this->normalizePath($path, true);
444 444
     }
445 445
     
446
-   /**
447
-    * Adds a folder: creates it as necessary (recursive),
448
-    * and adds it to be committed if it is not versioned yet.
449
-    * Use this instead of {@link getFolder()} when you are
450
-    * not sure that it exists yet, and will need it.
451
-    * 
452
-    * @param string $path Absolute or relative path to the folder
453
-    * @throws SVNHelper_Exception
454
-    * @return SVNHelper_Target_Folder
455
-    */
446
+    /**
447
+     * Adds a folder: creates it as necessary (recursive),
448
+     * and adds it to be committed if it is not versioned yet.
449
+     * Use this instead of {@link getFolder()} when you are
450
+     * not sure that it exists yet, and will need it.
451
+     * 
452
+     * @param string $path Absolute or relative path to the folder
453
+     * @throws SVNHelper_Exception
454
+     * @return SVNHelper_Target_Folder
455
+     */
456 456
     public function addFolder($path)
457 457
     {
458 458
         if(is_dir($path)) {
@@ -502,14 +502,14 @@  discard block
 block discarded – undo
502 502
     
503 503
     protected static $logCallback;
504 504
 
505
-   /**
506
-    * Sets the callback function/method to use for
507
-    * SVH helper log messages. This gets the message
508
-    * and the SVNHelper instance as parameters.
509
-    * 
510
-    * @param callable $callback
511
-    * @throws SVNHelper_Exception
512
-    */
505
+    /**
506
+     * Sets the callback function/method to use for
507
+     * SVH helper log messages. This gets the message
508
+     * and the SVNHelper instance as parameters.
509
+     * 
510
+     * @param callable $callback
511
+     * @throws SVNHelper_Exception
512
+     */
513 513
     public static function setLogCallback($callback)
514 514
     {
515 515
         if(!is_callable($callback)) {
@@ -530,22 +530,22 @@  discard block
 block discarded – undo
530 530
         }
531 531
     }
532 532
 
533
-   /**
534
-    * Retrieves information about the file, and adds it
535
-    * to be committed later if it not versioned yet. 
536
-    * 
537
-    * @param string $path
538
-    * @return SVNHelper_Target_File
539
-    */
533
+    /**
534
+     * Retrieves information about the file, and adds it
535
+     * to be committed later if it not versioned yet. 
536
+     * 
537
+     * @param string $path
538
+     * @return SVNHelper_Target_File
539
+     */
540 540
     public function addFile($path)
541 541
     {
542 542
         return $this->getFile($path)->runAdd();        
543 543
     }
544 544
     
545
-   /**
546
-    * Commits all changes in the repository.
547
-    * @param string $message The commit message to log.
548
-    */
545
+    /**
546
+     * Commits all changes in the repository.
547
+     * @param string $message The commit message to log.
548
+     */
549 549
     public function runCommit($message)
550 550
     {
551 551
         $this->createCommit($this->getFolder($this->path), $message)->execute();
Please login to merge, or discard this patch.
src/SVNHelper/Exception.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
     
18 18
     protected $logging = true;
19 19
     
20
-    public function __construct($message, $details=null, $code=null, $previous=null)
20
+    public function __construct($message, $details = null, $code = null, $previous = null)
21 21
     {
22 22
         parent::__construct($message, $details, $code, $previous);
23 23
         
@@ -31,17 +31,17 @@  discard block
 block discarded – undo
31 31
     
32 32
     public function __destruct()
33 33
     {
34
-        if(!$this->logging) {
34
+        if (!$this->logging) {
35 35
             return;
36 36
         }
37 37
         
38 38
         $loggers = SVNHelper::getExceptionLoggers();
39 39
         
40
-        if(empty($loggers)) {
40
+        if (empty($loggers)) {
41 41
             return;
42 42
         }
43 43
         
44
-        foreach($loggers as $callback) {
44
+        foreach ($loggers as $callback) {
45 45
             call_user_func($callback, $this);
46 46
         }
47 47
     }
Please login to merge, or discard this patch.
src/SVNHelper/Target.php 3 patches
Indentation   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -76,10 +76,10 @@  discard block
 block discarded – undo
76 76
         return $this instanceof SVNHelper_Target_Folder;
77 77
     }
78 78
     
79
-   /**
80
-    * Runs an update of the file or folder.
81
-    * @return SVNHelper_Command_Update
82
-    */
79
+    /**
80
+     * Runs an update of the file or folder.
81
+     * @return SVNHelper_Command_Update
82
+     */
83 83
     public function runUpdate()
84 84
     {
85 85
         $cmd = $this->createUpdate();
@@ -88,55 +88,55 @@  discard block
 block discarded – undo
88 88
         return $cmd;
89 89
     }
90 90
     
91
-   /**
92
-    * Creates an update command instance for the target file or folder.
93
-    * @return SVNHelper_Command_Update
94
-    */
91
+    /**
92
+     * Creates an update command instance for the target file or folder.
93
+     * @return SVNHelper_Command_Update
94
+     */
95 95
     public function createUpdate()
96 96
     {
97 97
         return $this->helper->createUpdate($this);
98 98
     }
99 99
     
100
-   /**
101
-    * Creates a status command instance for the target file or folder.
102
-    * @return SVNHelper_Command_Status
103
-    */
100
+    /**
101
+     * Creates a status command instance for the target file or folder.
102
+     * @return SVNHelper_Command_Status
103
+     */
104 104
     public function createStatus()
105 105
     {
106 106
         return $this->helper->createStatus($this);
107 107
     }
108 108
     
109
-   /**
110
-    * Creates an info command instance for the target file or folder.
111
-    * @return SVNHelper_Command_Info
112
-    */
109
+    /**
110
+     * Creates an info command instance for the target file or folder.
111
+     * @return SVNHelper_Command_Info
112
+     */
113 113
     public function createInfo()
114 114
     {
115 115
         return $this->helper->createInfo($this);
116 116
     }
117 117
     
118
-   /**
119
-    * Creates a commit command instance for the target file or folder.
120
-    * @param string $message
121
-    * @return SVNHelper_Command_Commit
122
-    */
118
+    /**
119
+     * Creates a commit command instance for the target file or folder.
120
+     * @param string $message
121
+     * @return SVNHelper_Command_Commit
122
+     */
123 123
     public function createCommit($message)
124 124
     {
125 125
         return $this->helper->createCommit($this, $message);
126 126
     }
127 127
 
128
-   /**
129
-    * Creates an add command instance for the target file or folder.
130
-    * @return SVNHelper_Command_Add
131
-    */
128
+    /**
129
+     * Creates an add command instance for the target file or folder.
130
+     * @return SVNHelper_Command_Add
131
+     */
132 132
     public function createAdd()
133 133
     {
134 134
         return $this->helper->createAdd($this);
135 135
     }
136 136
     
137
-   /**
138
-    * @return SVNHelper_Command_Status
139
-    */
137
+    /**
138
+     * @return SVNHelper_Command_Status
139
+     */
140 140
     public function getStatus()
141 141
     {
142 142
         $cmd = $this->createStatus();
@@ -154,10 +154,10 @@  discard block
 block discarded – undo
154 154
         return $this;
155 155
     }
156 156
     
157
-   /**
158
-    * Whether the target is versioned or needs to be added.
159
-    * @return boolean
160
-    */
157
+    /**
158
+     * Whether the target is versioned or needs to be added.
159
+     * @return boolean
160
+     */
161 161
     public function isVersioned()
162 162
     {
163 163
         return $this->getInfo()->isVersioned();
@@ -170,10 +170,10 @@  discard block
 block discarded – undo
170 170
         $this->cache = array();
171 171
     }
172 172
     
173
-   /**
174
-    * Retrieves information on the target.
175
-    * @return SVNHelper_Command_Info
176
-    */
173
+    /**
174
+     * Retrieves information on the target.
175
+     * @return SVNHelper_Command_Info
176
+     */
177 177
     public function getInfo()
178 178
     {
179 179
         if(!isset($this->cache['info'])) {
@@ -183,15 +183,15 @@  discard block
 block discarded – undo
183 183
         return $this->cache['info'];
184 184
     }
185 185
     
186
-   /**
187
-    * Commits the target file or folder. If it has
188
-    * not been added to the repository yet, it is 
189
-    * added automatically beforehand. If it does
190
-    * not need to be committed, no changes are made.
191
-    * 
192
-    * @param string $message
193
-    * @return SVNHelper_Target
194
-    */
186
+    /**
187
+     * Commits the target file or folder. If it has
188
+     * not been added to the repository yet, it is 
189
+     * added automatically beforehand. If it does
190
+     * not need to be committed, no changes are made.
191
+     * 
192
+     * @param string $message
193
+     * @return SVNHelper_Target
194
+     */
195 195
     public function runCommit($message)
196 196
     {
197 197
         if(!$this->isVersioned()) {
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -202,8 +202,7 @@
 block discarded – undo
202 202
         if(!$this->isCommitted()) {
203 203
             $this->createCommit($message)->execute();
204 204
             $this->clearCache();
205
-        }
206
-        else 
205
+        } else 
207 206
         {
208 207
             $this->log('Already committed, nothing to do.');
209 208
         }
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
         $this->url = $this->helper->getURL().'/'.$this->relativePath;
21 21
         
22 22
         $path = $this->helper->getPath();
23
-        if(!empty($relativePath)) {
23
+        if (!empty($relativePath)) {
24 24
             $path .= $this->helper->getSlash().$this->relativePath;
25 25
         }
26 26
         
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
         // this is relevant).
31 31
         $this->path = realpath($path);
32 32
         
33
-        if(!$this->path || !file_exists($this->path)) {
33
+        if (!$this->path || !file_exists($this->path)) {
34 34
             throw new SVNHelper_Exception(
35 35
                 'File not found',
36 36
                 sprintf(
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
     
139 139
     public function runAdd()
140 140
     {
141
-        if(!$this->isVersioned()) {
141
+        if (!$this->isVersioned()) {
142 142
             $this->createAdd()->execute();
143 143
             $this->clearCache();
144 144
         }
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
     */
169 169
     public function getInfo()
170 170
     {
171
-        if(!isset($this->cache['info'])) {
171
+        if (!isset($this->cache['info'])) {
172 172
             $this->cache['info'] = $this->helper->createInfo($this);
173 173
         }
174 174
         
@@ -186,12 +186,12 @@  discard block
 block discarded – undo
186 186
     */
187 187
     public function runCommit($message)
188 188
     {
189
-        if(!$this->isVersioned()) {
189
+        if (!$this->isVersioned()) {
190 190
             $this->log('Adding the unversioned file.');
191 191
             $this->runAdd();
192 192
         }
193 193
         
194
-        if(!$this->isCommitted()) {
194
+        if (!$this->isCommitted()) {
195 195
             $this->createCommit($message)->execute();
196 196
             $this->clearCache();
197 197
         }
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 
225 225
     public function requireIsFile() : SVNHelper_Target_File
226 226
     {
227
-        if($this instanceof SVNHelper_Target_File)
227
+        if ($this instanceof SVNHelper_Target_File)
228 228
         {
229 229
             return $this;
230 230
         }
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 
239 239
     public function requireIsFolder() : SVNHelper_Target_Folder
240 240
     {
241
-        if($this instanceof SVNHelper_Target_Folder)
241
+        if ($this instanceof SVNHelper_Target_Folder)
242 242
         {
243 243
             return $this;
244 244
         }
Please login to merge, or discard this patch.
src/SVNHelper/CommandException.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
      */
19 19
     protected $result;
20 20
     
21
-    public function __construct($message, $details, $code, SVNHelper_CommandResult $result, $previous=null)
21
+    public function __construct($message, $details, $code, SVNHelper_CommandResult $result, $previous = null)
22 22
     {
23 23
         parent::__construct($message, $details, $code, $previous);
24 24
         $this->result = $result;
Please login to merge, or discard this patch.
src/SVNHelper/Command/Add.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
     {
15 15
         $result = $this->execCommand('add', $this->target->getPath());
16 16
 
17
-        if($result->isError()) {
17
+        if ($result->isError()) {
18 18
             throw new SVNHelper_Exception(
19 19
                 'Could not add target path',
20 20
                 sprintf(
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
         }
28 28
         
29 29
         $line = $result->getFirstLine();
30
-        if(substr($line, 0, 1) != 'a') {
30
+        if (substr($line, 0, 1) != 'a') {
31 31
             throw new SVNHelper_Exception(
32 32
                 'Unexpected result for adding a path',
33 33
                 sprintf(
Please login to merge, or discard this patch.
src/SVNHelper/Command/Commit.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
             )
17 17
         );
18 18
         
19
-        if($result->isError()) {
19
+        if ($result->isError()) {
20 20
             $this->throwExceptionUnexpected($result);
21 21
         }
22 22
         
Please login to merge, or discard this patch.