@@ -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 { |
@@ -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 | - $content = $this->fs->put( $path, $content ); |
|
| 300 | - } catch( \Exception $e ) { |
|
| 301 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 299 | + $content = $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 | } |
@@ -264,7 +264,6 @@ |
||
| 264 | 264 | * {@inheritDoc} |
| 265 | 265 | * |
| 266 | 266 | * @param string $path Path to the remote file |
| 267 | - * @param string $file Path to the local file |
|
| 268 | 267 | * @return void |
| 269 | 268 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 270 | 269 | */ |
@@ -5,18 +5,18 @@ |
||
| 5 | 5 | * @copyright Aimeos (aimeos.org), 2014 |
| 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' => 0, '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' => 1, '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' => 2, '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' => 3, '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' => 0, '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' => 1, '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' => 2, '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' => 3, 'status' => 1), |
|
| 21 | 21 | ), |
| 22 | 22 | ); |
| 23 | 23 | \ No newline at end of file |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | */ |
| 22 | 22 | public function getPreDependencies() |
| 23 | 23 | { |
| 24 | - return array( 'TablesAddLaravelTestData' ); |
|
| 24 | + return array('TablesAddLaravelTestData'); |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | |
@@ -31,36 +31,36 @@ discard block |
||
| 31 | 31 | protected function process() |
| 32 | 32 | { |
| 33 | 33 | $iface = '\\Aimeos\\MShop\\Context\\Item\\Iface'; |
| 34 | - if( !( $this->additional instanceof $iface ) ) { |
|
| 35 | - throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) ); |
|
| 34 | + if (!($this->additional instanceof $iface)) { |
|
| 35 | + throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface)); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - $this->msg( 'Adding Laravel customer test data', 0 ); |
|
| 39 | - $this->additional->setEditor( 'ai-laravel:unittest' ); |
|
| 38 | + $this->msg('Adding Laravel customer test data', 0); |
|
| 39 | + $this->additional->setEditor('ai-laravel:unittest'); |
|
| 40 | 40 | |
| 41 | 41 | $parentIds = array(); |
| 42 | 42 | $ds = DIRECTORY_SEPARATOR; |
| 43 | - $path = __DIR__ . $ds . 'data' . $ds . 'customer.php'; |
|
| 43 | + $path = __DIR__.$ds.'data'.$ds.'customer.php'; |
|
| 44 | 44 | |
| 45 | - if( ( $testdata = include( $path ) ) == false ){ |
|
| 46 | - throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) ); |
|
| 45 | + if (($testdata = include($path)) == false) { |
|
| 46 | + throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer domain', $path)); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | |
| 50 | - $customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->additional, 'Laravel' ); |
|
| 51 | - $customerAddressManager = $customerManager->getSubManager( 'address', 'Laravel' ); |
|
| 50 | + $customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->additional, 'Laravel'); |
|
| 51 | + $customerAddressManager = $customerManager->getSubManager('address', 'Laravel'); |
|
| 52 | 52 | |
| 53 | - $this->cleanupCustomerData( $customerManager, $customerAddressManager ); |
|
| 53 | + $this->cleanupCustomerData($customerManager, $customerAddressManager); |
|
| 54 | 54 | |
| 55 | 55 | $this->conn->begin(); |
| 56 | 56 | |
| 57 | - $parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() ); |
|
| 58 | - $this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds ); |
|
| 57 | + $parentIds = $this->addCustomerData($testdata, $customerManager, $customerAddressManager->createItem()); |
|
| 58 | + $this->addCustomerAddressData($testdata, $customerAddressManager, $parentIds); |
|
| 59 | 59 | |
| 60 | 60 | $this->conn->commit(); |
| 61 | 61 | |
| 62 | 62 | |
| 63 | - $this->status( 'done' ); |
|
| 63 | + $this->status('done'); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | |
@@ -70,17 +70,17 @@ discard block |
||
| 70 | 70 | * @param \Aimeos\MShop\Common\Manager\Iface $customerManager Customer manager |
| 71 | 71 | * @param \Aimeos\MShop\Common\Manager\Iface $customerAddressManager Customer address manager |
| 72 | 72 | */ |
| 73 | - protected function cleanupCustomerData( \Aimeos\MShop\Common\Manager\Iface $customerManager, \Aimeos\MShop\Common\Manager\Iface $customerAddressManager ) |
|
| 73 | + protected function cleanupCustomerData(\Aimeos\MShop\Common\Manager\Iface $customerManager, \Aimeos\MShop\Common\Manager\Iface $customerAddressManager) |
|
| 74 | 74 | { |
| 75 | 75 | $search = $customerManager->createSearch(); |
| 76 | - $search->setConditions( $search->compare( '=~', 'customer.code', 'unitCustomer' ) ); |
|
| 77 | - $customerItems = $customerManager->searchItems( $search ); |
|
| 76 | + $search->setConditions($search->compare('=~', 'customer.code', 'unitCustomer')); |
|
| 77 | + $customerItems = $customerManager->searchItems($search); |
|
| 78 | 78 | |
| 79 | 79 | $search = $customerAddressManager->createSearch(); |
| 80 | - $search->setConditions( $search->compare( '=~', 'customer.address.email', 'unitCustomer' ) ); |
|
| 81 | - $addressItems = $customerAddressManager->searchItems( $search ); |
|
| 80 | + $search->setConditions($search->compare('=~', 'customer.address.email', 'unitCustomer')); |
|
| 81 | + $addressItems = $customerAddressManager->searchItems($search); |
|
| 82 | 82 | |
| 83 | - $customerAddressManager->deleteItems( array_keys( $addressItems ) ); |
|
| 84 | - $customerManager->deleteItems( array_keys( $customerItems ) ); |
|
| 83 | + $customerAddressManager->deleteItems(array_keys($addressItems)); |
|
| 84 | + $customerManager->deleteItems(array_keys($customerItems)); |
|
| 85 | 85 | } |
| 86 | 86 | } |
@@ -31,9 +31,9 @@ discard block |
||
| 31 | 31 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
| 32 | 32 | * @param string $tempdir Directory for storing temporary files |
| 33 | 33 | */ |
| 34 | - public function __construct( \Illuminate\Filesystem\FilesystemManager $fsm, \Aimeos\MW\Config\Iface $config, $tempdir ) |
|
| 34 | + public function __construct(\Illuminate\Filesystem\FilesystemManager $fsm, \Aimeos\MW\Config\Iface $config, $tempdir) |
|
| 35 | 35 | { |
| 36 | - parent::__construct( $config ); |
|
| 36 | + parent::__construct($config); |
|
| 37 | 37 | |
| 38 | 38 | $this->fsm = $fsm; |
| 39 | 39 | $this->tempdir = $tempdir; |
@@ -47,19 +47,19 @@ discard block |
||
| 47 | 47 | * @return \Aimeos\MW\Filesystem\Iface File system object |
| 48 | 48 | * @throws \Aimeos\MW\Filesystem\Exception If an no configuration for that name is found |
| 49 | 49 | */ |
| 50 | - public function get( $name ) |
|
| 50 | + public function get($name) |
|
| 51 | 51 | { |
| 52 | - $key = $this->getConfig( $name ); |
|
| 52 | + $key = $this->getConfig($name); |
|
| 53 | 53 | |
| 54 | - if( is_string( $key ) ) |
|
| 54 | + if (is_string($key)) |
|
| 55 | 55 | { |
| 56 | - if( !isset( $this->objects[$key] ) ) { |
|
| 57 | - $this->objects[$key] = new \Aimeos\MW\Filesystem\Laravel( $this->fsm->disk( $key ), $this->tempdir ); |
|
| 56 | + if (!isset($this->objects[$key])) { |
|
| 57 | + $this->objects[$key] = new \Aimeos\MW\Filesystem\Laravel($this->fsm->disk($key), $this->tempdir); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | return $this->objects[$key]; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - return parent::get( $name ); |
|
| 63 | + return parent::get($name); |
|
| 64 | 64 | } |
| 65 | 65 | } |
@@ -12,50 +12,50 @@ |
||
| 12 | 12 | |
| 13 | 13 | protected function setUp() |
| 14 | 14 | { |
| 15 | - if( !class_exists( '\Illuminate\Filesystem\FilesystemManager' ) ) { |
|
| 16 | - $this->markTestSkipped( 'Install the Laravel framework first' ); |
|
| 15 | + if (!class_exists('\Illuminate\Filesystem\FilesystemManager')) { |
|
| 16 | + $this->markTestSkipped('Install the Laravel framework first'); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - $this->storage = $this->getMockBuilder( '\Illuminate\Filesystem\FilesystemManager' ) |
|
| 20 | - ->setMethods( array( 'get' ) ) |
|
| 19 | + $this->storage = $this->getMockBuilder('\Illuminate\Filesystem\FilesystemManager') |
|
| 20 | + ->setMethods(array('get')) |
|
| 21 | 21 | ->disableOriginalConstructor() |
| 22 | 22 | ->getMock(); |
| 23 | 23 | |
| 24 | - $this->config = new \Aimeos\MW\Config\Decorator\Memory( new \Aimeos\MW\Config\PHPArray( array(), array() ) ); |
|
| 25 | - $this->object = new \Aimeos\MW\Filesystem\Manager\Laravel( $this->storage, $this->config, sys_get_temp_dir() ); |
|
| 24 | + $this->config = new \Aimeos\MW\Config\Decorator\Memory(new \Aimeos\MW\Config\PHPArray(array(), array())); |
|
| 25 | + $this->object = new \Aimeos\MW\Filesystem\Manager\Laravel($this->storage, $this->config, sys_get_temp_dir()); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | |
| 29 | 29 | protected function tearDown() |
| 30 | 30 | { |
| 31 | - unset( $this->config, $this->object, $this->storage ); |
|
| 31 | + unset($this->config, $this->object, $this->storage); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | |
| 35 | 35 | public function testGet() |
| 36 | 36 | { |
| 37 | - $fs = $this->getMockBuilder( 'Illuminate\Contracts\Filesystem\Filesystem' ) |
|
| 37 | + $fs = $this->getMockBuilder('Illuminate\Contracts\Filesystem\Filesystem') |
|
| 38 | 38 | ->disableOriginalConstructor() |
| 39 | 39 | ->getMock(); |
| 40 | 40 | |
| 41 | - $this->storage->expects( $this->once() )->method( 'get' ) |
|
| 42 | - ->will( $this->returnValue( $fs ) ); |
|
| 41 | + $this->storage->expects($this->once())->method('get') |
|
| 42 | + ->will($this->returnValue($fs)); |
|
| 43 | 43 | |
| 44 | - $this->config->set( 'resource/fs-media', 'local' ); |
|
| 45 | - $this->assertInstanceof( 'Aimeos\MW\Filesystem\Iface', $this->object->get( 'fs-media' ) ); |
|
| 44 | + $this->config->set('resource/fs-media', 'local'); |
|
| 45 | + $this->assertInstanceof('Aimeos\MW\Filesystem\Iface', $this->object->get('fs-media')); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | public function testGetFallback() |
| 50 | 50 | { |
| 51 | - $this->config->set( 'resource/fs', array( 'adapter' => 'Standard', 'basedir' => __DIR__ ) ); |
|
| 52 | - $this->assertInstanceof( 'Aimeos\MW\Filesystem\Iface', $this->object->get( 'fs-media' ) ); |
|
| 51 | + $this->config->set('resource/fs', array('adapter' => 'Standard', 'basedir' => __DIR__)); |
|
| 52 | + $this->assertInstanceof('Aimeos\MW\Filesystem\Iface', $this->object->get('fs-media')); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | |
| 56 | 56 | public function testGetException() |
| 57 | 57 | { |
| 58 | - $this->setExpectedException( 'Aimeos\MW\Filesystem\Exception' ); |
|
| 59 | - $this->object->get( 'fs-media' ); |
|
| 58 | + $this->setExpectedException('Aimeos\MW\Filesystem\Exception'); |
|
| 59 | + $this->object->get('fs-media'); |
|
| 60 | 60 | } |
| 61 | 61 | } |
@@ -98,8 +98,7 @@ |
||
| 98 | 98 | $value->getClientMimeType(), |
| 99 | 99 | $value->getError() |
| 100 | 100 | ); |
| 101 | - } |
|
| 102 | - elseif( is_array( $value ) ) |
|
| 101 | + } elseif( is_array( $value ) ) |
|
| 103 | 102 | { |
| 104 | 103 | $list[$key] = $this->createUploadedFiles( $value ); |
| 105 | 104 | } |
@@ -34,11 +34,11 @@ discard block |
||
| 34 | 34 | * @param \\Aimeos\MW\View\Iface $view View instance with registered view helpers |
| 35 | 35 | * @param \Illuminate\Http\Request $request Laravel request object |
| 36 | 36 | */ |
| 37 | - public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request ) |
|
| 37 | + public function __construct(\Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request) |
|
| 38 | 38 | { |
| 39 | 39 | $this->request = $request; |
| 40 | 40 | |
| 41 | - parent::__construct( $view, $this->createRequest( $request ) ); |
|
| 41 | + parent::__construct($view, $this->createRequest($request)); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | public function getTarget() |
| 62 | 62 | { |
| 63 | - if( ( $route = $this->request->route() ) !== null ) { |
|
| 63 | + if (($route = $this->request->route()) !== null) { |
|
| 64 | 64 | return $route->getName(); |
| 65 | 65 | } |
| 66 | 66 | } |
@@ -72,10 +72,10 @@ discard block |
||
| 72 | 72 | * @param \Illuminate\Http\Request $nativeRequest Laravel request object |
| 73 | 73 | * @return \Psr\Http\Message\ServerRequestInterface PSR-7 request object |
| 74 | 74 | */ |
| 75 | - protected function createRequest( \Illuminate\Http\Request $nativeRequest ) |
|
| 75 | + protected function createRequest(\Illuminate\Http\Request $nativeRequest) |
|
| 76 | 76 | { |
| 77 | - $files = ServerRequestFactory::normalizeFiles( $this->getFiles( $nativeRequest->files->all() ) ); |
|
| 78 | - $server = ServerRequestFactory::normalizeServer( $nativeRequest->server->all() ); |
|
| 77 | + $files = ServerRequestFactory::normalizeFiles($this->getFiles($nativeRequest->files->all())); |
|
| 78 | + $server = ServerRequestFactory::normalizeServer($nativeRequest->server->all()); |
|
| 79 | 79 | $headers = $nativeRequest->headers->all(); |
| 80 | 80 | $cookies = $nativeRequest->cookies->all(); |
| 81 | 81 | $post = $nativeRequest->request->all(); |
@@ -83,13 +83,13 @@ discard block |
||
| 83 | 83 | $method = $nativeRequest->getMethod(); |
| 84 | 84 | $uri = $nativeRequest->getUri(); |
| 85 | 85 | |
| 86 | - $body = new Stream( 'php://temp', 'wb+' ); |
|
| 87 | - $body->write( $nativeRequest->getContent() ); |
|
| 86 | + $body = new Stream('php://temp', 'wb+'); |
|
| 87 | + $body->write($nativeRequest->getContent()); |
|
| 88 | 88 | |
| 89 | - $request = new ServerRequest( $server, $files, $uri, $method, $body, $headers, $cookies, $query, $post ); |
|
| 89 | + $request = new ServerRequest($server, $files, $uri, $method, $body, $headers, $cookies, $query, $post); |
|
| 90 | 90 | |
| 91 | - foreach( $nativeRequest->attributes->all() as $key => $value ) { |
|
| 92 | - $request = $request->withAttribute( $key, $value ); |
|
| 91 | + foreach ($nativeRequest->attributes->all() as $key => $value) { |
|
| 92 | + $request = $request->withAttribute($key, $value); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | return $request; |
@@ -102,13 +102,13 @@ discard block |
||
| 102 | 102 | * @param array $files Multi-dimensional list of uploaded files from Symfony request |
| 103 | 103 | * @return array Multi-dimensional list of uploaded files as PSR-7 objects |
| 104 | 104 | */ |
| 105 | - protected function getFiles( array $files ) |
|
| 105 | + protected function getFiles(array $files) |
|
| 106 | 106 | { |
| 107 | 107 | $list = array(); |
| 108 | 108 | |
| 109 | - foreach( $files as $key => $value ) |
|
| 109 | + foreach ($files as $key => $value) |
|
| 110 | 110 | { |
| 111 | - if( $value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile ) |
|
| 111 | + if ($value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile) |
|
| 112 | 112 | { |
| 113 | 113 | $list[$key] = new \Zend\Diactoros\UploadedFile( |
| 114 | 114 | $value->getRealPath(), |
@@ -118,9 +118,9 @@ discard block |
||
| 118 | 118 | $value->getClientMimeType() |
| 119 | 119 | ); |
| 120 | 120 | } |
| 121 | - elseif( is_array( $value ) ) |
|
| 121 | + elseif (is_array($value)) |
|
| 122 | 122 | { |
| 123 | - $list[$key] = $this->getFiles( $value ); |
|
| 123 | + $list[$key] = $this->getFiles($value); |
|
| 124 | 124 | } |
| 125 | 125 | } |
| 126 | 126 | |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | /** |
| 32 | 32 | * Initializes the request view helper. |
| 33 | 33 | * |
| 34 | - * @param \\Aimeos\MW\View\Iface $view View instance with registered view helpers |
|
| 34 | + * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers |
|
| 35 | 35 | * @param \Illuminate\Http\Request $request Laravel request object |
| 36 | 36 | */ |
| 37 | 37 | public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request ) |
@@ -26,8 +26,8 @@ |
||
| 26 | 26 | * |
| 27 | 27 | * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers |
| 28 | 28 | */ |
| 29 | - public function __construct( \Aimeos\MW\View\Iface $view ) |
|
| 29 | + public function __construct(\Aimeos\MW\View\Iface $view) |
|
| 30 | 30 | { |
| 31 | - parent::__construct( $view, new \Zend\Diactoros\Response() ); |
|
| 31 | + parent::__construct($view, new \Zend\Diactoros\Response()); |
|
| 32 | 32 | } |
| 33 | 33 | } |
@@ -17,42 +17,42 @@ |
||
| 17 | 17 | |
| 18 | 18 | protected function setUp() |
| 19 | 19 | { |
| 20 | - if( !class_exists( '\Illuminate\Http\Request' ) ) { |
|
| 21 | - $this->markTestSkipped( '\Illuminate\Http\Request is not available' ); |
|
| 20 | + if (!class_exists('\Illuminate\Http\Request')) { |
|
| 21 | + $this->markTestSkipped('\Illuminate\Http\Request is not available'); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | - if( !class_exists( '\Zend\Diactoros\Response' ) ) { |
|
| 25 | - $this->markTestSkipped( '\Zend\Diactoros\Response is not available' ); |
|
| 24 | + if (!class_exists('\Zend\Diactoros\Response')) { |
|
| 25 | + $this->markTestSkipped('\Zend\Diactoros\Response is not available'); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | $view = new \Aimeos\MW\View\Standard(); |
| 29 | - $param = array( 'HTTP_HOST' => 'localhost', 'REMOTE_ADDR' => '127.0.0.1' ); |
|
| 30 | - $request = new \Illuminate\Http\Request( array(), array(), array(), array(), array(), $param, 'Content' ); |
|
| 29 | + $param = array('HTTP_HOST' => 'localhost', 'REMOTE_ADDR' => '127.0.0.1'); |
|
| 30 | + $request = new \Illuminate\Http\Request(array(), array(), array(), array(), array(), $param, 'Content'); |
|
| 31 | 31 | |
| 32 | - $this->object = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, $request ); |
|
| 32 | + $this->object = new \Aimeos\MW\View\Helper\Request\Laravel5($view, $request); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | |
| 36 | 36 | protected function tearDown() |
| 37 | 37 | { |
| 38 | - unset( $this->object, $this->mock ); |
|
| 38 | + unset($this->object, $this->mock); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | |
| 42 | 42 | public function testTransform() |
| 43 | 43 | { |
| 44 | - $this->assertInstanceOf( '\Aimeos\MW\View\Helper\Request\Laravel5', $this->object->transform() ); |
|
| 44 | + $this->assertInstanceOf('\Aimeos\MW\View\Helper\Request\Laravel5', $this->object->transform()); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | |
| 48 | 48 | public function testGetClientAddress() |
| 49 | 49 | { |
| 50 | - $this->assertEquals( '127.0.0.1', $this->object->getClientAddress() ); |
|
| 50 | + $this->assertEquals('127.0.0.1', $this->object->getClientAddress()); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | |
| 54 | 54 | public function testGetTarget() |
| 55 | 55 | { |
| 56 | - $this->assertEquals( null, $this->object->getTarget() ); |
|
| 56 | + $this->assertEquals(null, $this->object->getTarget()); |
|
| 57 | 57 | } |
| 58 | 58 | } |
@@ -17,27 +17,27 @@ |
||
| 17 | 17 | |
| 18 | 18 | protected function setUp() |
| 19 | 19 | { |
| 20 | - if( !class_exists( '\Illuminate\Http\Response' ) ) { |
|
| 21 | - $this->markTestSkipped( '\Illuminate\Http\Response is not available' ); |
|
| 20 | + if (!class_exists('\Illuminate\Http\Response')) { |
|
| 21 | + $this->markTestSkipped('\Illuminate\Http\Response is not available'); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | - if( !class_exists( '\Zend\Diactoros\Response' ) ) { |
|
| 25 | - $this->markTestSkipped( '\Zend\Diactoros\Response is not available' ); |
|
| 24 | + if (!class_exists('\Zend\Diactoros\Response')) { |
|
| 25 | + $this->markTestSkipped('\Zend\Diactoros\Response is not available'); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | $view = new \Aimeos\MW\View\Standard(); |
| 29 | - $this->object = new \Aimeos\MW\View\Helper\Response\Laravel5( $view ); |
|
| 29 | + $this->object = new \Aimeos\MW\View\Helper\Response\Laravel5($view); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | |
| 33 | 33 | protected function tearDown() |
| 34 | 34 | { |
| 35 | - unset( $this->object, $this->mock ); |
|
| 35 | + unset($this->object, $this->mock); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | |
| 39 | 39 | public function testTransform() |
| 40 | 40 | { |
| 41 | - $this->assertInstanceOf( '\Aimeos\MW\View\Helper\Response\Laravel5', $this->object->transform() ); |
|
| 41 | + $this->assertInstanceOf('\Aimeos\MW\View\Helper\Response\Laravel5', $this->object->transform()); |
|
| 42 | 42 | } |
| 43 | 43 | } |