@@ -11,7 +11,7 @@ |
||
11 | 11 | error_reporting( -1 ); |
12 | 12 | ini_set( 'display_errors', '1' ); |
13 | 13 | |
14 | -date_default_timezone_set('UTC'); |
|
14 | +date_default_timezone_set( 'UTC' ); |
|
15 | 15 | |
16 | 16 | |
17 | 17 | /* |
@@ -52,34 +52,34 @@ discard block |
||
52 | 52 | { |
53 | 53 | $this->assertEquals( '127.0.0.1', $this->object->get( 'resource/db/host' ) ); |
54 | 54 | |
55 | - $x = $this->object->get( 'config/manager/standard/select', 'defvalue1'); |
|
55 | + $x = $this->object->get( 'config/manager/standard/select', 'defvalue1' ); |
|
56 | 56 | $this->assertEquals( 'select11', $x ); |
57 | 57 | |
58 | - $x = $this->object->get( 'config/provider/delivery/sh/select', 'defvalue2'); |
|
58 | + $x = $this->object->get( 'config/provider/delivery/sh/select', 'defvalue2' ); |
|
59 | 59 | $this->assertEquals( 'select2', $x ); |
60 | 60 | |
61 | - $x = $this->object->get( 'subconfig/standard/subitem/a/aa', 'defvalue3'); |
|
61 | + $x = $this->object->get( 'subconfig/standard/subitem/a/aa', 'defvalue3' ); |
|
62 | 62 | $this->assertEquals( '111', $x ); |
63 | 63 | |
64 | - $x = $this->object->get( 'subconfig/subsubconfig/standard/subsubitem/aa/aaa', 'defvalue4'); |
|
64 | + $x = $this->object->get( 'subconfig/subsubconfig/standard/subsubitem/aa/aaa', 'defvalue4' ); |
|
65 | 65 | $this->assertEquals( '111', $x ); |
66 | 66 | |
67 | - $x = $this->object->get( 'config/manager/standard/select', 'defvalue5'); |
|
67 | + $x = $this->object->get( 'config/manager/standard/select', 'defvalue5' ); |
|
68 | 68 | $this->assertEquals( 'select11', $x ); |
69 | 69 | |
70 | - $x = $this->object->get( 'subconfig/subsubconfig/standard/subsubitem/aa/aaa', 'defvalue6'); |
|
70 | + $x = $this->object->get( 'subconfig/subsubconfig/standard/subsubitem/aa/aaa', 'defvalue6' ); |
|
71 | 71 | $this->assertEquals( '111', $x ); |
72 | 72 | |
73 | - $x = $this->object->get( 'subconfig/standard/subitem/a/aa', 'defvalue7'); |
|
73 | + $x = $this->object->get( 'subconfig/standard/subitem/a/aa', 'defvalue7' ); |
|
74 | 74 | $this->assertEquals( '111', $x ); |
75 | 75 | |
76 | - $x = $this->object->get( 'subconfig/standard/subitem/a/bb', 'defvalue8'); |
|
76 | + $x = $this->object->get( 'subconfig/standard/subitem/a/bb', 'defvalue8' ); |
|
77 | 77 | $this->assertEquals( 'defvalue8', $x ); |
78 | 78 | |
79 | - $x = $this->object->get( 'nonsubconfig', 'defvalue9'); |
|
79 | + $x = $this->object->get( 'nonsubconfig', 'defvalue9' ); |
|
80 | 80 | $this->assertEquals( 'defvalue9', $x ); |
81 | 81 | |
82 | - $x = $this->object->get( 'subconfig', 'defvalue10'); |
|
82 | + $x = $this->object->get( 'subconfig', 'defvalue10' ); |
|
83 | 83 | $this->assertInternalType( 'array', $x ); |
84 | 84 | } |
85 | 85 | |
@@ -90,13 +90,13 @@ discard block |
||
90 | 90 | |
91 | 91 | $this->assertEquals( |
92 | 92 | array( |
93 | - 'subitem' => array ( |
|
93 | + 'subitem' => array( |
|
94 | 94 | 'a' => array( |
95 | 95 | 'aa' => '111', |
96 | 96 | ), |
97 | 97 | ), |
98 | 98 | 'subbla' => array( |
99 | - 'b' => array ( |
|
99 | + 'b' => array( |
|
100 | 100 | 'bb' => '22', |
101 | 101 | ), |
102 | 102 | ), |
@@ -261,8 +261,7 @@ discard block |
||
261 | 261 | } else { |
262 | 262 | $parts[] = $this->createContainer( $this->embedded, $type ); |
263 | 263 | } |
264 | - } |
|
265 | - else if( $this->html != null ) |
|
264 | + } else if( $this->html != null ) |
|
266 | 265 | { |
267 | 266 | $parts[] = $this->html; |
268 | 267 | } |
@@ -275,8 +274,7 @@ discard block |
||
275 | 274 | { |
276 | 275 | $type = \Zend\Mime\Mime::MULTIPART_ALTERNATIVE; |
277 | 276 | $msgparts = array( $this->createContainer( array_reverse( $parts ), $type ) ); |
278 | - } |
|
279 | - else if( !empty( $parts ) ) |
|
277 | + } else if( !empty( $parts ) ) |
|
280 | 278 | { |
281 | 279 | $msgparts = $parts; |
282 | 280 | } |
@@ -115,7 +115,7 @@ |
||
115 | 115 | { |
116 | 116 | if( $config->$key instanceof \Zend\Config\Config ) |
117 | 117 | { |
118 | - if( count( $parts ) > 0 ) { |
|
118 | + if( count( $parts ) > 0 ) { |
|
119 | 119 | return $this->getPart( $config->$key, $parts ); |
120 | 120 | } |
121 | 121 |
@@ -52,10 +52,10 @@ |
||
52 | 52 | |
53 | 53 | $this->logger->log( $priority, '<' . $facility . '> ' . $message ); |
54 | 54 | } |
55 | - catch( \Zend\Log\Exception\InvalidArgumentException $ze ) { |
|
55 | + catch( \Zend\Log\Exception\InvalidArgumentException $ze ) { |
|
56 | 56 | throw new \Aimeos\MW\Logger\Exception( $ze->getMessage() ); |
57 | 57 | } |
58 | - catch( \Zend\Log\Exception\RuntimeException $ze ) { |
|
58 | + catch( \Zend\Log\Exception\RuntimeException $ze ) { |
|
59 | 59 | throw new \Aimeos\MW\Logger\Exception( $ze->getMessage() ); |
60 | 60 | } |
61 | 61 | } |
@@ -52,10 +52,12 @@ |
||
52 | 52 | |
53 | 53 | $this->logger->log( $priority, '<' . $facility . '> ' . $message ); |
54 | 54 | } |
55 | - catch( \Zend\Log\Exception\InvalidArgumentException $ze ) { |
|
55 | + catch( \Zend\Log\Exception\InvalidArgumentException $ze ) |
|
56 | + { |
|
56 | 57 | throw new \Aimeos\MW\Logger\Exception( $ze->getMessage() ); |
57 | 58 | } |
58 | - catch( \Zend\Log\Exception\RuntimeException $ze ) { |
|
59 | + catch( \Zend\Log\Exception\RuntimeException $ze ) |
|
60 | + { |
|
59 | 61 | throw new \Aimeos\MW\Logger\Exception( $ze->getMessage() ); |
60 | 62 | } |
61 | 63 | } |