Passed
Branch master (c991d8)
by Sebastian
08:15
created
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.
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   +103 added lines, -103 removed lines patch added patch discarded remove patch
@@ -14,49 +14,49 @@  discard block
 block discarded – undo
14 14
     const CONTEXT_COMMAND_LINE = 'cli';
15 15
     const CONTEXT_WEB = 'web';
16 16
     
17
-   /**
18
-    * @var \Throwable
19
-    */
17
+    /**
18
+     * @var \Throwable
19
+     */
20 20
     protected $exception;
21 21
     
22
-   /**
23
-    * @var ConvertHelper_ThrowableInfo_Call[]
24
-    */
22
+    /**
23
+     * @var ConvertHelper_ThrowableInfo_Call[]
24
+     */
25 25
     protected $calls = array();
26 26
     
27
-   /**
28
-    * @var integer
29
-    */
27
+    /**
28
+     * @var integer
29
+     */
30 30
     protected $code;
31 31
     
32
-   /**
33
-    * @var string
34
-    */
32
+    /**
33
+     * @var string
34
+     */
35 35
     protected $message;
36 36
     
37
-   /**
38
-    * @var integer
39
-    */
37
+    /**
38
+     * @var integer
39
+     */
40 40
     protected $callsCount = 0;
41 41
     
42
-   /**
43
-    * @var ConvertHelper_ThrowableInfo
44
-    */
42
+    /**
43
+     * @var ConvertHelper_ThrowableInfo
44
+     */
45 45
     protected $previous;
46 46
     
47
-   /**
48
-    * @var string
49
-    */
47
+    /**
48
+     * @var string
49
+     */
50 50
     protected $referer = '';
51 51
     
52
-   /**
53
-    * @var \DateTime
54
-    */
52
+    /**
53
+     * @var \DateTime
54
+     */
55 55
     protected $date;
56 56
     
57
-   /**
58
-    * @var string
59
-    */
57
+    /**
58
+     * @var string
59
+     */
60 60
     protected $context = self::CONTEXT_WEB;
61 61
     
62 62
     protected function __construct($subject)
@@ -103,16 +103,16 @@  discard block
 block discarded – undo
103 103
         return isset($this->previous);
104 104
     }
105 105
     
106
-   /**
107
-    * Retrieves the information on the previous exception.
108
-    * 
109
-    * NOTE: Throws an exception if there is no previous 
110
-    * exception. Use hasPrevious() first to avoid this.
111
-    * 
112
-    * @throws ConvertHelper_Exception
113
-    * @return ConvertHelper_ThrowableInfo
114
-    * @see ConvertHelper_ThrowableInfo::ERROR_NO_PREVIOUS_EXCEPTION
115
-    */
106
+    /**
107
+     * Retrieves the information on the previous exception.
108
+     * 
109
+     * NOTE: Throws an exception if there is no previous 
110
+     * exception. Use hasPrevious() first to avoid this.
111
+     * 
112
+     * @throws ConvertHelper_Exception
113
+     * @return ConvertHelper_ThrowableInfo
114
+     * @see ConvertHelper_ThrowableInfo::ERROR_NO_PREVIOUS_EXCEPTION
115
+     */
116 116
     public function getPrevious() : ConvertHelper_ThrowableInfo
117 117
     {
118 118
         if(isset($this->previous)) {
@@ -131,9 +131,9 @@  discard block
 block discarded – undo
131 131
         return !empty($this->code);
132 132
     }
133 133
     
134
-   /**
135
-    * Improved textonly exception trace.
136
-    */
134
+    /**
135
+     * Improved textonly exception trace.
136
+     */
137 137
     public function toString() : string
138 138
     {
139 139
         $calls = $this->getCalls();
@@ -161,73 +161,73 @@  discard block
 block discarded – undo
161 161
         return $string;
162 162
     }
163 163
     
164
-   /**
165
-    * Retrieves the URL of the page in which the exception
166
-    * was thrown, if applicable: in CLI context, this will
167
-    * return an empty string.
168
-    * 
169
-    * @return string
170
-    */
164
+    /**
165
+     * Retrieves the URL of the page in which the exception
166
+     * was thrown, if applicable: in CLI context, this will
167
+     * return an empty string.
168
+     * 
169
+     * @return string
170
+     */
171 171
     public function getReferer() : string
172 172
     {
173 173
         return $this->referer;
174 174
     }
175 175
     
176
-   /**
177
-    * Whether the exception occurred in a command line context.
178
-    * @return bool
179
-    */
176
+    /**
177
+     * Whether the exception occurred in a command line context.
178
+     * @return bool
179
+     */
180 180
     public function isCommandLine() : bool
181 181
     {
182 182
         return $this->getContext() === self::CONTEXT_COMMAND_LINE;
183 183
     }
184 184
     
185
-   /**
186
-    * Whether the exception occurred during an http request.
187
-    * @return bool
188
-    */
185
+    /**
186
+     * Whether the exception occurred during an http request.
187
+     * @return bool
188
+     */
189 189
     public function isWebRequest() : bool
190 190
     {
191 191
         return $this->getContext() === self::CONTEXT_WEB;
192 192
     }
193 193
     
194
-   /**
195
-    * Retrieves the context identifier, i.e. if the exception
196
-    * occurred in a command line context or regular web request.
197
-    * 
198
-    * @return string
199
-    * 
200
-    * @see ConvertHelper_ThrowableInfo::isCommandLine()
201
-    * @see ConvertHelper_ThrowableInfo::isWebRequest()
202
-    * @see ConvertHelper_ThrowableInfo::CONTEXT_COMMAND_LINE
203
-    * @see ConvertHelper_ThrowableInfo::CONTEXT_WEB
204
-    */
194
+    /**
195
+     * Retrieves the context identifier, i.e. if the exception
196
+     * occurred in a command line context or regular web request.
197
+     * 
198
+     * @return string
199
+     * 
200
+     * @see ConvertHelper_ThrowableInfo::isCommandLine()
201
+     * @see ConvertHelper_ThrowableInfo::isWebRequest()
202
+     * @see ConvertHelper_ThrowableInfo::CONTEXT_COMMAND_LINE
203
+     * @see ConvertHelper_ThrowableInfo::CONTEXT_WEB
204
+     */
205 205
     public function getContext() : string
206 206
     {
207 207
         return $this->context;
208 208
     }
209 209
     
210
-   /**
211
-    * Retrieves the date of the exception, and approximate time:
212
-    * since exceptions do not store time, this is captured the 
213
-    * moment the ThrowableInfo is created.
214
-    * 
215
-    * @return \DateTime
216
-    */
210
+    /**
211
+     * Retrieves the date of the exception, and approximate time:
212
+     * since exceptions do not store time, this is captured the 
213
+     * moment the ThrowableInfo is created.
214
+     * 
215
+     * @return \DateTime
216
+     */
217 217
     public function getDate() : \DateTime
218 218
     {
219 219
         return $this->date;
220 220
     }
221 221
     
222
-   /**
223
-    * Serializes all information on the exception to an
224
-    * associative array. This can be saved (file, database, 
225
-    * session...), and later be restored into a throwable
226
-    * info instance using the fromSerialized() method.
227
-    * 
228
-    * @return array
229
-    * @see ConvertHelper_ThrowableInfo::fromSerialized()
230
-    */
222
+    /**
223
+     * Serializes all information on the exception to an
224
+     * associative array. This can be saved (file, database, 
225
+     * session...), and later be restored into a throwable
226
+     * info instance using the fromSerialized() method.
227
+     * 
228
+     * @return array
229
+     * @see ConvertHelper_ThrowableInfo::fromSerialized()
230
+     */
231 231
     public function serialize() : array
232 232
     {
233 233
         $result = array(
@@ -254,24 +254,24 @@  discard block
 block discarded – undo
254 254
         return $result;
255 255
     }
256 256
 
257
-   /**
258
-    * Sets the maximum folder depth to show in the 
259
-    * file paths, to avoid them being too long.
260
-    * 
261
-    * @param int $depth
262
-    * @return ConvertHelper_ThrowableInfo
263
-    */
257
+    /**
258
+     * Sets the maximum folder depth to show in the 
259
+     * file paths, to avoid them being too long.
260
+     * 
261
+     * @param int $depth
262
+     * @return ConvertHelper_ThrowableInfo
263
+     */
264 264
     public function setFolderDepth(int $depth) : ConvertHelper_ThrowableInfo
265 265
     {
266 266
         return $this->setOption('folder-depth', $depth);
267 267
     }
268 268
     
269
-   /**
270
-    * Retrieves the current folder depth option value.
271
-    * 
272
-    * @return int
273
-    * @see ConvertHelper_ThrowableInfo::setFolderDepth()
274
-    */
269
+    /**
270
+     * Retrieves the current folder depth option value.
271
+     * 
272
+     * @return int
273
+     * @see ConvertHelper_ThrowableInfo::setFolderDepth()
274
+     */
275 275
     public function getFolderDepth() : int
276 276
     {
277 277
         $depth = $this->getOption('folder-depth');
@@ -282,19 +282,19 @@  discard block
 block discarded – undo
282 282
         return 2;
283 283
     }
284 284
     
285
-   /**
286
-    * Retrieves all function calls that led to the error.
287
-    * @return ConvertHelper_ThrowableInfo_Call[]
288
-    */
285
+    /**
286
+     * Retrieves all function calls that led to the error.
287
+     * @return ConvertHelper_ThrowableInfo_Call[]
288
+     */
289 289
     public function getCalls()
290 290
     {
291 291
         return $this->calls;
292 292
     }
293 293
     
294
-   /**
295
-    * Returns the amount of function and method calls in the stack trace.
296
-    * @return int
297
-    */
294
+    /**
295
+     * Returns the amount of function and method calls in the stack trace.
296
+     * @return int
297
+     */
298 298
     public function countCalls() : int
299 299
     {
300 300
         return $this->callsCount;
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
     
62 62
     protected function __construct($subject)
63 63
     {
64
-        if(is_array($subject))
64
+        if (is_array($subject))
65 65
         {
66 66
             $this->parseSerialized($subject);
67 67
         }
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
     */
116 116
     public function getPrevious() : ConvertHelper_ThrowableInfo
117 117
     {
118
-        if(isset($this->previous)) {
118
+        if (isset($this->previous)) {
119 119
             return $this->previous;
120 120
         }
121 121
         
@@ -140,18 +140,18 @@  discard block
 block discarded – undo
140 140
         
141 141
         $string = 'Exception';
142 142
         
143
-        if($this->hasCode()) {
143
+        if ($this->hasCode()) {
144 144
             $string .= ' #'.$this->code;
145 145
         }
146 146
         
147 147
         $string .= ': '.$this->getMessage().PHP_EOL;
148 148
         
149
-        foreach($calls as $call) 
149
+        foreach ($calls as $call) 
150 150
         {
151 151
             $string .= $call->toString().PHP_EOL;
152 152
         }
153 153
         
154
-        if($this->hasPrevious())
154
+        if ($this->hasPrevious())
155 155
         {
156 156
             $string .= PHP_EOL.PHP_EOL.
157 157
             'Previous error:'.PHP_EOL.PHP_EOL.
@@ -242,11 +242,11 @@  discard block
 block discarded – undo
242 242
             'previous' => null,
243 243
         );
244 244
         
245
-        if($this->hasPrevious()) {
246
-            $result['previous'] =  $this->previous->serialize();
245
+        if ($this->hasPrevious()) {
246
+            $result['previous'] = $this->previous->serialize();
247 247
         }
248 248
         
249
-        foreach($this->calls as $call)
249
+        foreach ($this->calls as $call)
250 250
         {
251 251
             $result['calls'][] = $call->serialize(); 
252 252
         }
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
     public function getFolderDepth() : int
276 276
     {
277 277
         $depth = $this->getOption('folder-depth');
278
-        if(!empty($depth)) {
278
+        if (!empty($depth)) {
279 279
             return $depth;
280 280
         }
281 281
         
@@ -311,12 +311,12 @@  discard block
 block discarded – undo
311 311
         
312 312
         $this->setOptions($serialized['options']);
313 313
         
314
-        if(!empty($serialized['previous']))
314
+        if (!empty($serialized['previous']))
315 315
         {
316 316
             $this->previous = ConvertHelper_ThrowableInfo::fromSerialized($serialized['previous']);
317 317
         }
318 318
         
319
-        foreach($serialized['calls'] as $def)
319
+        foreach ($serialized['calls'] as $def)
320 320
         {
321 321
             $this->calls[] = ConvertHelper_ThrowableInfo_Call::fromSerialized($this, $def);
322 322
         }
@@ -328,16 +328,16 @@  discard block
 block discarded – undo
328 328
         $this->message = $e->getMessage();
329 329
         $this->code = intval($e->getCode());
330 330
         
331
-        if(!isset($_REQUEST['REQUEST_URI'])) {
331
+        if (!isset($_REQUEST['REQUEST_URI'])) {
332 332
             $this->context = self::CONTEXT_COMMAND_LINE;
333 333
         }
334 334
         
335 335
         $previous = $e->getPrevious();
336
-        if(!empty($previous)) {
336
+        if (!empty($previous)) {
337 337
             $this->previous = ConvertHelper::throwable2info($previous);
338 338
         }
339 339
         
340
-        if(isset($_SERVER['REQUEST_URI'])) {
340
+        if (isset($_SERVER['REQUEST_URI'])) {
341 341
             $this->referer = $_SERVER['REQUEST_URI'];
342 342
         }
343 343
         
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
         
352 352
         $idx = 1;
353 353
         
354
-        foreach($trace as $entry)
354
+        foreach ($trace as $entry)
355 355
         {
356 356
             $this->calls[] = ConvertHelper_ThrowableInfo_Call::fromTrace($this, $idx, $entry);
357 357
             
Please login to merge, or discard this patch.
src/ConvertHelper/ThrowableInfo/Call.php 3 patches
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -12,50 +12,50 @@  discard block
 block discarded – undo
12 12
     
13 13
     const TYPE_SCRIPT_START = 'start';
14 14
     
15
-   /**
16
-    * @var ConvertHelper_ThrowableInfo
17
-    */
15
+    /**
16
+     * @var ConvertHelper_ThrowableInfo
17
+     */
18 18
     protected $info;
19 19
     
20
-   /**
21
-    * @var array
22
-    */
20
+    /**
21
+     * @var array
22
+     */
23 23
     protected $trace;
24 24
     
25
-   /**
26
-    * @var VariableInfo[]
27
-    */
25
+    /**
26
+     * @var VariableInfo[]
27
+     */
28 28
     protected $args = array();
29 29
     
30
-   /**
31
-    * The source file, if any
32
-    * @var string
33
-    */
30
+    /**
31
+     * The source file, if any
32
+     * @var string
33
+     */
34 34
     protected $file = '';
35 35
     
36
-   /**
37
-    * @var string
38
-    */
36
+    /**
37
+     * @var string
38
+     */
39 39
     protected $class = '';
40 40
     
41
-   /**
42
-    * @var integer
43
-    */
41
+    /**
42
+     * @var integer
43
+     */
44 44
     protected $line = 0;
45 45
     
46
-   /**
47
-    * @var int
48
-    */
46
+    /**
47
+     * @var int
48
+     */
49 49
     protected $position = 1;
50 50
     
51
-   /**
52
-    * @var string
53
-    */
51
+    /**
52
+     * @var string
53
+     */
54 54
     protected $function = '';
55 55
     
56
-   /**
57
-    * @var string
58
-    */
56
+    /**
57
+     * @var string
58
+     */
59 59
     protected $type = self::TYPE_SCRIPT_START;
60 60
     
61 61
     protected function __construct(ConvertHelper_ThrowableInfo $info, array $data)
@@ -82,10 +82,10 @@  discard block
 block discarded – undo
82 82
         }
83 83
     }
84 84
     
85
-   /**
86
-    * 1-based position of the call in the calls list.
87
-    * @return int
88
-    */
85
+    /**
86
+     * 1-based position of the call in the calls list.
87
+     * @return int
88
+     */
89 89
     public function getPosition() : int
90 90
     {
91 91
         return $this->position;
@@ -96,18 +96,18 @@  discard block
 block discarded – undo
96 96
         return $this->line;
97 97
     }
98 98
     
99
-   /**
100
-    * Whether the call had any arguments.
101
-    * @return bool
102
-    */
99
+    /**
100
+     * Whether the call had any arguments.
101
+     * @return bool
102
+     */
103 103
     public function hasArguments() : bool
104 104
     {
105 105
         return !empty($this->args);
106 106
     }
107 107
     
108
-   /**
109
-    * @return VariableInfo[]
110
-    */
108
+    /**
109
+     * @return VariableInfo[]
110
+     */
111 111
     public function getArguments()
112 112
     {
113 113
         return $this->args;
@@ -240,31 +240,31 @@  discard block
 block discarded – undo
240 240
         return implode(', ', $tokens); 
241 241
     }
242 242
     
243
-   /**
244
-    * Retrieves the type of call: typcially a function 
245
-    * call, or a method call of an object. Note that the
246
-    * first call in a script does not have either.
247
-    * 
248
-    * @return string
249
-    * 
250
-    * @see ConvertHelper_ThrowableInfo_Call::TYPE_FUNCTION_CALL
251
-    * @see ConvertHelper_ThrowableInfo_Call::TYPE_METHOD_CALL
252
-    * @see ConvertHelper_ThrowableInfo_Call::TYPE_SCRIPT_START
253
-    * @see ConvertHelper_ThrowableInfo_Call::hasFunction()
254
-    * @see ConvertHelper_ThrowableInfo_Call::hasClass()
255
-    */
243
+    /**
244
+     * Retrieves the type of call: typcially a function 
245
+     * call, or a method call of an object. Note that the
246
+     * first call in a script does not have either.
247
+     * 
248
+     * @return string
249
+     * 
250
+     * @see ConvertHelper_ThrowableInfo_Call::TYPE_FUNCTION_CALL
251
+     * @see ConvertHelper_ThrowableInfo_Call::TYPE_METHOD_CALL
252
+     * @see ConvertHelper_ThrowableInfo_Call::TYPE_SCRIPT_START
253
+     * @see ConvertHelper_ThrowableInfo_Call::hasFunction()
254
+     * @see ConvertHelper_ThrowableInfo_Call::hasClass()
255
+     */
256 256
     public function getType() : string
257 257
     {
258 258
         return $this->type;
259 259
     }
260 260
      
261
-   /**
262
-    * Serializes the call to an array, with all
263
-    * necessary information. Can be used to restore
264
-    * the call later using {@link ConvertHelper_ThrowableInfo_Call::fromSerialized()}.
265
-    * 
266
-    * @return array
267
-    */
261
+    /**
262
+     * Serializes the call to an array, with all
263
+     * necessary information. Can be used to restore
264
+     * the call later using {@link ConvertHelper_ThrowableInfo_Call::fromSerialized()}.
265
+     * 
266
+     * @return array
267
+     */
268 268
     public function serialize() : array
269 269
     {
270 270
         $result = array(
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     {
63 63
         $this->info = $info;
64 64
         
65
-        if(isset($data['serialized'])) 
65
+        if (isset($data['serialized'])) 
66 66
         {
67 67
             $this->parseSerialized($data['serialized']);
68 68
         }
@@ -72,11 +72,11 @@  discard block
 block discarded – undo
72 72
             $this->position = $data['position'];
73 73
         }
74 74
         
75
-        if($this->hasClass()) 
75
+        if ($this->hasClass()) 
76 76
         {
77 77
             $this->type = self::TYPE_METHOD_CALL;
78 78
         }
79
-        else if($this->hasFunction()) 
79
+        else if ($this->hasFunction()) 
80 80
         {
81 81
             $this->type = self::TYPE_FUNCTION_CALL;
82 82
         }
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
     
136 136
     public function getFileName() : string
137 137
     {
138
-        if($this->hasFile()) {
138
+        if ($this->hasFile()) {
139 139
             return basename($this->file);
140 140
         }
141 141
         
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
     
145 145
     public function getFileRelative() : string
146 146
     {
147
-        if($this->hasFile()) {
147
+        if ($this->hasFile()) {
148 148
             return FileHelper::relativizePathByDepth($this->file, $this->info->getFolderDepth());
149 149
         }
150 150
         
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
         $this->class = $data['class'];
171 171
         $this->position = $data['position'];
172 172
         
173
-        foreach($data['arguments'] as $arg)
173
+        foreach ($data['arguments'] as $arg)
174 174
         {
175 175
             $this->args[] = VariableInfo::fromSerialized($arg);
176 176
         }
@@ -178,29 +178,29 @@  discard block
 block discarded – undo
178 178
     
179 179
     protected function parseTrace(array $trace)
180 180
     {
181
-        if(isset($trace['line']))
181
+        if (isset($trace['line']))
182 182
         {
183 183
             $this->line = intval($trace['line']);
184 184
         }
185 185
         
186
-        if(isset($trace['function'])) 
186
+        if (isset($trace['function'])) 
187 187
         {
188 188
             $this->function = $trace['function'];
189 189
         }
190 190
         
191
-        if(isset($trace['file']))
191
+        if (isset($trace['file']))
192 192
         {
193 193
             $this->file = FileHelper::normalizePath($trace['file']);
194 194
         }
195 195
         
196
-        if(isset($trace['class'])) 
196
+        if (isset($trace['class'])) 
197 197
         {
198 198
             $this->class = $trace['class'];
199 199
         }
200 200
      
201
-        if(isset($trace['args']) && !empty($trace['args']))
201
+        if (isset($trace['args']) && !empty($trace['args']))
202 202
         {
203
-            foreach($trace['args'] as $arg) 
203
+            foreach ($trace['args'] as $arg) 
204 204
             {
205 205
                 $this->args[] = parseVariable($arg);
206 206
             }
@@ -215,13 +215,13 @@  discard block
 block discarded – undo
215 215
         
216 216
         $tokens[] = '#'.sprintf('%0'.$padLength.'d', $this->getPosition()).' ';
217 217
         
218
-        if($this->hasFile()) {
218
+        if ($this->hasFile()) {
219 219
             $tokens[] = $this->getFileRelative().':'.$this->getLine();
220 220
         }
221 221
         
222
-        if($this->hasClass()) {
222
+        if ($this->hasClass()) {
223 223
             $tokens[] = $this->getClass().'::'.$this->getFunction().'('.$this->argumentsToString().')';
224
-        } else if($this->hasFunction()) {
224
+        } else if ($this->hasFunction()) {
225 225
             $tokens[] = $this->getFunction().'('.$this->argumentsToString().')';
226 226
         }
227 227
         
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
     {
233 233
         $tokens = array();
234 234
         
235
-        foreach($this->args as $arg) 
235
+        foreach ($this->args as $arg) 
236 236
         {
237 237
             $tokens[] = $arg->toString();
238 238
         }
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
             'arguments' => array()
278 278
         );
279 279
         
280
-        foreach($this->args as $argument)
280
+        foreach ($this->args as $argument)
281 281
         {
282 282
             $result['arguments'][] = $argument->serialize();
283 283
         }
Please login to merge, or discard this patch.
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.
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.