Passed
Push — master ( 5153e5...af085a )
by Sebastian
05:42 queued 30s
created
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.
src/SVNHelper/Command/Info.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -44,12 +44,12 @@
 block discarded – undo
44 44
         return $result;
45 45
     }
46 46
     
47
-   /**
48
-    * Whether the file or folder has already been committed
49
-    * and has no pending changes.
50
-    * 
51
-    * @return boolean
52
-    */
47
+    /**
48
+     * Whether the file or folder has already been committed
49
+     * and has no pending changes.
50
+     * 
51
+     * @return boolean
52
+     */
53 53
     public function isCommitted()
54 54
     {
55 55
         $status = $this->target->getStatus();
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,9 +14,9 @@  discard block
 block discarded – undo
14 14
 
15 15
         $this->params = array();
16 16
         
17
-        if($result->isError()) {
17
+        if ($result->isError()) {
18 18
             // this error code means the target exists, but is not versioned yet
19
-            if(!$result->hasErrorCode('200009')) {
19
+            if (!$result->hasErrorCode('200009')) {
20 20
                 $this->throwExceptionUnexpected($result);
21 21
             }
22 22
 
@@ -29,15 +29,15 @@  discard block
 block discarded – undo
29 29
         
30 30
         $lines = $result->getOutput();
31 31
         
32
-        foreach($lines as $line) 
32
+        foreach ($lines as $line) 
33 33
         {
34
-            if(!strstr($line, ':')) {
34
+            if (!strstr($line, ':')) {
35 35
                 continue;
36 36
             }
37 37
             
38 38
             $pos = strpos($line, ':');
39 39
             $name = str_replace(' ', '-', substr($line, 0, $pos));
40
-            $value = trim(substr($line, $pos+1));
40
+            $value = trim(substr($line, $pos + 1));
41 41
             $this->params[$name] = $value;
42 42
         }
43 43
         
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
     {
90 90
         $this->execute();
91 91
         
92
-        if(isset($this->params[$name])) {
92
+        if (isset($this->params[$name])) {
93 93
             return $this->params[$name];
94 94
         }
95 95
         
Please login to merge, or discard this patch.
src/SVNHelper/Command/Update.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -28,17 +28,17 @@  discard block
 block discarded – undo
28 28
         return $result;
29 29
     }
30 30
     
31
-   /**
32
-    * @var SVNHelper_Command_Update_Status[]
33
-    */
31
+    /**
32
+     * @var SVNHelper_Command_Update_Status[]
33
+     */
34 34
     protected $stati;
35 35
     
36 36
     protected $revision;
37 37
     
38
-   /**
39
-    * Parses the command output to find out which files have been modified, and how.
40
-    * @param SVNHelper_CommandResult $result
41
-    */
38
+    /**
39
+     * Parses the command output to find out which files have been modified, and how.
40
+     * @param SVNHelper_CommandResult $result
41
+     */
42 42
     protected function parseResult(SVNHelper_CommandResult $result)
43 43
     {
44 44
         $this->stati = array();
@@ -119,11 +119,11 @@  discard block
 block discarded – undo
119 119
         return $this->getByStatus('a');
120 120
     }
121 121
     
122
-   /**
123
-    * Whether there were files with the specified status code.
124
-    * @param string $status
125
-    * @return boolean
126
-    */
122
+    /**
123
+     * Whether there were files with the specified status code.
124
+     * @param string $status
125
+     * @return boolean
126
+     */
127 127
     protected function hasStatus($status)
128 128
     {
129 129
         $this->execute();
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -10,13 +10,13 @@  discard block
 block discarded – undo
10 10
     {
11 11
         $result = $this->execCommand('update', $this->target->getPath());
12 12
         
13
-        if($result->isError()) {
13
+        if ($result->isError()) {
14 14
             $this->throwExceptionUnexpected($result);
15 15
         }
16 16
         
17 17
         $this->parseResult($result);
18 18
         
19
-        if(!isset($this->revision)) {
19
+        if (!isset($this->revision)) {
20 20
             $this->throwException(
21 21
                 'No update revision returned',
22 22
                 'The command did not return the expected last line with "at revision x".',
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
         
46 46
         $lines = $result->getLines();
47 47
         
48
-        foreach($lines as $line) 
48
+        foreach ($lines as $line) 
49 49
         {
50 50
             $result = array();
51 51
             preg_match_all('/\A(a|c|d|u)[ ]+(.+)/si', $line, $result, PREG_PATTERN_ORDER);
@@ -53,13 +53,13 @@  discard block
 block discarded – undo
53 53
             // is this a file update status line? It looks like this:
54 54
             // a    c:\path\to\file.ext
55 55
             // ^ status code
56
-            if(isset($result[0]) && isset($result[1][0]) && !empty($result[1][0])) 
56
+            if (isset($result[0]) && isset($result[1][0]) && !empty($result[1][0])) 
57 57
             {
58 58
                 $status = $result[1][0];
59 59
                 $path = $result[2][0];
60 60
                 $obj = new SVNHelper_Command_Update_Status($this, $status, $path);
61 61
                 
62
-                if(!isset($this->stati[$status])) {
62
+                if (!isset($this->stati[$status])) {
63 63
                     $this->stati[$status] = array();
64 64
                 }
65 65
                 
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
             }
70 70
             
71 71
             // the revision line, "updated to revision X" or "at revision X"
72
-            if(strstr($line, 'revision ')) {
72
+            if (strstr($line, 'revision ')) {
73 73
                 preg_match('/(at revision|to revision) ([0-9]+)/si', $line, $result);
74
-                if(isset($result[2])) {
74
+                if (isset($result[2])) {
75 75
                     $this->revision = $result[2];
76 76
                 }
77 77
                 continue;
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
     {
136 136
         $this->execute();
137 137
         
138
-        if(isset($this->stati[$status])) {
138
+        if (isset($this->stati[$status])) {
139 139
             return $this->stati[$status];
140 140
         }
141 141
         
Please login to merge, or discard this patch.
src/SVNHelper/Command/Status.php 3 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -24,10 +24,10 @@  discard block
 block discarded – undo
24 24
     
25 25
     const STATUS_FILETYPE_CHANGE = 'filetype-change';
26 26
     
27
-   /**
28
-    * @var array
29
-    * @see http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.status.html
30
-    */
27
+    /**
28
+     * @var array
29
+     * @see http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.status.html
30
+     */
31 31
     protected static $knownStati = array(
32 32
         'a' => self::STATUS_ADD,
33 33
         'd' => self::STATUS_DELETE,
@@ -40,9 +40,9 @@  discard block
 block discarded – undo
40 40
         '~' => self::STATUS_FILETYPE_CHANGE,
41 41
     );
42 42
     
43
-   /**
44
-    * @var string
45
-    */
43
+    /**
44
+     * @var string
45
+     */
46 46
     protected $status;
47 47
     
48 48
     protected function _execute()
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
             
66 66
             $svnStatusCode = strtolower(substr($lines[0], 0, 1));
67 67
             if(isset(self::$knownStati[$svnStatusCode])) {
68
-               $this->status = self::$knownStati[$svnStatusCode];
68
+                $this->status = self::$knownStati[$svnStatusCode];
69 69
             }
70 70
         }
71 71
         
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -49,13 +49,13 @@  discard block
 block discarded – undo
49 49
     {
50 50
         $result = $this->execCommand('status', $this->target->getPath(), array('depth empty'));
51 51
         
52
-        if($result->isError()) {
52
+        if ($result->isError()) {
53 53
             $this->throwExceptionUnexpected($result);
54 54
         }
55 55
 
56 56
         $lines = $result->getOutput();
57 57
         
58
-        if(empty($lines)) 
58
+        if (empty($lines)) 
59 59
         {
60 60
             $this->status = self::STATUS_NOT_MODIFIED;
61 61
         }
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
             $this->status = self::STATUS_UNKNOWN;
65 65
             
66 66
             $svnStatusCode = strtolower(substr($lines[0], 0, 1));
67
-            if(isset(self::$knownStati[$svnStatusCode])) {
67
+            if (isset(self::$knownStati[$svnStatusCode])) {
68 68
                $this->status = self::$knownStati[$svnStatusCode];
69 69
             }
70 70
         }
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,8 +58,7 @@
 block discarded – undo
58 58
         if(empty($lines)) 
59 59
         {
60 60
             $this->status = self::STATUS_NOT_MODIFIED;
61
-        }
62
-        else 
61
+        } else 
63 62
         {
64 63
             $this->status = self::STATUS_UNKNOWN;
65 64
             
Please login to merge, or discard this patch.
src/ConvertHelper/ThrowableInfo.php 3 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,8 +64,7 @@
 block discarded – undo
64 64
         if(is_array($subject))
65 65
         {
66 66
             $this->parseSerialized($subject);
67
-        }
68
-        else
67
+        } else
69 68
         {
70 69
             $this->parseException($subject);
71 70
         }
Please login to merge, or discard this patch.
Indentation   +106 added lines, -106 removed lines patch added patch discarded remove patch
@@ -18,49 +18,49 @@  discard block
 block discarded – undo
18 18
     const CONTEXT_COMMAND_LINE = 'cli';
19 19
     const CONTEXT_WEB = 'web';
20 20
     
21
-   /**
22
-    * @var Throwable
23
-    */
21
+    /**
22
+     * @var Throwable
23
+     */
24 24
     protected $exception;
25 25
     
26
-   /**
27
-    * @var ConvertHelper_ThrowableInfo_Call[]
28
-    */
26
+    /**
27
+     * @var ConvertHelper_ThrowableInfo_Call[]
28
+     */
29 29
     protected $calls = array();
30 30
     
31
-   /**
32
-    * @var integer
33
-    */
31
+    /**
32
+     * @var integer
33
+     */
34 34
     protected $code;
35 35
     
36
-   /**
37
-    * @var string
38
-    */
36
+    /**
37
+     * @var string
38
+     */
39 39
     protected $message;
40 40
     
41
-   /**
42
-    * @var integer
43
-    */
41
+    /**
42
+     * @var integer
43
+     */
44 44
     protected $callsCount = 0;
45 45
     
46
-   /**
47
-    * @var ConvertHelper_ThrowableInfo
48
-    */
46
+    /**
47
+     * @var ConvertHelper_ThrowableInfo
48
+     */
49 49
     protected $previous;
50 50
     
51
-   /**
52
-    * @var string
53
-    */
51
+    /**
52
+     * @var string
53
+     */
54 54
     protected $referer = '';
55 55
     
56
-   /**
57
-    * @var DateTime
58
-    */
56
+    /**
57
+     * @var DateTime
58
+     */
59 59
     protected $date;
60 60
     
61
-   /**
62
-    * @var string
63
-    */
61
+    /**
62
+     * @var string
63
+     */
64 64
     protected $context = self::CONTEXT_WEB;
65 65
 
66 66
     /**
@@ -114,16 +114,16 @@  discard block
 block discarded – undo
114 114
         return isset($this->previous);
115 115
     }
116 116
     
117
-   /**
118
-    * Retrieves the information on the previous exception.
119
-    * 
120
-    * NOTE: Throws an exception if there is no previous 
121
-    * exception. Use hasPrevious() first to avoid this.
122
-    * 
123
-    * @throws ConvertHelper_Exception
124
-    * @return ConvertHelper_ThrowableInfo
125
-    * @see ConvertHelper_ThrowableInfo::ERROR_NO_PREVIOUS_EXCEPTION
126
-    */
117
+    /**
118
+     * Retrieves the information on the previous exception.
119
+     * 
120
+     * NOTE: Throws an exception if there is no previous 
121
+     * exception. Use hasPrevious() first to avoid this.
122
+     * 
123
+     * @throws ConvertHelper_Exception
124
+     * @return ConvertHelper_ThrowableInfo
125
+     * @see ConvertHelper_ThrowableInfo::ERROR_NO_PREVIOUS_EXCEPTION
126
+     */
127 127
     public function getPrevious() : ConvertHelper_ThrowableInfo
128 128
     {
129 129
         if(isset($this->previous)) {
@@ -142,9 +142,9 @@  discard block
 block discarded – undo
142 142
         return !empty($this->code);
143 143
     }
144 144
     
145
-   /**
146
-    * Improved textonly exception trace.
147
-    */
145
+    /**
146
+     * Improved textonly exception trace.
147
+     */
148 148
     public function toString() : string
149 149
     {
150 150
         $calls = $this->getCalls();
@@ -172,73 +172,73 @@  discard block
 block discarded – undo
172 172
         return $string;
173 173
     }
174 174
     
175
-   /**
176
-    * Retrieves the URL of the page in which the exception
177
-    * was thrown, if applicable: in CLI context, this will
178
-    * return an empty string.
179
-    * 
180
-    * @return string
181
-    */
175
+    /**
176
+     * Retrieves the URL of the page in which the exception
177
+     * was thrown, if applicable: in CLI context, this will
178
+     * return an empty string.
179
+     * 
180
+     * @return string
181
+     */
182 182
     public function getReferer() : string
183 183
     {
184 184
         return $this->referer;
185 185
     }
186 186
     
187
-   /**
188
-    * Whether the exception occurred in a command line context.
189
-    * @return bool
190
-    */
187
+    /**
188
+     * Whether the exception occurred in a command line context.
189
+     * @return bool
190
+     */
191 191
     public function isCommandLine() : bool
192 192
     {
193 193
         return $this->getContext() === self::CONTEXT_COMMAND_LINE;
194 194
     }
195 195
     
196
-   /**
197
-    * Whether the exception occurred during an http request.
198
-    * @return bool
199
-    */
196
+    /**
197
+     * Whether the exception occurred during an http request.
198
+     * @return bool
199
+     */
200 200
     public function isWebRequest() : bool
201 201
     {
202 202
         return $this->getContext() === self::CONTEXT_WEB;
203 203
     }
204 204
     
205
-   /**
206
-    * Retrieves the context identifier, i.e. if the exception
207
-    * occurred in a command line context or regular web request.
208
-    * 
209
-    * @return string
210
-    * 
211
-    * @see ConvertHelper_ThrowableInfo::isCommandLine()
212
-    * @see ConvertHelper_ThrowableInfo::isWebRequest()
213
-    * @see ConvertHelper_ThrowableInfo::CONTEXT_COMMAND_LINE
214
-    * @see ConvertHelper_ThrowableInfo::CONTEXT_WEB
215
-    */
205
+    /**
206
+     * Retrieves the context identifier, i.e. if the exception
207
+     * occurred in a command line context or regular web request.
208
+     * 
209
+     * @return string
210
+     * 
211
+     * @see ConvertHelper_ThrowableInfo::isCommandLine()
212
+     * @see ConvertHelper_ThrowableInfo::isWebRequest()
213
+     * @see ConvertHelper_ThrowableInfo::CONTEXT_COMMAND_LINE
214
+     * @see ConvertHelper_ThrowableInfo::CONTEXT_WEB
215
+     */
216 216
     public function getContext() : string
217 217
     {
218 218
         return $this->context;
219 219
     }
220 220
     
221
-   /**
222
-    * Retrieves the date of the exception, and approximate time:
223
-    * since exceptions do not store time, this is captured the 
224
-    * moment the ThrowableInfo is created.
225
-    * 
226
-    * @return DateTime
227
-    */
221
+    /**
222
+     * Retrieves the date of the exception, and approximate time:
223
+     * since exceptions do not store time, this is captured the 
224
+     * moment the ThrowableInfo is created.
225
+     * 
226
+     * @return DateTime
227
+     */
228 228
     public function getDate() : DateTime
229 229
     {
230 230
         return $this->date;
231 231
     }
232 232
     
233
-   /**
234
-    * Serializes all information on the exception to an
235
-    * associative array. This can be saved (file, database, 
236
-    * session...), and later be restored into a throwable
237
-    * info instance using the fromSerialized() method.
238
-    * 
239
-    * @return array<string,mixed>
240
-    * @see ConvertHelper_ThrowableInfo::fromSerialized()
241
-    */
233
+    /**
234
+     * Serializes all information on the exception to an
235
+     * associative array. This can be saved (file, database, 
236
+     * session...), and later be restored into a throwable
237
+     * info instance using the fromSerialized() method.
238
+     * 
239
+     * @return array<string,mixed>
240
+     * @see ConvertHelper_ThrowableInfo::fromSerialized()
241
+     */
242 242
     public function serialize() : array
243 243
     {
244 244
         $result = array(
@@ -265,24 +265,24 @@  discard block
 block discarded – undo
265 265
         return $result;
266 266
     }
267 267
 
268
-   /**
269
-    * Sets the maximum folder depth to show in the 
270
-    * file paths, to avoid them being too long.
271
-    * 
272
-    * @param int $depth
273
-    * @return ConvertHelper_ThrowableInfo
274
-    */
268
+    /**
269
+     * Sets the maximum folder depth to show in the 
270
+     * file paths, to avoid them being too long.
271
+     * 
272
+     * @param int $depth
273
+     * @return ConvertHelper_ThrowableInfo
274
+     */
275 275
     public function setFolderDepth(int $depth) : ConvertHelper_ThrowableInfo
276 276
     {
277 277
         return $this->setOption('folder-depth', $depth);
278 278
     }
279 279
     
280
-   /**
281
-    * Retrieves the current folder depth option value.
282
-    * 
283
-    * @return int
284
-    * @see ConvertHelper_ThrowableInfo::setFolderDepth()
285
-    */
280
+    /**
281
+     * Retrieves the current folder depth option value.
282
+     * 
283
+     * @return int
284
+     * @see ConvertHelper_ThrowableInfo::setFolderDepth()
285
+     */
286 286
     public function getFolderDepth() : int
287 287
     {
288 288
         $depth = $this->getOption('folder-depth');
@@ -293,13 +293,13 @@  discard block
 block discarded – undo
293 293
         return 2;
294 294
     }
295 295
     
296
-   /**
297
-    * Retrieves all function calls that led to the error,
298
-    * ordered from latest to earliest (the first one in
299
-    * the stack is actually the last call).
300
-    *
301
-    * @return ConvertHelper_ThrowableInfo_Call[]
302
-    */
296
+    /**
297
+     * Retrieves all function calls that led to the error,
298
+     * ordered from latest to earliest (the first one in
299
+     * the stack is actually the last call).
300
+     *
301
+     * @return ConvertHelper_ThrowableInfo_Call[]
302
+     */
303 303
     public function getCalls()
304 304
     {
305 305
         return $this->calls;
@@ -315,10 +315,10 @@  discard block
 block discarded – undo
315 315
         return $this->calls[0];
316 316
     }
317 317
     
318
-   /**
319
-    * Returns the amount of function and method calls in the stack trace.
320
-    * @return int
321
-    */
318
+    /**
319
+     * Returns the amount of function and method calls in the stack trace.
320
+     * @return int
321
+     */
322 322
     public function countCalls() : int
323 323
     {
324 324
         return $this->callsCount;
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
      */
69 69
     protected function __construct($subject)
70 70
     {
71
-        if(is_array($subject))
71
+        if (is_array($subject))
72 72
         {
73 73
             $this->parseSerialized($subject);
74 74
         }
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
     */
127 127
     public function getPrevious() : ConvertHelper_ThrowableInfo
128 128
     {
129
-        if(isset($this->previous)) {
129
+        if (isset($this->previous)) {
130 130
             return $this->previous;
131 131
         }
132 132
         
@@ -151,18 +151,18 @@  discard block
 block discarded – undo
151 151
         
152 152
         $string = 'Exception';
153 153
         
154
-        if($this->hasCode()) {
154
+        if ($this->hasCode()) {
155 155
             $string .= ' #'.$this->code;
156 156
         }
157 157
         
158 158
         $string .= ': '.$this->getMessage().PHP_EOL;
159 159
         
160
-        foreach($calls as $call) 
160
+        foreach ($calls as $call) 
161 161
         {
162 162
             $string .= $call->toString().PHP_EOL;
163 163
         }
164 164
         
165
-        if($this->hasPrevious())
165
+        if ($this->hasPrevious())
166 166
         {
167 167
             $string .= PHP_EOL.PHP_EOL.
168 168
             'Previous error:'.PHP_EOL.PHP_EOL.
@@ -253,11 +253,11 @@  discard block
 block discarded – undo
253 253
             'previous' => null,
254 254
         );
255 255
         
256
-        if($this->hasPrevious()) {
257
-            $result['previous'] =  $this->previous->serialize();
256
+        if ($this->hasPrevious()) {
257
+            $result['previous'] = $this->previous->serialize();
258 258
         }
259 259
         
260
-        foreach($this->calls as $call)
260
+        foreach ($this->calls as $call)
261 261
         {
262 262
             $result['calls'][] = $call->serialize(); 
263 263
         }
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
     public function getFolderDepth() : int
287 287
     {
288 288
         $depth = $this->getOption('folder-depth');
289
-        if(!empty($depth)) {
289
+        if (!empty($depth)) {
290 290
             return $depth;
291 291
         }
292 292
         
@@ -340,12 +340,12 @@  discard block
 block discarded – undo
340 340
         
341 341
         $this->setOptions($serialized['options']);
342 342
         
343
-        if(!empty($serialized['previous']))
343
+        if (!empty($serialized['previous']))
344 344
         {
345 345
             $this->previous = ConvertHelper_ThrowableInfo::fromSerialized($serialized['previous']);
346 346
         }
347 347
         
348
-        foreach($serialized['calls'] as $def)
348
+        foreach ($serialized['calls'] as $def)
349 349
         {
350 350
             $this->calls[] = ConvertHelper_ThrowableInfo_Call::fromSerialized($this, $def);
351 351
         }
@@ -357,16 +357,16 @@  discard block
 block discarded – undo
357 357
         $this->message = $e->getMessage();
358 358
         $this->code = $e->getCode();
359 359
         
360
-        if(!isset($_REQUEST['REQUEST_URI'])) {
360
+        if (!isset($_REQUEST['REQUEST_URI'])) {
361 361
             $this->context = self::CONTEXT_COMMAND_LINE;
362 362
         }
363 363
         
364 364
         $previous = $e->getPrevious();
365
-        if(!empty($previous)) {
365
+        if (!empty($previous)) {
366 366
             $this->previous = ConvertHelper::throwable2info($previous);
367 367
         }
368 368
         
369
-        if(isset($_SERVER['REQUEST_URI'])) {
369
+        if (isset($_SERVER['REQUEST_URI'])) {
370 370
             $this->referer = $_SERVER['REQUEST_URI'];
371 371
         }
372 372
         
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
         
381 381
         $idx = 1;
382 382
         
383
-        foreach($trace as $entry)
383
+        foreach ($trace as $entry)
384 384
         {
385 385
             $this->calls[] = ConvertHelper_ThrowableInfo_Call::fromTrace($this, $idx, $entry);
386 386
             
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
      * @return string
416 416
      * @throws ConvertHelper_Exception
417 417
      */
418
-    public function renderErrorMessage(bool $withDeveloperInfo=false) : string
418
+    public function renderErrorMessage(bool $withDeveloperInfo = false) : string
419 419
     {
420 420
         $finalCall = $this->getFinalCall();
421 421
 
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
             ->t('Message:')
428 428
             ->add($this->getMessage());
429 429
 
430
-        if($withDeveloperInfo)
430
+        if ($withDeveloperInfo)
431 431
         {
432 432
             $message
433 433
             ->eol()
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
435 435
             ->add($finalCall->toString());
436 436
         }
437 437
 
438
-        if($withDeveloperInfo && $this->hasDetails())
438
+        if ($withDeveloperInfo && $this->hasDetails())
439 439
         {
440 440
             $message
441 441
                 ->t('Developer details:')
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
 
446 446
         $previous = $this->getPrevious();
447 447
 
448
-        if($previous !== null)
448
+        if ($previous !== null)
449 449
         {
450 450
             $message
451 451
                 ->eol()
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
 
461 461
     public function getDetails() : string
462 462
     {
463
-        if($this->exception instanceof BaseException)
463
+        if ($this->exception instanceof BaseException)
464 464
         {
465 465
             return $this->exception->getDetails();
466 466
         }
Please login to merge, or discard this patch.
src/ConvertHelper/ThrowableInfo/Call.php 3 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -65,8 +65,7 @@  discard block
 block discarded – undo
65 65
         if(isset($data['serialized'])) 
66 66
         {
67 67
             $this->parseSerialized($data['serialized']);
68
-        }
69
-        else
68
+        } else
70 69
         {
71 70
             $this->parseTrace($data['trace']);
72 71
             $this->position = $data['position'];
@@ -75,8 +74,7 @@  discard block
 block discarded – undo
75 74
         if($this->hasClass()) 
76 75
         {
77 76
             $this->type = self::TYPE_METHOD_CALL;
78
-        }
79
-        else if($this->hasFunction()) 
77
+        } else if($this->hasFunction()) 
80 78
         {
81 79
             $this->type = self::TYPE_FUNCTION_CALL;
82 80
         }
Please login to merge, or discard this patch.
Indentation   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -10,45 +10,45 @@  discard block
 block discarded – undo
10 10
     const TYPE_METHOD_CALL = 'method';
11 11
     const TYPE_SCRIPT_START = 'start';
12 12
     
13
-   /**
14
-    * @var ConvertHelper_ThrowableInfo
15
-    */
13
+    /**
14
+     * @var ConvertHelper_ThrowableInfo
15
+     */
16 16
     protected $info;
17 17
     
18
-   /**
19
-    * @var VariableInfo[]
20
-    */
18
+    /**
19
+     * @var VariableInfo[]
20
+     */
21 21
     protected $args = array();
22 22
     
23
-   /**
24
-    * The source file, if any
25
-    * @var string
26
-    */
23
+    /**
24
+     * The source file, if any
25
+     * @var string
26
+     */
27 27
     protected $file = '';
28 28
     
29
-   /**
30
-    * @var string
31
-    */
29
+    /**
30
+     * @var string
31
+     */
32 32
     protected $class = '';
33 33
     
34
-   /**
35
-    * @var integer
36
-    */
34
+    /**
35
+     * @var integer
36
+     */
37 37
     protected $line = 0;
38 38
     
39
-   /**
40
-    * @var int
41
-    */
39
+    /**
40
+     * @var int
41
+     */
42 42
     protected $position = 1;
43 43
     
44
-   /**
45
-    * @var string
46
-    */
44
+    /**
45
+     * @var string
46
+     */
47 47
     protected $function = '';
48 48
     
49
-   /**
50
-    * @var string
51
-    */
49
+    /**
50
+     * @var string
51
+     */
52 52
     protected $type = self::TYPE_SCRIPT_START;
53 53
 
54 54
     /**
@@ -79,10 +79,10 @@  discard block
 block discarded – undo
79 79
         }
80 80
     }
81 81
     
82
-   /**
83
-    * 1-based position of the call in the calls list.
84
-    * @return int
85
-    */
82
+    /**
83
+     * 1-based position of the call in the calls list.
84
+     * @return int
85
+     */
86 86
     public function getPosition() : int
87 87
     {
88 88
         return $this->position;
@@ -93,18 +93,18 @@  discard block
 block discarded – undo
93 93
         return $this->line;
94 94
     }
95 95
     
96
-   /**
97
-    * Whether the call had any arguments.
98
-    * @return bool
99
-    */
96
+    /**
97
+     * Whether the call had any arguments.
98
+     * @return bool
99
+     */
100 100
     public function hasArguments() : bool
101 101
     {
102 102
         return !empty($this->args);
103 103
     }
104 104
     
105
-   /**
106
-    * @return VariableInfo[]
107
-    */
105
+    /**
106
+     * @return VariableInfo[]
107
+     */
108 108
     public function getArguments()
109 109
     {
110 110
         return $this->args;
@@ -244,31 +244,31 @@  discard block
 block discarded – undo
244 244
         return implode(', ', $tokens); 
245 245
     }
246 246
     
247
-   /**
248
-    * Retrieves the type of call: typically a function
249
-    * call, or a method call of an object. Note that the
250
-    * first call in a script does not have either.
251
-    * 
252
-    * @return string
253
-    * 
254
-    * @see ConvertHelper_ThrowableInfo_Call::TYPE_FUNCTION_CALL
255
-    * @see ConvertHelper_ThrowableInfo_Call::TYPE_METHOD_CALL
256
-    * @see ConvertHelper_ThrowableInfo_Call::TYPE_SCRIPT_START
257
-    * @see ConvertHelper_ThrowableInfo_Call::hasFunction()
258
-    * @see ConvertHelper_ThrowableInfo_Call::hasClass()
259
-    */
247
+    /**
248
+     * Retrieves the type of call: typically a function
249
+     * call, or a method call of an object. Note that the
250
+     * first call in a script does not have either.
251
+     * 
252
+     * @return string
253
+     * 
254
+     * @see ConvertHelper_ThrowableInfo_Call::TYPE_FUNCTION_CALL
255
+     * @see ConvertHelper_ThrowableInfo_Call::TYPE_METHOD_CALL
256
+     * @see ConvertHelper_ThrowableInfo_Call::TYPE_SCRIPT_START
257
+     * @see ConvertHelper_ThrowableInfo_Call::hasFunction()
258
+     * @see ConvertHelper_ThrowableInfo_Call::hasClass()
259
+     */
260 260
     public function getType() : string
261 261
     {
262 262
         return $this->type;
263 263
     }
264 264
      
265
-   /**
266
-    * Serializes the call to an array, with all
267
-    * necessary information. Can be used to restore
268
-    * the call later using {@link ConvertHelper_ThrowableInfo_Call::fromSerialized()}.
269
-    * 
270
-    * @return array<string,mixed>
271
-    */
265
+    /**
266
+     * Serializes the call to an array, with all
267
+     * necessary information. Can be used to restore
268
+     * the call later using {@link ConvertHelper_ThrowableInfo_Call::fromSerialized()}.
269
+     * 
270
+     * @return array<string,mixed>
271
+     */
272 272
     public function serialize() : array
273 273
     {
274 274
         $result = array(
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     {
60 60
         $this->info = $info;
61 61
         
62
-        if(isset($data['serialized'])) 
62
+        if (isset($data['serialized'])) 
63 63
         {
64 64
             $this->parseSerialized($data['serialized']);
65 65
         }
@@ -69,11 +69,11 @@  discard block
 block discarded – undo
69 69
             $this->position = $data['position'];
70 70
         }
71 71
         
72
-        if($this->hasClass()) 
72
+        if ($this->hasClass()) 
73 73
         {
74 74
             $this->type = self::TYPE_METHOD_CALL;
75 75
         }
76
-        else if($this->hasFunction()) 
76
+        else if ($this->hasFunction()) 
77 77
         {
78 78
             $this->type = self::TYPE_FUNCTION_CALL;
79 79
         }
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
     
133 133
     public function getFileName() : string
134 134
     {
135
-        if($this->hasFile()) {
135
+        if ($this->hasFile()) {
136 136
             return basename($this->file);
137 137
         }
138 138
         
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
     
142 142
     public function getFileRelative() : string
143 143
     {
144
-        if($this->hasFile()) {
144
+        if ($this->hasFile()) {
145 145
             return FileHelper::relativizePathByDepth($this->file, $this->info->getFolderDepth());
146 146
         }
147 147
         
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
         $this->class = $data['class'];
172 172
         $this->position = $data['position'];
173 173
         
174
-        foreach($data['arguments'] as $arg)
174
+        foreach ($data['arguments'] as $arg)
175 175
         {
176 176
             $this->args[] = VariableInfo::fromSerialized($arg);
177 177
         }
@@ -182,29 +182,29 @@  discard block
 block discarded – undo
182 182
      */
183 183
     protected function parseTrace(array $trace) : void
184 184
     {
185
-        if(isset($trace['line']))
185
+        if (isset($trace['line']))
186 186
         {
187 187
             $this->line = intval($trace['line']);
188 188
         }
189 189
         
190
-        if(isset($trace['function'])) 
190
+        if (isset($trace['function'])) 
191 191
         {
192 192
             $this->function = $trace['function'];
193 193
         }
194 194
         
195
-        if(isset($trace['file']))
195
+        if (isset($trace['file']))
196 196
         {
197 197
             $this->file = FileHelper::normalizePath($trace['file']);
198 198
         }
199 199
         
200
-        if(isset($trace['class'])) 
200
+        if (isset($trace['class'])) 
201 201
         {
202 202
             $this->class = $trace['class'];
203 203
         }
204 204
      
205
-        if(isset($trace['args']) && !empty($trace['args']))
205
+        if (isset($trace['args']) && !empty($trace['args']))
206 206
         {
207
-            foreach($trace['args'] as $arg) 
207
+            foreach ($trace['args'] as $arg) 
208 208
             {
209 209
                 $this->args[] = parseVariable($arg);
210 210
             }
@@ -219,13 +219,13 @@  discard block
 block discarded – undo
219 219
         
220 220
         $tokens[] = '#'.sprintf('%0'.$padLength.'d', $this->getPosition()).' ';
221 221
         
222
-        if($this->hasFile()) {
222
+        if ($this->hasFile()) {
223 223
             $tokens[] = $this->getFileRelative().':'.$this->getLine();
224 224
         }
225 225
         
226
-        if($this->hasClass()) {
226
+        if ($this->hasClass()) {
227 227
             $tokens[] = $this->getClass().'::'.$this->getFunction().'('.$this->argumentsToString().')';
228
-        } else if($this->hasFunction()) {
228
+        } else if ($this->hasFunction()) {
229 229
             $tokens[] = $this->getFunction().'('.$this->argumentsToString().')';
230 230
         }
231 231
         
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
     {
237 237
         $tokens = array();
238 238
         
239
-        foreach($this->args as $arg) 
239
+        foreach ($this->args as $arg) 
240 240
         {
241 241
             $tokens[] = $arg->toString();
242 242
         }
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
             'arguments' => array()
282 282
         );
283 283
         
284
-        foreach($this->args as $argument)
284
+        foreach ($this->args as $argument)
285 285
         {
286 286
             $result['arguments'][] = $argument->serialize();
287 287
         }
Please login to merge, or discard this patch.
src/ConvertHelper/StringMatch.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -33,19 +33,19 @@
 block discarded – undo
33 33
         $this->match = $matchedString;
34 34
     }
35 35
     
36
-   /**
37
-    * The zero-based start position of the string in the haystack.
38
-    * @return int
39
-    */
36
+    /**
37
+     * The zero-based start position of the string in the haystack.
38
+     * @return int
39
+     */
40 40
     public function getPosition() : int
41 41
     {
42 42
         return $this->position;
43 43
     }
44 44
     
45
-   /**
46
-    * The exact string that was matched, respecting the case as found in needle.
47
-    * @return string
48
-    */
45
+    /**
46
+     * The exact string that was matched, respecting the case as found in needle.
47
+     * @return string
48
+     */
49 49
     public function getMatchedString() : string
50 50
     {
51 51
         return $this->match;
Please login to merge, or discard this patch.
src/XMLHelper/SimpleXML/Error.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -6,9 +6,9 @@
 block discarded – undo
6 6
 {
7 7
     protected $xml;
8 8
     
9
-   /**
10
-    * @var  \LibXMLError
11
-    */
9
+    /**
10
+     * @var  \LibXMLError
11
+     */
12 12
     protected $nativeError;
13 13
     
14 14
     public function __construct(XMLHelper_SimpleXML $xml, \LibXMLError $nativeError)
Please login to merge, or discard this patch.
src/XMLHelper/Converter.php 2 patches
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -41,14 +41,14 @@  discard block
 block discarded – undo
41 41
 {
42 42
     const ERROR_FAILED_CONVERTING_TO_JSON = 37901;
43 43
     
44
-   /**
45
-    * @var \SimpleXMLElement
46
-    */
44
+    /**
45
+     * @var \SimpleXMLElement
46
+     */
47 47
     protected $xml;
48 48
     
49
-   /**
50
-    * @var string
51
-    */
49
+    /**
50
+     * @var string
51
+     */
52 52
     protected $json;
53 53
     
54 54
     protected function __construct(\SimpleXMLElement $element)
@@ -56,24 +56,24 @@  discard block
 block discarded – undo
56 56
         $this->xml = $element;
57 57
     }
58 58
     
59
-   /**
60
-    * Factory method: creates a converter from an XML file on disk.
61
-    * 
62
-    * @param string $path
63
-    * @return \AppUtils\XMLHelper_Converter
64
-    */
59
+    /**
60
+     * Factory method: creates a converter from an XML file on disk.
61
+     * 
62
+     * @param string $path
63
+     * @return \AppUtils\XMLHelper_Converter
64
+     */
65 65
     public static function fromFile(string $path)
66 66
     {
67 67
         $xmlString = file_get_contents($path);
68 68
         return self::fromString($xmlString);
69 69
     }
70 70
  
71
-   /**
72
-    * Factory method: creates a converter from an XML string.
73
-    * 
74
-    * @param string $xmlString
75
-    * @return \AppUtils\XMLHelper_Converter
76
-    */
71
+    /**
72
+     * Factory method: creates a converter from an XML string.
73
+     * 
74
+     * @param string $xmlString
75
+     * @return \AppUtils\XMLHelper_Converter
76
+     */
77 77
     public static function fromString(string $xmlString)
78 78
     {
79 79
         $element = new \SimpleXMLElement($xmlString);
@@ -81,36 +81,36 @@  discard block
 block discarded – undo
81 81
         return self::fromElement($element);
82 82
     }
83 83
     
84
-   /**
85
-    * Factory method: creates a converter from an existing SimpleXMLElement instance.
86
-    * 
87
-    * @param \SimpleXMLElement $element
88
-    * @return \AppUtils\XMLHelper_Converter
89
-    */
84
+    /**
85
+     * Factory method: creates a converter from an existing SimpleXMLElement instance.
86
+     * 
87
+     * @param \SimpleXMLElement $element
88
+     * @return \AppUtils\XMLHelper_Converter
89
+     */
90 90
     public static function fromElement(\SimpleXMLElement $element)
91 91
     {
92 92
         $obj = new XMLHelper_Converter($element);
93 93
         return $obj;
94 94
     }
95 95
 
96
-   /**
97
-    * Factory method: creates a converter from an existing SimpleXMLElement instance.
98
-    *
99
-    * @param \DOMElement $element
100
-    * @return \AppUtils\XMLHelper_Converter
101
-    */
96
+    /**
97
+     * Factory method: creates a converter from an existing SimpleXMLElement instance.
98
+     *
99
+     * @param \DOMElement $element
100
+     * @return \AppUtils\XMLHelper_Converter
101
+     */
102 102
     public static function fromDOMElement(\DOMElement $element)
103 103
     {
104 104
         $obj = new XMLHelper_Converter(simplexml_import_dom($element));
105 105
         return $obj;
106 106
     }
107 107
     
108
-   /**
109
-    * Converts the XML to JSON.
110
-    * 
111
-    * @throws XMLHelper_Exception
112
-    * @return string
113
-    */
108
+    /**
109
+     * Converts the XML to JSON.
110
+     * 
111
+     * @throws XMLHelper_Exception
112
+     * @return string
113
+     */
114 114
     public function toJSON() : string
115 115
     {
116 116
         if(isset($this->json)) {
@@ -138,11 +138,11 @@  discard block
 block discarded – undo
138 138
         );
139 139
     }
140 140
     
141
-   /**
142
-    * Converts the XML to an associative array.
143
-    * @return array
144
-    * @throws XMLHelper_Exception
145
-    */
141
+    /**
142
+     * Converts the XML to an associative array.
143
+     * @return array
144
+     * @throws XMLHelper_Exception
145
+     */
146 146
     public function toArray() : array 
147 147
     {
148 148
         $json = $this->toJSON();
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
     */
114 114
     public function toJSON() : string
115 115
     {
116
-        if(isset($this->json)) {
116
+        if (isset($this->json)) {
117 117
             return $this->json;
118 118
         }
119 119
         
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
         
124 124
         unset($this->xml);
125 125
         
126
-        if($this->json !== false) {
126
+        if ($this->json !== false) {
127 127
             return $this->json;
128 128
         }
129 129
         
Please login to merge, or discard this patch.