@@ -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 \Illuminate\Http\UploadedFile ) |
|
| 111 | + if ($value instanceof \Illuminate\Http\UploadedFile) |
|
| 112 | 112 | { |
| 113 | 113 | $list[$key] = new \Zend\Diactoros\UploadedFile( |
| 114 | 114 | $file->getRealPath(), |
@@ -118,9 +118,9 @@ discard block |
||
| 118 | 118 | $file->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 | |