@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | * @param string $path Path to the directory |
53 | 53 | * @return void |
54 | 54 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
55 | - */ |
|
55 | + */ |
|
56 | 56 | public function mkdir( $path ) |
57 | 57 | { |
58 | 58 | try { |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * @param string $path Path to the directory |
70 | 70 | * @return void |
71 | 71 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
72 | - */ |
|
72 | + */ |
|
73 | 73 | public function rmdir( $path ) |
74 | 74 | { |
75 | 75 | try { |
@@ -58,9 +58,12 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public function mkdir( $path ) |
60 | 60 | { |
61 | - try { |
|
61 | + try |
|
62 | + { |
|
62 | 63 | $this->fs->makeDirectory( $path ); |
63 | - } catch( \Exception $e ) { |
|
64 | + } |
|
65 | + catch( \Exception $e ) |
|
66 | + { |
|
64 | 67 | throw new Exception( $e->getMessage(), 0, $e ); |
65 | 68 | } |
66 | 69 | } |
@@ -75,9 +78,12 @@ discard block |
||
75 | 78 | */ |
76 | 79 | public function rmdir( $path ) |
77 | 80 | { |
78 | - try { |
|
81 | + try |
|
82 | + { |
|
79 | 83 | $this->fs->deleteDirectory( $path ); |
80 | - } catch( \Exception $e ) { |
|
84 | + } |
|
85 | + catch( \Exception $e ) |
|
86 | + { |
|
81 | 87 | throw new Exception( $e->getMessage(), 0, $e ); |
82 | 88 | } |
83 | 89 | } |
@@ -94,9 +100,12 @@ discard block |
||
94 | 100 | */ |
95 | 101 | public function scan( $path = null ) |
96 | 102 | { |
97 | - try { |
|
103 | + try |
|
104 | + { |
|
98 | 105 | return array_merge( $this->fs->directories( $path ), $this->fs->files( $path ) ); |
99 | - } catch( \Exception $e ) { |
|
106 | + } |
|
107 | + catch( \Exception $e ) |
|
108 | + { |
|
100 | 109 | throw new Exception( $e->getMessage(), 0, $e ); |
101 | 110 | } |
102 | 111 | } |
@@ -111,9 +120,12 @@ discard block |
||
111 | 120 | */ |
112 | 121 | public function size( $path ) |
113 | 122 | { |
114 | - try { |
|
123 | + try |
|
124 | + { |
|
115 | 125 | return $this->fs->size( $path ); |
116 | - } catch( \Exception $e ) { |
|
126 | + } |
|
127 | + catch( \Exception $e ) |
|
128 | + { |
|
117 | 129 | throw new Exception( $e->getMessage(), 0, $e ); |
118 | 130 | } |
119 | 131 | } |
@@ -128,9 +140,12 @@ discard block |
||
128 | 140 | */ |
129 | 141 | public function time( $path ) |
130 | 142 | { |
131 | - try { |
|
143 | + try |
|
144 | + { |
|
132 | 145 | return $this->fs->lastModified( $path ); |
133 | - } catch( \Exception $e ) { |
|
146 | + } |
|
147 | + catch( \Exception $e ) |
|
148 | + { |
|
134 | 149 | throw new Exception( $e->getMessage(), 0, $e ); |
135 | 150 | } |
136 | 151 | } |
@@ -145,9 +160,12 @@ discard block |
||
145 | 160 | */ |
146 | 161 | public function rm( $path ) |
147 | 162 | { |
148 | - try { |
|
163 | + try |
|
164 | + { |
|
149 | 165 | $this->fs->delete( $path ); |
150 | - } catch( \Exception $e ) { |
|
166 | + } |
|
167 | + catch( \Exception $e ) |
|
168 | + { |
|
151 | 169 | throw new Exception( $e->getMessage(), 0, $e ); |
152 | 170 | } |
153 | 171 | } |
@@ -176,9 +194,12 @@ discard block |
||
176 | 194 | */ |
177 | 195 | public function read( $path ) |
178 | 196 | { |
179 | - try { |
|
197 | + try |
|
198 | + { |
|
180 | 199 | return $this->fs->get( $path ); |
181 | - } catch( \Exception $e ) { |
|
200 | + } |
|
201 | + catch( \Exception $e ) |
|
202 | + { |
|
182 | 203 | throw new Exception( $e->getMessage(), 0, $e ); |
183 | 204 | } |
184 | 205 | } |
@@ -216,9 +237,12 @@ discard block |
||
216 | 237 | */ |
217 | 238 | public function reads( $path ) |
218 | 239 | { |
219 | - try { |
|
240 | + try |
|
241 | + { |
|
220 | 242 | $content = $this->fs->get( $path ); |
221 | - } catch( \Exception $e ) { |
|
243 | + } |
|
244 | + catch( \Exception $e ) |
|
245 | + { |
|
222 | 246 | throw new Exception( $e->getMessage(), 0, $e ); |
223 | 247 | } |
224 | 248 | |
@@ -250,9 +274,12 @@ discard block |
||
250 | 274 | */ |
251 | 275 | public function write( $path, $content ) |
252 | 276 | { |
253 | - try { |
|
277 | + try |
|
278 | + { |
|
254 | 279 | $this->fs->put( $path, $content ); |
255 | - } catch( \Exception $e ) { |
|
280 | + } |
|
281 | + catch( \Exception $e ) |
|
282 | + { |
|
256 | 283 | throw new Exception( $e->getMessage(), 0, $e ); |
257 | 284 | } |
258 | 285 | } |
@@ -295,9 +322,12 @@ discard block |
||
295 | 322 | throw new Exception( $error['message'] ); |
296 | 323 | } |
297 | 324 | |
298 | - try { |
|
325 | + try |
|
326 | + { |
|
299 | 327 | $this->fs->put( $path, $content ); |
300 | - } catch( \Exception $e ) { |
|
328 | + } |
|
329 | + catch( \Exception $e ) |
|
330 | + { |
|
301 | 331 | throw new Exception( $e->getMessage(), 0, $e ); |
302 | 332 | } |
303 | 333 | } |
@@ -313,9 +343,12 @@ discard block |
||
313 | 343 | */ |
314 | 344 | public function move( $from, $to ) |
315 | 345 | { |
316 | - try { |
|
346 | + try |
|
347 | + { |
|
317 | 348 | $this->fs->move( $from, $to ); |
318 | - } catch( \Exception $e ) { |
|
349 | + } |
|
350 | + catch( \Exception $e ) |
|
351 | + { |
|
319 | 352 | throw new Exception( $e->getMessage(), 0, $e ); |
320 | 353 | } |
321 | 354 | } |
@@ -331,9 +364,12 @@ discard block |
||
331 | 364 | */ |
332 | 365 | public function copy( $from, $to ) |
333 | 366 | { |
334 | - try { |
|
367 | + try |
|
368 | + { |
|
335 | 369 | $this->fs->copy( $from, $to ); |
336 | - } catch( \Exception $e ) { |
|
370 | + } |
|
371 | + catch( \Exception $e ) |
|
372 | + { |
|
337 | 373 | throw new Exception( $e->getMessage(), 0, $e ); |
338 | 374 | } |
339 | 375 | } |
@@ -117,8 +117,7 @@ |
||
117 | 117 | $value->getClientOriginalName(), |
118 | 118 | $value->getClientMimeType() |
119 | 119 | ); |
120 | - } |
|
121 | - elseif( is_array( $value ) ) |
|
120 | + } elseif( is_array( $value ) ) |
|
122 | 121 | { |
123 | 122 | $list[$key] = $this->getFiles( $value ); |
124 | 123 | } |
@@ -126,56 +126,56 @@ discard block |
||
126 | 126 | |
127 | 127 | $this->assertTrue( $item->getId() !== null ); |
128 | 128 | $this->assertEquals( $item->getId(), $itemSaved->getId() ); |
129 | - $this->assertEquals( $item->getParentId(), $itemSaved->getParentId()); |
|
130 | - $this->assertEquals( $item->getPosition(), $itemSaved->getPosition()); |
|
131 | - $this->assertEquals( $item->getCompany(), $itemSaved->getCompany()); |
|
132 | - $this->assertEquals( $item->getVatID(), $itemSaved->getVatID()); |
|
133 | - $this->assertEquals( $item->getSalutation(), $itemSaved->getSalutation()); |
|
134 | - $this->assertEquals( $item->getTitle(), $itemSaved->getTitle()); |
|
135 | - $this->assertEquals( $item->getFirstname(), $itemSaved->getFirstname()); |
|
136 | - $this->assertEquals( $item->getLastname(), $itemSaved->getLastname()); |
|
137 | - $this->assertEquals( $item->getAddress1(), $itemSaved->getAddress1()); |
|
138 | - $this->assertEquals( $item->getAddress2(), $itemSaved->getAddress2()); |
|
139 | - $this->assertEquals( $item->getAddress3(), $itemSaved->getAddress3()); |
|
140 | - $this->assertEquals( $item->getPostal(), $itemSaved->getPostal()); |
|
141 | - $this->assertEquals( $item->getCity(), $itemSaved->getCity()); |
|
142 | - $this->assertEquals( $item->getState(), $itemSaved->getState()); |
|
143 | - $this->assertEquals( $item->getCountryId(), $itemSaved->getCountryId()); |
|
144 | - $this->assertEquals( $item->getLanguageId(), $itemSaved->getLanguageId()); |
|
145 | - $this->assertEquals( $item->getTelephone(), $itemSaved->getTelephone()); |
|
146 | - $this->assertEquals( $item->getEmail(), $itemSaved->getEmail()); |
|
147 | - $this->assertEquals( $item->getTelefax(), $itemSaved->getTelefax()); |
|
148 | - $this->assertEquals( $item->getWebsite(), $itemSaved->getWebsite()); |
|
149 | - $this->assertEquals( $item->getLongitude(), $itemSaved->getLongitude()); |
|
150 | - $this->assertEquals( $item->getLatitude(), $itemSaved->getLatitude()); |
|
129 | + $this->assertEquals( $item->getParentId(), $itemSaved->getParentId() ); |
|
130 | + $this->assertEquals( $item->getPosition(), $itemSaved->getPosition() ); |
|
131 | + $this->assertEquals( $item->getCompany(), $itemSaved->getCompany() ); |
|
132 | + $this->assertEquals( $item->getVatID(), $itemSaved->getVatID() ); |
|
133 | + $this->assertEquals( $item->getSalutation(), $itemSaved->getSalutation() ); |
|
134 | + $this->assertEquals( $item->getTitle(), $itemSaved->getTitle() ); |
|
135 | + $this->assertEquals( $item->getFirstname(), $itemSaved->getFirstname() ); |
|
136 | + $this->assertEquals( $item->getLastname(), $itemSaved->getLastname() ); |
|
137 | + $this->assertEquals( $item->getAddress1(), $itemSaved->getAddress1() ); |
|
138 | + $this->assertEquals( $item->getAddress2(), $itemSaved->getAddress2() ); |
|
139 | + $this->assertEquals( $item->getAddress3(), $itemSaved->getAddress3() ); |
|
140 | + $this->assertEquals( $item->getPostal(), $itemSaved->getPostal() ); |
|
141 | + $this->assertEquals( $item->getCity(), $itemSaved->getCity() ); |
|
142 | + $this->assertEquals( $item->getState(), $itemSaved->getState() ); |
|
143 | + $this->assertEquals( $item->getCountryId(), $itemSaved->getCountryId() ); |
|
144 | + $this->assertEquals( $item->getLanguageId(), $itemSaved->getLanguageId() ); |
|
145 | + $this->assertEquals( $item->getTelephone(), $itemSaved->getTelephone() ); |
|
146 | + $this->assertEquals( $item->getEmail(), $itemSaved->getEmail() ); |
|
147 | + $this->assertEquals( $item->getTelefax(), $itemSaved->getTelefax() ); |
|
148 | + $this->assertEquals( $item->getWebsite(), $itemSaved->getWebsite() ); |
|
149 | + $this->assertEquals( $item->getLongitude(), $itemSaved->getLongitude() ); |
|
150 | + $this->assertEquals( $item->getLatitude(), $itemSaved->getLatitude() ); |
|
151 | 151 | |
152 | 152 | $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
153 | 153 | $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); |
154 | - $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); |
|
154 | + $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); |
|
155 | 155 | |
156 | 156 | $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); |
157 | - $this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId()); |
|
158 | - $this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition()); |
|
159 | - $this->assertEquals( $itemExp->getCompany(), $itemUpd->getCompany()); |
|
160 | - $this->assertEquals( $itemExp->getVatID(), $itemUpd->getVatID()); |
|
161 | - $this->assertEquals( $itemExp->getSalutation(), $itemUpd->getSalutation()); |
|
162 | - $this->assertEquals( $itemExp->getTitle(), $itemUpd->getTitle()); |
|
163 | - $this->assertEquals( $itemExp->getFirstname(), $itemUpd->getFirstname()); |
|
164 | - $this->assertEquals( $itemExp->getLastname(), $itemUpd->getLastname()); |
|
165 | - $this->assertEquals( $itemExp->getAddress1(), $itemUpd->getAddress1()); |
|
166 | - $this->assertEquals( $itemExp->getAddress2(), $itemUpd->getAddress2()); |
|
167 | - $this->assertEquals( $itemExp->getAddress3(), $itemUpd->getAddress3()); |
|
168 | - $this->assertEquals( $itemExp->getPostal(), $itemUpd->getPostal()); |
|
169 | - $this->assertEquals( $itemExp->getCity(), $itemUpd->getCity()); |
|
170 | - $this->assertEquals( $itemExp->getState(), $itemUpd->getState()); |
|
171 | - $this->assertEquals( $itemExp->getCountryId(), $itemUpd->getCountryId()); |
|
172 | - $this->assertEquals( $itemExp->getLanguageId(), $itemUpd->getLanguageId()); |
|
173 | - $this->assertEquals( $itemExp->getTelephone(), $itemUpd->getTelephone()); |
|
174 | - $this->assertEquals( $itemExp->getEmail(), $itemUpd->getEmail()); |
|
175 | - $this->assertEquals( $itemExp->getTelefax(), $itemUpd->getTelefax()); |
|
176 | - $this->assertEquals( $itemExp->getWebsite(), $itemUpd->getWebsite()); |
|
177 | - $this->assertEquals( $itemExp->getLongitude(), $itemUpd->getLongitude()); |
|
178 | - $this->assertEquals( $itemExp->getLatitude(), $itemUpd->getLatitude()); |
|
157 | + $this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId() ); |
|
158 | + $this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition() ); |
|
159 | + $this->assertEquals( $itemExp->getCompany(), $itemUpd->getCompany() ); |
|
160 | + $this->assertEquals( $itemExp->getVatID(), $itemUpd->getVatID() ); |
|
161 | + $this->assertEquals( $itemExp->getSalutation(), $itemUpd->getSalutation() ); |
|
162 | + $this->assertEquals( $itemExp->getTitle(), $itemUpd->getTitle() ); |
|
163 | + $this->assertEquals( $itemExp->getFirstname(), $itemUpd->getFirstname() ); |
|
164 | + $this->assertEquals( $itemExp->getLastname(), $itemUpd->getLastname() ); |
|
165 | + $this->assertEquals( $itemExp->getAddress1(), $itemUpd->getAddress1() ); |
|
166 | + $this->assertEquals( $itemExp->getAddress2(), $itemUpd->getAddress2() ); |
|
167 | + $this->assertEquals( $itemExp->getAddress3(), $itemUpd->getAddress3() ); |
|
168 | + $this->assertEquals( $itemExp->getPostal(), $itemUpd->getPostal() ); |
|
169 | + $this->assertEquals( $itemExp->getCity(), $itemUpd->getCity() ); |
|
170 | + $this->assertEquals( $itemExp->getState(), $itemUpd->getState() ); |
|
171 | + $this->assertEquals( $itemExp->getCountryId(), $itemUpd->getCountryId() ); |
|
172 | + $this->assertEquals( $itemExp->getLanguageId(), $itemUpd->getLanguageId() ); |
|
173 | + $this->assertEquals( $itemExp->getTelephone(), $itemUpd->getTelephone() ); |
|
174 | + $this->assertEquals( $itemExp->getEmail(), $itemUpd->getEmail() ); |
|
175 | + $this->assertEquals( $itemExp->getTelefax(), $itemUpd->getTelefax() ); |
|
176 | + $this->assertEquals( $itemExp->getWebsite(), $itemUpd->getWebsite() ); |
|
177 | + $this->assertEquals( $itemExp->getLongitude(), $itemUpd->getLongitude() ); |
|
178 | + $this->assertEquals( $itemExp->getLatitude(), $itemUpd->getLatitude() ); |
|
179 | 179 | |
180 | 180 | $this->assertEquals( $this->editor, $itemUpd->getEditor() ); |
181 | 181 | $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | $this->assertInstanceOf( \Aimeos\MShop\Common\Item\Iface::class, $resultSaved ); |
185 | 185 | $this->assertInstanceOf( \Aimeos\MShop\Common\Item\Iface::class, $resultUpd ); |
186 | 186 | |
187 | - $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
187 | + $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
188 | 188 | $this->object->getItem( $itemSaved->getId() ); |
189 | 189 | } |
190 | 190 |
@@ -57,11 +57,11 @@ discard block |
||
57 | 57 | $search->setConditions( $search->compare( '==', 'customer.property.editor', $this->editor ) ); |
58 | 58 | $results = $this->object->searchItems( $search ); |
59 | 59 | |
60 | - if( ( $item = reset($results) ) === false ) { |
|
60 | + if( ( $item = reset( $results ) ) === false ) { |
|
61 | 61 | throw new \RuntimeException( 'No property item found' ); |
62 | 62 | } |
63 | 63 | |
64 | - $item->setId(null); |
|
64 | + $item->setId( null ); |
|
65 | 65 | $item->setLanguageId( 'en' ); |
66 | 66 | $resultSaved = $this->object->saveItem( $item ); |
67 | 67 | $itemSaved = $this->object->getItem( $item->getId() ); |
@@ -110,13 +110,13 @@ discard block |
||
110 | 110 | { |
111 | 111 | $search = $this->object->createSearch(); |
112 | 112 | $conditions = array( |
113 | - $search->compare( '~=', 'customer.property.value', '1'), |
|
113 | + $search->compare( '~=', 'customer.property.value', '1' ), |
|
114 | 114 | $search->compare( '==', 'customer.property.editor', $this->editor ) |
115 | 115 | ); |
116 | 116 | $search->setConditions( $search->combine( '&&', $conditions ) ); |
117 | 117 | $results = $this->object->searchItems( $search ); |
118 | 118 | |
119 | - if( ($expected = reset($results)) === false ) { |
|
119 | + if( ( $expected = reset( $results ) ) === false ) { |
|
120 | 120 | throw new \RuntimeException( sprintf( 'No customer property item found for value "%1$s".', '1' ) ); |
121 | 121 | } |
122 | 122 | |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | $expr[] = $search->compare( '==', 'customer.property.value', '1' ); |
156 | 156 | $expr[] = $search->compare( '==', 'customer.property.editor', $this->editor ); |
157 | 157 | |
158 | - $search->setConditions( $search->combine('&&', $expr) ); |
|
158 | + $search->setConditions( $search->combine( '&&', $expr ) ); |
|
159 | 159 | $results = $this->object->searchItems( $search, [], $total ); |
160 | 160 | $this->assertEquals( 1, count( $results ) ); |
161 | 161 | } |
@@ -163,17 +163,17 @@ discard block |
||
163 | 163 | |
164 | 164 | public function testGetSubManager() |
165 | 165 | { |
166 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') ); |
|
167 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') ); |
|
166 | + $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'type' ) ); |
|
167 | + $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'type', 'Standard' ) ); |
|
168 | 168 | |
169 | - $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
170 | - $this->object->getSubManager('unknown'); |
|
169 | + $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
170 | + $this->object->getSubManager( 'unknown' ); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | |
174 | 174 | public function testGetSubManagerInvalidName() |
175 | 175 | { |
176 | - $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
177 | - $this->object->getSubManager('type', 'unknown'); |
|
176 | + $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
177 | + $this->object->getSubManager( 'type', 'unknown' ); |
|
178 | 178 | } |
179 | 179 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | public function testTransform() |
37 | 37 | { |
38 | 38 | $this->mock->expects( $this->once() )->method( 'route' ) |
39 | - ->with( $this->equalTo( 'route'), $this->equalTo( array( 'key' => 'value' ) ), $this->equalTo( false ) ); |
|
39 | + ->with( $this->equalTo( 'route' ), $this->equalTo( array( 'key' => 'value' ) ), $this->equalTo( false ) ); |
|
40 | 40 | |
41 | 41 | $this->object->transform( 'route', 'catalog', 'lists', array( 'key' => 'value' ) ); |
42 | 42 | } |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | public function testTransformAbsolute() |
46 | 46 | { |
47 | 47 | $this->mock->expects( $this->once() )->method( 'route' ) |
48 | - ->with( $this->equalTo( 'route'), $this->equalTo( [] ), $this->equalTo( true ) ); |
|
48 | + ->with( $this->equalTo( 'route' ), $this->equalTo( [] ), $this->equalTo( true ) ); |
|
49 | 49 | |
50 | 50 | $options = array( 'absoluteUri' => true ); |
51 | 51 | $this->object->transform( 'route', 'catalog', 'lists', [], [], $options ); |
@@ -48,7 +48,7 @@ |
||
48 | 48 | ->will( $this->returnValue( 'test' ) ); |
49 | 49 | |
50 | 50 | $this->mock->expects( $this->once() )->method( 'file' ) |
51 | - ->will( $this->returnValue( $view) ); |
|
51 | + ->will( $this->returnValue( $view ) ); |
|
52 | 52 | |
53 | 53 | $result = $this->object->render( $v, 'filepath', array( 'key' => 'value' ) ); |
54 | 54 | $this->assertEquals( 'test', $result ); |
@@ -10,16 +10,16 @@ |
||
10 | 10 | * Set error reporting to maximum |
11 | 11 | */ |
12 | 12 | error_reporting( -1 ); |
13 | -ini_set('display_errors', '1'); |
|
13 | +ini_set( 'display_errors', '1' ); |
|
14 | 14 | |
15 | 15 | |
16 | 16 | /* |
17 | 17 | * Set locale settings to reasonable defaults |
18 | 18 | */ |
19 | -setlocale(LC_ALL, 'en_US.UTF-8'); |
|
20 | -setlocale(LC_NUMERIC, 'POSIX'); |
|
21 | -setlocale(LC_CTYPE, 'en_US.UTF-8'); |
|
22 | -setlocale(LC_TIME, 'POSIX'); |
|
19 | +setlocale( LC_ALL, 'en_US.UTF-8' ); |
|
20 | +setlocale( LC_NUMERIC, 'POSIX' ); |
|
21 | +setlocale( LC_CTYPE, 'en_US.UTF-8' ); |
|
22 | +setlocale( LC_TIME, 'POSIX' ); |
|
23 | 23 | |
24 | 24 | |
25 | 25 | require_once 'TestHelper.php'; |
@@ -489,14 +489,14 @@ |
||
489 | 489 | |
490 | 490 | $results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level ); |
491 | 491 | while( ( $row = $results->fetch() ) !== false ) { |
492 | - $map[ $row['customer.id'] ] = $row; |
|
492 | + $map[$row['customer.id']] = $row; |
|
493 | 493 | } |
494 | 494 | |
495 | 495 | $dbm->release( $conn, $dbname ); |
496 | 496 | } |
497 | 497 | catch( \Exception $e ) |
498 | 498 | { |
499 | - $dbm->release( $conn, $dbname ); |
|
499 | + $dbm->release( $conn, $dbname ); |
|
500 | 500 | throw $e; |
501 | 501 | } |
502 | 502 |
@@ -340,8 +340,7 @@ |
||
340 | 340 | * @see mshop/customer/manager/laravel/count |
341 | 341 | */ |
342 | 342 | $path = 'mshop/customer/manager/laravel/insert'; |
343 | - } |
|
344 | - else |
|
343 | + } else |
|
345 | 344 | { |
346 | 345 | /** mshop/customer/manager/laravel/update |
347 | 346 | * Updates an existing customer record in the database |
@@ -54,7 +54,7 @@ |
||
54 | 54 | |
55 | 55 | $this->logger->log( $message, $this->translatePriority( $priority ) ); |
56 | 56 | } |
57 | - catch( \Exception $e ) { |
|
57 | + catch( \Exception $e ) { |
|
58 | 58 | throw new \Aimeos\MW\Logger\Exception( $e->getMessage(), $e->getCode(), $e ); |
59 | 59 | } |
60 | 60 | } |
@@ -54,7 +54,8 @@ |
||
54 | 54 | |
55 | 55 | $this->logger->log( $message, $this->translatePriority( $priority ) ); |
56 | 56 | } |
57 | - catch( \Exception $e ) { |
|
57 | + catch( \Exception $e ) |
|
58 | + { |
|
58 | 59 | throw new \Aimeos\MW\Logger\Exception( $e->getMessage(), $e->getCode(), $e ); |
59 | 60 | } |
60 | 61 | } |