@@ -41,8 +41,8 @@ discard block |
||
41 | 41 | $this->commandLine = $commandLine; |
42 | 42 | $this->output = $output; |
43 | 43 | |
44 | - foreach($errors as $error) { |
|
45 | - if($error->isError()) { |
|
44 | + foreach ($errors as $error) { |
|
45 | + if ($error->isError()) { |
|
46 | 46 | $this->errors[] = $error; |
47 | 47 | } else { |
48 | 48 | $this->warnings[] = $error; |
@@ -62,8 +62,8 @@ discard block |
||
62 | 62 | |
63 | 63 | public function hasErrorCode($code) |
64 | 64 | { |
65 | - foreach($this->errors as $error) { |
|
66 | - if($error->getCode() == $code) { |
|
65 | + foreach ($this->errors as $error) { |
|
66 | + if ($error->getCode() == $code) { |
|
67 | 67 | return true; |
68 | 68 | } |
69 | 69 | } |
@@ -92,11 +92,11 @@ discard block |
||
92 | 92 | * @param string $asString |
93 | 93 | * @return string|string[] |
94 | 94 | */ |
95 | - public function getErrorMessages($asString=false) |
|
95 | + public function getErrorMessages($asString = false) |
|
96 | 96 | { |
97 | - if($asString) { |
|
97 | + if ($asString) { |
|
98 | 98 | $lines = array(); |
99 | - foreach($this->errors as $error) { |
|
99 | + foreach ($this->errors as $error) { |
|
100 | 100 | $lines[] = (string)$error; |
101 | 101 | } |
102 | 102 | |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | } |
105 | 105 | |
106 | 106 | $messages = array(); |
107 | - foreach($this->errors as $error) { |
|
107 | + foreach ($this->errors as $error) { |
|
108 | 108 | $messages[] = (string)$error; |
109 | 109 | } |
110 | 110 | |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | |
124 | 124 | public function getLastLine() |
125 | 125 | { |
126 | - return $this->output[count($this->output)-1]; |
|
126 | + return $this->output[count($this->output) - 1]; |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | public function getFirstLine() |
@@ -138,8 +138,8 @@ discard block |
||
138 | 138 | |
139 | 139 | public function isConnectionFailed() |
140 | 140 | { |
141 | - foreach($this->errors as $error) { |
|
142 | - if($error->isConnectionFailed()) { |
|
141 | + foreach ($this->errors as $error) { |
|
142 | + if ($error->isConnectionFailed()) { |
|
143 | 143 | return true; |
144 | 144 | } |
145 | 145 | } |
@@ -149,8 +149,8 @@ discard block |
||
149 | 149 | |
150 | 150 | public function hasConflicts() |
151 | 151 | { |
152 | - foreach($this->errors as $error) { |
|
153 | - if($error->isConflict()) { |
|
152 | + foreach ($this->errors as $error) { |
|
153 | + if ($error->isConflict()) { |
|
154 | 154 | return true; |
155 | 155 | } |
156 | 156 | } |
@@ -160,8 +160,8 @@ discard block |
||
160 | 160 | |
161 | 161 | public function hasLocks() |
162 | 162 | { |
163 | - foreach($this->errors as $error) { |
|
164 | - if($error->isLock()) { |
|
163 | + foreach ($this->errors as $error) { |
|
164 | + if ($error->isLock()) { |
|
165 | 165 | return true; |
166 | 166 | } |
167 | 167 | } |
@@ -14,7 +14,7 @@ discard block |
||
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 |
||
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( |
@@ -16,7 +16,7 @@ |
||
16 | 16 | ) |
17 | 17 | ); |
18 | 18 | |
19 | - if($result->isError()) { |
|
19 | + if ($result->isError()) { |
|
20 | 20 | $this->throwExceptionUnexpected($result); |
21 | 21 | } |
22 | 22 |
@@ -14,9 +14,9 @@ discard block |
||
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 |
||
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 |
||
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 |
@@ -10,13 +10,13 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
@@ -49,13 +49,13 @@ discard block |
||
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 |
||
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 | } |
@@ -62,7 +62,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -113,7 +113,7 @@ discard block |
||
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 |
||
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 |
@@ -52,7 +52,7 @@ |
||
52 | 52 | // add any errors that were triggered, using the |
53 | 53 | // error wrappers. |
54 | 54 | $errors = libxml_get_errors(); |
55 | - foreach($errors as $error) { |
|
55 | + foreach ($errors as $error) { |
|
56 | 56 | $this->errors[] = new XMLHelper_SimpleXML_Error($this, $error); |
57 | 57 | } |
58 | 58 |