@@ -60,13 +60,9 @@ |
||
60 | 60 | |
61 | 61 | if (file_exists($file)) { |
62 | 62 | $this->template = file_get_contents($file); |
63 | - } |
|
64 | - |
|
65 | - else if (file_exists($distFile)) { |
|
63 | + } else if (file_exists($distFile)) { |
|
66 | 64 | $this->template = file_get_contents($distFile); |
67 | - } |
|
68 | - |
|
69 | - else { |
|
65 | + } else { |
|
70 | 66 | throw new InvalidArgumentException( |
71 | 67 | 'Template file could not be loaded.' |
72 | 68 | ); |
@@ -33,8 +33,7 @@ |
||
33 | 33 | foreach ($ts as $token) { |
34 | 34 | if ($token instanceof PHP_Token_CLASS) { |
35 | 35 | $this->class = $token; |
36 | - } |
|
37 | - elseif ($token instanceof PHP_Token_INTERFACE) { |
|
36 | + } elseif ($token instanceof PHP_Token_INTERFACE) { |
|
38 | 37 | $this->interfaces[$i] = $token; |
39 | 38 | $i++; |
40 | 39 | } |
@@ -84,9 +84,7 @@ |
||
84 | 84 | |
85 | 85 | try { |
86 | 86 | $this->comparator->assertEquals($expected, $actual); |
87 | - } |
|
88 | - |
|
89 | - catch (ComparisonFailure $exception) { |
|
87 | + } catch (ComparisonFailure $exception) { |
|
90 | 88 | } |
91 | 89 | |
92 | 90 | $this->assertNull($exception, 'Unexpected ComparisonFailure'); |
@@ -67,17 +67,13 @@ |
||
67 | 67 | if (is_array($value)) { |
68 | 68 | if ($context->contains($data[$key]) !== false) { |
69 | 69 | $result[] = '*RECURSION*'; |
70 | - } |
|
71 | - |
|
72 | - else { |
|
70 | + } else { |
|
73 | 71 | $result[] = sprintf( |
74 | 72 | 'array(%s)', |
75 | 73 | $this->shortenedRecursiveExport($data[$key], $context) |
76 | 74 | ); |
77 | 75 | } |
78 | - } |
|
79 | - |
|
80 | - else { |
|
76 | + } else { |
|
81 | 77 | $result[] = $exporter->shortenedExport($value); |
82 | 78 | } |
83 | 79 | } |
@@ -48,9 +48,7 @@ discard block |
||
48 | 48 | { |
49 | 49 | if (is_array($value)) { |
50 | 50 | return $this->addArray($value); |
51 | - } |
|
52 | - |
|
53 | - else if (is_object($value)) { |
|
51 | + } else if (is_object($value)) { |
|
54 | 52 | return $this->addObject($value); |
55 | 53 | } |
56 | 54 | |
@@ -73,9 +71,7 @@ discard block |
||
73 | 71 | { |
74 | 72 | if (is_array($value)) { |
75 | 73 | return $this->containsArray($value); |
76 | - } |
|
77 | - |
|
78 | - else if (is_object($value)) { |
|
74 | + } else if (is_object($value)) { |
|
79 | 75 | return $this->containsObject($value); |
80 | 76 | } |
81 | 77 |
@@ -84,9 +84,7 @@ |
||
84 | 84 | |
85 | 85 | try { |
86 | 86 | $this->comparator->assertEquals($expected, $actual); |
87 | - } |
|
88 | - |
|
89 | - catch (ComparisonFailure $exception) { |
|
87 | + } catch (ComparisonFailure $exception) { |
|
90 | 88 | } |
91 | 89 | |
92 | 90 | $this->assertNull($exception, 'Unexpected ComparisonFailure'); |
@@ -84,9 +84,7 @@ |
||
84 | 84 | |
85 | 85 | try { |
86 | 86 | $this->comparator->assertEquals($expected, $actual); |
87 | - } |
|
88 | - |
|
89 | - catch (ComparisonFailure $exception) { |
|
87 | + } catch (ComparisonFailure $exception) { |
|
90 | 88 | } |
91 | 89 | |
92 | 90 | $this->assertNull($exception, 'Unexpected ComparisonFailure'); |
@@ -84,9 +84,7 @@ |
||
84 | 84 | |
85 | 85 | try { |
86 | 86 | $this->comparator->assertEquals($expected, $actual); |
87 | - } |
|
88 | - |
|
89 | - catch (ComparisonFailure $exception) { |
|
87 | + } catch (ComparisonFailure $exception) { |
|
90 | 88 | } |
91 | 89 | |
92 | 90 | $this->assertNull($exception, 'Unexpected ComparisonFailure'); |
@@ -84,9 +84,7 @@ |
||
84 | 84 | |
85 | 85 | try { |
86 | 86 | $this->comparator->assertEquals($expected, $actual); |
87 | - } |
|
88 | - |
|
89 | - catch (ComparisonFailure $exception) { |
|
87 | + } catch (ComparisonFailure $exception) { |
|
90 | 88 | } |
91 | 89 | |
92 | 90 | $this->assertNull($exception, 'Unexpected ComparisonFailure'); |