@@ -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 |
@@ -44,12 +44,12 @@ |
||
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(); |
@@ -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 |
@@ -28,17 +28,17 @@ discard block |
||
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 |
||
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(); |
@@ -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 | } |
@@ -58,8 +58,7 @@ |
||
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 |
@@ -24,10 +24,10 @@ discard block |
||
24 | 24 | |
25 | 25 | public 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 |
||
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 |
||
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 |
@@ -65,8 +65,7 @@ discard block |
||
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 |
||
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 | } |
@@ -59,7 +59,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -10,45 +10,45 @@ discard block |
||
10 | 10 | public const TYPE_METHOD_CALL = 'method'; |
11 | 11 | public 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 |
||
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 |
||
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 |
||
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( |
@@ -33,19 +33,19 @@ |
||
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; |
@@ -6,9 +6,9 @@ |
||
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) |
@@ -55,8 +55,7 @@ |
||
55 | 55 | if(is_array($serialized)) |
56 | 56 | { |
57 | 57 | $this->parseSerialized($serialized); |
58 | - } |
|
59 | - else |
|
58 | + } else |
|
60 | 59 | { |
61 | 60 | $this->parseValue($value); |
62 | 61 | } |
@@ -67,9 +67,9 @@ discard block |
||
67 | 67 | * @param array|null $serialized |
68 | 68 | * @throws BaseException |
69 | 69 | */ |
70 | - public function __construct($value, ?array $serialized=null) |
|
70 | + public function __construct($value, ?array $serialized = null) |
|
71 | 71 | { |
72 | - if(is_array($serialized)) |
|
72 | + if (is_array($serialized)) |
|
73 | 73 | { |
74 | 74 | $this->parseSerialized($serialized); |
75 | 75 | } |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | */ |
118 | 118 | protected function parseSerialized(array $serialized) : void |
119 | 119 | { |
120 | - if(!isset($serialized['string']) || !isset($serialized['type']) || !isset($serialized['options'])) |
|
120 | + if (!isset($serialized['string']) || !isset($serialized['type']) || !isset($serialized['options'])) |
|
121 | 121 | { |
122 | 122 | throw new BaseException( |
123 | 123 | 'Invalid variable info serialized data.', |
@@ -139,12 +139,12 @@ discard block |
||
139 | 139 | |
140 | 140 | // Gettype will return a string like "Resource(closed)" when |
141 | 141 | // working with a resource that has already been closed. |
142 | - if(strstr($this->type, 'resource')) |
|
142 | + if (strstr($this->type, 'resource')) |
|
143 | 143 | { |
144 | 144 | $this->type = self::TYPE_RESOURCE; |
145 | 145 | } |
146 | 146 | |
147 | - if(in_array($this->type, $this->callableTypes) && is_callable($value)) { |
|
147 | + if (in_array($this->type, $this->callableTypes) && is_callable($value)) { |
|
148 | 148 | $this->type = self::TYPE_CALLABLE; |
149 | 149 | } |
150 | 150 | |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | * @param bool $enable |
183 | 183 | * @return VariableInfo |
184 | 184 | */ |
185 | - public function enableType(bool $enable=true) : VariableInfo |
|
185 | + public function enableType(bool $enable = true) : VariableInfo |
|
186 | 186 | { |
187 | 187 | return $this->setOption('prepend-type', $enable); |
188 | 188 | } |
@@ -191,9 +191,9 @@ discard block |
||
191 | 191 | { |
192 | 192 | $converted = $this->string; |
193 | 193 | |
194 | - if($this->getOption('prepend-type') === true && !$this->isNull()) |
|
194 | + if ($this->getOption('prepend-type') === true && !$this->isNull()) |
|
195 | 195 | { |
196 | - if($this->isString()) |
|
196 | + if ($this->isString()) |
|
197 | 197 | { |
198 | 198 | $converted = '"'.$converted.'"'; |
199 | 199 | } |
@@ -37,19 +37,19 @@ discard block |
||
37 | 37 | |
38 | 38 | public const ERROR_INVALID_SERIALIZED_DATA = 56301; |
39 | 39 | |
40 | - /** |
|
41 | - * @var string |
|
42 | - */ |
|
40 | + /** |
|
41 | + * @var string |
|
42 | + */ |
|
43 | 43 | protected $string; |
44 | 44 | |
45 | - /** |
|
46 | - * @var mixed |
|
47 | - */ |
|
45 | + /** |
|
46 | + * @var mixed |
|
47 | + */ |
|
48 | 48 | protected $value; |
49 | 49 | |
50 | - /** |
|
51 | - * @var string |
|
52 | - */ |
|
50 | + /** |
|
51 | + * @var string |
|
52 | + */ |
|
53 | 53 | protected $type; |
54 | 54 | |
55 | 55 | /** |
@@ -106,15 +106,15 @@ discard block |
||
106 | 106 | return new VariableInfo(null, $serialized); |
107 | 107 | } |
108 | 108 | |
109 | - /** |
|
110 | - * Parses a previously serialized data set to restore the |
|
111 | - * variable information from it. |
|
112 | - * |
|
113 | - * @param array $serialized |
|
114 | - * @throws BaseException |
|
115 | - * |
|
116 | - * @see VariableInfo::ERROR_INVALID_SERIALIZED_DATA |
|
117 | - */ |
|
109 | + /** |
|
110 | + * Parses a previously serialized data set to restore the |
|
111 | + * variable information from it. |
|
112 | + * |
|
113 | + * @param array $serialized |
|
114 | + * @throws BaseException |
|
115 | + * |
|
116 | + * @see VariableInfo::ERROR_INVALID_SERIALIZED_DATA |
|
117 | + */ |
|
118 | 118 | protected function parseSerialized(array $serialized) : void |
119 | 119 | { |
120 | 120 | if(!isset($serialized['string']) || !isset($serialized['type']) || !isset($serialized['options'])) |
@@ -156,12 +156,12 @@ discard block |
||
156 | 156 | return $this->value; |
157 | 157 | } |
158 | 158 | |
159 | - /** |
|
160 | - * The variable type - this is the same string that |
|
161 | - * is returned by the PHP function `gettype`. |
|
162 | - * |
|
163 | - * @return string |
|
164 | - */ |
|
159 | + /** |
|
160 | + * The variable type - this is the same string that |
|
161 | + * is returned by the PHP function `gettype`. |
|
162 | + * |
|
163 | + * @return string |
|
164 | + */ |
|
165 | 165 | public function getType() : string |
166 | 166 | { |
167 | 167 | return $this->type; |
@@ -175,13 +175,13 @@ discard block |
||
175 | 175 | ); |
176 | 176 | } |
177 | 177 | |
178 | - /** |
|
179 | - * Whether to prepend the variable type before the value, |
|
180 | - * like the var_dump function. Example: <code>string "Some text"</code>. |
|
181 | - * |
|
182 | - * @param bool $enable |
|
183 | - * @return VariableInfo |
|
184 | - */ |
|
178 | + /** |
|
179 | + * Whether to prepend the variable type before the value, |
|
180 | + * like the var_dump function. Example: <code>string "Some text"</code>. |
|
181 | + * |
|
182 | + * @param bool $enable |
|
183 | + * @return VariableInfo |
|
184 | + */ |
|
185 | 185 | public function enableType(bool $enable=true) : VariableInfo |
186 | 186 | { |
187 | 187 | return $this->setOption('prepend-type', $enable); |
@@ -59,8 +59,7 @@ discard block |
||
59 | 59 | try |
60 | 60 | { |
61 | 61 | throw new BaseException(''); |
62 | - } |
|
63 | - catch(BaseException $e) |
|
62 | + } catch(BaseException $e) |
|
64 | 63 | { |
65 | 64 | echo self::createInfo($e)->toString(); |
66 | 65 | } |
@@ -74,8 +73,7 @@ discard block |
||
74 | 73 | try |
75 | 74 | { |
76 | 75 | throw new BaseException(''); |
77 | - } |
|
78 | - catch(BaseException $e) |
|
76 | + } catch(BaseException $e) |
|
79 | 77 | { |
80 | 78 | echo '<pre style="background:#fff;font-family:monospace;font-size:14px;color:#444;padding:16px;border:solid 1px #999;border-radius:4px;">'; |
81 | 79 | echo self::createInfo($e)->toString(); |
@@ -22,17 +22,17 @@ discard block |
||
22 | 22 | */ |
23 | 23 | class BaseException extends \Exception |
24 | 24 | { |
25 | - /** |
|
26 | - * @var string |
|
27 | - */ |
|
25 | + /** |
|
26 | + * @var string |
|
27 | + */ |
|
28 | 28 | protected $details; |
29 | 29 | |
30 | - /** |
|
31 | - * @param string $message |
|
32 | - * @param string $details |
|
33 | - * @param int $code |
|
34 | - * @param \Exception $previous |
|
35 | - */ |
|
30 | + /** |
|
31 | + * @param string $message |
|
32 | + * @param string $details |
|
33 | + * @param int $code |
|
34 | + * @param \Exception $previous |
|
35 | + */ |
|
36 | 36 | public function __construct(string $message, $details=null, $code=null, $previous=null) |
37 | 37 | { |
38 | 38 | parent::__construct($message, $code, $previous); |
@@ -40,10 +40,10 @@ discard block |
||
40 | 40 | $this->details = $details; |
41 | 41 | } |
42 | 42 | |
43 | - /** |
|
44 | - * Retrieves the detailed error description, if any. |
|
45 | - * @return string |
|
46 | - */ |
|
43 | + /** |
|
44 | + * Retrieves the detailed error description, if any. |
|
45 | + * @return string |
|
46 | + */ |
|
47 | 47 | public function getDetails() : string |
48 | 48 | { |
49 | 49 | if($this->details !== null) { |
@@ -53,9 +53,9 @@ discard block |
||
53 | 53 | return ''; |
54 | 54 | } |
55 | 55 | |
56 | - /** |
|
57 | - * Displays pertinent information on the exception. |
|
58 | - */ |
|
56 | + /** |
|
57 | + * Displays pertinent information on the exception. |
|
58 | + */ |
|
59 | 59 | public function display() : void |
60 | 60 | { |
61 | 61 | if(!headers_sent()) { |
@@ -65,20 +65,20 @@ discard block |
||
65 | 65 | echo $this->getInfo(); |
66 | 66 | } |
67 | 67 | |
68 | - /** |
|
69 | - * Retrieves information on the exception that can be |
|
70 | - * easily accessed. |
|
71 | - * |
|
72 | - * @return ConvertHelper_ThrowableInfo |
|
73 | - */ |
|
68 | + /** |
|
69 | + * Retrieves information on the exception that can be |
|
70 | + * easily accessed. |
|
71 | + * |
|
72 | + * @return ConvertHelper_ThrowableInfo |
|
73 | + */ |
|
74 | 74 | public function getInfo() : ConvertHelper_ThrowableInfo |
75 | 75 | { |
76 | 76 | return ConvertHelper::throwable2info($this); |
77 | 77 | } |
78 | 78 | |
79 | - /** |
|
80 | - * Dumps a current PHP function trace, as a text only string. |
|
81 | - */ |
|
79 | + /** |
|
80 | + * Dumps a current PHP function trace, as a text only string. |
|
81 | + */ |
|
82 | 82 | public static function dumpTraceAsString() : void |
83 | 83 | { |
84 | 84 | try |
@@ -91,9 +91,9 @@ discard block |
||
91 | 91 | } |
92 | 92 | } |
93 | 93 | |
94 | - /** |
|
95 | - * Dumps a current PHP function trace, with HTML styling. |
|
96 | - */ |
|
94 | + /** |
|
95 | + * Dumps a current PHP function trace, with HTML styling. |
|
96 | + */ |
|
97 | 97 | public static function dumpTraceAsHTML() : void |
98 | 98 | { |
99 | 99 | try |
@@ -108,13 +108,13 @@ discard block |
||
108 | 108 | } |
109 | 109 | } |
110 | 110 | |
111 | - /** |
|
112 | - * Creates an exception info instance from a throwable instance. |
|
113 | - * |
|
114 | - * @param Throwable $e |
|
115 | - * @return ConvertHelper_ThrowableInfo |
|
116 | - * @see ConvertHelper::throwable2info() |
|
117 | - */ |
|
111 | + /** |
|
112 | + * Creates an exception info instance from a throwable instance. |
|
113 | + * |
|
114 | + * @param Throwable $e |
|
115 | + * @return ConvertHelper_ThrowableInfo |
|
116 | + * @see ConvertHelper::throwable2info() |
|
117 | + */ |
|
118 | 118 | public static function createInfo(Throwable $e) : ConvertHelper_ThrowableInfo |
119 | 119 | { |
120 | 120 | return ConvertHelper::throwable2info($e); |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | * @param int $code |
34 | 34 | * @param \Exception $previous |
35 | 35 | */ |
36 | - public function __construct(string $message, $details=null, $code=null, $previous=null) |
|
36 | + public function __construct(string $message, $details = null, $code = null, $previous = null) |
|
37 | 37 | { |
38 | 38 | parent::__construct($message, $code, $previous); |
39 | 39 | |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public function getDetails() : string |
48 | 48 | { |
49 | - if($this->details !== null) { |
|
49 | + if ($this->details !== null) { |
|
50 | 50 | return $this->details; |
51 | 51 | } |
52 | 52 | |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public function display() : void |
60 | 60 | { |
61 | - if(!headers_sent()) { |
|
61 | + if (!headers_sent()) { |
|
62 | 62 | header('Content-type:text/plain; charset=utf-8'); |
63 | 63 | } |
64 | 64 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | { |
86 | 86 | throw new BaseException(''); |
87 | 87 | } |
88 | - catch(BaseException $e) |
|
88 | + catch (BaseException $e) |
|
89 | 89 | { |
90 | 90 | echo self::createInfo($e)->toString(); |
91 | 91 | } |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | { |
101 | 101 | throw new BaseException(''); |
102 | 102 | } |
103 | - catch(BaseException $e) |
|
103 | + catch (BaseException $e) |
|
104 | 104 | { |
105 | 105 | echo '<pre style="background:#fff;font-family:monospace;font-size:14px;color:#444;padding:16px;border:solid 1px #999;border-radius:4px;">'; |
106 | 106 | echo self::createInfo($e)->toString(); |