@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * @param \Illuminate\Contracts\Filesystem\Filesystem $fs Laravel file system object |
30 | 30 | * @param string $tempdir Directory for storing temporary files |
31 | 31 | */ |
32 | - public function __construct( \Illuminate\Contracts\Filesystem\Filesystem $fs, $tempdir ) |
|
32 | + public function __construct(\Illuminate\Contracts\Filesystem\Filesystem $fs, $tempdir) |
|
33 | 33 | { |
34 | 34 | $this->fs = $fs; |
35 | 35 | $this->tempdir = $tempdir; |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | * @return boolean True if directory, false if not |
44 | 44 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
45 | 45 | */ |
46 | - public function isdir( $path ) |
|
46 | + public function isdir($path) |
|
47 | 47 | { |
48 | - return in_array( basename( $path ), $this->fs->directories( dirname( $path ) ) ); |
|
48 | + return in_array(basename($path), $this->fs->directories(dirname($path))); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
@@ -56,12 +56,12 @@ discard block |
||
56 | 56 | * @return void |
57 | 57 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
58 | 58 | */ |
59 | - public function mkdir( $path ) |
|
59 | + public function mkdir($path) |
|
60 | 60 | { |
61 | 61 | try { |
62 | - $this->fs->makeDirectory( $path ); |
|
63 | - } catch( \Exception $e ) { |
|
64 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
62 | + $this->fs->makeDirectory($path); |
|
63 | + } catch (\Exception $e) { |
|
64 | + throw new Exception($e->getMessage(), 0, $e); |
|
65 | 65 | } |
66 | 66 | } |
67 | 67 | |
@@ -73,12 +73,12 @@ discard block |
||
73 | 73 | * @return void |
74 | 74 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
75 | 75 | */ |
76 | - public function rmdir( $path ) |
|
76 | + public function rmdir($path) |
|
77 | 77 | { |
78 | 78 | try { |
79 | - $this->fs->deleteDirectory( $path ); |
|
80 | - } catch( \Exception $e ) { |
|
81 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
79 | + $this->fs->deleteDirectory($path); |
|
80 | + } catch (\Exception $e) { |
|
81 | + throw new Exception($e->getMessage(), 0, $e); |
|
82 | 82 | } |
83 | 83 | } |
84 | 84 | |
@@ -92,12 +92,12 @@ discard block |
||
92 | 92 | * @return \Iterator|array Iterator over the entries or array with entries |
93 | 93 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
94 | 94 | */ |
95 | - public function scan( $path = null ) |
|
95 | + public function scan($path = null) |
|
96 | 96 | { |
97 | 97 | try { |
98 | - return array_merge( $this->fs->directories( $path ), $this->fs->files( $path ) ); |
|
99 | - } catch( \Exception $e ) { |
|
100 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
98 | + return array_merge($this->fs->directories($path), $this->fs->files($path)); |
|
99 | + } catch (\Exception $e) { |
|
100 | + throw new Exception($e->getMessage(), 0, $e); |
|
101 | 101 | } |
102 | 102 | } |
103 | 103 | |
@@ -109,12 +109,12 @@ discard block |
||
109 | 109 | * @return integer Size in bytes |
110 | 110 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
111 | 111 | */ |
112 | - public function size( $path ) |
|
112 | + public function size($path) |
|
113 | 113 | { |
114 | 114 | try { |
115 | - return $this->fs->size( $path ); |
|
116 | - } catch( \Exception $e ) { |
|
117 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
115 | + return $this->fs->size($path); |
|
116 | + } catch (\Exception $e) { |
|
117 | + throw new Exception($e->getMessage(), 0, $e); |
|
118 | 118 | } |
119 | 119 | } |
120 | 120 | |
@@ -126,12 +126,12 @@ discard block |
||
126 | 126 | * @return integer Unix time stamp in seconds |
127 | 127 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
128 | 128 | */ |
129 | - public function time( $path ) |
|
129 | + public function time($path) |
|
130 | 130 | { |
131 | 131 | try { |
132 | - return $this->fs->lastModified( $path ); |
|
133 | - } catch( \Exception $e ) { |
|
134 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
132 | + return $this->fs->lastModified($path); |
|
133 | + } catch (\Exception $e) { |
|
134 | + throw new Exception($e->getMessage(), 0, $e); |
|
135 | 135 | } |
136 | 136 | } |
137 | 137 | |
@@ -143,12 +143,12 @@ discard block |
||
143 | 143 | * @return void |
144 | 144 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
145 | 145 | */ |
146 | - public function rm( $path ) |
|
146 | + public function rm($path) |
|
147 | 147 | { |
148 | 148 | try { |
149 | - $this->fs->delete( $path ); |
|
150 | - } catch( \Exception $e ) { |
|
151 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
149 | + $this->fs->delete($path); |
|
150 | + } catch (\Exception $e) { |
|
151 | + throw new Exception($e->getMessage(), 0, $e); |
|
152 | 152 | } |
153 | 153 | } |
154 | 154 | |
@@ -159,9 +159,9 @@ discard block |
||
159 | 159 | * @param string $path Path to the file |
160 | 160 | * @return boolean True if it exists, false if not |
161 | 161 | */ |
162 | - public function has( $path ) |
|
162 | + public function has($path) |
|
163 | 163 | { |
164 | - return $this->fs->exists( $path ); |
|
164 | + return $this->fs->exists($path); |
|
165 | 165 | } |
166 | 166 | |
167 | 167 | |
@@ -174,12 +174,12 @@ discard block |
||
174 | 174 | * @return string File content |
175 | 175 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
176 | 176 | */ |
177 | - public function read( $path ) |
|
177 | + public function read($path) |
|
178 | 178 | { |
179 | 179 | try { |
180 | - return $this->fs->get( $path ); |
|
181 | - } catch( \Exception $e ) { |
|
182 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
180 | + return $this->fs->get($path); |
|
181 | + } catch (\Exception $e) { |
|
182 | + throw new Exception($e->getMessage(), 0, $e); |
|
183 | 183 | } |
184 | 184 | } |
185 | 185 | |
@@ -191,14 +191,14 @@ discard block |
||
191 | 191 | * @return string Path of the local file |
192 | 192 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
193 | 193 | */ |
194 | - public function readf( $path ) |
|
194 | + public function readf($path) |
|
195 | 195 | { |
196 | - if( ( $filename = tempnam( $this->tempdir, 'ai-' ) ) === false ) { |
|
197 | - throw new Exception( sprintf( 'Unable to create file in "%1$s"', $this->tempdir ) ); |
|
196 | + if (($filename = tempnam($this->tempdir, 'ai-')) === false) { |
|
197 | + throw new Exception(sprintf('Unable to create file in "%1$s"', $this->tempdir)); |
|
198 | 198 | } |
199 | 199 | |
200 | - if( @file_put_contents( $filename, $this->fs->get( $path ) ) === false ) { |
|
201 | - throw new Exception( sprintf( 'Couldn\'t write file "%1$s"', $filename ) ); |
|
200 | + if (@file_put_contents($filename, $this->fs->get($path)) === false) { |
|
201 | + throw new Exception(sprintf('Couldn\'t write file "%1$s"', $filename)); |
|
202 | 202 | } |
203 | 203 | |
204 | 204 | return $filename; |
@@ -214,24 +214,24 @@ discard block |
||
214 | 214 | * @return resource File stream descriptor |
215 | 215 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
216 | 216 | */ |
217 | - public function reads( $path ) |
|
217 | + public function reads($path) |
|
218 | 218 | { |
219 | 219 | try { |
220 | - $content = $this->fs->get( $path ); |
|
221 | - } catch( \Exception $e ) { |
|
222 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
220 | + $content = $this->fs->get($path); |
|
221 | + } catch (\Exception $e) { |
|
222 | + throw new Exception($e->getMessage(), 0, $e); |
|
223 | 223 | } |
224 | 224 | |
225 | - if( ( $stream = tmpfile() ) === false ) { |
|
226 | - throw new Exception( 'Couldn\'t create temporary file' ); |
|
225 | + if (($stream = tmpfile()) === false) { |
|
226 | + throw new Exception('Couldn\'t create temporary file'); |
|
227 | 227 | } |
228 | 228 | |
229 | - if( fwrite( $stream, $content ) === false ) { |
|
230 | - throw new Exception( 'Couldn\'t write to temporary file' ); |
|
229 | + if (fwrite($stream, $content) === false) { |
|
230 | + throw new Exception('Couldn\'t write to temporary file'); |
|
231 | 231 | } |
232 | 232 | |
233 | - if( rewind( $stream ) === false ) { |
|
234 | - throw new Exception( 'Couldn\'t rewind temporary file' ); |
|
233 | + if (rewind($stream) === false) { |
|
234 | + throw new Exception('Couldn\'t rewind temporary file'); |
|
235 | 235 | } |
236 | 236 | |
237 | 237 | return $stream; |
@@ -248,12 +248,12 @@ discard block |
||
248 | 248 | * @return void |
249 | 249 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
250 | 250 | */ |
251 | - public function write( $path, $content ) |
|
251 | + public function write($path, $content) |
|
252 | 252 | { |
253 | 253 | try { |
254 | - $this->fs->put( $path, $content ); |
|
255 | - } catch( \Exception $e ) { |
|
256 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
254 | + $this->fs->put($path, $content); |
|
255 | + } catch (\Exception $e) { |
|
256 | + throw new Exception($e->getMessage(), 0, $e); |
|
257 | 257 | } |
258 | 258 | } |
259 | 259 | |
@@ -268,13 +268,13 @@ discard block |
||
268 | 268 | * @return void |
269 | 269 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
270 | 270 | */ |
271 | - public function writef( $path, $local ) |
|
271 | + public function writef($path, $local) |
|
272 | 272 | { |
273 | - if( ( $content = @file_get_contents( $local ) ) === false ) { |
|
274 | - throw new Exception( sprintf( 'Couldn\'t read file "%1$s"', $local ) ); |
|
273 | + if (($content = @file_get_contents($local)) === false) { |
|
274 | + throw new Exception(sprintf('Couldn\'t read file "%1$s"', $local)); |
|
275 | 275 | } |
276 | 276 | |
277 | - $this->write( $path, $content ); |
|
277 | + $this->write($path, $content); |
|
278 | 278 | } |
279 | 279 | |
280 | 280 | |
@@ -288,17 +288,17 @@ discard block |
||
288 | 288 | * @return void |
289 | 289 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
290 | 290 | */ |
291 | - public function writes( $path, $stream ) |
|
291 | + public function writes($path, $stream) |
|
292 | 292 | { |
293 | - if( ( $content = @fread( $stream, 0x7ffffffd ) ) === false ) { |
|
293 | + if (($content = @fread($stream, 0x7ffffffd)) === false) { |
|
294 | 294 | $error = error_get_last(); |
295 | - throw new Exception( $error['message'] ); |
|
295 | + throw new Exception($error['message']); |
|
296 | 296 | } |
297 | 297 | |
298 | 298 | try { |
299 | - $this->fs->put( $path, $content ); |
|
300 | - } catch( \Exception $e ) { |
|
301 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
299 | + $this->fs->put($path, $content); |
|
300 | + } catch (\Exception $e) { |
|
301 | + throw new Exception($e->getMessage(), 0, $e); |
|
302 | 302 | } |
303 | 303 | } |
304 | 304 | |
@@ -311,12 +311,12 @@ discard block |
||
311 | 311 | * @return void |
312 | 312 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
313 | 313 | */ |
314 | - public function move( $from, $to ) |
|
314 | + public function move($from, $to) |
|
315 | 315 | { |
316 | 316 | try { |
317 | - $this->fs->move( $from, $to ); |
|
318 | - } catch( \Exception $e ) { |
|
319 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
317 | + $this->fs->move($from, $to); |
|
318 | + } catch (\Exception $e) { |
|
319 | + throw new Exception($e->getMessage(), 0, $e); |
|
320 | 320 | } |
321 | 321 | } |
322 | 322 | |
@@ -329,12 +329,12 @@ discard block |
||
329 | 329 | * @return void |
330 | 330 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
331 | 331 | */ |
332 | - public function copy( $from, $to ) |
|
332 | + public function copy($from, $to) |
|
333 | 333 | { |
334 | 334 | try { |
335 | - $this->fs->copy( $from, $to ); |
|
336 | - } catch( \Exception $e ) { |
|
337 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
335 | + $this->fs->copy($from, $to); |
|
336 | + } catch (\Exception $e) { |
|
337 | + throw new Exception($e->getMessage(), 0, $e); |
|
338 | 338 | } |
339 | 339 | } |
340 | 340 | } |
@@ -16,41 +16,41 @@ |
||
16 | 16 | |
17 | 17 | protected function setUp() |
18 | 18 | { |
19 | - if( !class_exists( '\Illuminate\View\Factory' ) ) { |
|
20 | - $this->markTestSkipped( '\Illuminate\View\Factory is not available' ); |
|
19 | + if (!class_exists('\Illuminate\View\Factory')) { |
|
20 | + $this->markTestSkipped('\Illuminate\View\Factory is not available'); |
|
21 | 21 | } |
22 | 22 | |
23 | - $this->mock = $this->getMockBuilder( '\Illuminate\View\Factory' ) |
|
24 | - ->setMethods( array( 'file' ) ) |
|
23 | + $this->mock = $this->getMockBuilder('\Illuminate\View\Factory') |
|
24 | + ->setMethods(array('file')) |
|
25 | 25 | ->disableOriginalConstructor() |
26 | 26 | ->getMock(); |
27 | 27 | |
28 | - $this->object = new \Aimeos\MW\View\Engine\Blade( $this->mock ); |
|
28 | + $this->object = new \Aimeos\MW\View\Engine\Blade($this->mock); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
32 | 32 | protected function tearDown() |
33 | 33 | { |
34 | - unset( $this->object, $this->mock ); |
|
34 | + unset($this->object, $this->mock); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | |
38 | 38 | public function testRender() |
39 | 39 | { |
40 | - $v = new \Aimeos\MW\View\Standard( array() ); |
|
40 | + $v = new \Aimeos\MW\View\Standard(array()); |
|
41 | 41 | |
42 | - $view = $this->getMockBuilder( '\Illuminate\View\View' ) |
|
43 | - ->setMethods( array( 'render' ) ) |
|
42 | + $view = $this->getMockBuilder('\Illuminate\View\View') |
|
43 | + ->setMethods(array('render')) |
|
44 | 44 | ->disableOriginalConstructor() |
45 | 45 | ->getMock(); |
46 | 46 | |
47 | - $view->expects( $this->once() )->method( 'render' ) |
|
48 | - ->will( $this->returnValue( 'test' ) ); |
|
47 | + $view->expects($this->once())->method('render') |
|
48 | + ->will($this->returnValue('test')); |
|
49 | 49 | |
50 | - $this->mock->expects( $this->once() )->method( 'file' ) |
|
51 | - ->will( $this->returnValue( $view) ); |
|
50 | + $this->mock->expects($this->once())->method('file') |
|
51 | + ->will($this->returnValue($view)); |
|
52 | 52 | |
53 | - $result = $this->object->render( $v, 'filepath', array( 'key' => 'value' ) ); |
|
54 | - $this->assertEquals( 'test', $result ); |
|
53 | + $result = $this->object->render($v, 'filepath', array('key' => 'value')); |
|
54 | + $this->assertEquals('test', $result); |
|
55 | 55 | } |
56 | 56 | } |
@@ -21,12 +21,12 @@ discard block |
||
21 | 21 | */ |
22 | 22 | protected function setUp() |
23 | 23 | { |
24 | - if( interface_exists( '\\Illuminate\\Session\\Store' ) === false ) { |
|
25 | - $this->markTestSkipped( 'Class \\Illuminate\\Session\\Store not found' ); |
|
24 | + if (interface_exists('\\Illuminate\\Session\\Store') === false) { |
|
25 | + $this->markTestSkipped('Class \\Illuminate\\Session\\Store not found'); |
|
26 | 26 | } |
27 | 27 | |
28 | - $this->mock = $this->getMockBuilder( '\\Illuminate\\Session\\Store' )->getMock(); |
|
29 | - $this->object = new \Aimeos\MW\Session\Laravel5( $this->mock ); |
|
28 | + $this->mock = $this->getMockBuilder('\\Illuminate\\Session\\Store')->getMock(); |
|
29 | + $this->object = new \Aimeos\MW\Session\Laravel5($this->mock); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | |
@@ -38,21 +38,21 @@ discard block |
||
38 | 38 | */ |
39 | 39 | protected function tearDown() |
40 | 40 | { |
41 | - unset( $this->object ); |
|
41 | + unset($this->object); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | |
45 | 45 | public function testGetDefault() |
46 | 46 | { |
47 | - $this->mock->expects( $this->once() )->method( 'get' )->with( $this->equalTo( 'notexist' ) ); |
|
48 | - $this->object->get( 'notexist' ); |
|
47 | + $this->mock->expects($this->once())->method('get')->with($this->equalTo('notexist')); |
|
48 | + $this->object->get('notexist'); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
52 | 52 | public function testSet() |
53 | 53 | { |
54 | - $this->mock->expects( $this->once() )->method( 'put' ) |
|
55 | - ->with( $this->equalTo( 'key' ), $this->equalTo( 'value' ) ); |
|
56 | - $this->object->set( 'key', 'value' ); |
|
54 | + $this->mock->expects($this->once())->method('put') |
|
55 | + ->with($this->equalTo('key'), $this->equalTo('value')); |
|
56 | + $this->object->set('key', 'value'); |
|
57 | 57 | } |
58 | 58 | } |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | * |
28 | 28 | * @param \Illuminate\View\Factory $factory Laravel view factory |
29 | 29 | */ |
30 | - public function __construct( \Illuminate\View\Factory $factory ) |
|
30 | + public function __construct(\Illuminate\View\Factory $factory) |
|
31 | 31 | { |
32 | 32 | $this->factory = $factory; |
33 | 33 | } |
@@ -42,19 +42,19 @@ discard block |
||
42 | 42 | * @return string Output generated by the template |
43 | 43 | * @throws \Aimeos\MW\View\Exception If the template isn't found |
44 | 44 | */ |
45 | - public function render( \Aimeos\MW\View\Iface $view, $filename, array $values ) |
|
45 | + public function render(\Aimeos\MW\View\Iface $view, $filename, array $values) |
|
46 | 46 | { |
47 | 47 | $factory = $this->factory; |
48 | - $lv = $factory->file( $filename, $values ); |
|
48 | + $lv = $factory->file($filename, $values); |
|
49 | 49 | |
50 | - $fcn = function() use ( $factory, $view ) |
|
50 | + $fcn = function() use ($factory, $view) |
|
51 | 51 | { |
52 | - foreach( $factory->getSections() as $name => $section ) { |
|
53 | - $view->block()->set( $name, $section ); |
|
52 | + foreach ($factory->getSections() as $name => $section) { |
|
53 | + $view->block()->set($name, $section); |
|
54 | 54 | } |
55 | 55 | }; |
56 | 56 | |
57 | - $contents = $lv->render( $fcn ); |
|
57 | + $contents = $lv->render($fcn); |
|
58 | 58 | $this->factory->flushSections(); |
59 | 59 | |
60 | 60 | return $contents; |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * |
29 | 29 | * @param \Illuminate\Session\Store $object Laravel session object |
30 | 30 | */ |
31 | - public function __construct( \Illuminate\Session\Store $object ) |
|
31 | + public function __construct(\Illuminate\Session\Store $object) |
|
32 | 32 | { |
33 | 33 | $this->object = $object; |
34 | 34 | } |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | * @param mixed $default Value returned if requested key isn't found |
44 | 44 | * @return mixed Value associated to the requested key |
45 | 45 | */ |
46 | - public function get( $name, $default = null ) |
|
46 | + public function get($name, $default = null) |
|
47 | 47 | { |
48 | - return $this->object->get( $name, $default ); |
|
48 | + return $this->object->get($name, $default); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | * @param mixed $value Value that should be associated with the given key |
59 | 59 | * @return void |
60 | 60 | */ |
61 | - public function set( $name, $value ) |
|
61 | + public function set($name, $value) |
|
62 | 62 | { |
63 | - $this->object->put( $name, $value ); |
|
63 | + $this->object->put($name, $value); |
|
64 | 64 | } |
65 | 65 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * |
30 | 30 | * @param \Illuminate\Contracts\Cache\Store $cache Laravel cache object |
31 | 31 | */ |
32 | - public function __construct( \Illuminate\Contracts\Cache\Store $cache ) |
|
32 | + public function __construct(\Illuminate\Contracts\Cache\Store $cache) |
|
33 | 33 | { |
34 | 34 | $this->object = $cache; |
35 | 35 | } |
@@ -53,9 +53,9 @@ discard block |
||
53 | 53 | * |
54 | 54 | * @param string $key Key string that identifies the single cache entry |
55 | 55 | */ |
56 | - public function delete( $key ) |
|
56 | + public function delete($key) |
|
57 | 57 | { |
58 | - $this->object->forget( $key ); |
|
58 | + $this->object->forget($key); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | |
@@ -67,10 +67,10 @@ discard block |
||
67 | 67 | * @param \Traversable|array $keys List of key strings that identify the cache entries |
68 | 68 | * that should be removed |
69 | 69 | */ |
70 | - public function deleteMultiple( $keys ) |
|
70 | + public function deleteMultiple($keys) |
|
71 | 71 | { |
72 | - foreach( $keys as $key ) { |
|
73 | - $this->object->forget( $key ); |
|
72 | + foreach ($keys as $key) { |
|
73 | + $this->object->forget($key); |
|
74 | 74 | } |
75 | 75 | } |
76 | 76 | |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | * @param string[] $tags List of tag strings that are associated to one or more |
84 | 84 | * cache entries that should be removed |
85 | 85 | */ |
86 | - public function deleteByTags( array $tags ) |
|
86 | + public function deleteByTags(array $tags) |
|
87 | 87 | { |
88 | 88 | // $this->object->tags( $tag )->flush(); |
89 | 89 | $this->object->flush(); |
@@ -99,9 +99,9 @@ discard block |
||
99 | 99 | * @param string $default Value returned if requested key isn't found |
100 | 100 | * @return mixed Value associated to the requested key |
101 | 101 | */ |
102 | - public function get( $name, $default = null ) |
|
102 | + public function get($name, $default = null) |
|
103 | 103 | { |
104 | - if( ( $entry = $this->object->get( $name ) ) !== null ) { |
|
104 | + if (($entry = $this->object->get($name)) !== null) { |
|
105 | 105 | return $entry; |
106 | 106 | } |
107 | 107 | |
@@ -120,13 +120,13 @@ discard block |
||
120 | 120 | * entries. If a cache entry doesn't exist, neither its key nor a value |
121 | 121 | * will be in the result list |
122 | 122 | */ |
123 | - public function getMultiple( $keys, $default = null ) |
|
123 | + public function getMultiple($keys, $default = null) |
|
124 | 124 | { |
125 | 125 | $result = array(); |
126 | 126 | |
127 | - foreach( $keys as $key ) |
|
127 | + foreach ($keys as $key) |
|
128 | 128 | { |
129 | - if( ( $entry = $this->object->get( $key ) ) !== false ) { |
|
129 | + if (($entry = $this->object->get($key)) !== false) { |
|
130 | 130 | $result[$key] = $entry; |
131 | 131 | } else { |
132 | 132 | $result[$key] = $default; |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | * entries. If a tag isn't associated to any cache entry, nothing is returned |
148 | 148 | * for that tag |
149 | 149 | */ |
150 | - public function getMultipleByTags( array $tags ) |
|
150 | + public function getMultipleByTags(array $tags) |
|
151 | 151 | { |
152 | 152 | return array(); |
153 | 153 | } |
@@ -165,14 +165,14 @@ discard block |
||
165 | 165 | * @param array $tags List of tag strings that should be assoicated to the |
166 | 166 | * given value in the cache |
167 | 167 | */ |
168 | - public function set( $key, $value, $expires = null, array $tags = array() ) |
|
168 | + public function set($key, $value, $expires = null, array $tags = array()) |
|
169 | 169 | { |
170 | - if( is_string( $expires ) ) { |
|
171 | - $this->object->put( $key, $value, (int) ( date_create( $expires )->getTimestamp() - time() ) / 60 ); |
|
172 | - } elseif( is_int( $expires ) ) { |
|
173 | - $this->object->put( $key, $value, (int) $expires / 60 ); |
|
170 | + if (is_string($expires)) { |
|
171 | + $this->object->put($key, $value, (int) (date_create($expires)->getTimestamp() - time())/60); |
|
172 | + } elseif (is_int($expires)) { |
|
173 | + $this->object->put($key, $value, (int) $expires/60); |
|
174 | 174 | } else { |
175 | - $this->object->forever( $key, $value ); |
|
175 | + $this->object->forever($key, $value); |
|
176 | 176 | } |
177 | 177 | } |
178 | 178 | |
@@ -191,14 +191,14 @@ discard block |
||
191 | 191 | * should be associated to the values identified by their key. The value |
192 | 192 | * associated to the key can either be a tag string or an array of tag strings |
193 | 193 | */ |
194 | - public function setMultiple( $pairs, $expires = null, array $tags = array() ) |
|
194 | + public function setMultiple($pairs, $expires = null, array $tags = array()) |
|
195 | 195 | { |
196 | - foreach( $pairs as $key => $value ) |
|
196 | + foreach ($pairs as $key => $value) |
|
197 | 197 | { |
198 | - $tagList = ( isset( $tags[$key] ) ? (array) $tags[$key] : array() ); |
|
199 | - $keyExpire = ( isset( $expires[$key] ) ? $expires[$key] : null ); |
|
198 | + $tagList = (isset($tags[$key]) ? (array) $tags[$key] : array()); |
|
199 | + $keyExpire = (isset($expires[$key]) ? $expires[$key] : null); |
|
200 | 200 | |
201 | - $this->set( $key, $value, $keyExpire, $tagList ); |
|
201 | + $this->set($key, $value, $keyExpire, $tagList); |
|
202 | 202 | } |
203 | 203 | } |
204 | 204 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function getPreDependencies() |
24 | 24 | { |
25 | - return array( 'TablesCreateLaravel', 'CustomerAddLaravelTestData', 'LocaleAddTestData', 'TextAddTestData' ); |
|
25 | + return array('TablesCreateLaravel', 'CustomerAddLaravelTestData', 'LocaleAddTestData', 'TextAddTestData'); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | |
@@ -32,29 +32,29 @@ discard block |
||
32 | 32 | public function migrate() |
33 | 33 | { |
34 | 34 | $iface = '\\Aimeos\\MShop\\Context\\Item\\Iface'; |
35 | - if( !( $this->additional instanceof $iface ) ) { |
|
36 | - throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) ); |
|
35 | + if (!($this->additional instanceof $iface)) { |
|
36 | + throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface)); |
|
37 | 37 | } |
38 | 38 | |
39 | - $this->msg( 'Adding customer-list Laravel test data', 0 ); |
|
40 | - $this->additional->setEditor( 'ai-laravel:unittest' ); |
|
39 | + $this->msg('Adding customer-list Laravel test data', 0); |
|
40 | + $this->additional->setEditor('ai-laravel:unittest'); |
|
41 | 41 | |
42 | 42 | $ds = DIRECTORY_SEPARATOR; |
43 | - $path = __DIR__ . $ds . 'data' . $ds . 'customer-list.php'; |
|
43 | + $path = __DIR__.$ds.'data'.$ds.'customer-list.php'; |
|
44 | 44 | |
45 | - if( ( $testdata = include( $path ) ) == false ){ |
|
46 | - throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer list domain', $path ) ); |
|
45 | + if (($testdata = include($path)) == false) { |
|
46 | + throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer list domain', $path)); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | $refKeys = array(); |
50 | - foreach( $testdata['customer/lists'] as $dataset ) { |
|
51 | - $refKeys[ $dataset['domain'] ][] = $dataset['refid']; |
|
50 | + foreach ($testdata['customer/lists'] as $dataset) { |
|
51 | + $refKeys[$dataset['domain']][] = $dataset['refid']; |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | $refIds = array(); |
55 | - $refIds['text'] = $this->getTextData( $refKeys['text'] ); |
|
56 | - $this->addCustomerListData( $testdata, $refIds, 'Laravel' ); |
|
55 | + $refIds['text'] = $this->getTextData($refKeys['text']); |
|
56 | + $this->addCustomerListData($testdata, $refIds, 'Laravel'); |
|
57 | 57 | |
58 | - $this->status( 'done' ); |
|
58 | + $this->status('done'); |
|
59 | 59 | } |
60 | 60 | } |
61 | 61 | \ No newline at end of file |
@@ -5,17 +5,17 @@ |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2014-2016 |
6 | 6 | */ |
7 | 7 | |
8 | -return array ( |
|
9 | - 'customer' => array ( |
|
10 | - 'customer/unitCustomer1' => array( 'label' => 'Max Mustermann', 'code' => 'unitCustomer1', 'status' => 1, 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Max', 'lastname' => 'Mustermann', 'address1' => 'Musterstraße', 'address2' => '1a', 'address3' => '', 'postal' => '20001', 'city' => 'Musterstadt', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '01234567890', 'email' => '[email protected]', 'telefax' => '01234567890', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'unittest' ), |
|
11 | - 'customer/unitCustomer2' => array( 'label' => 'Erika Mustermann', 'code' => 'unitCustomer2', 'status' => 1, 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mrs', 'title' => 'Prof. Dr.', 'firstname' => 'Erika', 'lastname' => 'Mustermann', 'address1' => 'Heidestraße', 'address2' => '17', 'address3' => '', 'postal' => '45632', 'city' => 'Köln', 'state' => '', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '09876543210', 'email' => '[email protected]', 'telefax' => '09876543210', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'birthday' => '1970-01-01', 'status' => '0' ), |
|
12 | - 'customer/unitCustomer3' => array( 'label' => 'Franz-Xaver Gabler', 'code' => 'unitCustomer3', 'status' => 0, 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => '', 'firstname' => 'Franz-Xaver', 'lastname' => 'Gabler', 'address1' => 'Phantasiestraße', 'address2' => '2', 'address3' => '', 'postal' => '23643', 'city' => 'Berlin', 'state' => '', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '01234509876', 'email' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'birthday' => '1970-01-01', 'status' => '1' ), |
|
8 | +return array( |
|
9 | + 'customer' => array( |
|
10 | + 'customer/unitCustomer1' => array('label' => 'Max Mustermann', 'code' => 'unitCustomer1', 'status' => 1, 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Max', 'lastname' => 'Mustermann', 'address1' => 'Musterstraße', 'address2' => '1a', 'address3' => '', 'postal' => '20001', 'city' => 'Musterstadt', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '01234567890', 'email' => '[email protected]', 'telefax' => '01234567890', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'unittest'), |
|
11 | + 'customer/unitCustomer2' => array('label' => 'Erika Mustermann', 'code' => 'unitCustomer2', 'status' => 1, 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mrs', 'title' => 'Prof. Dr.', 'firstname' => 'Erika', 'lastname' => 'Mustermann', 'address1' => 'Heidestraße', 'address2' => '17', 'address3' => '', 'postal' => '45632', 'city' => 'Köln', 'state' => '', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '09876543210', 'email' => '[email protected]', 'telefax' => '09876543210', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'birthday' => '1970-01-01', 'status' => '0'), |
|
12 | + 'customer/unitCustomer3' => array('label' => 'Franz-Xaver Gabler', 'code' => 'unitCustomer3', 'status' => 0, 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => '', 'firstname' => 'Franz-Xaver', 'lastname' => 'Gabler', 'address1' => 'Phantasiestraße', 'address2' => '2', 'address3' => '', 'postal' => '23643', 'city' => 'Berlin', 'state' => '', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '01234509876', 'email' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'birthday' => '1970-01-01', 'status' => '1'), |
|
13 | 13 | ), |
14 | 14 | |
15 | - 'customer/address' => array ( |
|
16 | - array ( 'parentid' => 'customer/unitCustomer1', 'company' => 'ABC', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Our', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '0' ), |
|
17 | - array ( 'parentid' => 'customer/unitCustomer2', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'flag' => 0, 'pos' => '1' ), |
|
18 | - array ( 'parentid' => 'customer/unitCustomer2', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '11099', 'city' => 'Berlin', 'state' => 'Berlin', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332221', 'email' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'flag' => 0, 'pos' => '1' ), |
|
19 | - array ( 'parentid' => 'customer/unitCustomer3', 'company' => 'unitcompany', 'vatid' => 'DE999999999', 'salutation' => 'company', 'title' => 'unittitle', 'firstname' => 'unitfirstname', 'lastname' => 'unitlastname', 'address1' => 'unitaddress1', 'address2' => 'unitaddress2', 'address3' => 'unitaddress3', 'postal' => 'unitpostal', 'city' => 'unitcity', 'state' => 'unitstate', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '1234567890', 'email' => '[email protected]', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '2' ), |
|
15 | + 'customer/address' => array( |
|
16 | + array('parentid' => 'customer/unitCustomer1', 'company' => 'ABC', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Our', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '0'), |
|
17 | + array('parentid' => 'customer/unitCustomer2', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'flag' => 0, 'pos' => '1'), |
|
18 | + array('parentid' => 'customer/unitCustomer2', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '11099', 'city' => 'Berlin', 'state' => 'Berlin', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332221', 'email' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'flag' => 0, 'pos' => '1'), |
|
19 | + array('parentid' => 'customer/unitCustomer3', 'company' => 'unitcompany', 'vatid' => 'DE999999999', 'salutation' => 'company', 'title' => 'unittitle', 'firstname' => 'unitfirstname', 'lastname' => 'unitlastname', 'address1' => 'unitaddress1', 'address2' => 'unitaddress2', 'address3' => 'unitaddress3', 'postal' => 'unitpostal', 'city' => 'unitcity', 'state' => 'unitstate', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '1234567890', 'email' => '[email protected]', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '2'), |
|
20 | 20 | ), |
21 | 21 | ); |
@@ -5,18 +5,18 @@ |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2014-2016 |
6 | 6 | */ |
7 | 7 | |
8 | -return array ( |
|
9 | - 'customer/lists/type' => array ( |
|
10 | - 'customer/group/default' => array( 'domain' => 'customer/group', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ), |
|
11 | - 'product/favorite' => array( 'domain' => 'product', 'code' => 'favorite', 'label' => 'Favorite', 'status' => 1 ), |
|
12 | - 'product/watch' => array( 'domain' => 'product', 'code' => 'watch', 'label' => 'Watch list', 'status' => 1 ), |
|
13 | - 'text/default' => array( 'domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ), |
|
8 | +return array( |
|
9 | + 'customer/lists/type' => array( |
|
10 | + 'customer/group/default' => array('domain' => 'customer/group', 'code' => 'default', 'label' => 'Standard', 'status' => 1), |
|
11 | + 'product/favorite' => array('domain' => 'product', 'code' => 'favorite', 'label' => 'Favorite', 'status' => 1), |
|
12 | + 'product/watch' => array('domain' => 'product', 'code' => 'watch', 'label' => 'Watch list', 'status' => 1), |
|
13 | + 'text/default' => array('domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1), |
|
14 | 14 | ), |
15 | 15 | |
16 | - 'customer/lists' => array ( |
|
17 | - array( 'parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 1, 'status' => 1 ), |
|
18 | - array( 'parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 2, 'status' => 1 ), |
|
19 | - array( 'parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 3, 'status' => 1 ), |
|
20 | - array( 'parentid' => 'customer/unitCustomer1', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 1, 'status' => 1 ), |
|
16 | + 'customer/lists' => array( |
|
17 | + array('parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 1, 'status' => 1), |
|
18 | + array('parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 2, 'status' => 1), |
|
19 | + array('parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 3, 'status' => 1), |
|
20 | + array('parentid' => 'customer/unitCustomer1', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 1, 'status' => 1), |
|
21 | 21 | ), |
22 | 22 | ); |
23 | 23 | \ No newline at end of file |