@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $obj2 = new \stdClass(); |
46 | 46 | $obj2->foo = 'bar'; |
47 | 47 | |
48 | - $obj3 = (object) array(1,2,"Test\r\n",4,5,6,7,8); |
|
48 | + $obj3 = (object) array(1, 2, "Test\r\n", 4, 5, 6, 7, 8); |
|
49 | 49 | |
50 | 50 | $obj = new \stdClass(); |
51 | 51 | //@codingStandardsIgnoreStart |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | $obj->object = $obj2; |
60 | 60 | $obj->objectagain = $obj2; |
61 | 61 | $obj->array = array('foo' => 'bar'); |
62 | - $obj->array2 = array(1,2,3,4,5,6); |
|
62 | + $obj->array2 = array(1, 2, 3, 4, 5, 6); |
|
63 | 63 | $obj->array3 = array($obj, $obj2, $obj3); |
64 | 64 | $obj->self = $obj; |
65 | 65 |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | $obj2 = new \stdClass; |
33 | 33 | $obj2->foo = 'bar'; |
34 | 34 | |
35 | - $obj3 = (object)array(1,2,"Test\r\n",4,5,6,7,8); |
|
35 | + $obj3 = (object) array(1, 2, "Test\r\n", 4, 5, 6, 7, 8); |
|
36 | 36 | |
37 | 37 | $obj = new \stdClass; |
38 | 38 | //@codingStandardsIgnoreStart |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | 'export float 1.2' => array(1.2, '1.2'), |
62 | 62 | 'export stream' => array(fopen('php://memory', 'r'), 'resource(%d) of type (stream)'), |
63 | 63 | 'export numeric string' => array('1', "'1'"), |
64 | - 'export multidimentional array' => array(array(array(1,2,3), array(3,4,5)), |
|
64 | + 'export multidimentional array' => array(array(array(1, 2, 3), array(3, 4, 5)), |
|
65 | 65 | <<<EOF |
66 | 66 | Array &0 ( |
67 | 67 | 0 => Array &1 ( |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | EOF |
155 | 155 | ), |
156 | 156 | array( |
157 | - chr(0) . chr(1) . chr(2) . chr(3) . chr(4) . chr(5), |
|
157 | + chr(0).chr(1).chr(2).chr(3).chr(4).chr(5), |
|
158 | 158 | 'Binary String: 0x000102030405' |
159 | 159 | ), |
160 | 160 | array( |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | 'Binary String: 0x0e0f101112131415161718191a1b1c1d1e1f' |
163 | 163 | ), |
164 | 164 | array( |
165 | - chr(0x00) . chr(0x09), |
|
165 | + chr(0x00).chr(0x09), |
|
166 | 166 | 'Binary String: 0x0009' |
167 | 167 | ), |
168 | 168 | array( |
@@ -106,11 +106,11 @@ discard block |
||
106 | 106 | |
107 | 107 | if (function_exists('mb_strlen')) { |
108 | 108 | if (mb_strlen($string) > 40) { |
109 | - $string = mb_substr($string, 0, 30) . '...' . mb_substr($string, -7); |
|
109 | + $string = mb_substr($string, 0, 30).'...'.mb_substr($string, -7); |
|
110 | 110 | } |
111 | 111 | } else { |
112 | 112 | if (strlen($string) > 40) { |
113 | - $string = substr($string, 0, 30) . '...' . substr($string, -7); |
|
113 | + $string = substr($string, 0, 30).'...'.substr($string, -7); |
|
114 | 114 | } |
115 | 115 | } |
116 | 116 | |
@@ -235,17 +235,17 @@ discard block |
||
235 | 235 | if (is_string($value)) { |
236 | 236 | // Match for most non printable chars somewhat taking multibyte chars into account |
237 | 237 | if (preg_match('/[^\x09-\x0d\x1b\x20-\xff]/', $value)) { |
238 | - return 'Binary String: 0x' . bin2hex($value); |
|
238 | + return 'Binary String: 0x'.bin2hex($value); |
|
239 | 239 | } |
240 | 240 | |
241 | - return "'" . |
|
241 | + return "'". |
|
242 | 242 | str_replace('<lf>', "\n", |
243 | 243 | str_replace( |
244 | 244 | ["\r\n", "\n\r", "\r", "\n"], |
245 | 245 | ['\r\n<lf>', '\n\r<lf>', '\r<lf>', '\n<lf>'], |
246 | 246 | $value |
247 | 247 | ) |
248 | - ) . |
|
248 | + ). |
|
249 | 249 | "'"; |
250 | 250 | } |
251 | 251 | |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | |
258 | 258 | if (is_array($value)) { |
259 | 259 | if (($key = $processed->contains($value)) !== false) { |
260 | - return 'Array &' . $key; |
|
260 | + return 'Array &'.$key; |
|
261 | 261 | } |
262 | 262 | |
263 | 263 | $array = $value; |
@@ -267,14 +267,14 @@ discard block |
||
267 | 267 | if (count($array) > 0) { |
268 | 268 | foreach ($array as $k => $v) { |
269 | 269 | $values .= sprintf( |
270 | - '%s %s => %s' . "\n", |
|
270 | + '%s %s => %s'."\n", |
|
271 | 271 | $whitespace, |
272 | 272 | $this->recursiveExport($k, $indentation), |
273 | 273 | $this->recursiveExport($value[$k], $indentation + 1, $processed) |
274 | 274 | ); |
275 | 275 | } |
276 | 276 | |
277 | - $values = "\n" . $values . $whitespace; |
|
277 | + $values = "\n".$values.$whitespace; |
|
278 | 278 | } |
279 | 279 | |
280 | 280 | return sprintf('Array &%s (%s)', $key, $values); |
@@ -294,14 +294,14 @@ discard block |
||
294 | 294 | if (count($array) > 0) { |
295 | 295 | foreach ($array as $k => $v) { |
296 | 296 | $values .= sprintf( |
297 | - '%s %s => %s' . "\n", |
|
297 | + '%s %s => %s'."\n", |
|
298 | 298 | $whitespace, |
299 | 299 | $this->recursiveExport($k, $indentation), |
300 | 300 | $this->recursiveExport($v, $indentation + 1, $processed) |
301 | 301 | ); |
302 | 302 | } |
303 | 303 | |
304 | - $values = "\n" . $values . $whitespace; |
|
304 | + $values = "\n".$values.$whitespace; |
|
305 | 305 | } |
306 | 306 | |
307 | 307 | return sprintf('%s Object &%s (%s)', $class, $hash, $values); |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | if (isset($this->lookupTable[$filename][$lineNumber])) { |
46 | 46 | return $this->lookupTable[$filename][$lineNumber]; |
47 | 47 | } else { |
48 | - return $filename . ':' . $lineNumber; |
|
48 | + return $filename.':'.$lineNumber; |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 | |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $name = $functionOrMethod->getName(); |
98 | 98 | |
99 | 99 | if ($functionOrMethod instanceof \ReflectionMethod) { |
100 | - $name = $functionOrMethod->getDeclaringClass()->getName() . '::' . $name; |
|
100 | + $name = $functionOrMethod->getDeclaringClass()->getName().'::'.$name; |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | if (!isset($this->lookupTable[$functionOrMethod->getFileName()])) { |
@@ -93,7 +93,7 @@ |
||
93 | 93 | ['STRING', 'string', $stringException], |
94 | 94 | ['string', 'other string', $stringException], |
95 | 95 | // https://github.com/sebastianbergmann/phpunit/issues/1023 |
96 | - ['9E6666666','9E7777777', $stringException], |
|
96 | + ['9E6666666', '9E7777777', $stringException], |
|
97 | 97 | [new ClassWithToString, 'does not match', $otherException], |
98 | 98 | ['does not match', new ClassWithToString, $otherException], |
99 | 99 | [0, 'Foobar', $otherException], |
@@ -51,7 +51,7 @@ |
||
51 | 51 | [1.0, 2.0], |
52 | 52 | ['hello', 'world'], |
53 | 53 | ['', ''], |
54 | - [[], [1,2,3]] |
|
54 | + [[], [1, 2, 3]] |
|
55 | 55 | ]; |
56 | 56 | } |
57 | 57 |
@@ -26,16 +26,16 @@ discard block |
||
26 | 26 | $failure = new ComparisonFailure( |
27 | 27 | $expected, |
28 | 28 | $actual, |
29 | - '|' . $expected, |
|
30 | - '|' . $actual, |
|
29 | + '|'.$expected, |
|
30 | + '|'.$actual, |
|
31 | 31 | false, |
32 | 32 | $message |
33 | 33 | ); |
34 | 34 | |
35 | 35 | $this->assertSame($actual, $failure->getActual()); |
36 | 36 | $this->assertSame($expected, $failure->getExpected()); |
37 | - $this->assertSame('|' . $actual, $failure->getActualAsString()); |
|
38 | - $this->assertSame('|' . $expected, $failure->getExpectedAsString()); |
|
37 | + $this->assertSame('|'.$actual, $failure->getActualAsString()); |
|
38 | + $this->assertSame('|'.$expected, $failure->getExpectedAsString()); |
|
39 | 39 | |
40 | 40 | $diff = ' |
41 | 41 | --- Expected |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | +B |
47 | 47 | '; |
48 | 48 | $this->assertSame($diff, $failure->getDiff()); |
49 | - $this->assertSame($message . $diff, $failure->toString()); |
|
49 | + $this->assertSame($message.$diff, $failure->toString()); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | public function testDiffNotPossible() |
@@ -130,6 +130,6 @@ |
||
130 | 130 | */ |
131 | 131 | public function toString() |
132 | 132 | { |
133 | - return $this->message . $this->getDiff(); |
|
133 | + return $this->message.$this->getDiff(); |
|
134 | 134 | } |
135 | 135 | } |
@@ -83,8 +83,8 @@ |
||
83 | 83 | $expected, |
84 | 84 | $actual, |
85 | 85 | // replace "Array" with "MyClass object" |
86 | - substr_replace($e->getExpectedAsString(), get_class($expected) . ' Object', 0, 5), |
|
87 | - substr_replace($e->getActualAsString(), get_class($actual) . ' Object', 0, 5), |
|
86 | + substr_replace($e->getExpectedAsString(), get_class($expected).' Object', 0, 5), |
|
87 | + substr_replace($e->getActualAsString(), get_class($actual).' Object', 0, 5), |
|
88 | 88 | false, |
89 | 89 | 'Failed asserting that two objects are equal.' |
90 | 90 | ); |