@@ -60,8 +60,7 @@ |
||
60 | 60 | $value->getClientMimeType(), |
61 | 61 | $value->getError() |
62 | 62 | ); |
63 | - } |
|
64 | - else |
|
63 | + } else |
|
65 | 64 | { |
66 | 65 | $files[$key] = $this->createUploadedFiles($value); |
67 | 66 | } |
@@ -34,11 +34,11 @@ discard block |
||
34 | 34 | * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers |
35 | 35 | * @param \Symfony\Component\HttpFoundation\Request $request Symfony2 request object |
36 | 36 | */ |
37 | - public function __construct( $view, \Symfony\Component\HttpFoundation\Request $request ) |
|
37 | + public function __construct($view, \Symfony\Component\HttpFoundation\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 | - return $this->request->get( '_route' ); |
|
63 | + return $this->request->get('_route'); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | |
@@ -70,10 +70,10 @@ discard block |
||
70 | 70 | * @param \Symfony\Component\HttpFoundation\Request $nativeRequest Symfony request object |
71 | 71 | * @return \Psr\Http\Message\ServerRequestInterface PSR-7 request object |
72 | 72 | */ |
73 | - protected function createRequest( \Symfony\Component\HttpFoundation\Request $nativeRequest ) |
|
73 | + protected function createRequest(\Symfony\Component\HttpFoundation\Request $nativeRequest) |
|
74 | 74 | { |
75 | - $files = ServerRequestFactory::normalizeFiles( $this->getFiles( $nativeRequest->files->all() ) ); |
|
76 | - $server = ServerRequestFactory::normalizeServer( $nativeRequest->server->all() ); |
|
75 | + $files = ServerRequestFactory::normalizeFiles($this->getFiles($nativeRequest->files->all())); |
|
76 | + $server = ServerRequestFactory::normalizeServer($nativeRequest->server->all()); |
|
77 | 77 | $headers = $nativeRequest->headers->all(); |
78 | 78 | $cookies = $nativeRequest->cookies->all(); |
79 | 79 | $post = $nativeRequest->request->all(); |
@@ -81,13 +81,13 @@ discard block |
||
81 | 81 | $method = $nativeRequest->getMethod(); |
82 | 82 | $uri = $nativeRequest->getUri(); |
83 | 83 | |
84 | - $body = new Stream( 'php://temp', 'wb+' ); |
|
85 | - $body->write( $nativeRequest->getContent() ); |
|
84 | + $body = new Stream('php://temp', 'wb+'); |
|
85 | + $body->write($nativeRequest->getContent()); |
|
86 | 86 | |
87 | - $request = new ServerRequest( $server, $files, $uri, $method, $body, $headers, $cookies, $query, $post ); |
|
87 | + $request = new ServerRequest($server, $files, $uri, $method, $body, $headers, $cookies, $query, $post); |
|
88 | 88 | |
89 | - foreach( $nativeRequest->attributes->all() as $key => $value ) { |
|
90 | - $request = $request->withAttribute( $key, $value ); |
|
89 | + foreach ($nativeRequest->attributes->all() as $key => $value) { |
|
90 | + $request = $request->withAttribute($key, $value); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | return $request; |
@@ -100,13 +100,13 @@ discard block |
||
100 | 100 | * @param array $files Multi-dimensional list of uploaded files from Symfony request |
101 | 101 | * @return array Multi-dimensional list of uploaded files as PSR-7 objects |
102 | 102 | */ |
103 | - protected function getFiles( array $files ) |
|
103 | + protected function getFiles(array $files) |
|
104 | 104 | { |
105 | 105 | $list = array(); |
106 | 106 | |
107 | - foreach( $files as $key => $value ) |
|
107 | + foreach ($files as $key => $value) |
|
108 | 108 | { |
109 | - if( $value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile ) |
|
109 | + if ($value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile) |
|
110 | 110 | { |
111 | 111 | $list[$key] = new \Zend\Diactoros\UploadedFile( |
112 | 112 | $file->getRealPath(), |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | } |
119 | 119 | else |
120 | 120 | { |
121 | - $list[$key] = $this->getFiles( $value ); |
|
121 | + $list[$key] = $this->getFiles($value); |
|
122 | 122 | } |
123 | 123 | } |
124 | 124 |