@@ -26,8 +26,7 @@ discard block |
||
26 | 26 | if ( $recursive === false ) |
27 | 27 | { |
28 | 28 | $iterator = new DirectoryIterator( $directory ); |
29 | - } |
|
30 | - else |
|
29 | + } else |
|
31 | 30 | { |
32 | 31 | $iterator = new RecursiveIteratorIterator( |
33 | 32 | new RecursiveDirectoryIterator( $directory ) |
@@ -59,8 +58,7 @@ discard block |
||
59 | 58 | { |
60 | 59 | throw new plPhumlInvalidProcessorChainException( 'application/phuml-structure', $processor->getInputTypes() ); |
61 | 60 | } |
62 | - } |
|
63 | - else |
|
61 | + } else |
|
64 | 62 | { |
65 | 63 | $this->checkProcessorCompatibility( end( $this->processors ), $processor ); |
66 | 64 |
@@ -6,11 +6,11 @@ |
||
6 | 6 | { |
7 | 7 | parent::__construct( |
8 | 8 | 'To processors in the chain are incompatible. The first processor\'s output is "' |
9 | - . $first |
|
10 | - . '". The next Processor in the queue does only support the following input types: ' |
|
11 | - . implode( ', ', $second ) |
|
12 | - . '.' |
|
13 | - ); |
|
9 | + . $first |
|
10 | + . '". The next Processor in the queue does only support the following input types: ' |
|
11 | + . implode( ', ', $second ) |
|
12 | + . '.' |
|
13 | + ); |
|
14 | 14 | } |
15 | 15 | } |
16 | 16 |
@@ -4,10 +4,10 @@ |
||
4 | 4 | { |
5 | 5 | public function __construct( $output ) |
6 | 6 | { |
7 | - // Convert array to string if is_array |
|
8 | - if(is_array($output)) { |
|
9 | - $output = var_export($output, true); |
|
10 | - } |
|
7 | + // Convert array to string if is_array |
|
8 | + if(is_array($output)) { |
|
9 | + $output = var_export($output, true); |
|
10 | + } |
|
11 | 11 | parent::__construct( 'Execution of external program failed:' . "\n" . $output ); |
12 | 12 | } |
13 | 13 | } |
@@ -17,7 +17,7 @@ |
||
17 | 17 | : ( ( $type === self::UNKNOWN ) |
18 | 18 | ? ( 'existent' ) |
19 | 19 | : ( 'writable') |
20 | - ) |
|
20 | + ) |
|
21 | 21 | . ' in this context.' |
22 | 22 | ); |
23 | 23 | } |
@@ -75,8 +75,7 @@ discard block |
||
75 | 75 | // Ignore everything else |
76 | 76 | $this->lastToken = null; |
77 | 77 | } |
78 | - } |
|
79 | - else if ( is_array( $token ) === true ) |
|
78 | + } else if ( is_array( $token ) === true ) |
|
80 | 79 | { |
81 | 80 | switch ( $token[0] ) |
82 | 81 | { |
@@ -369,8 +368,7 @@ discard block |
||
369 | 368 | { |
370 | 369 | // Function name |
371 | 370 | $this->parserStruct['function'] = $token[1]; |
372 | - } |
|
373 | - else |
|
371 | + } else |
|
374 | 372 | { |
375 | 373 | // Type hint |
376 | 374 | $this->parserStruct['typehint'] = $token[1]; |
@@ -572,8 +570,7 @@ discard block |
||
572 | 570 | if ( preg_match( $regexp, $attribute[2], $matches ) ) |
573 | 571 | { |
574 | 572 | $type = $matches[2]; |
575 | - } |
|
576 | - else if ( $return = preg_match( '/^[\s*]*@var\s+(\S+).*$/m', $attribute[2], $matches ) ) |
|
573 | + } else if ( $return = preg_match( '/^[\s*]*@var\s+(\S+).*$/m', $attribute[2], $matches ) ) |
|
577 | 574 | { |
578 | 575 | $type = trim( $matches[1] ); |
579 | 576 | } |