@@ -94,8 +94,7 @@ |
||
| 94 | 94 | $value->getClientMimeType(), |
| 95 | 95 | $value->getError() |
| 96 | 96 | ); |
| 97 | - } |
|
| 98 | - else |
|
| 97 | + } else |
|
| 99 | 98 | { |
| 100 | 99 | $files[$key] = $this->createUploadedFiles($value); |
| 101 | 100 | } |
@@ -30,11 +30,11 @@ discard block |
||
| 30 | 30 | * @param \\Aimeos\MW\View\Iface $view View instance with registered view helpers |
| 31 | 31 | * @param \Illuminate\Http\Request $request Laravel request object |
| 32 | 32 | */ |
| 33 | - public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request ) |
|
| 33 | + public function __construct(\Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request) |
|
| 34 | 34 | { |
| 35 | 35 | $this->request = $request; |
| 36 | 36 | |
| 37 | - parent::__construct( $view, $this->createRequest( $request ) ); |
|
| 37 | + parent::__construct($view, $this->createRequest($request)); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | public function getTarget() |
| 58 | 58 | { |
| 59 | - if( ( $route = $this->request->route() ) !== null ) { |
|
| 59 | + if (($route = $this->request->route()) !== null) { |
|
| 60 | 60 | return $route->getName(); |
| 61 | 61 | } |
| 62 | 62 | } |
@@ -68,10 +68,10 @@ discard block |
||
| 68 | 68 | * @param \Illuminate\Http\Request $nativeRequest Laravel request object |
| 69 | 69 | * @return \Psr\Http\Message\ServerRequestInterface PSR-7 request object |
| 70 | 70 | */ |
| 71 | - protected function createRequest( \Illuminate\Http\Request $nativeRequest ) |
|
| 71 | + protected function createRequest(\Illuminate\Http\Request $nativeRequest) |
|
| 72 | 72 | { |
| 73 | - $files = ServerRequestFactory::normalizeFiles( $this->getFiles( $nativeRequest->files->all() ) ); |
|
| 74 | - $server = ServerRequestFactory::normalizeServer( $nativeRequest->server->all() ); |
|
| 73 | + $files = ServerRequestFactory::normalizeFiles($this->getFiles($nativeRequest->files->all())); |
|
| 74 | + $server = ServerRequestFactory::normalizeServer($nativeRequest->server->all()); |
|
| 75 | 75 | $headers = $nativeRequest->headers->all(); |
| 76 | 76 | $cookies = $nativeRequest->cookies->all(); |
| 77 | 77 | $post = $nativeRequest->request->all(); |
@@ -79,13 +79,13 @@ discard block |
||
| 79 | 79 | $method = $nativeRequest->getMethod(); |
| 80 | 80 | $uri = $nativeRequest->getUri(); |
| 81 | 81 | |
| 82 | - $body = new Stream( 'php://temp', 'wb+' ); |
|
| 83 | - $body->write( $nativeRequest->getContent() ); |
|
| 82 | + $body = new Stream('php://temp', 'wb+'); |
|
| 83 | + $body->write($nativeRequest->getContent()); |
|
| 84 | 84 | |
| 85 | - $request = new ServerRequest( $server, $files, $uri, $method, $body, $headers, $cookies, $query, $post ); |
|
| 85 | + $request = new ServerRequest($server, $files, $uri, $method, $body, $headers, $cookies, $query, $post); |
|
| 86 | 86 | |
| 87 | - foreach( $nativeRequest->attributes->all() as $key => $value ) { |
|
| 88 | - $request = $request->withAttribute( $key, $value ); |
|
| 87 | + foreach ($nativeRequest->attributes->all() as $key => $value) { |
|
| 88 | + $request = $request->withAttribute($key, $value); |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | return $request; |
@@ -98,13 +98,13 @@ discard block |
||
| 98 | 98 | * @param array $files Multi-dimensional list of uploaded files from Symfony request |
| 99 | 99 | * @return array Multi-dimensional list of uploaded files as PSR-7 objects |
| 100 | 100 | */ |
| 101 | - protected function getFiles( array $files ) |
|
| 101 | + protected function getFiles(array $files) |
|
| 102 | 102 | { |
| 103 | 103 | $list = array(); |
| 104 | 104 | |
| 105 | - foreach( $files as $key => $value ) |
|
| 105 | + foreach ($files as $key => $value) |
|
| 106 | 106 | { |
| 107 | - if( $value instanceof \Illuminate\Http\UploadedFile ) |
|
| 107 | + if ($value instanceof \Illuminate\Http\UploadedFile) |
|
| 108 | 108 | { |
| 109 | 109 | $list[$key] = new \Zend\Diactoros\UploadedFile( |
| 110 | 110 | $file->getRealPath(), |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | } |
| 117 | 117 | else |
| 118 | 118 | { |
| 119 | - $list[$key] = $this->getFiles( $value ); |
|
| 119 | + $list[$key] = $this->getFiles($value); |
|
| 120 | 120 | } |
| 121 | 121 | } |
| 122 | 122 | |